GH-126 Move ignore system checks to a separate validator function

mdziekon · Sep 5, 2020 · 2f9f4e3 · 2f9f4e3
1 parent 7df4fdb
commit 2f9f4e3
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 22 deletions.
diff --git a/messages.php b/messages.php
@@ -280,29 +280,29 @@
                 }
             }
 
-            if($FormData['uid'] > 0 && !CheckAuth('user', AUTHCHECK_HIGHER) AND !CheckAuth('user', AUTHCHECK_HIGHER, $FormData))
-            {
-                $Query_IgnoreSystem = '';
-                $Query_IgnoreSystem .= "SELECT `OwnerID` FROM {{table}} WHERE ";
-                $Query_IgnoreSystem .= "(`OwnerID` = {$_User['id']} AND `IgnoredID` = {$FormData['uid']}) OR ";
-                $Query_IgnoreSystem .= "(`OwnerID` = {$FormData['uid']} AND `IgnoredID` = {$_User['id']}) ";
-                $Query_IgnoreSystem .= "LIMIT 2; -- messages.php|IgnoreSystem";
-
-                $Result_IgnoreSystem = doquery($Query_IgnoreSystem, 'ignoresystem');
-
-                if($Result_IgnoreSystem->num_rows > 0)
-                {
+            if ($FormData['uid'] > 0) {
+                $ignoreSystemValidationResult = Messages\Validators\validateWithIgnoreSystem([
+                    'senderUser' => &$_User,
+                    'recipientUser' => [
+                        'id' => $FormData['uid'],
+                        'authlevel' => $FormData['authlevel'],
+                    ],
+                ]);
+
+                if (!$ignoreSystemValidationResult['isValid']) {
                     $AllowSend = false;
-                    while($IgnoreData = $Result_IgnoreSystem->fetch_assoc())
-                    {
-                        if($IgnoreData['OwnerID'] == $_User['id'])
-                        {
-                            $MsgBox[] = array('color' => 'red', 'text' => $_Lang['Errors_IgnoreYour']);
-                        }
-                        else
-                        {
-                            $MsgBox[] = array('color' => 'red', 'text' => $_Lang['Errors_IgnoreHis']);
-                        }
+
+                    if ($ignoreSystemValidationResult['errors']['isRecipientIgnored']) {
+                        $MsgBox[] = [
+                            'color' => 'red',
+                            'text' => $_Lang['Errors_IgnoreYour'],
+                        ];
+                    }
+                    if ($ignoreSystemValidationResult['errors']['isSenderIgnored']) {
+                        $MsgBox[] = [
+                            'color' => 'red',
+                            'text' => $_Lang['Errors_IgnoreHis'],
+                        ];
                     }
                 }
             }

diff --git a/modules/messages/_includes.php b/modules/messages/_includes.php
@@ -12,6 +12,7 @@
     include($includePath . './input/batchActions.userCommands.php');
     include($includePath . './utils/batchDeleteMessages.utils.php');
     include($includePath . './utils/batchMessageUpdates.utils.php');
+    include($includePath . './validators/validateWithIgnoreSystem.validators.php');
 
 });
 

diff --git a/modules/messages/validators/index.php b/modules/messages/validators/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/modules/messages/validators/validateWithIgnoreSystem.validators.php b/modules/messages/validators/validateWithIgnoreSystem.validators.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace UniEngine\Engine\Modules\Messages\Validators;
+
+/**
+ * @param array $params
+ * @param &array $params['senderUser']
+ * @param &array $params['recipientUser']
+ */
+function validateWithIgnoreSystem($params) {
+    $isValid = function () {
+        return [
+            'isValid' => true,
+        ];
+    };
+    $isInvalid = function ($errors) {
+        return [
+            'isValid' => false,
+            'errors' => $errors,
+        ];
+    };
+
+    $senderUser = &$params['senderUser'];
+    $recipientUser = &$params['recipientUser'];
+
+    if (
+        CheckAuth('user', AUTHCHECK_HIGHER, $senderUser) ||
+        CheckAuth('user', AUTHCHECK_HIGHER, $recipientUser)
+    ) {
+        return $isValid();
+    }
+
+    $Query_IgnoreSystem = '';
+    $Query_IgnoreSystem .= "SELECT `OwnerID` FROM {{table}} WHERE ";
+    $Query_IgnoreSystem .= "(`OwnerID` = {$senderUser['id']} AND `IgnoredID` = {$recipientUser['id']}) OR ";
+    $Query_IgnoreSystem .= "(`OwnerID` = {$recipientUser['id']} AND `IgnoredID` = {$senderUser['id']}) ";
+    $Query_IgnoreSystem .= "LIMIT 2; -- messages.php|IgnoreSystem";
+
+    $Result_IgnoreSystem = doquery($Query_IgnoreSystem, 'ignoresystem');
+
+    if ($Result_IgnoreSystem->num_rows == 0) {
+        return $isValid();
+    }
+
+    $validationErrors = [
+        'isRecipientIgnored' => false,
+        'isSenderIgnored' => false,
+    ];
+
+    while ($IgnoreData = $Result_IgnoreSystem->fetch_assoc()) {
+        if ($IgnoreData['OwnerID'] == $senderUser['id']) {
+            $validationErrors['isRecipientIgnored'] = true;
+        }
+        if ($IgnoreData['OwnerID'] == $recipientUser['id']) {
+            $validationErrors['isSenderIgnored'] = true;
+        }
+    }
+
+    return $isInvalid($validationErrors);
+}
+
+?>