Removed Activation

Technopathic · Dec 1, 2016 · 13bc2cd · 13bc2cd
1 parent dffc23b
commit 13bc2cd
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 32 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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