From 4b3aeb6149ebf28b8308ed3dd0aa71fafd703b32 Mon Sep 17 00:00:00 2001 From: flashwave Date: Wed, 7 Dec 2016 15:38:57 +0100 Subject: [PATCH] remove verified can't even remember what it was supposed to do anyway --- app/Controllers/PremiumController.php | 7 ++----- app/User.php | 7 ------- database/2016_10_23_152450_restructure_permissions.php | 4 ---- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/app/Controllers/PremiumController.php b/app/Controllers/PremiumController.php index ff65640..5a52fbf 100644 --- a/app/Controllers/PremiumController.php +++ b/app/Controllers/PremiumController.php @@ -54,11 +54,8 @@ class PremiumController extends Controller $months = $_POST['months'] ?? 0; // Check if the session is valid - if (!session_check() - || !CurrentSession::$user->activated - || !CurrentSession::$user->verified - || CurrentSession::$user->restricted) { - throw new HttpMethodNotAllowedException(); + if (!session_check() || !CurrentSession::$user->activated || CurrentSession::$user->restricted) { + throw new HttpMethodNotAllowedException; } // Fetch the limit diff --git a/app/User.php b/app/User.php index a424370..1394555 100644 --- a/app/User.php +++ b/app/User.php @@ -242,12 +242,6 @@ class User */ public $activated = false; - /** - * Is this user verified? - * @var bool - */ - public $verified = false; - /** * Is this user restricted? * @var bool @@ -381,7 +375,6 @@ class User $this->musicListening = boolval($userRow->user_music_listening); $this->musicCheck = intval($userRow->user_music_check); $this->activated = boolval($userRow->user_activated); - $this->verified = boolval($userRow->user_verified); $this->restricted = boolval($userRow->user_restricted); // Temporary backwards compatible IP storage system diff --git a/database/2016_10_23_152450_restructure_permissions.php b/database/2016_10_23_152450_restructure_permissions.php index dff1a56..0d406f8 100644 --- a/database/2016_10_23_152450_restructure_permissions.php +++ b/database/2016_10_23_152450_restructure_permissions.php @@ -17,9 +17,6 @@ class RestructurePermissions extends Migration $table->boolean('user_activated') ->default(0); - $table->boolean('user_verified') - ->default(0); - $table->boolean('user_restricted') ->default(0); }); @@ -129,7 +126,6 @@ class RestructurePermissions extends Migration $schema->table('users', function (Blueprint $table) { $table->dropColumn([ 'user_activated', - 'user_verified', 'user_restricted', ]); });