Quellcode durchsuchen

Fix files for new Validator\addError()

Visman vor 4 Jahren
Ursprung
Commit
7960a2199a

+ 4 - 4
app/Models/Pages/Admin/Bans.php

@@ -733,14 +733,14 @@ class Bans extends Admin
             if (! $user instanceof User) { // ???? может ли вернутся несколько юзеров?
                 $v->addError('No user message');
             } elseif ($this->c->bans->banFromName($user->username) > 0) {
-                $v->addError(__(['User is ban', $user->username]));
+                $v->addError(['User is ban', $user->username]);
             } elseif (! $this->c->userRules->canBanUser($user)) {
                 if ($user->isGuest) { // ???? O_o
                     $v->addError('Cannot ban guest message');
                 } elseif ($user->isAdmin) {
-                    $v->addError(__(['User is admin message', $user->username]));
+                    $v->addError(['User is admin message', $user->username]);
                 } elseif ($user->isAdmMod) {
-                    $v->addError(__(['User is mod message', $user->username]));
+                    $v->addError(['User is mod message', $user->username]);
                 }
             }
         }
@@ -776,7 +776,7 @@ class Bans extends Admin
                     }
                 }
 
-                $v->addError(__('Invalid IP message (%s)', $address));
+                $v->addError(['Invalid IP message (%s)', $address]);
                 break;
             }
         }

+ 1 - 1
app/Models/Pages/Admin/Install.php

@@ -524,7 +524,7 @@ class Install extends Admin
             $stmt = $this->c->DB->query('SELECT 1 FROM ::users LIMIT 1');
 
             if (! empty($stmt->fetch())) {
-                $v->addError(__(['Existing table error', $v->dbprefix, $v->dbname]));
+                $v->addError(['Existing table error', $v->dbprefix, $v->dbname]);
 
                 return $dbhost;
             }

+ 5 - 1
app/Models/Pages/Admin/Parser/BBCode.php

@@ -384,7 +384,11 @@ class BBCode extends Parser
         $error = $structure->getError();
 
         if (\is_array($error)) {
-            $v->addError(__($error));
+            if (1 === \count($error)) {
+                $v->addError(\reset($error));
+            } else {
+                $v->addError($error);
+            }
         }
 
         return $txt;

+ 2 - 2
app/Models/Pages/Admin/Update.php

@@ -265,11 +265,11 @@ class Update extends Admin
     {
         if (\substr($this->c->DB_DSN, 0, 6) === 'sqlite') {
             if (! \hash_equals($this->c->DB_DSN, "sqlite:{$dbpass}")) {  // ????
-                $v->addError(__(['Invalid file error', self::CONFIG_FILE]));
+                $v->addError(['Invalid file error', self::CONFIG_FILE]);
             }
         } else {
             if (! \hash_equals($this->c->DB_PASSWORD, $dbpass)) {
-                $v->addError(__(['Invalid password error', self::CONFIG_FILE]));
+                $v->addError(['Invalid password error', self::CONFIG_FILE]);
             }
         }
 

+ 2 - 2
app/Models/Pages/PostValidatorTrait.php

@@ -54,7 +54,7 @@ trait PostValidatorTrait
 
             foreach ($this->c->Parser->getErrors([], [], true) as $error) {
                 $prepare = false;
-                $v->addError(__($error));
+                $v->addError($error);
             }
         }
 
@@ -89,7 +89,7 @@ trait PostValidatorTrait
         $time = \time() - (int) $this->user->last_post;
 
         if ($time < $this->user->g_post_flood) {
-            $v->addError(__(['Flood message', $this->user->g_post_flood - $time]), 'e');
+            $v->addError(['Flood message', $this->user->g_post_flood - $time], 'e');
         }
 
         return $submit;

+ 1 - 1
app/Models/Pages/Profile/Edit.php

@@ -186,7 +186,7 @@ class Edit extends Profile
 
                 foreach ($this->c->Parser->getErrors([], [], true) as $error) {
                     $prepare = false;
-                    $v->addError(__($error));
+                    $v->addError($error);
                 }
             }
 

+ 2 - 2
app/Models/Pages/Search.php

@@ -324,7 +324,7 @@ class Search extends Page
                 $search = $this->c->search;
 
                 if (! $search->prepare($query)) {
-                    $v->addError(__([$search->queryError, $search->queryText]));
+                    $v->addError([$search->queryError, $search->queryText]);
                 } else {
 
                     if ($this->c->search->execute($v, $this->listOfIndexes, $flood)) {
@@ -346,7 +346,7 @@ class Search extends Page
             }
 
             if ($flood) {
-                $v->addError(__(['Flood message', $this->user->g_search_flood - \time() + $this->user->last_search]));
+                $v->addError(['Flood message', $this->user->g_search_flood - \time() + $this->user->last_search]);
             }
         }
 

+ 1 - 1
app/Models/Validators/Email.php

@@ -128,7 +128,7 @@ class Email extends RulesValidator
             }
 
             if ($flood < $this->c->FLOOD_INTERVAL) {
-                $v->addError(__(['Account email flood', (int) (($this->c->FLOOD_INTERVAL - $flood) / 60)]), 'e');
+                $v->addError(['Account email flood', (int) (($this->c->FLOOD_INTERVAL - $flood) / 60)], 'e');
                 $ok = false;
             }
         }

+ 1 - 1
app/Models/Validators/Html.php

@@ -33,7 +33,7 @@ class Html extends RulesValidator
             return $result;
         } else {
             foreach ($errors as $args) {
-                $v->addError(__($args));
+                $v->addError($args);
             }
 
             return $value;