Code style

app/Core/DB/mysql.php

@@ -129,7 +129,7 @@ class Mysql
         $table = ($noPrefix ? '' : $this->dbPrefix) . $table;
 
         try {
-            $vars  = [
+            $vars = [
                 ':table' => $table,
             ];
             $query = 'SELECT 1
@@ -154,7 +154,7 @@ class Mysql
         $table = ($noPrefix ? '' : $this->dbPrefix) . $table;
 
         try {
-            $vars  = [
+            $vars = [
                 ':table' => $table,
                 ':field' => $field,
             ];
@@ -181,7 +181,7 @@ class Mysql
         $index = 'PRIMARY' == $index ? $index : $table . '_' . $index;
 
         try {
-            $vars  = [
+            $vars = [
                 ':table' => $table,
                 ':index' => $index,
             ];
@@ -408,7 +408,7 @@ class Mysql
         $table = ($noPrefix ? '' : $this->dbPrefix) . $table;
 
         try {
-            $vars  = [
+            $vars = [
                 ':table' => $table,
                 ':field' => $old,
             ];
@@ -557,7 +557,7 @@ class Mysql
      */
     public function getMap(): array
     {
-        $vars  = [
+        $vars = [
             "{$this->dbPrefix}%",
         ];
         $query = 'SELECT TABLE_NAME, COLUMN_NAME, DATA_TYPE

app/Models/BanList/Delete.php

@@ -16,7 +16,7 @@ class Delete extends Method
     public function delete(int ...$ids): BanList
     {
         if (! empty($ids)) {
-            $vars  = [
+            $vars = [
                 ':ids' => $ids,
             ];
             $query = 'DELETE

app/Models/BanList/GetList.php

@@ -13,7 +13,7 @@ class GetList extends Method
      */
     public function getList(array $ids): array
     {
-        $vars  = [
+        $vars = [
             ':ids' => $ids,
         ];
         $query = 'SELECT b.id, b.username, b.ip, b.email, b.message, b.expire, u.id AS id_creator, u.username AS name_creator

app/Models/Categories/Manager.php

@@ -61,7 +61,7 @@ class Manager extends ManagerModel
     {
         foreach ($this->modified as $key => $value) {
             $cat   = $this->get($key);
-            $vars  = [
+            $vars = [
                 ':name'     => $cat['cat_name'],
                 ':position' => $cat['disp_position'],
                 ':cid'      => $key,
@@ -87,7 +87,7 @@ class Manager extends ManagerModel
         }
         ++$pos;
 
-        $vars  = [
+        $vars = [
             ':name'     => $name,
             ':position' => $pos,
         ];
@@ -116,7 +116,7 @@ class Manager extends ManagerModel
             $this->c->forums->delete(...$del);
         }
 
-        $vars  = [
+        $vars = [
             ':cid' => $cid,
         ];
         $query = 'DELETE

app/Models/Censorship/Save.php

@@ -31,7 +31,7 @@ class Save extends Method
                     $list[$id]['search_for'] !== $words[$id]['search_for']
                     || $list[$id]['replace_with'] !== $words[$id]['replace_with']
                 ) {
-                    $vars  = [
+                    $vars = [
                         ':id'      => $id,
                         ':search'  => $list[$id]['search_for'],
                         ':replace' => $list[$id]['replace_with'],
@@ -43,7 +43,7 @@ class Save extends Method
                     $this->c->DB->exec($query, $vars);
                 }
             } elseif (0 === $id) {
-                $vars  = [
+                $vars = [
                     ':search'  => $list[$id]['search_for'],
                     ':replace' => $list[$id]['replace_with'],
                 ];
@@ -54,7 +54,7 @@ class Save extends Method
             }
         }
         if ($forDel) {
-            $vars  = [
+            $vars = [
                 ':del' => $forDel
             ];
             $query = 'DELETE

app/Models/Forum/CalcStat.php

@@ -19,7 +19,9 @@ class CalcStat extends Method
             throw new RuntimeException('The model does not have ID');
         }
 
-        $vars  = [':fid' => $this->model->id];
+        $vars = [
+            ':fid' => $this->model->id,
+        ];
         $query = 'SELECT COUNT(t.id)
             FROM ::topics AS t
             WHERE t.forum_id=?i:fid AND t.moved_to!=0';

app/Models/Forum/Delete.php

@@ -35,7 +35,7 @@ class Delete extends Action
                 }
 
                 $uids[$arg->id] = $arg->id;
-                $isUser            = 1;
+                $isUser         = 1;
             } elseif ($arg instanceof Forum) {
                 if (! $this->c->forums->get($arg->id) instanceof Forum) {
                     throw new RuntimeException('Forum unavailable');

app/Models/Forum/LoadTree.php

@@ -107,7 +107,7 @@ class LoadTree extends Action
         }
 
         // проверка по темам
-        $vars  = [
+        $vars = [
             ':uid'    => $this->c->user->id,
             ':forums' => \array_keys($time),
             ':max'    => $max,

app/Models/Forum/Markread.php

@@ -25,7 +25,7 @@ class Markread extends Action
 
             $this->c->users->update($user);
 
-            $vars  = [
+            $vars = [
                 ':uid' => $user->id,
             ];
             $query = 'DELETE
@@ -40,7 +40,7 @@ class Markread extends Action
 
             $this->c->DB->exec($query, $vars);
         } elseif ($forum->id > 0) {
-            $vars  = [
+            $vars = [
                 ':uid'  => $user->id,
                 ':fid'  => $forum->id,
                 ':mark' => \time(),

app/Models/Forum/Model.php

@@ -408,7 +408,7 @@ class Model extends DataModel
                 break;
         }
 
-        $vars  = [
+        $vars = [
             ':fid'    => $this->id,
             ':offset' => ($this->page - 1) * $this->c->user->disp_topics,
             ':rows'   => $this->c->user->disp_topics,

app/Models/Forum/Refresh.php

@@ -30,8 +30,8 @@ class Refresh extends Action
         $this->list = [];
 
         if ('1' == $read) {
-            $list  = [];
-            $vars  = [
+            $list = [];
+            $vars = [
                 ':gid' => $gid,
             ];
             $query = 'SELECT f.cat_id, c.cat_name, f.id, f.forum_name, f.redirect_url, f.parent_forum_id,

app/Models/Forum/Save.php

@@ -49,7 +49,7 @@ class Save extends Action
             foreach ($forum->descendants as $f) {
                 $f->__cat_id = $values['cat_id'];
             }
-            $vars  = [
+            $vars = [
                 ':ids'      => \array_keys($forum->descendants),
                 ':category' => $values['cat_id'],
             ];

app/Models/Group/Delete.php

@@ -20,7 +20,7 @@ class Delete extends Action
 
         $this->manager->Perm->delete($group);
 
-        $vars  = [
+        $vars = [
             ':gid' => $group->g_id,
         ];
         $query = 'DELETE

app/Models/Group/Perm.php

@@ -22,7 +22,7 @@ class Perm extends Action
      */
     public function get(Forum $forum): array
     {
-        $vars  = [
+        $vars = [
             ':fid' => $forum->id > 0 ? $forum->id : 0,
             ':adm' => $this->c->GROUP_ADMIN,
         ];
@@ -87,7 +87,7 @@ class Perm extends Action
                 $modDef
                 || $modPerm
             ) {
-                $vars  = [
+                $vars = [
                     ':gid' => $id,
                     ':fid' => $forum->id,
                 ];
@@ -126,7 +126,7 @@ class Perm extends Action
             throw new RuntimeException('The forum does not have ID');
         }
 
-        $vars  = [
+        $vars = [
             ':fid' => $forum->id,
         ];
         $query = 'DELETE
@@ -145,7 +145,7 @@ class Perm extends Action
             throw new RuntimeException('The group does not have ID');
         }
 
-        $vars  = [
+        $vars = [
             ':gid' => $group->g_id,
         ];
         $query = 'DELETE
@@ -169,7 +169,7 @@ class Perm extends Action
 
         $this->delete($to);
 
-        $vars  = [
+        $vars = [
             ':old' => $from->g_id,
             ':new' => $to->g_id,
         ];

app/Models/Online/Model.php

@@ -223,14 +223,14 @@ class Model extends ParentModel
     public function delete(User $user): void
     {
         if ($user->isGuest) {
-            $vars  = [
+            $vars = [
                 ':ip' => $user->ip,
             ];
             $query = 'DELETE
                 FROM ::online
                 WHERE user_id=1 AND ident=?s:ip';
         } else {
-            $vars  = [
+            $vars = [
                 ':id' => $user->id,
             ];
             $query = 'DELETE

app/Models/Pages/Admin/Update.php

@@ -504,7 +504,7 @@ class Update extends Admin
         $this->c->DB->addField('groups', 'g_sig_length', 'SMALLINT UNSIGNED', false, 400);
         $this->c->DB->addField('groups', 'g_sig_lines', 'TINYINT UNSIGNED', false, 4);
 
-        $vars  = [
+        $vars = [
             ':sig_use'    => '1' == $this->c->config->o_signatures ? 1 : 0,
             ':sig_length' => $this->c->config->p_sig_length > 10000 ? 10000 : (int) $this->c->config->p_sig_length,
             ':sig_lines'  => $this->c->config->p_sig_lines> 255 ? 255 : (int) $this->c->config->p_sig_lines,
@@ -514,7 +514,7 @@ class Update extends Admin
 
         $this->c->DB->query($query, $vars);
 
-        $vars  = [
+        $vars = [
             ':grp' => $this->c->GROUP_ADMIN,
         ];
         $query = 'UPDATE ::groups
@@ -523,7 +523,7 @@ class Update extends Admin
 
         $this->c->DB->query($query, $vars);
 
-        $vars  = [
+        $vars = [
             ':grp' => $this->c->GROUP_GUEST,
         ];
         $query = 'UPDATE ::groups

app/Models/Poll/Delete.php

@@ -50,7 +50,7 @@ class Delete extends Action
             throw new InvalidArgumentException('Expected only Poll(s) or Topic(s)');
         }
 
-        $vars  = [
+        $vars = [
             ':tids' => $tids,
         ];
         $query = 'DELETE

app/Models/Poll/Load.php

@@ -19,7 +19,7 @@ class Load extends Action
             throw new InvalidArgumentException('Expected a positive poll id');
         }
 
-        $vars  = [
+        $vars = [
             ':tid' => $id,
         ];
         $query = 'SELECT question_id, field_id, qna_text, votes

app/Models/Post/Feed.php

@@ -24,7 +24,7 @@ class Feed extends Action
                 return [];
             }
 
-            $vars  = [
+            $vars = [
                 ':id' => $model->id,
             ];
             $query = 'SELECT p.id as pid, p.poster as username, p.poster_id as uid, p.message as content,
@@ -34,7 +34,7 @@ class Feed extends Action
                 ORDER BY p.id DESC
                 LIMIT 50';
 
-        } else if ($model instanceof Forum) {
+        } elseif ($model instanceof Forum) {
             $ids = \array_keys($model->descendants);
             if ($model->id) {
                 $ids[] = $model->id;
@@ -44,7 +44,7 @@ class Feed extends Action
                 return [];
             }
 
-            $vars  = [
+            $vars = [
                 ':forums' => $ids,
             ];
             $query = 'SELECT p.id as pid, p.poster as username, p.poster_id as uid, p.message as content,

app/Models/Post/Load.php

@@ -42,7 +42,7 @@ class Load extends Action
             throw new InvalidArgumentException('Expected a positive topic id');
         }
 
-        $vars  = [
+        $vars = [
             ':pid' => $id,
             ':tid' => $tid,
         ];
@@ -84,7 +84,7 @@ class Load extends Action
             }
         }
 
-        $vars  = [
+        $vars = [
             ':ids' => $ids,
         ];
         $query = $this->getSql('p.id IN (?ai:ids)');

app/Models/Post/PreviousPost.php

@@ -14,7 +14,7 @@ class PreviousPost extends Action
      */
     public function previousPost(Post $post, bool $returnId = true): ?int
     {
-        $vars  = [
+        $vars = [
             ':pid' => $post->id,
             ':tid' => $post->topic_id,
         ];

app/Models/Post/RebuildIndex.php

@@ -14,7 +14,7 @@ class RebuildIndex extends Action
      */
     public function rebuildIndex(int $start, int $limit, string $mode): int
     {
-        $vars  = [
+        $vars = [
             ':start' => $start,
             ':limit' => $limit,
         ];

app/Models/Post/UserInfoFromIP.php

@@ -14,7 +14,7 @@ class UserInfoFromIP extends Action
      */
     public function userInfoFromIP(string $ip): array
     {
-        $vars  = [
+        $vars = [
             ':ip' => $ip,
         ];
         $query = 'SELECT p.poster_id, p.poster

app/Models/Post/UserStat.php

@@ -15,7 +15,7 @@ class UserStat extends Action
      */
     public function userStat(int $id): array
     {
-        $vars  = [
+        $vars = [
             ':id' => $id,
         ];
         $query = 'SELECT p.poster_ip, MAX(p.posted) AS last_used, COUNT(p.id) AS used_times

app/Models/Post/View.php

@@ -34,7 +34,7 @@ class View extends Action
         }
 
         if (! $review) {
-            $vars  = [
+            $vars = [
                 ':ids' => $arg->idsList,
             ];
             $query = 'SELECT w.id, w.message, w.poster, w.posted

app/Models/Report/Load.php

@@ -19,7 +19,7 @@ class Load extends Action
             throw new InvalidArgumentException('Expected a positive report id');
         }
 
-        $vars  = [
+        $vars = [
             ':id' => $id,
         ];
         $query = 'SELECT r.*

app/Models/Report/Manager.php

@@ -109,7 +109,7 @@ class Manager extends ManagerModel
         $time = (int) $this->c->DB->query($query)->fetchColumn();
 
         if ($time > 0) {
-            $vars  = [
+            $vars = [
                 ':time' => $time,
             ];
             $query = 'DELETE

app/Models/Search/Delete.php

@@ -76,7 +76,7 @@ class Delete extends Method
         $query = null;
 
         if ($users) {
-            $vars  = [
+            $vars = [
                 ':users' => $users,
             ];
             $query = 'DELETE
@@ -88,7 +88,7 @@ class Delete extends Method
                 )';
         }
         if ($forums) {
-            $vars  = [
+            $vars = [
                 ':forums' => \array_keys($forums),
             ];
             $query = 'DELETE
@@ -101,7 +101,7 @@ class Delete extends Method
                 )';
         }
         if ($topics) {
-            $vars  = [
+            $vars = [
                 ':topics' => \array_keys($topics),
             ];
             $query = 'DELETE
@@ -113,7 +113,7 @@ class Delete extends Method
                 )';
         }
         if ($posts) {
-            $vars  = [
+            $vars = [
                 ':posts' => \array_keys($posts),
             ];
             $query = 'DELETE

app/Models/Search/Execute.php

@@ -48,7 +48,7 @@ class Execute extends Method
                $v->author . '-' .
                $v->forums;
 
-        $vars  = [
+        $vars = [
             ':key' => $key,
         ];
         $query = 'SELECT sc.search_time, sc.search_data
@@ -83,7 +83,7 @@ class Execute extends Method
         $data  = [
             \implode(',', $ids),
         ];
-        $vars  = [
+        $vars = [
             ':data' => \implode("\n", $data),
             ':key'  => $key,
             ':time' => \time(),

app/Models/Search/Index.php

@@ -22,7 +22,7 @@ class Index extends Method
             : [];
 
         if ('add' !== $mode) {
-            $vars  = [
+            $vars = [
                 ':pid' => $post->id,
             ];
             $query = 'SELECT sw.id, sw.word, sm.subject_match
@@ -67,7 +67,7 @@ class Index extends Method
             $allWords = \array_unique(\array_merge($words['add']['p'], $words['add']['s']));
         }
         if (! empty($allWords)) {
-            $vars  = [
+            $vars = [
                 ':words' => $allWords,
             ];
             $query = 'SELECT sw.word
@@ -97,7 +97,7 @@ class Index extends Method
                 continue;
             }
 
-            $vars  = [
+            $vars = [
                 ':pid'  => $post->id,
                 ':subj' => 's' === $key ? 1 : 0,
                 ':ids'  => $list,
@@ -115,7 +115,7 @@ class Index extends Method
                 continue;
             }
 
-            $vars  = [
+            $vars = [
                 ':pid'   => $post->id,
                 ':subj'  => 's' === $key ? 1 : 0,
                 ':words' => $list,

app/Models/Topic/Access.php

@@ -21,7 +21,7 @@ class Access extends Action
         }
 
         if (! empty($ids)) {
-            $vars  = [
+            $vars = [
                 ':ids'    => $ids,
                 ':closed' => $open ? 0 : 1,
             ];

app/Models/Topic/CalcStat.php

@@ -22,7 +22,7 @@ class CalcStat extends Method
         if ($this->model->moved_to) {
             $numReplies = 0;
         } else {
-            $vars  = [
+            $vars = [
                 ':tid' => $this->model->id
             ];
             $query = 'SELECT COUNT(p.id) - 1

app/Models/Topic/Load.php

@@ -46,7 +46,7 @@ class Load extends Action
             throw new InvalidArgumentException('Expected a positive topic id');
         }
 
-        $vars  = [
+        $vars = [
             ':tid' => $id,
             ':uid' => $this->c->user->id,
         ];
@@ -87,7 +87,7 @@ class Load extends Action
             }
         }
 
-        $vars  = [
+        $vars = [
             ':ids' => $ids,
             ':uid' => $this->c->user->id,
         ];

app/Models/Topic/Merge.php

@@ -48,7 +48,7 @@ class Merge extends Action
         }
 
         //???? перенести обработку в посты?
-        $vars  = [
+        $vars = [
             'start'  => "[from]",
             'end'    => "[/from]\n",
             'topics' => $ids,
@@ -59,7 +59,7 @@ class Merge extends Action
 
         $this->c->DB->exec($query, $vars);
 
-        $vars  = [
+        $vars = [
             'id'     => $firstTopic->id,
             'topics' => $ids,
         ];
@@ -77,7 +77,7 @@ class Merge extends Action
                 $this->c->topics->update($topic->calcStat());
             }
 
-            $vars  = [
+            $vars = [
                 'topics' => $ids,
             ];
             $query = 'SELECT t.id

app/Models/Topic/Model.php

@@ -231,7 +231,7 @@ class Model extends DataModel
             return 0;
         }
 
-        $vars  = [
+        $vars = [
             ':tid'   => $this->id,
             ':visit' => $this->hasNew,
         ];
@@ -253,7 +253,7 @@ class Model extends DataModel
             return 0;
         }
 
-        $vars  = [
+        $vars = [
             ':tid'   => $this->id,
             ':visit' => $this->hasUnread,
         ];
@@ -321,7 +321,7 @@ class Model extends DataModel
             throw new InvalidArgumentException('Bad number of displayed page');
         }
 
-        $vars  = [
+        $vars = [
             ':tid'    => $this->id,
             ':offset' => ($this->page - 1) * $this->c->user->disp_posts,
             ':rows'   => $this->c->user->disp_posts,
@@ -364,7 +364,7 @@ class Model extends DataModel
 
         $this->page = 1;
 
-        $vars  = [
+        $vars = [
             ':tid'  => $this->id,
             ':rows' => $this->c->config->i_topic_review,
         ];
@@ -384,7 +384,7 @@ class Model extends DataModel
      */
     public function calcPage(int $pid): void
     {
-        $vars  = [
+        $vars = [
             ':tid' => $this->id,
             ':pid' => $pid,
         ];
@@ -411,7 +411,7 @@ class Model extends DataModel
      */
     public function incViews(): void
     {
-        $vars  = [
+        $vars = [
             ':tid' => $this->id,
         ];
         $query = 'UPDATE ::topics

app/Models/Topic/View.php

@@ -40,7 +40,7 @@ class View extends Action
             ! $this->c->user->isGuest
             && '1' == $this->c->config->o_show_dot
         ) {
-            $vars  = [
+            $vars = [
                 ':uid' => $this->c->user->id,
                 ':ids' => $arg->idsList,
             ];

app/Models/User/AdminsIds.php

@@ -14,7 +14,7 @@ class AdminsIds extends Action
      */
     public function adminsIds(): array
     {
-        $vars  = [
+        $vars = [
             ':gid' => $this->c->GROUP_ADMIN,
         ];
         $query = 'SELECT u.id

app/Models/User/ChangeGroup.php

@@ -61,7 +61,7 @@ class ChangeGroup extends Action
             }
         }
 
-        $vars  = [
+        $vars = [
             ':new' => $newGroupId,
             ':ids' => $ids,
         ];

app/Models/User/IsUniqueName.php

@@ -14,7 +14,7 @@ class IsUniqueName extends Action
      */
     public function isUniqueName(User $user): bool
     {
-        $vars  = [
+        $vars = [
             ':id'    => (int) $user->id,
             ':name'  => $user->username,
         ];

app/Models/User/Load.php

@@ -33,7 +33,9 @@ class Load extends Action
             throw new InvalidArgumentException('Expected a positive user id');
         }
 
-        $vars  = [':id' => $id];
+        $vars = [
+            ':id' => $id,
+        ];
         $query = $this->getSql('u.id=?i:id');
 
         $data = $this->c->DB->query($query, $vars)->fetch();
@@ -55,7 +57,9 @@ class Load extends Action
             }
         }
 
-        $vars  = [':ids' => $ids];
+        $vars = [
+            ':ids' => $ids,
+        ];
         $query = $this->getSql('u.id IN (?ai:ids)');
 
         $data = $this->c->DB->query($query, $vars)->fetchAll();
@@ -89,8 +93,10 @@ class Load extends Action
      */
     public function loadByName(string $name, bool $caseInsencytive = false): ?User
     {
+        $vars = [
+            ':name' => $name,
+        ];
         $where = $caseInsencytive ? 'LOWER(u.username)=LOWER(?s:name)' : 'u.username=?s:name';
-        $vars  = [':name' => $name];
         $query = $this->getSql($where);
 
         return $this->returnUser($query, $vars);
@@ -101,7 +107,9 @@ class Load extends Action
      */
     public function loadByEmail(string $email): ?User
     {
-        $vars  = [':email' => $this->c->NormEmail->normalize($email)];
+        $vars = [
+            ':email' => $this->c->NormEmail->normalize($email),
+        ];
         $query = $this->getSql('u.email_normal=?s:email');
 
         return $this->returnUser($query, $vars);

app/Models/User/Promote.php

@@ -19,7 +19,7 @@ class Promote extends Action
 
         // перемещение всех пользователей из группы 0 в группу 1
         if (2 == $count) {
-            $vars  = [
+            $vars = [
                 ':old' => $args[0]->g_id,
                 ':new' => $args[1]->g_id,
             ];
@@ -30,7 +30,7 @@ class Promote extends Action
             return $this->c->DB->exec($query, $vars);
         // продвижение всех пользователей в группе 0
         } elseif (1 == $count) {
-            $vars  = [
+            $vars = [
                 ':old'   => $args[0]->g_id,
                 ':new'   => $args[0]->g_promote_next_group,
                 ':count' => $args[0]->g_promote_min_posts,

app/Models/User/UpdateLastVisit.php

@@ -19,7 +19,7 @@ class UpdateLastVisit extends Action
             throw new RuntimeException('Expected user');
         }
         if ($user->logged > 0) {
-            $vars  = [
+            $vars = [
                 ':loggid' => $user->logged,
                 ':id'     => $user->id,
             ];

app/Models/User/UsersNumber.php

@@ -21,7 +21,7 @@ class UsersNumber extends Action
             return 0;
         }
 
-        $vars  = [
+        $vars = [
             ':gid' => $group->g_id,
         ];
         $query = 'SELECT COUNT(u.id)

app/config/defaultBBCode.php

@@ -364,11 +364,11 @@ $fUrl = \str_replace([' ', '\'', '`', '"'], ['%20', '', '', ''], $url);
 
 if (\strpos($url, 'www.') === 0) {
     $fUrl = 'http://'.$fUrl;
-} else if (\strpos($url, 'ftp.') === 0) {
+} elseif (\strpos($url, 'ftp.') === 0) {
     $fUrl = 'ftp://'.$fUrl;
-} else if (\strpos($url, '/') === 0) {
+} elseif (\strpos($url, '/') === 0) {
     $fUrl = $parser->attr('baseUrl') . $fUrl;
-} else if (! \preg_match('%^([a-z0-9]{3,6})://%', $url)) {
+} elseif (! \preg_match('%^([a-z0-9]{3,6})://%', $url)) {
     $fUrl = 'http://'.$fUrl;
 }