diff --git a/_sakura/changelog.json b/_sakura/changelog.json index 4a3bf9a..7f406be 100644 --- a/_sakura/changelog.json +++ b/_sakura/changelog.json @@ -15,7 +15,8 @@ "20150427.4", "20150427.5", "20150427.6", - "20150427.7" + "20150427.7", + "20150427.8" ] @@ -786,6 +787,23 @@ "change": "Add members page pagination." } + ], + + "20150427.8": [ + + { + "type": "FIX", + "change": "Fix long usernames exceeding the rectangle view." + }, + { + "type": "FIX", + "change": "Abyss'd users showing up in the member list." + }, + { + "type": "FIX", + "change": "Abyss'd user's names still showing up in the title of the profile." + } + ] } diff --git a/_sakura/components/Users.php b/_sakura/components/Users.php index b1fe829..5cce653 100644 --- a/_sakura/components/Users.php +++ b/_sakura/components/Users.php @@ -861,7 +861,7 @@ class Users { foreach($users as $user) { // If so store the user's row in the array - if(self::checkIfUserHasRanks([$rankId], $user, true)) + if(self::checkIfUserHasRanks([$rankId], $user, true) && $user['password_algo'] != 'nologin') $rank[] = $user; } @@ -872,7 +872,7 @@ class Users { } // Get all users - public static function getAllUsers($includeInactive = true) { + public static function getAllUsers($includeInactive = true, $includeAbyss = false) { // Execute query $getUsers = Database::fetch('users', true); @@ -883,6 +883,10 @@ class Users { // Reorder shit foreach($getUsers as $user) { + // Skip abyss + if(!$includeAbyss && $user['password_algo'] == 'nologin') + continue; + // Skip if inactive and not include deactivated users if(!$includeInactive && self::checkIfUserHasRanks([0, 1], $user, true)) continue; diff --git a/_sakura/sakura.php b/_sakura/sakura.php index 82ad45f..827dca2 100644 --- a/_sakura/sakura.php +++ b/_sakura/sakura.php @@ -8,7 +8,7 @@ namespace Sakura; // Define Sakura version -define('SAKURA_VERSION', '20150427.7'); +define('SAKURA_VERSION', '20150427.8'); define('SAKURA_VLABEL', 'Heliotrope'); define('SAKURA_VTYPE', 'Development'); define('SAKURA_COLOUR', '#DF73FF'); diff --git a/content/data/yuuno/css/yuuno.css b/content/data/yuuno/css/yuuno.css index 1b150a7..33653a4 100644 --- a/content/data/yuuno/css/yuuno.css +++ b/content/data/yuuno/css/yuuno.css @@ -914,7 +914,7 @@ h1.stylised { } .membersPage .rectangles .userBox { - width: 200px; + width: 300px; height: 100px; text-align: left; } diff --git a/main/profile.php b/main/profile.php index c057550..d7c3458 100644 --- a/main/profile.php +++ b/main/profile.php @@ -37,7 +37,7 @@ if(isset($_GET['u'])) { 'data' => Users::getUserProfileData($_PROFILE_USER_DATA['id']) ]; - $renderData['page']['title'] = ($renderData['profile']['user']['id'] < 1 ? 'User not found!' : 'Profile of '. $renderData['profile']['user']['username']); + $renderData['page']['title'] = ($_PROFILE_USER_DATA['id'] < 1 || $_PROFILE_USER_DATA['password_algo'] == 'nologin' ? 'User not found!' : 'Profile of '. $renderData['profile']['user']['username']); } else {