From 13bc2cdd0b065941dfe305a3ca5536781a81a9d5 Mon Sep 17 00:00:00 2001
From: unknown <nsoharab@gmail.com>
Date: Thu, 1 Dec 2016 15:44:20 -0500
Subject: [PATCH] Removed Activation

---
 .../Controllers/AuthenticateController.php    | 22 -------------------
 app/Http/Controllers/DashboardController.php  |  2 --
 public/js/dashboard.js                        |  2 --
 public/views/dashboard/options.html           |  6 -----
 4 files changed, 32 deletions(-)

diff --git a/app/Http/Controllers/AuthenticateController.php b/app/Http/Controllers/AuthenticateController.php
index dc63228..b798524 100644
--- a/app/Http/Controllers/AuthenticateController.php
+++ b/app/Http/Controllers/AuthenticateController.php
@@ -229,26 +229,4 @@ public function refreshToken() {
     return Response::json($token);
   }
 
-  public function unSubscribe($token)
-  {
-    $subscription = Subscription::where('subscriptionID', '=', $token)->first();
-
-    if(!empty($subscription))
-    {
-      if($subscription->subscriptionActive == true)
-      {
-        $subscription->subscriptionActive = false;
-        $subscription->save();
-        //Unsubscribed
-        return Response::json(1);
-      }
-      else {
-        //Not subscribed
-        return Response::json(0);
-      }
-    } else {
-      //Token not found
-      return Response::json(2);
-    }
-  }
 }
diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
index 2268d3f..dcbe040 100644
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -561,8 +561,6 @@ public function saveOptions(Request $request)
         $options->siteLogo = $request->json('siteLogo');
         $options->homePage = $request->json('homePage');
         $options->allowRegistration = $request->json('allowRegistration');
-        $options->allowSubscription = $request->json('allowSubscription');
-        $options->requireActivation = $request->json('requireActivation');
         $options->replyModeration = $request->json('replyModeration');
         $options->aboutWebsite = $request->json('aboutWebsite');
         $options->homeBanner = $request->json('homeBanner');
diff --git a/public/js/dashboard.js b/public/js/dashboard.js
index 29ca502..f091a90 100644
--- a/public/js/dashboard.js
+++ b/public/js/dashboard.js
@@ -1500,7 +1500,6 @@ angular.module('remark.dashboard', [])
   $scope.apps = optionData.data.apps;
 
   $scope.options.allowRegistration = Number($scope.options.allowRegistration);
-  $scope.options.requireActivation = Number($scope.options.requireActivation);
   $scope.options.replyModeration = Number($scope.options.replyModeration);
   $scope.options.homeBanner = Number($scope.options.homeBanner);
   $scope.options.allowAsk = Number($scope.options.allowAsk);
@@ -1523,7 +1522,6 @@ angular.module('remark.dashboard', [])
           siteLogo:$scope.options.siteLogo,
           homePage: $scope.options.homePage,
           allowRegistration: $scope.options.allowRegistration,
-          requireActivation: $scope.options.requireActivation,
           replyModeration: $scope.options.replyModeration,
           allowAsk: $scope.options.allowAsk,
           homeBanner: $scope.options.homeBanner,
diff --git a/public/views/dashboard/options.html b/public/views/dashboard/options.html
index b853a02..7e579a6 100644
--- a/public/views/dashboard/options.html
+++ b/public/views/dashboard/options.html
@@ -39,12 +39,6 @@ <h2 class="content-h2">General</h2>
               </md-checkbox>
               <pre hide-xs>Allow Users to sign up to your site.</pre>
             </div>
-            <div class="menuSelect">
-              <md-checkbox ng-model="options.requireActivation" aria-label="Require Activation" ng-true-value="1" ng-false-value="0">
-                Require Activation
-              </md-checkbox>
-              <pre hide-xs>Requires Email Activation on Sign up.</pre>
-            </div>
             <div class="menuSelect">
               <md-checkbox ng-model="options.replyModeration" aria-label="Moderate Replies" ng-true-value="1" ng-false-value="0">
                 Moderate Replies