flash/sakura
flash/sakura
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

I'm a fucking retard!

Browse source
This commit is contained in:
flash 2015-04-26 00:05:32 +00:00
parent 30b443ab52
commit 559cc041fd
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
_sakura/components/Users.php
View file

@ -115,7 +115,7 @@ class Users {
} }
// Check if the user is deactivated // Check if the user is deactivated
if(in_array(0, json_decode($userData['ranks'], true))) if(in_array(1, json_decode($userData['ranks'], true)) || in_array(0, json_decode($userData['ranks'], true)) || $userData['rank_main'] < 2)
return [0, 'DEACTIVATED']; return [0, 'DEACTIVATED'];
// Create a new session // Create a new session
@ -215,7 +215,7 @@ class Users {
$emailClean = Main::cleanString($email, true); $emailClean = Main::cleanString($email, true);
$password = Hashing::create_hash($password); $password = Hashing::create_hash($password);
$requireActive = Configuration::getConfig('require_activation'); $requireActive = Configuration::getConfig('require_activation');
$userRank = $requireActive ? [0] : [1]; $userRank = $requireActive ? [1] : [2];
$userRankJson = json_encode($userRank); $userRankJson = json_encode($userRank);
// Insert the user into the database // Insert the user into the database
@ -284,7 +284,7 @@ class Users {
return [0, 'USER_NOT_EXIST']; return [0, 'USER_NOT_EXIST'];
// Check if the user is deactivated // Check if the user is deactivated
if(in_array(0, json_decode($user['ranks'], true))) if(in_array(1, json_decode($userData['ranks'], true)) || in_array(0, json_decode($userData['ranks'], true)) || $userData['rank_main'] < 2)
return [0, 'DEACTIVATED']; return [0, 'DEACTIVATED'];
// Generate the verification key // Generate the verification key
@ -326,7 +326,7 @@ class Users {
$user = Users::getUser(Session::$userId); $user = Users::getUser(Session::$userId);
// Check if the user is deactivated // Check if the user is deactivated
if(in_array(0, json_decode($user['ranks'], true))) if(in_array(1, json_decode($userData['ranks'], true)) || in_array(0, json_decode($userData['ranks'], true)) || $userData['rank_main'] < 2)
return [0, 'DEACTIVATED']; return [0, 'DEACTIVATED'];
// Check if the account is disabled // Check if the account is disabled
@ -453,7 +453,7 @@ class Users {
$user = Database::fetch('users', false, ['id' => [$uid, '=']]); $user = Database::fetch('users', false, ['id' => [$uid, '=']]);
// User is already activated or doesn't even exist // User is already activated or doesn't even exist
if(!count($user) > 1 || $user['rank_main']) if(!count($user) > 1 || !in_array(1, json_decode($userData['ranks'], true)) || !in_array(0, json_decode($userData['ranks'], true)) || $userData['rank_main'] > 1)
return false; return false;
// Generate activation key // Generate activation key
@ -497,12 +497,12 @@ class Users {
return [0, 'USER_NOT_EXIST']; return [0, 'USER_NOT_EXIST'];
// Check if user is already activated // Check if user is already activated
if($user['rank_main']) if(!in_array(1, json_decode($userData['ranks'], true)) || !in_array(0, json_decode($userData['ranks'], true)) || $userData['rank_main'] > 1)
return [0, 'USER_ALREADY_ACTIVE']; return [0, 'USER_ALREADY_ACTIVE'];
// Set default values for activation // Set default values for activation
$rank = 1; $rank = 2;
$ranks = json_encode([1]); $ranks = json_encode([2]);
// Check if a key is set (there's an option to not set one for user management reasons but you can't really get around this anyway) // Check if a key is set (there's an option to not set one for user management reasons but you can't really get around this anyway)
if($requireKey) { if($requireKey) {
@ -554,8 +554,8 @@ class Users {
// Deactivate the account // Deactivate the account
Database::update('users', [ Database::update('users', [
[ [
'rank_main' => 0, 'rank_main' => 1,
'ranks' => json_encode([0]) 'ranks' => json_encode([1])
], ],
[ [
'id' => [$uid, '='] 'id' => [$uid, '=']
@ -702,7 +702,7 @@ class Users {
foreach($getUsers as $user) { foreach($getUsers as $user) {
// Skip if inactive and not include deactivated users // Skip if inactive and not include deactivated users
if(!$includeInactive && $user['rank_main'] == 0) if(!$includeInactive && $user['rank_main'] < 2)
continue; continue;
$users[$user['id']] = $user; $users[$user['id']] = $user;