From 2745dfe0cd711b635eab44051bc2b3f7f53e2bcc Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Sat, 18 Aug 2018 04:31:46 +0200
Subject: [PATCH] Rename global permission constants to make more sense.

---
 misuzu.php                  |   2 +-
 public/manage/changelog.php |  12 ++--
 public/manage/index.php     |   6 +-
 public/manage/users.php     |   6 +-
 public/settings.php         |   4 +-
 src/Forum/forum.php         |   2 +-
 src/Users/user.php          |  16 ++---
 src/changelog.php           |   6 +-
 src/comments.php            |  47 ++++++-------
 src/general.php             |   8 +--
 src/manage.php              | 132 ++++++++++++++++++------------------
 src/news.php                |   4 +-
 12 files changed, 123 insertions(+), 122 deletions(-)

diff --git a/misuzu.php b/misuzu.php
index 8bfc570f..79fa2721 100644
--- a/misuzu.php
+++ b/misuzu.php
@@ -245,7 +245,7 @@ MIG;
     }
 
     $inManageMode = starts_with($_SERVER['REQUEST_URI'], '/manage');
-    $hasManageAccess = perms_check(perms_get_user(MSZ_PERMS_GENERAL, $app->getUserId()), MSZ_GENERAL_PERM_CAN_MANAGE);
+    $hasManageAccess = perms_check(perms_get_user(MSZ_PERMS_GENERAL, $app->getUserId()), MSZ_PERM_GENERAL_CAN_MANAGE);
     tpl_var('has_manage_access', $hasManageAccess);
 
     if ($inManageMode) {
diff --git a/public/manage/changelog.php b/public/manage/changelog.php
index 818d3bc1..18bbba57 100644
--- a/public/manage/changelog.php
+++ b/public/manage/changelog.php
@@ -9,7 +9,7 @@ $queryOffset = (int)($_GET['o'] ?? 0);
 switch ($_GET['v'] ?? null) {
     default:
     case 'changes':
-        if (!perms_check($changelogPerms, MSZ_CHANGELOG_PERM_MANAGE_CHANGES)) {
+        if (!perms_check($changelogPerms, MSZ_PERM_CHANGELOG_MANAGE_CHANGES)) {
             echo render_error(403);
             break;
         }
@@ -66,7 +66,7 @@ switch ($_GET['v'] ?? null) {
         break;
 
     case 'change':
-        if (!perms_check($changelogPerms, MSZ_CHANGELOG_PERM_MANAGE_CHANGES)) {
+        if (!perms_check($changelogPerms, MSZ_PERM_CHANGELOG_MANAGE_CHANGES)) {
             echo render_error(403);
             break;
         }
@@ -211,8 +211,8 @@ switch ($_GET['v'] ?? null) {
         break;
 
     case 'tags':
-        $canManageTags = perms_check($changelogPerms, MSZ_CHANGELOG_PERM_MANAGE_TAGS);
-        $canManageActions = perms_check($changelogPerms, MSZ_CHANGELOG_PERM_MANAGE_ACTIONS);
+        $canManageTags = perms_check($changelogPerms, MSZ_PERM_CHANGELOG_MANAGE_TAGS);
+        $canManageActions = perms_check($changelogPerms, MSZ_PERM_CHANGELOG_MANAGE_ACTIONS);
 
         if (!$canManageTags && !$canManageActions) {
             echo render_error(403);
@@ -253,7 +253,7 @@ switch ($_GET['v'] ?? null) {
         break;
 
     case 'tag':
-        if (!perms_check($changelogPerms, MSZ_CHANGELOG_PERM_MANAGE_TAGS)) {
+        if (!perms_check($changelogPerms, MSZ_PERM_CHANGELOG_MANAGE_TAGS)) {
             echo render_error(403);
             break;
         }
@@ -318,7 +318,7 @@ switch ($_GET['v'] ?? null) {
         break;
 
     case 'action':
-        if (!perms_check($changelogPerms, MSZ_CHANGELOG_PERM_MANAGE_ACTIONS)) {
+        if (!perms_check($changelogPerms, MSZ_PERM_CHANGELOG_MANAGE_ACTIONS)) {
             echo render_error(403);
             break;
         }
diff --git a/public/manage/index.php b/public/manage/index.php
index 83d9999b..69fc759c 100644
--- a/public/manage/index.php
+++ b/public/manage/index.php
@@ -10,7 +10,7 @@ switch ($_GET['v'] ?? null) {
         break;
 
     case 'logs':
-        if (!perms_check($generalPerms, MSZ_GENERAL_PERM_VIEW_LOGS)) {
+        if (!perms_check($generalPerms, MSZ_PERM_GENERAL_VIEW_LOGS)) {
             echo render_error(403);
             break;
         }
@@ -20,7 +20,7 @@ switch ($_GET['v'] ?? null) {
         break;
 
     case 'emoticons':
-        if (!perms_check($generalPerms, MSZ_GENERAL_PERM_MANAGE_EMOTICONS)) {
+        if (!perms_check($generalPerms, MSZ_PERM_GENERAL_MANAGE_EMOTICONS)) {
             echo render_error(403);
             break;
         }
@@ -29,7 +29,7 @@ switch ($_GET['v'] ?? null) {
         break;
 
     case 'settings':
-        if (!perms_check($generalPerms, MSZ_GENERAL_PERM_MANAGE_SETTINGS)) {
+        if (!perms_check($generalPerms, MSZ_PERM_GENERAL_MANAGE_SETTINGS)) {
             echo render_error(403);
             break;
         }
diff --git a/public/manage/users.php b/public/manage/users.php
index b2035a11..2700347a 100644
--- a/public/manage/users.php
+++ b/public/manage/users.php
@@ -8,9 +8,9 @@ $isPostRequest = $_SERVER['REQUEST_METHOD'] === 'POST';
 $queryQffset = (int)($_GET['o'] ?? 0);
 
 tpl_vars([
-    'can_manage_users' => $canManageUsers = perms_check($userPerms, MSZ_USER_PERM_MANAGE_USERS),
-    'can_manage_roles' => $canManageRoles = perms_check($userPerms, MSZ_USER_PERM_MANAGE_ROLES),
-    'can_manage_perms' => $canManagePerms = perms_check($userPerms, MSZ_USER_PERM_MANAGE_PERMS),
+    'can_manage_users' => $canManageUsers = perms_check($userPerms, MSZ_PERM_USER_MANAGE_USERS),
+    'can_manage_roles' => $canManageRoles = perms_check($userPerms, MSZ_PERM_USER_MANAGE_ROLES),
+    'can_manage_perms' => $canManagePerms = perms_check($userPerms, MSZ_PERM_USER_MANAGE_PERMS),
 ]);
 
 switch ($_GET['v'] ?? null) {
diff --git a/public/settings.php b/public/settings.php
index 2ca49da4..b2f262dd 100644
--- a/public/settings.php
+++ b/public/settings.php
@@ -9,8 +9,8 @@ $queryTake = 15;
 
 $userPerms = perms_get_user(MSZ_PERMS_USER, $app->getUserId());
 $perms = [
-    'edit_profile' => perms_check($userPerms, MSZ_USER_PERM_EDIT_PROFILE),
-    'edit_avatar' => perms_check($userPerms, MSZ_USER_PERM_CHANGE_AVATAR),
+    'edit_profile' => perms_check($userPerms, MSZ_PERM_USER_EDIT_PROFILE),
+    'edit_avatar' => perms_check($userPerms, MSZ_PERM_USER_CHANGE_AVATAR),
 ];
 
 if (!$app->hasActiveSession()) {
diff --git a/src/Forum/forum.php b/src/Forum/forum.php
index dfc55491..68f798c0 100644
--- a/src/Forum/forum.php
+++ b/src/Forum/forum.php
@@ -1,7 +1,7 @@
 <?php
 use Misuzu\Database;
 
-define('MSZ_FORUM_PERM_MANAGE_FORUMS', 1);
+define('MSZ_PERM_FORUM_MANAGE_FORUMS', 1);
 
 define('MSZ_FORUM_PERM_LIST_FORUM', 1); // can see stats, but will get error when trying to view
 define('MSZ_FORUM_PERM_VIEW_FORUM', 1 << 1);
diff --git a/src/Users/user.php b/src/Users/user.php
index a1e9b12b..dd168104 100644
--- a/src/Users/user.php
+++ b/src/Users/user.php
@@ -3,15 +3,15 @@ use Misuzu\Application;
 use Misuzu\Database;
 use Misuzu\IO\File;
 
-define('MSZ_USER_PERM_EDIT_PROFILE', 1);
-define('MSZ_USER_PERM_CHANGE_AVATAR', 1 << 1);
+define('MSZ_PERM_USER_EDIT_PROFILE', 1);
+define('MSZ_PERM_USER_CHANGE_AVATAR', 1 << 1);
 
-define('MSZ_USER_PERM_MANAGE_USERS', 1 << 20);
-define('MSZ_USER_PERM_MANAGE_ROLES', 1 << 21);
-define('MSZ_USER_PERM_MANAGE_PERMS', 1 << 22);
-define('MSZ_USER_PERM_MANAGE_REPORTS', 1 << 23);
-define('MSZ_USER_PERM_MANAGE_RESTRICTIONS', 1 << 24);
-define('MSZ_USER_PERM_MANAGE_BLACKLISTS', 1 << 25);
+define('MSZ_PERM_USER_MANAGE_USERS', 1 << 20);
+define('MSZ_PERM_USER_MANAGE_ROLES', 1 << 21);
+define('MSZ_PERM_USER_MANAGE_PERMS', 1 << 22);
+define('MSZ_PERM_USER_MANAGE_REPORTS', 1 << 23);
+define('MSZ_PERM_USER_MANAGE_RESTRICTIONS', 1 << 24);
+define('MSZ_PERM_USER_MANAGE_BLACKLISTS', 1 << 25);
 
 define('MSZ_USERS_PASSWORD_HASH_ALGO', PASSWORD_ARGON2I);
 
diff --git a/src/changelog.php b/src/changelog.php
index cad05e1b..b1833645 100644
--- a/src/changelog.php
+++ b/src/changelog.php
@@ -1,9 +1,9 @@
 <?php
 use Misuzu\Database;
 
-define('MSZ_CHANGELOG_PERM_MANAGE_CHANGES', 1);
-define('MSZ_CHANGELOG_PERM_MANAGE_TAGS', 1 << 1);
-define('MSZ_CHANGELOG_PERM_MANAGE_ACTIONS', 1 << 2);
+define('MSZ_PERM_CHANGELOG_MANAGE_CHANGES', 1);
+define('MSZ_PERM_CHANGELOG_MANAGE_TAGS', 1 << 1);
+define('MSZ_PERM_CHANGELOG_MANAGE_ACTIONS', 1 << 2);
 
 function changelog_action_add(string $name, ?int $colour = null, ?string $class = null): int
 {
diff --git a/src/comments.php b/src/comments.php
index 4f10c999..c0c8fab5 100644
--- a/src/comments.php
+++ b/src/comments.php
@@ -3,14 +3,14 @@ use Misuzu\Database;
 
 require_once __DIR__ . '/Users/validation.php';
 
-define('MSZ_COMMENTS_PERM_CREATE', 1);
-define('MSZ_COMMENTS_PERM_EDIT_OWN', 1 << 1);
-define('MSZ_COMMENTS_PERM_EDIT_ANY', 1 << 2);
-define('MSZ_COMMENTS_PERM_DELETE_OWN', 1 << 3);
-define('MSZ_COMMENTS_PERM_DELETE_ANY', 1 << 4);
-define('MSZ_COMMENTS_PERM_PIN', 1 << 5);
-define('MSZ_COMMENTS_PERM_LOCK', 1 << 6);
-define('MSZ_COMMENTS_PERM_VOTE', 1 << 7);
+define('MSZ_PERM_COMMENTS_CREATE', 1);
+define('MSZ_PERM_COMMENTS_EDIT_OWN', 1 << 1);
+define('MSZ_PERM_COMMENTS_EDIT_ANY', 1 << 2);
+define('MSZ_PERM_COMMENTS_DELETE_OWN', 1 << 3);
+define('MSZ_PERM_COMMENTS_DELETE_ANY', 1 << 4);
+define('MSZ_PERM_COMMENTS_PIN', 1 << 5);
+define('MSZ_PERM_COMMENTS_LOCK', 1 << 6);
+define('MSZ_PERM_COMMENTS_VOTE', 1 << 7);
 
 define('MSZ_COMMENTS_VOTE_INDIFFERENT', null);
 define('MSZ_COMMENTS_VOTE_LIKE', 'Like');
@@ -55,15 +55,16 @@ function comments_parse_for_display(string $text): string
             return $matches[0];
         }
 
-        return sprintf(
-            '<a href="/profile.php?u=%d" class="comment__mention", style="%s">@%s</a>',
-            $info['user_id'],
-            html_colour($info['user_colour'], [
+        return '<a href="/profile.php?u='
+            . $info['user_id']
+            . '" class="comment__mention" style="'
+            . html_colour($info['user_colour'], [
                 'color' => '%s',
                 'text-shadow' => '0 0 5px %s',
-            ]),
-            $info['username']
-        );
+            ])
+            . '">@'
+            .  $info['username']
+            . '</a>';
     }, $text);
 }
 
@@ -74,14 +75,14 @@ function comments_get_perms(int $userId): array
 {
     $perms = perms_get_user(MSZ_PERMS_COMMENTS, $userId);
     return [
-        'can_comment' => perms_check($perms, MSZ_COMMENTS_PERM_CREATE),
-        'can_edit' => perms_check($perms, MSZ_COMMENTS_PERM_EDIT_OWN | MSZ_COMMENTS_PERM_EDIT_ANY),
-        'can_edit_any' => perms_check($perms, MSZ_COMMENTS_PERM_EDIT_ANY),
-        'can_delete' => perms_check($perms, MSZ_COMMENTS_PERM_DELETE_OWN | MSZ_COMMENTS_PERM_DELETE_ANY),
-        'can_delete_any' => perms_check($perms, MSZ_COMMENTS_PERM_DELETE_ANY),
-        'can_pin' => perms_check($perms, MSZ_COMMENTS_PERM_PIN),
-        'can_lock' => perms_check($perms, MSZ_COMMENTS_PERM_LOCK),
-        'can_vote' => perms_check($perms, MSZ_COMMENTS_PERM_VOTE),
+        'can_comment' => perms_check($perms, MSZ_PERM_COMMENTS_CREATE),
+        'can_edit' => perms_check($perms, MSZ_PERM_COMMENTS_EDIT_OWN | MSZ_PERM_COMMENTS_EDIT_ANY),
+        'can_edit_any' => perms_check($perms, MSZ_PERM_COMMENTS_EDIT_ANY),
+        'can_delete' => perms_check($perms, MSZ_PERM_COMMENTS_DELETE_OWN | MSZ_PERM_COMMENTS_DELETE_ANY),
+        'can_delete_any' => perms_check($perms, MSZ_PERM_COMMENTS_DELETE_ANY),
+        'can_pin' => perms_check($perms, MSZ_PERM_COMMENTS_PIN),
+        'can_lock' => perms_check($perms, MSZ_PERM_COMMENTS_LOCK),
+        'can_vote' => perms_check($perms, MSZ_PERM_COMMENTS_VOTE),
     ];
 }
 
diff --git a/src/general.php b/src/general.php
index 95db1884..47195fa1 100644
--- a/src/general.php
+++ b/src/general.php
@@ -1,5 +1,5 @@
 <?php
-define('MSZ_GENERAL_PERM_CAN_MANAGE', 1);
-define('MSZ_GENERAL_PERM_VIEW_LOGS', 1 << 1);
-define('MSZ_GENERAL_PERM_MANAGE_EMOTICONS', 1 << 2);
-define('MSZ_GENERAL_PERM_MANAGE_SETTINGS', 1 << 3);
+define('MSZ_PERM_GENERAL_CAN_MANAGE', 1);
+define('MSZ_PERM_GENERAL_VIEW_LOGS', 1 << 1);
+define('MSZ_PERM_GENERAL_MANAGE_EMOTICONS', 1 << 2);
+define('MSZ_PERM_GENERAL_MANAGE_SETTINGS', 1 << 3);
diff --git a/src/manage.php b/src/manage.php
index 8e596cb1..2e8128e4 100644
--- a/src/manage.php
+++ b/src/manage.php
@@ -7,54 +7,54 @@ function manage_get_menu(int $userId): array
         $perms[$mode] = perms_get_user($mode, $userId);
     }
 
-    if (!perms_check($perms['general'], MSZ_GENERAL_PERM_CAN_MANAGE)) {
+    if (!perms_check($perms['general'], MSZ_PERM_GENERAL_CAN_MANAGE)) {
         return [];
     }
 
     $menu = [];
     $menu['General']['Overview'] = '/manage/index.php?v=overview';
 
-    if (perms_check($perms['general'], MSZ_GENERAL_PERM_VIEW_LOGS)) {
+    if (perms_check($perms['general'], MSZ_PERM_GENERAL_VIEW_LOGS)) {
         $menu['General']['Logs'] = '/manage/index.php?v=logs';
     }
 
-    if (perms_check($perms['general'], MSZ_GENERAL_PERM_MANAGE_EMOTICONS)) {
+    if (perms_check($perms['general'], MSZ_PERM_GENERAL_MANAGE_EMOTICONS)) {
         $menu['General']['Emoticons'] = '/manage/index.php?v=emoticons';
     }
 
-    if (perms_check($perms['general'], MSZ_GENERAL_PERM_MANAGE_SETTINGS)) {
+    if (perms_check($perms['general'], MSZ_PERM_GENERAL_MANAGE_SETTINGS)) {
         $menu['General']['Settings'] = '/manage/index.php?v=settings';
     }
 
-    if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_USERS | MSZ_USER_PERM_MANAGE_PERMS)) {
+    if (perms_check($perms['user'], MSZ_PERM_USER_MANAGE_USERS | MSZ_PERM_USER_MANAGE_PERMS)) {
         $menu['Users']['Listing'] = '/manage/users.php?v=listing';
     }
 
-    if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_ROLES | MSZ_USER_PERM_MANAGE_PERMS)) {
+    if (perms_check($perms['user'], MSZ_PERM_USER_MANAGE_ROLES | MSZ_PERM_USER_MANAGE_PERMS)) {
         $menu['Users']['Roles'] = '/manage/users.php?v=roles';
     }
 
-    if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_REPORTS)) {
+    if (perms_check($perms['user'], MSZ_PERM_USER_MANAGE_REPORTS)) {
         $menu['Users']['Reports'] = '/manage/users.php?v=reports';
     }
 
-    if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_RESTRICTIONS)) {
+    if (perms_check($perms['user'], MSZ_PERM_USER_MANAGE_RESTRICTIONS)) {
         $menu['Users']['Restrictions'] = '/manage/users.php?v=restrictions';
     }
 
-    if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_BLACKLISTS)) {
+    if (perms_check($perms['user'], MSZ_PERM_USER_MANAGE_BLACKLISTS)) {
         $menu['Users']['Blacklisting'] = '/manage/users.php?v=blacklisting';
     }
 
-    if (perms_check($perms['news'], MSZ_NEWS_PERM_MANAGE_POSTS)) {
+    if (perms_check($perms['news'], MSZ_PERM_NEWS_MANAGE_POSTS)) {
         $menu['News']['Posts'] = '/manage/news.php?v=posts';
     }
 
-    if (perms_check($perms['news'], MSZ_NEWS_PERM_MANAGE_CATEGORIES)) {
+    if (perms_check($perms['news'], MSZ_PERM_NEWS_MANAGE_CATEGORIES)) {
         $menu['News']['Categories'] = '/manage/news.php?v=categories';
     }
 
-    if (perms_check($perms['forum'], MSZ_FORUM_PERM_MANAGE_FORUMS)) {
+    if (perms_check($perms['forum'], MSZ_PERM_FORUM_MANAGE_FORUMS)) {
         $menu['Forums']['Listing'] = '/manage/forums.php?v=listing';
     }
 
@@ -66,11 +66,11 @@ function manage_get_menu(int $userId): array
         $menu['Forums']['Settings'] = '/manage/forums.php?v=settings';
     }
 
-    if (perms_check($perms['changelog'], MSZ_CHANGELOG_PERM_MANAGE_CHANGES)) {
+    if (perms_check($perms['changelog'], MSZ_PERM_CHANGELOG_MANAGE_CHANGES)) {
         $menu['Changelog']['Changes'] = '/manage/changelog.php?v=changes';
     }
 
-    if (perms_check($perms['changelog'], MSZ_CHANGELOG_PERM_MANAGE_TAGS | MSZ_CHANGELOG_PERM_MANAGE_ACTIONS)) {
+    if (perms_check($perms['changelog'], MSZ_PERM_CHANGELOG_MANAGE_TAGS | MSZ_PERM_CHANGELOG_MANAGE_ACTIONS)) {
         $menu['Changelog']['Action & Tags'] = '/manage/changelog.php?v=tags';
     }
 
@@ -151,9 +151,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'can-manage',
                     'title' => 'Can access the management panel.',
-                    'perm' => MSZ_GENERAL_PERM_CAN_MANAGE,
+                    'perm' => MSZ_PERM_GENERAL_CAN_MANAGE,
                     'value' => manage_perms_value(
-                        MSZ_GENERAL_PERM_CAN_MANAGE,
+                        MSZ_PERM_GENERAL_CAN_MANAGE,
                         $rawPerms['general_perms_allow'],
                         $rawPerms['general_perms_deny']
                     ),
@@ -161,9 +161,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'view-logs',
                     'title' => 'Can view audit logs.',
-                    'perm' => MSZ_GENERAL_PERM_VIEW_LOGS,
+                    'perm' => MSZ_PERM_GENERAL_VIEW_LOGS,
                     'value' => manage_perms_value(
-                        MSZ_GENERAL_PERM_VIEW_LOGS,
+                        MSZ_PERM_GENERAL_VIEW_LOGS,
                         $rawPerms['general_perms_allow'],
                         $rawPerms['general_perms_deny']
                     )
@@ -171,9 +171,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-emotes',
                     'title' => 'Can manage emoticons.',
-                    'perm' => MSZ_GENERAL_PERM_MANAGE_EMOTICONS,
+                    'perm' => MSZ_PERM_GENERAL_MANAGE_EMOTICONS,
                     'value' => manage_perms_value(
-                        MSZ_GENERAL_PERM_MANAGE_EMOTICONS,
+                        MSZ_PERM_GENERAL_MANAGE_EMOTICONS,
                         $rawPerms['general_perms_allow'],
                         $rawPerms['general_perms_deny']
                     )
@@ -181,9 +181,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-settings',
                     'title' => 'Can manage general Misuzu settings.',
-                    'perm' => MSZ_GENERAL_PERM_MANAGE_SETTINGS,
+                    'perm' => MSZ_PERM_GENERAL_MANAGE_SETTINGS,
                     'value' => manage_perms_value(
-                        MSZ_GENERAL_PERM_MANAGE_SETTINGS,
+                        MSZ_PERM_GENERAL_MANAGE_SETTINGS,
                         $rawPerms['general_perms_allow'],
                         $rawPerms['general_perms_deny']
                     )
@@ -197,9 +197,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'edit-profile',
                     'title' => 'Can edit own profile.',
-                    'perm' => MSZ_USER_PERM_EDIT_PROFILE,
+                    'perm' => MSZ_PERM_USER_EDIT_PROFILE,
                     'value' => manage_perms_value(
-                        MSZ_USER_PERM_EDIT_PROFILE,
+                        MSZ_PERM_USER_EDIT_PROFILE,
                         $rawPerms['user_perms_allow'],
                         $rawPerms['user_perms_deny']
                     ),
@@ -207,9 +207,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'change-avatar',
                     'title' => 'Can change own avatar.',
-                    'perm' => MSZ_USER_PERM_CHANGE_AVATAR,
+                    'perm' => MSZ_PERM_USER_CHANGE_AVATAR,
                     'value' => manage_perms_value(
-                        MSZ_USER_PERM_CHANGE_AVATAR,
+                        MSZ_PERM_USER_CHANGE_AVATAR,
                         $rawPerms['user_perms_allow'],
                         $rawPerms['user_perms_deny']
                     ),
@@ -217,9 +217,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-users',
                     'title' => 'Can manage other users.',
-                    'perm' => MSZ_USER_PERM_MANAGE_USERS,
+                    'perm' => MSZ_PERM_USER_MANAGE_USERS,
                     'value' => manage_perms_value(
-                        MSZ_USER_PERM_MANAGE_USERS,
+                        MSZ_PERM_USER_MANAGE_USERS,
                         $rawPerms['user_perms_allow'],
                         $rawPerms['user_perms_deny']
                     ),
@@ -227,9 +227,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-roles',
                     'title' => 'Can manage roles.',
-                    'perm' => MSZ_USER_PERM_MANAGE_ROLES,
+                    'perm' => MSZ_PERM_USER_MANAGE_ROLES,
                     'value' => manage_perms_value(
-                        MSZ_USER_PERM_MANAGE_ROLES,
+                        MSZ_PERM_USER_MANAGE_ROLES,
                         $rawPerms['user_perms_allow'],
                         $rawPerms['user_perms_deny']
                     ),
@@ -237,9 +237,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-perms',
                     'title' => 'Can manage permissions.',
-                    'perm' => MSZ_USER_PERM_MANAGE_PERMS,
+                    'perm' => MSZ_PERM_USER_MANAGE_PERMS,
                     'value' => manage_perms_value(
-                        MSZ_USER_PERM_MANAGE_PERMS,
+                        MSZ_PERM_USER_MANAGE_PERMS,
                         $rawPerms['user_perms_allow'],
                         $rawPerms['user_perms_deny']
                     ),
@@ -247,9 +247,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-reports',
                     'title' => 'Can handle reports.',
-                    'perm' => MSZ_USER_PERM_MANAGE_REPORTS,
+                    'perm' => MSZ_PERM_USER_MANAGE_REPORTS,
                     'value' => manage_perms_value(
-                        MSZ_USER_PERM_MANAGE_REPORTS,
+                        MSZ_PERM_USER_MANAGE_REPORTS,
                         $rawPerms['user_perms_allow'],
                         $rawPerms['user_perms_deny']
                     ),
@@ -257,9 +257,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-restrictions',
                     'title' => 'Can manage restrictions.',
-                    'perm' => MSZ_USER_PERM_MANAGE_RESTRICTIONS,
+                    'perm' => MSZ_PERM_USER_MANAGE_RESTRICTIONS,
                     'value' => manage_perms_value(
-                        MSZ_USER_PERM_MANAGE_RESTRICTIONS,
+                        MSZ_PERM_USER_MANAGE_RESTRICTIONS,
                         $rawPerms['user_perms_allow'],
                         $rawPerms['user_perms_deny']
                     ),
@@ -267,9 +267,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-blacklistings',
                     'title' => 'Can manage blacklistings.',
-                    'perm' => MSZ_USER_PERM_MANAGE_BLACKLISTS,
+                    'perm' => MSZ_PERM_USER_MANAGE_BLACKLISTS,
                     'value' => manage_perms_value(
-                        MSZ_USER_PERM_MANAGE_BLACKLISTS,
+                        MSZ_PERM_USER_MANAGE_BLACKLISTS,
                         $rawPerms['user_perms_allow'],
                         $rawPerms['user_perms_deny']
                     ),
@@ -283,9 +283,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-posts',
                     'title' => 'Can manage posts.',
-                    'perm' => MSZ_NEWS_PERM_MANAGE_POSTS,
+                    'perm' => MSZ_PERM_NEWS_MANAGE_POSTS,
                     'value' => manage_perms_value(
-                        MSZ_NEWS_PERM_MANAGE_POSTS,
+                        MSZ_PERM_NEWS_MANAGE_POSTS,
                         $rawPerms['news_perms_allow'],
                         $rawPerms['news_perms_deny']
                     ),
@@ -293,9 +293,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-cats',
                     'title' => 'Can manage catagories.',
-                    'perm' => MSZ_NEWS_PERM_MANAGE_CATEGORIES,
+                    'perm' => MSZ_PERM_NEWS_MANAGE_CATEGORIES,
                     'value' => manage_perms_value(
-                        MSZ_NEWS_PERM_MANAGE_CATEGORIES,
+                        MSZ_PERM_NEWS_MANAGE_CATEGORIES,
                         $rawPerms['news_perms_allow'],
                         $rawPerms['news_perms_deny']
                     ),
@@ -309,9 +309,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-forums',
                     'title' => 'Can manage forum sections.',
-                    'perm' => MSZ_FORUM_PERM_MANAGE_FORUMS,
+                    'perm' => MSZ_PERM_FORUM_MANAGE_FORUMS,
                     'value' => manage_perms_value(
-                        MSZ_FORUM_PERM_MANAGE_FORUMS,
+                        MSZ_PERM_FORUM_MANAGE_FORUMS,
                         $rawPerms['forum_perms_allow'],
                         $rawPerms['forum_perms_deny']
                     )
@@ -325,9 +325,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'create',
                     'title' => 'Can post comments.',
-                    'perm' => MSZ_COMMENTS_PERM_CREATE,
+                    'perm' => MSZ_PERM_COMMENTS_CREATE,
                     'value' => manage_perms_value(
-                        MSZ_COMMENTS_PERM_CREATE,
+                        MSZ_PERM_COMMENTS_CREATE,
                         $rawPerms['comments_perms_allow'],
                         $rawPerms['comments_perms_deny']
                     ),
@@ -335,9 +335,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'edit-own',
                     'title' => 'Can edit own comments.',
-                    'perm' => MSZ_COMMENTS_PERM_EDIT_OWN,
+                    'perm' => MSZ_PERM_COMMENTS_EDIT_OWN,
                     'value' => manage_perms_value(
-                        MSZ_COMMENTS_PERM_EDIT_OWN,
+                        MSZ_PERM_COMMENTS_EDIT_OWN,
                         $rawPerms['comments_perms_allow'],
                         $rawPerms['comments_perms_deny']
                     ),
@@ -345,9 +345,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'edit-any',
                     'title' => 'Can edit anyone\'s comments.',
-                    'perm' => MSZ_COMMENTS_PERM_EDIT_ANY,
+                    'perm' => MSZ_PERM_COMMENTS_EDIT_ANY,
                     'value' => manage_perms_value(
-                        MSZ_COMMENTS_PERM_EDIT_ANY,
+                        MSZ_PERM_COMMENTS_EDIT_ANY,
                         $rawPerms['comments_perms_allow'],
                         $rawPerms['comments_perms_deny']
                     ),
@@ -355,9 +355,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'delete-own',
                     'title' => 'Can delete own comments.',
-                    'perm' => MSZ_COMMENTS_PERM_DELETE_OWN,
+                    'perm' => MSZ_PERM_COMMENTS_DELETE_OWN,
                     'value' => manage_perms_value(
-                        MSZ_COMMENTS_PERM_DELETE_OWN,
+                        MSZ_PERM_COMMENTS_DELETE_OWN,
                         $rawPerms['comments_perms_allow'],
                         $rawPerms['comments_perms_deny']
                     ),
@@ -365,9 +365,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'delete-any',
                     'title' => 'Can delete anyone\'s comments.',
-                    'perm' => MSZ_COMMENTS_PERM_DELETE_ANY,
+                    'perm' => MSZ_PERM_COMMENTS_DELETE_ANY,
                     'value' => manage_perms_value(
-                        MSZ_COMMENTS_PERM_DELETE_ANY,
+                        MSZ_PERM_COMMENTS_DELETE_ANY,
                         $rawPerms['comments_perms_allow'],
                         $rawPerms['comments_perms_deny']
                     ),
@@ -375,9 +375,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'pin',
                     'title' => 'Can pin comments.',
-                    'perm' => MSZ_COMMENTS_PERM_PIN,
+                    'perm' => MSZ_PERM_COMMENTS_PIN,
                     'value' => manage_perms_value(
-                        MSZ_COMMENTS_PERM_PIN,
+                        MSZ_PERM_COMMENTS_PIN,
                         $rawPerms['comments_perms_allow'],
                         $rawPerms['comments_perms_deny']
                     ),
@@ -385,9 +385,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'lock',
                     'title' => 'Can lock comment threads.',
-                    'perm' => MSZ_COMMENTS_PERM_LOCK,
+                    'perm' => MSZ_PERM_COMMENTS_LOCK,
                     'value' => manage_perms_value(
-                        MSZ_COMMENTS_PERM_LOCK,
+                        MSZ_PERM_COMMENTS_LOCK,
                         $rawPerms['comments_perms_allow'],
                         $rawPerms['comments_perms_deny']
                     ),
@@ -395,9 +395,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'vote',
                     'title' => 'Can like or dislike comments.',
-                    'perm' => MSZ_COMMENTS_PERM_VOTE,
+                    'perm' => MSZ_PERM_COMMENTS_VOTE,
                     'value' => manage_perms_value(
-                        MSZ_COMMENTS_PERM_VOTE,
+                        MSZ_PERM_COMMENTS_VOTE,
                         $rawPerms['comments_perms_allow'],
                         $rawPerms['comments_perms_deny']
                     ),
@@ -411,9 +411,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-changes',
                     'title' => 'Can manage changes.',
-                    'perm' => MSZ_CHANGELOG_PERM_MANAGE_CHANGES,
+                    'perm' => MSZ_PERM_CHANGELOG_MANAGE_CHANGES,
                     'value' => manage_perms_value(
-                        MSZ_CHANGELOG_PERM_MANAGE_CHANGES,
+                        MSZ_PERM_CHANGELOG_MANAGE_CHANGES,
                         $rawPerms['changelog_perms_allow'],
                         $rawPerms['changelog_perms_deny']
                     ),
@@ -421,9 +421,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-tags',
                     'title' => 'Can manage tags.',
-                    'perm' => MSZ_CHANGELOG_PERM_MANAGE_TAGS,
+                    'perm' => MSZ_PERM_CHANGELOG_MANAGE_TAGS,
                     'value' => manage_perms_value(
-                        MSZ_CHANGELOG_PERM_MANAGE_TAGS,
+                        MSZ_PERM_CHANGELOG_MANAGE_TAGS,
                         $rawPerms['changelog_perms_allow'],
                         $rawPerms['changelog_perms_deny']
                     ),
@@ -431,9 +431,9 @@ function manage_perms_list(array $rawPerms): array
                 [
                     'section' => 'manage-actions',
                     'title' => 'Can manage action types.',
-                    'perm' => MSZ_CHANGELOG_PERM_MANAGE_ACTIONS,
+                    'perm' => MSZ_PERM_CHANGELOG_MANAGE_ACTIONS,
                     'value' => manage_perms_value(
-                        MSZ_CHANGELOG_PERM_MANAGE_ACTIONS,
+                        MSZ_PERM_CHANGELOG_MANAGE_ACTIONS,
                         $rawPerms['changelog_perms_allow'],
                         $rawPerms['changelog_perms_deny']
                     ),
diff --git a/src/news.php b/src/news.php
index 36024451..36674bf0 100644
--- a/src/news.php
+++ b/src/news.php
@@ -1,3 +1,3 @@
 <?php
-define('MSZ_NEWS_PERM_MANAGE_POSTS', 1);
-define('MSZ_NEWS_PERM_MANAGE_CATEGORIES', 1 << 1);
+define('MSZ_PERM_NEWS_MANAGE_POSTS', 1);
+define('MSZ_PERM_NEWS_MANAGE_CATEGORIES', 1 << 1);