From bdbcf3e30458c0993f14ffbbc30e5f2f0c45d0e1 Mon Sep 17 00:00:00 2001
From: Yuriy Pikhtarev <iglix@me.com>
Date: Fri, 30 Jun 2017 21:33:47 +0300
Subject: [PATCH 1/8] Gitkeep.

---
 .gitignore                                  | 7 +------
 bt/includes/.htaccess                       | 2 --
 internal_data/ajax_html/{.keep => .gitkeep} | 0
 internal_data/atom/{.keep => .gitkeep}      | 0
 sitemap/{.keep => .gitkeep}                 | 0
 5 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 bt/includes/.htaccess
 rename internal_data/ajax_html/{.keep => .gitkeep} (100%)
 rename internal_data/atom/{.keep => .gitkeep} (100%)
 rename sitemap/{.keep => .gitkeep} (100%)

diff --git a/.gitignore b/.gitignore
index c7cdab175..25439f6e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,26 +2,21 @@
 .env
 .idea
 .php_cs.cache
-bower_components
 composer.phar
 composer.lock
-configs/local.php
 data/avatars
 data/torrent_files
 internal_data/ajax_html
 internal_data/atom
 internal_data/cache
 internal_data/log
-internal_data/sitemap
 internal_data/triggers
-library/config.local.php
 node_modules
+sitemap
 vendor
 yarn.lock
 
 ### Archives ###
-*.log
-*.zip
 *.rar
 *.tar
 *.gz
diff --git a/bt/includes/.htaccess b/bt/includes/.htaccess
deleted file mode 100644
index baa56e5a3..000000000
--- a/bt/includes/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-order allow,deny
-deny from all
\ No newline at end of file
diff --git a/internal_data/ajax_html/.keep b/internal_data/ajax_html/.gitkeep
similarity index 100%
rename from internal_data/ajax_html/.keep
rename to internal_data/ajax_html/.gitkeep
diff --git a/internal_data/atom/.keep b/internal_data/atom/.gitkeep
similarity index 100%
rename from internal_data/atom/.keep
rename to internal_data/atom/.gitkeep
diff --git a/sitemap/.keep b/sitemap/.gitkeep
similarity index 100%
rename from sitemap/.keep
rename to sitemap/.gitkeep

From 35db5109a241611b7d202f2af1edb21924fc96b6 Mon Sep 17 00:00:00 2001
From: Yuriy Pikhtarev <iglix@me.com>
Date: Fri, 30 Jun 2017 21:47:51 +0300
Subject: [PATCH 2/8] Unnecessary parentheses.

---
 bt/announce.php                               |  6 +-
 common.php                                    |  2 +-
 dl.php                                        |  4 +-
 group.php                                     | 14 ++--
 group_edit.php                                |  4 +-
 index.php                                     | 28 ++++----
 info.php                                      |  2 +-
 .../TorrentPier/TorrentPier/Legacy/Attach.php | 16 ++---
 .../TorrentPier/TorrentPier/Legacy/BBCode.php |  2 +-
 .../TorrentPier/Legacy/Cache/File.php         |  4 +-
 .../TorrentPier/Legacy/Cache/Memcache.php     | 10 +--
 .../TorrentPier/Legacy/Cache/Redis.php        |  6 +-
 .../TorrentPier/Legacy/Common/User.php        |  4 +-
 .../TorrentPier/Legacy/Datastore/File.php     |  2 +-
 .../TorrentPier/Legacy/Datastore/Memcache.php |  2 +-
 .../TorrentPier/TorrentPier/Legacy/SqlDb.php  | 20 +++---
 library/ajax/change_user_rank.php             |  6 +-
 library/ajax/edit_group_profile.php           |  2 +-
 library/ajax/edit_user_profile.php            |  2 +-
 library/ajax/group_membership.php             |  2 +-
 library/ajax/index_data.php                   |  6 +-
 library/ajax/post_mod_comment.php             |  4 +-
 library/ajax/posts.php                        |  2 +-
 library/ajax/user_register.php                |  2 +-
 library/attach_mod/displaying.php             |  4 +-
 library/attach_mod/displaying_torrent.php     | 48 +++++++-------
 .../attach_mod/includes/functions_attach.php  | 12 ++--
 .../attach_mod/includes/functions_delete.php  |  4 +-
 .../includes/functions_includes.php           |  6 +-
 .../attach_mod/includes/functions_thumbs.php  |  4 +-
 library/includes/bbcode.php                   |  2 +-
 library/includes/cron/cron_check.php          |  2 +-
 library/includes/cron/cron_run.php            |  4 +-
 library/includes/cron/jobs/prune_forums.php   |  2 +-
 library/includes/functions.php                | 64 +++++++++----------
 library/includes/functions_admin.php          |  2 +-
 library/includes/functions_admin_cron.php     |  2 +-
 library/includes/functions_admin_torrent.php  |  6 +-
 library/includes/functions_atom.php           |  2 +-
 library/includes/functions_group.php          |  2 +-
 library/includes/functions_post.php           |  4 +-
 library/includes/init_bb.php                  |  2 +-
 library/includes/online_userlist.php          |  2 +-
 library/includes/page_footer.php              |  4 +-
 library/includes/page_header.php              |  6 +-
 library/includes/posting_tpl.php              |  2 +-
 library/includes/torrent_show_dl_list.php     |  2 +-
 library/includes/ucp/email.php                |  2 +-
 library/includes/ucp/register.php             | 32 +++++-----
 library/includes/ucp/sendpasswd.php           |  2 +-
 library/includes/ucp/topic_watch.php          |  4 +-
 library/includes/ucp/viewprofile.php          | 14 ++--
 library/includes/ucp/viewtorrent.php          | 28 ++++----
 login.php                                     |  4 +-
 memberlist.php                                |  8 +--
 modcp.php                                     | 34 +++++-----
 posting.php                                   | 24 +++----
 privmsg.php                                   | 16 ++---
 search.php                                    | 24 +++----
 tracker.php                                   | 20 +++---
 viewforum.php                                 | 36 +++++------
 viewtopic.php                                 | 42 ++++++------
 62 files changed, 315 insertions(+), 315 deletions(-)

diff --git a/bt/announce.php b/bt/announce.php
index 01d781744..fe5ed95e7 100644
--- a/bt/announce.php
+++ b/bt/announce.php
@@ -326,7 +326,7 @@ if (config('tracker.freeleech') && $down_add) {
 
 // Insert / update peer info
 $peer_info_updated = false;
-$update_time = ($stopped) ? 0 : TIMENOW;
+$update_time = $stopped ? 0 : TIMENOW;
 
 if ($lp_info) {
     $sql = "UPDATE " . BB_BT_TRACKER . " SET update_time = $update_time";
@@ -340,8 +340,8 @@ if ($lp_info) {
     $sql .= ($downloaded != $lp_info['downloaded']) ? ", downloaded = $downloaded" : '';
     $sql .= ", remain = $left";
 
-    $sql .= ($up_add) ? ", up_add = up_add + $up_add" : '';
-    $sql .= ($down_add) ? ", down_add = down_add + $down_add" : '';
+    $sql .= $up_add ? ", up_add = up_add + $up_add" : '';
+    $sql .= $down_add ? ", down_add = down_add + $down_add" : '';
 
     $sql .= ", speed_up = $speed_up";
     $sql .= ", speed_down = $speed_down";
diff --git a/common.php b/common.php
index e792d49e4..c65833fe1 100644
--- a/common.php
+++ b/common.php
@@ -198,7 +198,7 @@ function bb_log($msg, $file_name)
     if (is_array($msg)) {
         $msg = implode(LOG_LF, $msg);
     }
-    $file_name .= (LOG_EXT) ? '.' . LOG_EXT : '';
+    $file_name .= LOG_EXT ? '.' . LOG_EXT : '';
     return file_write($msg, LOG_DIR . '/' . $file_name);
 }
 
diff --git a/dl.php b/dl.php
index fe47deda5..595396d56 100644
--- a/dl.php
+++ b/dl.php
@@ -200,8 +200,8 @@ if (IS_GUEST && !bb_captcha('check')) {
         'ERROR_MESSAGE' => $message,
     ));
 
-    require(PAGE_HEADER);
-    require(PAGE_FOOTER);
+    require PAGE_HEADER;
+    require PAGE_FOOTER;
 }
 
 send_file_to_browser($attachment, $upload_dir);
diff --git a/group.php b/group.php
index 47371d55c..bff1ee874 100644
--- a/group.php
+++ b/group.php
@@ -119,7 +119,7 @@ if (!$group_id) {
             continue;
         }
 
-        $data = array('id' => $row['group_id'], 'm' => ($row['members'] - $row['candidates']), 'c' => $row['candidates'], 'rg' => $row['release_group']);
+        $data = array('id' => $row['group_id'], 'm' => $row['members'] - $row['candidates'], 'c' => $row['candidates'], 'rg' => $row['release_group']);
 
         $groups[$type][$row['group_name']] = $data;
     }
@@ -131,11 +131,11 @@ if (!$group_id) {
         foreach ($params as $name => $data) {
             $text = htmlCHR(str_short(rtrim($name), HTML_SELECT_MAX_LENGTH));
 
-            $members = ($data['m']) ? trans('messages.MEMBERS_IN_GROUP') . ': ' . $data['m'] : trans('messages.NO_GROUP_MEMBERS');
-            $candidates = ($data['c']) ? trans('messages.PENDING_MEMBERS') . ': ' . $data['c'] : trans('messages.NO_PENDING_GROUP_MEMBERS');
+            $members = $data['m'] ? trans('messages.MEMBERS_IN_GROUP') . ': ' . $data['m'] : trans('messages.NO_GROUP_MEMBERS');
+            $candidates = $data['c'] ? trans('messages.PENDING_MEMBERS') . ': ' . $data['c'] : trans('messages.NO_PENDING_GROUP_MEMBERS');
 
             $options .= '<li class="pad_2"><a href="' . GROUP_URL . $data['id'] . '" class="med bold">' . $text . '</a></li>';
-            $options .= ($data['rg']) ? '<ul><li class="med">' . trans('messages.RELEASE_GROUP') . '</li>' : '<ul>';
+            $options .= $data['rg'] ? '<ul><li class="med">' . trans('messages.RELEASE_GROUP') . '</li>' : '<ul>';
             $options .= '<li class="seedmed">' . $members . '</li>';
             if (IS_AM) {
                 $options .= '<li class="leechmed">' . $candidates . '</li>';
@@ -348,9 +348,9 @@ if (!$group_id) {
     } elseif ($is_group_member || $is_group_pending_member) {
         $template->assign_vars(array(
             'SHOW_UNSUBSCRIBE_CONTROLS' => true,
-            'CONTROL_NAME' => ($is_group_member) ? 'unsub' : 'unsubpending',
+            'CONTROL_NAME' => $is_group_member ? 'unsub' : 'unsubpending',
         ));
-        $group_details = ($is_group_pending_member) ? trans('messages.PENDING_THIS_GROUP') : trans('messages.MEMBER_THIS_GROUP');
+        $group_details = $is_group_pending_member ? trans('messages.PENDING_THIS_GROUP') : trans('messages.MEMBER_THIS_GROUP');
         $s_hidden_fields = '<input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />';
     } elseif (IS_GUEST) {
         $group_details = trans('messages.LOGIN_TO_JOIN');
@@ -410,7 +410,7 @@ if (!$group_id) {
         'U_GROUP_RELEASES' => "group.php?view=releases&amp;" . POST_GROUPS_URL . "=$group_id",
         'U_GROUP_MEMBERS' => "group.php?view=members&amp;" . POST_GROUPS_URL . "=$group_id",
         'U_GROUP_CONFIG' => "group_edit.php?g=$group_id",
-        'RELEASE_GROUP' => ($group_info['release_group']) ? true : false,
+        'RELEASE_GROUP' => $group_info['release_group'] ? true : false,
         'GROUP_TYPE' => $group_type,
 
         'S_GROUP_OPEN_TYPE' => GROUP_OPEN,
diff --git a/group_edit.php b/group_edit.php
index b5e259e94..3394eeb6b 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -85,11 +85,11 @@ if ($is_moderator) {
     $template->set_filenames(array('body' => 'group_edit.tpl'));
     $template->assign_vars(array('PAGE_TITLE' => trans('messages.GROUP_CONFIGURATION')));
 
-    require(PAGE_HEADER);
+    require PAGE_HEADER;
 
     $template->pparse('body');
 
-    require(PAGE_FOOTER);
+    require PAGE_FOOTER;
 } else {
     $redirect = 'index.php';
 
diff --git a/index.php b/index.php
index dc9d3ada8..10929184b 100644
--- a/index.php
+++ b/index.php
@@ -37,11 +37,11 @@ $user->session_start();
 
 // Init main vars
 $viewcat = isset($_GET['c']) ? (int)$_GET['c'] : 0;
-$lastvisit = (IS_GUEST) ? TIMENOW : $userdata['user_lastvisit'];
+$lastvisit = IS_GUEST ? TIMENOW : $userdata['user_lastvisit'];
 
 // Caching output
 $req_page = 'index_page';
-$req_page .= ($viewcat) ? "_c{$viewcat}" : '';
+$req_page .= $viewcat ? "_c{$viewcat}" : '';
 
 define('REQUESTED_PAGE', $req_page);
 caching_output(IS_GUEST, 'send', REQUESTED_PAGE . '_guest_' . config('app.locale'));
@@ -79,10 +79,10 @@ if ($viewcat && !($viewcat =& $forums['c'][$viewcat]['cat_id'])) {
 
 // Forums
 $forums_join_sql = 'f.cat_id = c.cat_id';
-$forums_join_sql .= ($viewcat) ? "
+$forums_join_sql .= $viewcat ? "
 	AND f.cat_id = $viewcat
 " : '';
-$forums_join_sql .= ($excluded_forums_csv) ? "
+$forums_join_sql .= $excluded_forums_csv ? "
 	AND f.forum_id NOT IN($excluded_forums_csv)
 	AND f.forum_parent NOT IN($excluded_forums_csv)
 " : '';
@@ -195,7 +195,7 @@ foreach ($cat_forums as $cid => $c) {
     ));
 
     $template->assign_vars(array(
-        'H_C_AL_MESS' => ($hide_cat_opt && !$showhide),
+        'H_C_AL_MESS' => $hide_cat_opt && !$showhide,
     ));
 
     if (!$showhide && isset($hide_cat_user[$cid]) && !$viewcat) {
@@ -216,10 +216,10 @@ foreach ($cat_forums as $cid => $c) {
 
         $forums_count++;
         $new = is_unread($f['last_post_time'], $f['last_topic_id'], $f['forum_id']) ? '_new' : '';
-        $folder_image = ($is_sf) ? $images["icon_minipost{$new}"] : $images["forum{$new}"];
+        $folder_image = $is_sf ? $images["icon_minipost{$new}"] : $images["forum{$new}"];
 
         if ($f['forum_status'] == FORUM_LOCKED) {
-            $folder_image = ($is_sf) ? $images['icon_minipost'] : $images['forum_locked'];
+            $folder_image = $is_sf ? $images['icon_minipost'] : $images['forum_locked'];
         }
 
         if ($is_sf) {
@@ -257,9 +257,9 @@ foreach ($cat_forums as $cid => $c) {
 
 $template->assign_vars(array(
     'SHOW_FORUMS' => $forums_count,
-    'SHOW_MAP' => (isset($_GET['map']) && !IS_GUEST),
-    'PAGE_TITLE' => ($viewcat) ? $cat_title_html[$viewcat] : trans('messages.HOME'),
-    'NO_FORUMS_MSG' => ($only_new) ? trans('messages.NO_NEW_POSTS') : trans('messages.NO_FORUMS'),
+    'SHOW_MAP' => isset($_GET['map']) && !IS_GUEST,
+    'PAGE_TITLE' => $viewcat ? $cat_title_html[$viewcat] : trans('messages.HOME'),
+    'NO_FORUMS_MSG' => $only_new ? trans('messages.NO_NEW_POSTS') : trans('messages.NO_FORUMS'),
 
     'TOTAL_TOPICS' => sprintf(trans('messages.POSTED_TOPICS_TOTAL'), $stats['topiccount']),
     'TOTAL_POSTS' => sprintf(trans('messages.POSTED_ARTICLES_TOTAL'), $stats['postcount']),
@@ -294,8 +294,8 @@ $template->assign_vars(array(
     'FORUM_LOCKED_IMG' => $images['forum_locked'],
 
     'SHOW_ONLY_NEW_MENU' => true,
-    'ONLY_NEW_POSTS_ON' => ($only_new == ONLY_NEW_POSTS),
-    'ONLY_NEW_TOPICS_ON' => ($only_new == ONLY_NEW_TOPICS),
+    'ONLY_NEW_POSTS_ON' => $only_new == ONLY_NEW_POSTS,
+    'ONLY_NEW_TOPICS_ON' => $only_new == ONLY_NEW_TOPICS,
 
     'U_SEARCH_NEW' => "search.php?new=1",
     'U_SEARCH_SELF_BY_MY' => "search.php?uid={$userdata['user_id']}&amp;o=1",
@@ -365,7 +365,7 @@ if (config('tp.birthday_check_day') && config('tp.birthday_enabled')) {
             }
             $week_list[] = profile_url($week) . ' <span class="small">(' . birthday_age($week['user_birthday'] - 1) . ')</span>';
         }
-        $week_all = ($week_all) ? '&nbsp;<a class="txtb" href="#" onclick="ajax.exec({action: \'index_data\', mode: \'birthday_week\'}); return false;" title="' . trans('messages.ALL') . '">...</a>' : '';
+        $week_all = $week_all ? '&nbsp;<a class="txtb" href="#" onclick="ajax.exec({action: \'index_data\', mode: \'birthday_week\'}); return false;" title="' . trans('messages.ALL') . '">...</a>' : '';
         $week_list = sprintf(trans('messages.BIRTHDAY_WEEK'), config('tp.birthday_check_day'), implode(', ', $week_list)) . $week_all;
     } else {
         $week_list = sprintf(trans('messages.NOBIRTHDAY_WEEK'), config('tp.birthday_check_day'));
@@ -380,7 +380,7 @@ if (config('tp.birthday_check_day') && config('tp.birthday_enabled')) {
             }
             $today_list[] = profile_url($today) . ' <span class="small">(' . birthday_age($today['user_birthday']) . ')</span>';
         }
-        $today_all = ($today_all) ? '&nbsp;<a class="txtb" href="#" onclick="ajax.exec({action: \'index_data\', mode: \'birthday_today\'}); return false;" title="' . trans('messages.ALL') . '">...</a>' : '';
+        $today_all = $today_all ? '&nbsp;<a class="txtb" href="#" onclick="ajax.exec({action: \'index_data\', mode: \'birthday_today\'}); return false;" title="' . trans('messages.ALL') . '">...</a>' : '';
         $today_list = trans('messages.BIRTHDAY_TODAY') . implode(', ', $today_list) . $today_all;
     } else {
         $today_list = trans('messages.NOBIRTHDAY_TODAY');
diff --git a/info.php b/info.php
index 9fd97857a..0c9988a14 100644
--- a/info.php
+++ b/info.php
@@ -77,7 +77,7 @@ $require = file_exists($html_dir . $info['src']) ? $html_dir . $info['src'] : $h
     <fieldset class="pad_6">
         <legend class="med bold mrg_2 warnColor1"><?php echo mb_strtoupper($info['title'], 'UTF-8'); ?></legend>
         <div class="bCenter">
-            <?php require($require); ?>
+            <?php require $require; ?>
         </div>
     </fieldset>
     <p class="gen tRight pad_6"><a href="javascript:window.close();" class="gen">[ <?php echo trans('messages.LOCK'); ?> ]</a>
diff --git a/library/TorrentPier/TorrentPier/Legacy/Attach.php b/library/TorrentPier/TorrentPier/Legacy/Attach.php
index 32a42e6f4..e0d46d924 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Attach.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Attach.php
@@ -370,7 +370,7 @@ class Attach
                             } else {
                                 $sql = 'UPDATE ' . BB_ATTACHMENTS_DESC . ' SET thumbnail = 0 WHERE attach_id = ' . (int)$actual_id_list[$i];
 
-                                if (!(OLD_DB()->sql_query($sql))) {
+                                if (!OLD_DB()->sql_query($sql)) {
                                     bb_die('Unable to update ' . BB_ATTACHMENTS_DESC);
                                 }
                             }
@@ -449,7 +449,7 @@ class Attach
                         $sql = 'UPDATE ' . BB_ATTACHMENTS_DESC . ' SET ' . attach_mod_sql_build_array('UPDATE', $sql_ary) . '
 							WHERE attach_id = ' . (int)$attachment_id;
 
-                        if (!(OLD_DB()->sql_query($sql))) {
+                        if (!OLD_DB()->sql_query($sql)) {
                             bb_die('Unable to update the attachment');
                         }
 
@@ -526,7 +526,7 @@ class Attach
         global $post_info, $userdata;
 
         $post_id = (int)$message_id;
-        $user_id_1 = (isset($post_info['poster_id'])) ? (int)$post_info['poster_id'] : 0;
+        $user_id_1 = isset($post_info['poster_id']) ? (int)$post_info['poster_id'] : 0;
 
         if (!$user_id_1) {
             $user_id_1 = (int)$userdata['user_id'];
@@ -546,7 +546,7 @@ class Attach
 						SET comment = '" . @attach_mod_sql_escape($this->attachment_comment_list[$i]) . "'
 						WHERE attach_id = " . $this->attachment_id_list[$i];
 
-                    if (!(OLD_DB()->sql_query($sql))) {
+                    if (!OLD_DB()->sql_query($sql)) {
                         bb_die('Unable to update the file comment');
                     }
                 } else {
@@ -568,7 +568,7 @@ class Attach
 
                     $sql = 'INSERT INTO ' . BB_ATTACHMENTS_DESC . ' ' . attach_mod_sql_build_array('INSERT', $sql_ary);
 
-                    if (!(OLD_DB()->sql_query($sql))) {
+                    if (!OLD_DB()->sql_query($sql)) {
                         bb_die('Could not store Attachment.<br />Your ' . $message_type . ' has been stored');
                     }
 
@@ -588,7 +588,7 @@ class Attach
 
                     $sql = 'INSERT INTO ' . BB_ATTACHMENTS . ' ' . attach_mod_sql_build_array('INSERT', $sql_ary);
 
-                    if (!(OLD_DB()->sql_query($sql))) {
+                    if (!OLD_DB()->sql_query($sql)) {
                         bb_die('Could not store Attachment.<br />Your ' . $message_type . ' has been stored');
                     }
                 }
@@ -614,7 +614,7 @@ class Attach
                 $sql = 'INSERT INTO ' . BB_ATTACHMENTS_DESC . ' ' . attach_mod_sql_build_array('INSERT', $sql_ary);
 
                 // Inform the user that his post has been created, but nothing is attached
-                if (!(OLD_DB()->sql_query($sql))) {
+                if (!OLD_DB()->sql_query($sql)) {
                     bb_die('Could not store Attachment.<br />Your ' . $message_type . ' has been stored');
                 }
 
@@ -628,7 +628,7 @@ class Attach
 
                 $sql = 'INSERT INTO ' . BB_ATTACHMENTS . ' ' . attach_mod_sql_build_array('INSERT', $sql_ary);
 
-                if (!(OLD_DB()->sql_query($sql))) {
+                if (!OLD_DB()->sql_query($sql)) {
                     bb_die('Could not store Attachment.<br />Your ' . $message_type . ' has been stored');
                 }
             }
diff --git a/library/TorrentPier/TorrentPier/Legacy/BBCode.php b/library/TorrentPier/TorrentPier/Legacy/BBCode.php
index afb31ad46..70784954f 100644
--- a/library/TorrentPier/TorrentPier/Legacy/BBCode.php
+++ b/library/TorrentPier/TorrentPier/Legacy/BBCode.php
@@ -330,7 +330,7 @@ class BBCode
         // Remove our padding..
         $ret = substr(substr($ret, 0, -1), 1);
 
-        return ($ret);
+        return $ret;
     }
 
     /**
diff --git a/library/TorrentPier/TorrentPier/Legacy/Cache/File.php b/library/TorrentPier/TorrentPier/Legacy/Cache/File.php
index 3ddecc759..ea4f12534 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Cache/File.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Cache/File.php
@@ -35,7 +35,7 @@ class File extends Common
         $this->debug('start');
 
         if (file_exists($filename)) {
-            require($filename);
+            require $filename;
         }
 
         $this->debug('stop');
@@ -115,7 +115,7 @@ class File extends Common
                     if ($file != "." && $file != "..") {
                         $filename = $this->dir . $file;
 
-                        require($filename);
+                        require $filename;
 
                         if (!empty($filecache['expire']) && ($filecache['expire'] < $expire_time)) {
                             unlink($filename);
diff --git a/library/TorrentPier/TorrentPier/Legacy/Cache/Memcache.php b/library/TorrentPier/TorrentPier/Legacy/Cache/Memcache.php
index 0fe7d706f..3658886ac 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Cache/Memcache.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Cache/Memcache.php
@@ -36,7 +36,7 @@ class Memcache extends Common
 
     public function connect()
     {
-        $connect_type = ($this->cfg['pconnect']) ? 'pconnect' : 'connect';
+        $connect_type = $this->cfg['pconnect'] ? 'pconnect' : 'connect';
 
         $this->cur_query = $connect_type . ' ' . $this->cfg['host'] . ':' . $this->cfg['port'];
         $this->debug('start');
@@ -69,7 +69,7 @@ class Memcache extends Common
         $this->cur_query = null;
         $this->num_queries++;
 
-        return ($this->connected) ? $this->memcache->get($this->prefix . $name) : false;
+        return $this->connected ? $this->memcache->get($this->prefix . $name) : false;
     }
 
     public function set($name, $value, $ttl = 0)
@@ -84,7 +84,7 @@ class Memcache extends Common
         $this->cur_query = null;
         $this->num_queries++;
 
-        return ($this->connected) ? $this->memcache->set($this->prefix . $name, $value, false, $ttl) : false;
+        return $this->connected ? $this->memcache->set($this->prefix . $name, $value, false, $ttl) : false;
     }
 
     public function rm($name = '')
@@ -100,10 +100,10 @@ class Memcache extends Common
             $this->cur_query = null;
             $this->num_queries++;
 
-            return ($this->connected) ? $this->memcache->delete($this->prefix . $name, 0) : false;
+            return $this->connected ? $this->memcache->delete($this->prefix . $name, 0) : false;
         }
 
-        return ($this->connected) ? $this->memcache->flush() : false;
+        return $this->connected ? $this->memcache->flush() : false;
     }
 
     public function is_installed()
diff --git a/library/TorrentPier/TorrentPier/Legacy/Cache/Redis.php b/library/TorrentPier/TorrentPier/Legacy/Cache/Redis.php
index e500425d2..74c616f00 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Cache/Redis.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Cache/Redis.php
@@ -63,7 +63,7 @@ class Redis extends Common
         $this->cur_query = null;
         $this->num_queries++;
 
-        return ($this->connected) ? unserialize($this->redis->get($this->prefix . $name)) : false;
+        return $this->connected ? unserialize($this->redis->get($this->prefix . $name)) : false;
     }
 
     public function set($name, $value, $ttl = 0)
@@ -103,10 +103,10 @@ class Redis extends Common
             $this->cur_query = null;
             $this->num_queries++;
 
-            return ($this->connected) ? $this->redis->del($this->prefix . $name) : false;
+            return $this->connected ? $this->redis->del($this->prefix . $name) : false;
         }
 
-        return ($this->connected) ? $this->redis->flushDB() : false;
+        return $this->connected ? $this->redis->flushDB() : false;
     }
 
     public function is_installed()
diff --git a/library/TorrentPier/TorrentPier/Legacy/Common/User.php b/library/TorrentPier/TorrentPier/Legacy/Common/User.php
index c5341f216..375aa1cd5 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Common/User.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Common/User.php
@@ -468,7 +468,7 @@ class User
             }
         } else {
             $c_sdata_resv = !empty($_COOKIE[COOKIE_DATA]) ? $_COOKIE[COOKIE_DATA] : null;
-            $c_sdata_curr = ($this->sessiondata) ? serialize($this->sessiondata) : '';
+            $c_sdata_curr = $this->sessiondata ? serialize($this->sessiondata) : '';
 
             if ($c_sdata_curr !== $c_sdata_resv) {
                 bb_setcookie(COOKIE_DATA, $c_sdata_curr, COOKIE_PERSIST, true);
@@ -517,7 +517,7 @@ class User
      */
     public function create_autologin_id($userdata, $create_new = true)
     {
-        $autologin_id = ($create_new) ? make_rand_str(LOGIN_KEY_LENGTH) : '';
+        $autologin_id = $create_new ? make_rand_str(LOGIN_KEY_LENGTH) : '';
 
         OLD_DB()->query("
 			UPDATE " . BB_USERS . " SET
diff --git a/library/TorrentPier/TorrentPier/Legacy/Datastore/File.php b/library/TorrentPier/TorrentPier/Legacy/Datastore/File.php
index 40bb15460..9ff225f7b 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Datastore/File.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Datastore/File.php
@@ -82,7 +82,7 @@ class File extends Common
             $this->num_queries++;
 
             if (file_exists($filename)) {
-                require($filename);
+                require $filename;
 
                 $this->data[$item] = $filecache;
             }
diff --git a/library/TorrentPier/TorrentPier/Legacy/Datastore/Memcache.php b/library/TorrentPier/TorrentPier/Legacy/Datastore/Memcache.php
index 2c7d938b1..d453232b7 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Datastore/Memcache.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Datastore/Memcache.php
@@ -35,7 +35,7 @@ class Memcache extends Common
 
     public function connect()
     {
-        $connect_type = ($this->cfg['pconnect']) ? 'pconnect' : 'connect';
+        $connect_type = $this->cfg['pconnect'] ? 'pconnect' : 'connect';
 
         $this->cur_query = $connect_type . ' ' . $this->cfg['host'] . ':' . $this->cfg['port'];
         $this->debug('start');
diff --git a/library/TorrentPier/TorrentPier/Legacy/SqlDb.php b/library/TorrentPier/TorrentPier/Legacy/SqlDb.php
index cab427698..83239d057 100644
--- a/library/TorrentPier/TorrentPier/Legacy/SqlDb.php
+++ b/library/TorrentPier/TorrentPier/Legacy/SqlDb.php
@@ -394,7 +394,7 @@ class SqlDb
             case is_int($v):
                 return "$v";
             case is_bool($v):
-                return ($v) ? '1' : '0';
+                return $v ? '1' : '0';
             case is_float($v):
                 return "'$v'";
             case null === $v:
@@ -514,31 +514,31 @@ class SqlDb
         foreach ($sql_ary as $clause => $ary) {
             switch ($clause) {
                 case 'SELECT':
-                    $sql .= ($ary) ? ' SELECT ' . implode(' ', $sql_ary['select_options']) . ' ' . implode(', ', $ary) : '';
+                    $sql .= $ary ? ' SELECT ' . implode(' ', $sql_ary['select_options']) . ' ' . implode(', ', $ary) : '';
                     break;
                 case 'FROM':
-                    $sql .= ($ary) ? ' FROM ' . implode(', ', $ary) : '';
+                    $sql .= $ary ? ' FROM ' . implode(', ', $ary) : '';
                     break;
                 case 'INNER JOIN':
-                    $sql .= ($ary) ? ' INNER JOIN ' . implode(' INNER JOIN ', $ary) : '';
+                    $sql .= $ary ? ' INNER JOIN ' . implode(' INNER JOIN ', $ary) : '';
                     break;
                 case 'LEFT JOIN':
-                    $sql .= ($ary) ? ' LEFT JOIN ' . implode(' LEFT JOIN ', $ary) : '';
+                    $sql .= $ary ? ' LEFT JOIN ' . implode(' LEFT JOIN ', $ary) : '';
                     break;
                 case 'WHERE':
-                    $sql .= ($ary) ? ' WHERE ' . implode(' AND ', $ary) : '';
+                    $sql .= $ary ? ' WHERE ' . implode(' AND ', $ary) : '';
                     break;
                 case 'GROUP BY':
-                    $sql .= ($ary) ? ' GROUP BY ' . implode(', ', $ary) : '';
+                    $sql .= $ary ? ' GROUP BY ' . implode(', ', $ary) : '';
                     break;
                 case 'HAVING':
-                    $sql .= ($ary) ? ' HAVING ' . implode(' AND ', $ary) : '';
+                    $sql .= $ary ? ' HAVING ' . implode(' AND ', $ary) : '';
                     break;
                 case 'ORDER BY':
-                    $sql .= ($ary) ? ' ORDER BY ' . implode(', ', $ary) : '';
+                    $sql .= $ary ? ' ORDER BY ' . implode(', ', $ary) : '';
                     break;
                 case 'LIMIT':
-                    $sql .= ($ary) ? ' LIMIT ' . implode(', ', $ary) : '';
+                    $sql .= $ary ? ' LIMIT ' . implode(', ', $ary) : '';
                     break;
             }
         }
diff --git a/library/ajax/change_user_rank.php b/library/ajax/change_user_rank.php
index b72f4f060..8fb281c3e 100644
--- a/library/ajax/change_user_rank.php
+++ b/library/ajax/change_user_rank.php
@@ -28,7 +28,7 @@ OLD_DB()->query("UPDATE " . BB_USERS . " SET user_rank = $rank_id WHERE user_id
 
 cache_rm_user_sessions($user_id);
 
-$user_rank = ($rank_id) ? '<span class="' . $ranks[$rank_id]['rank_style'] . '">' . $ranks[$rank_id]['rank_title'] . '</span>' : '';
+$user_rank = $rank_id ? '<span class="' . $ranks[$rank_id]['rank_style'] . '">' . $ranks[$rank_id]['rank_title'] . '</span>' : '';
 
-$this->response['html'] = ($rank_id) ? trans('messages.AWARDED_RANK') . "<b> $user_rank </b>" : trans('messages.SHOT_RANK');
-$this->response['rank_name'] = ($rank_id) ? $user_rank : trans('messages.USER');
+$this->response['html'] = $rank_id ? trans('messages.AWARDED_RANK') . "<b> $user_rank </b>" : trans('messages.SHOT_RANK');
+$this->response['rank_name'] = $rank_id ? $user_rank : trans('messages.USER');
diff --git a/library/ajax/edit_group_profile.php b/library/ajax/edit_group_profile.php
index 0a1579f24..1ff3793cf 100644
--- a/library/ajax/edit_group_profile.php
+++ b/library/ajax/edit_group_profile.php
@@ -20,7 +20,7 @@ if (!$mode = (string)$this->request['mode']) {
     $this->ajax_die('No mode specified');
 }
 
-$value = $this->request['value'] = (string)(isset($this->request['value'])) ? $this->request['value'] : 0;
+$value = $this->request['value'] = (string)isset($this->request['value']) ? $this->request['value'] : 0;
 
 if (!IS_ADMIN && $userdata['user_id'] != $group_info['group_moderator']) {
     $this->ajax_die(trans('messages.ONLY_FOR_MOD'));
diff --git a/library/ajax/edit_user_profile.php b/library/ajax/edit_user_profile.php
index 32b09fccd..fedd8e5ca 100644
--- a/library/ajax/edit_user_profile.php
+++ b/library/ajax/edit_user_profile.php
@@ -19,7 +19,7 @@ if (!$field = (string)$this->request['field']) {
 }
 
 $table = BB_USERS;
-$value = $this->request['value'] = (string)(isset($this->request['value'])) ? $this->request['value'] : 0;
+$value = $this->request['value'] = (string)isset($this->request['value']) ? $this->request['value'] : 0;
 
 switch ($field) {
     case 'username':
diff --git a/library/ajax/group_membership.php b/library/ajax/group_membership.php
index 4e16ebd23..49b104dba 100644
--- a/library/ajax/group_membership.php
+++ b/library/ajax/group_membership.php
@@ -33,7 +33,7 @@ switch ($mode) {
 				";
         $html = array();
         foreach (OLD_DB()->fetch_rowset($sql) as $row) {
-            $class = ($row['user_pending']) ? 'med' : 'med bold';
+            $class = $row['user_pending'] ? 'med' : 'med bold';
             $class .= ($row['group_moderator'] == $user_id) ? ' colorMod' : '';
             $href = "group.php?g={$row['group_id']}";
 
diff --git a/library/ajax/index_data.php b/library/ajax/index_data.php
index 88549457d..8948613ca 100644
--- a/library/ajax/index_data.php
+++ b/library/ajax/index_data.php
@@ -73,7 +73,7 @@ switch ($mode) {
         }
 
         $html = ':&nbsp;';
-        $html .= ($moderators) ? implode(', ', $moderators) : trans('messages.NONE');
+        $html .= $moderators ? implode(', ', $moderators) : trans('messages.NONE');
         unset($moderators, $mod);
         $datastore->rm('moderators');
         break;
@@ -99,8 +99,8 @@ switch ($mode) {
         $btu = get_bt_userdata($user_id);
         $profiledata = get_userdata($user_id);
 
-        $speed_up = ($btu['speed_up']) ? humn_size($btu['speed_up']) . '/s' : '0 KB/s';
-        $speed_down = ($btu['speed_down']) ? humn_size($btu['speed_down']) . '/s' : '0 KB/s';
+        $speed_up = $btu['speed_up'] ? humn_size($btu['speed_up']) . '/s' : '0 KB/s';
+        $speed_down = $btu['speed_down'] ? humn_size($btu['speed_down']) . '/s' : '0 KB/s';
         $user_ratio = ($btu['u_down_total'] > MIN_DL_FOR_RATIO) ? '<b class="gen">' . get_bt_ratio($btu) . '</b>' : trans('messages.IT_WILL_BE_DOWN') . ' <b>' . humn_size(MIN_DL_FOR_RATIO) . '</b>';
 
         $html = '
diff --git a/library/ajax/post_mod_comment.php b/library/ajax/post_mod_comment.php
index 2a6aa64e4..dbf1eaea4 100644
--- a/library/ajax/post_mod_comment.php
+++ b/library/ajax/post_mod_comment.php
@@ -31,9 +31,9 @@ if (!$post) {
 }
 
 $data = array(
-    'mc_comment' => ($mc_type) ? $mc_text : '',
+    'mc_comment' => $mc_type ? $mc_text : '',
     'mc_type' => $mc_type,
-    'mc_user_id' => ($mc_type) ? $userdata['user_id'] : 0,
+    'mc_user_id' => $mc_type ? $userdata['user_id'] : 0,
 );
 $sql_args = OLD_DB()->build_array('UPDATE', $data);
 OLD_DB()->query("UPDATE " . BB_POSTS . " SET $sql_args WHERE post_id = $post_id");
diff --git a/library/ajax/posts.php b/library/ajax/posts.php
index 50d4a02a9..17b4eefb5 100644
--- a/library/ajax/posts.php
+++ b/library/ajax/posts.php
@@ -229,7 +229,7 @@ switch ($this->request['type']) {
         $message = prepare_message($message);
 
         // Flood control
-        $where_sql = (IS_GUEST) ? "p.poster_ip = '" . USER_IP . "'" : "p.poster_id = {$userdata['user_id']}";
+        $where_sql = IS_GUEST ? "p.poster_ip = '" . USER_IP . "'" : "p.poster_id = {$userdata['user_id']}";
 
         $sql = "SELECT MAX(p.post_time) AS last_post_time FROM " . BB_POSTS . " p WHERE $where_sql";
         if ($row = OLD_DB()->fetch_row($sql) and $row['last_post_time']) {
diff --git a/library/ajax/user_register.php b/library/ajax/user_register.php
index ea5244831..2a22bbf0b 100644
--- a/library/ajax/user_register.php
+++ b/library/ajax/user_register.php
@@ -51,7 +51,7 @@ switch ($mode) {
                 } elseif (mb_strlen($pass, 'UTF-8') < 5) {
                     $html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">' . sprintf(trans('messages.CHOOSE_PASS_ERR_MIN'), 5) . '</span>';
                 } else {
-                    $text = (IS_GUEST) ? trans('messages.CHOOSE_PASS_REG_OK') : trans('messages.CHOOSE_PASS_OK');
+                    $text = IS_GUEST ? trans('messages.CHOOSE_PASS_REG_OK') : trans('messages.CHOOSE_PASS_OK');
                     $html = '<img src="./styles/images/good.gif"> <span class="seedmed bold">' . $text . '</span>';
                 }
             }
diff --git a/library/attach_mod/displaying.php b/library/attach_mod/displaying.php
index 10bc5e5de..b8e12bd92 100644
--- a/library/attach_mod/displaying.php
+++ b/library/attach_mod/displaying.php
@@ -260,7 +260,7 @@ function display_attachments($post_id)
 						SET download_count = download_count + 1
 						WHERE attach_id = ' . (int)$attachments['_' . $post_id][$i]['attach_id'];
 
-                    if (!(OLD_DB()->sql_query($sql))) {
+                    if (!OLD_DB()->sql_query($sql)) {
                         bb_die('Could not update attachment download count');
                     }
                 }
@@ -288,7 +288,7 @@ function display_attachments($post_id)
             if ($link && ($attachments['_' . $post_id][$i]['extension'] === TORRENT_EXT)) {
                 include ATTACH_DIR . '/displaying_torrent.php';
             } elseif ($link) {
-                $target_blank = ((@(int)$display_categories[$attachments['_' . $post_id][$i]['extension']] == IMAGE_CAT)) ? 'target="_blank"' : '';
+                $target_blank = @(int)$display_categories[$attachments['_' . $post_id][$i]['extension']] == IMAGE_CAT ? 'target="_blank"' : '';
 
                 // display attachment
                 $template->assign_block_vars('postrow.attach.attachrow', array(
diff --git a/library/attach_mod/displaying_torrent.php b/library/attach_mod/displaying_torrent.php
index 234cb3f3e..a2515b2b7 100644
--- a/library/attach_mod/displaying_torrent.php
+++ b/library/attach_mod/displaying_torrent.php
@@ -75,16 +75,16 @@ $tor_auth = ($bt_user_id != GUEST_UID && (($bt_user_id == $poster_id && !$locked
 $tor_auth_reg = ($tor_auth && $t_data['allow_reg_tracker'] && $post_id == $t_data['topic_first_post_id']);
 $tor_auth_del = ($tor_auth && $tor_reged);
 
-$tracker_link = ($tor_reged) ? trans('messages.BT_REG_YES') : trans('messages.BT_REG_NO');
+$tracker_link = $tor_reged ? trans('messages.BT_REG_YES') : trans('messages.BT_REG_NO');
 
 $download_link = DOWNLOAD_URL . $attach_id;
-$description = ($comment) ?: preg_replace("#.torrent$#i", '', $display_name);
+$description = $comment ?: preg_replace("#.torrent$#i", '', $display_name);
 
 if ($tor_auth_reg || $tor_auth_del) {
     $reg_tor_url = '<a class="txtb" href="#" onclick="ajax.exec({ action: \'change_torrent\', attach_id : ' . $attach_id . ', type: \'reg\'}); return false;">' . trans('messages.BT_REG_ON_TRACKER') . '</a>';
     $unreg_tor_url = '<a class="txtb" href="#" onclick="ajax.exec({ action: \'change_torrent\', attach_id : ' . $attach_id . ', type: \'unreg\'}); return false;">' . trans('messages.BT_UNREG_FROM_TRACKER') . '</a>';
 
-    $tracker_link = ($tor_reged) ? $unreg_tor_url : $reg_tor_url;
+    $tracker_link = $tor_reged ? $unreg_tor_url : $reg_tor_url;
 }
 
 $display_name = '[' . config('tp.server_name') . '].t' . $bt_topic_id . '.torrent';
@@ -137,7 +137,7 @@ if ($tor_auth) {
 }
 
 if ($tor_reged && $tor_info) {
-    $tor_size = ($tor_info['size']) ?: 0;
+    $tor_size = $tor_info['size'] ?: 0;
     $tor_id = $tor_info['topic_id'];
     $tor_type = $tor_info['tor_type'];
 
@@ -206,8 +206,8 @@ if ($tor_reged && $tor_info) {
 
             'S_UPLOAD_IMAGE' => $upload_image,
             'U_DOWNLOAD_LINK' => $download_link,
-            'DL_LINK_CLASS' => (isset($bt_userdata['user_status'])) ? $dl_link_css[$bt_userdata['user_status']] : 'genmed',
-            'DL_TITLE_CLASS' => (isset($bt_userdata['user_status'])) ? $dl_status_css[$bt_userdata['user_status']] : 'gen',
+            'DL_LINK_CLASS' => isset($bt_userdata['user_status']) ? $dl_link_css[$bt_userdata['user_status']] : 'genmed',
+            'DL_TITLE_CLASS' => isset($bt_userdata['user_status']) ? $dl_status_css[$bt_userdata['user_status']] : 'gen',
             'FILESIZE' => $tor_file_size,
             'MAGNET' => $tor_magnet,
             'HASH' => strtoupper(bin2hex($tor_info['info_hash'])),
@@ -309,7 +309,7 @@ if ($tor_reged && $tor_info) {
 
             if ($s_mode == 'full') {
                 foreach ($peers as $pid => $peer) {
-                    $x = ($peer['seeder']) ? 's' : 'l';
+                    $x = $peer['seeder'] ? 's' : 'l';
                     $cnt[$x]++;
                     $sp_up_tot[$x] += $peer['speed_up'];
                     $sp_down_tot[$x] += $peer['speed_down'];
@@ -356,8 +356,8 @@ if ($tor_reged && $tor_info) {
                 $peers = $tmp;
 
                 $template->assign_vars(array(
-                    'TOR_SPEED_UP' => ($tor_speed_up) ? humn_size($tor_speed_up, 0, 'KB') . '/s' : '0 KB/s',
-                    'TOR_SPEED_DOWN' => ($tor_speed_down) ? humn_size($tor_speed_down, 0, 'KB') . '/s' : '0 KB/s',
+                    'TOR_SPEED_UP' => $tor_speed_up ? humn_size($tor_speed_up, 0, 'KB') . '/s' : '0 KB/s',
+                    'TOR_SPEED_DOWN' => $tor_speed_down ? humn_size($tor_speed_down, 0, 'KB') . '/s' : '0 KB/s',
                 ));
             }
 
@@ -396,7 +396,7 @@ if ($tor_reged && $tor_info) {
                                 $template->assign_block_vars("$x_full.porthead", array());
                             }
                         }
-                        $compl_perc = ($tor_size) ? round(($p_max_up / $tor_size), 1) : 0;
+                        $compl_perc = $tor_size ? round($p_max_up / $tor_size, 1) : 0;
                     } else {
                         $x = 'l';
                         $x_row = 'lrow';
@@ -420,24 +420,24 @@ if ($tor_reged && $tor_info) {
                             }
                         }
                         $compl_size = ($peer['remain'] && $tor_size && $tor_size > $peer['remain']) ? ($tor_size - $peer['remain']) : 0;
-                        $compl_perc = ($compl_size) ? floor($compl_size * 100 / $tor_size) : 0;
+                        $compl_perc = $compl_size ? floor($compl_size * 100 / $tor_size) : 0;
                     }
 
                     $rel_sign = (!$guest && $peer['releaser']) ? '&nbsp;<b><sup>&reg;</sup></b>' : '';
                     $name = profile_url($peer) . $rel_sign;
-                    $up_tot = ($p_max_up) ? humn_size($p_max_up) : '-';
-                    $down_tot = ($p_max_down) ? humn_size($p_max_down) : '-';
-                    $up_ratio = ($p_max_down) ? round(($p_max_up / $p_max_down), 2) : '';
-                    $sp_up = ($peer['speed_up']) ? humn_size($peer['speed_up'], 0, 'KB') . '/s' : '-';
-                    $sp_down = ($peer['speed_down']) ? humn_size($peer['speed_down'], 0, 'KB') . '/s' : '-';
+                    $up_tot = $p_max_up ? humn_size($p_max_up) : '-';
+                    $down_tot = $p_max_down ? humn_size($p_max_down) : '-';
+                    $up_ratio = $p_max_down ? round($p_max_up / $p_max_down, 2) : '';
+                    $sp_up = $peer['speed_up'] ? humn_size($peer['speed_up'], 0, 'KB') . '/s' : '-';
+                    $sp_down = $peer['speed_down'] ? humn_size($peer['speed_down'], 0, 'KB') . '/s' : '-';
 
                     $bgr_class = (!($tr[$x] % 2)) ? $bgr_class_1 : $bgr_class_2;
-                    $row_bgr = ($change_peers_bgr_over) ? " class=\"$bgr_class\" onmouseover=\"this.className='$bgr_class_over';\" onmouseout=\"this.className='$bgr_class';\"" : '';
+                    $row_bgr = $change_peers_bgr_over ? " class=\"$bgr_class\" onmouseover=\"this.className='$bgr_class_over';\" onmouseout=\"this.className='$bgr_class';\"" : '';
                     $tr[$x]++;
 
                     $template->assign_block_vars("$x_full.$x_row", array(
                         'ROW_BGR' => $row_bgr,
-                        'NAME' => ($peer['update_time']) ? $name : "<s>$name</s>",
+                        'NAME' => $peer['update_time'] ? $name : "<s>$name</s>",
                         'COMPL_PRC' => $compl_perc,
                         'UP_TOTAL' => ($max_up_id[$x] == $pid) ? "<b>$up_tot</b>" : $up_tot,
                         'DOWN_TOTAL' => ($max_down_id[$x] == $pid) ? "<b>$down_tot</b>" : $down_tot,
@@ -447,8 +447,8 @@ if ($tor_reged && $tor_info) {
                         'DOWN_TOTAL_RAW' => $peer['downloaded'],
                         'SPEED_UP_RAW' => $peer['speed_up'],
                         'SPEED_DOWN_RAW' => $peer['speed_down'],
-                        'UPD_EXP_TIME' => ($peer['update_time']) ? trans('messages.DL_UPD') . bb_date($peer['update_time'], 'd-M-y H:i') . ' &middot; ' . delta_time($peer['update_time']) . trans('messages.TOR_BACK') : trans('messages.DL_STOPPED'),
-                        'TOR_RATIO' => ($up_ratio) ? trans('messages.USER_RATIO') . "UL/DL: $up_ratio" : '',
+                        'UPD_EXP_TIME' => $peer['update_time'] ? trans('messages.DL_UPD') . bb_date($peer['update_time'], 'd-M-y H:i') . ' &middot; ' . delta_time($peer['update_time']) . trans('messages.TOR_BACK') : trans('messages.DL_STOPPED'),
+                        'TOR_RATIO' => $up_ratio ? trans('messages.USER_RATIO') . "UL/DL: $up_ratio" : '',
                     ));
 
                     if ($ip) {
@@ -464,7 +464,7 @@ if ($tor_reged && $tor_info) {
                         $seed_count = $peer['username'];
                     } else {
                         $compl_size = (@$peer['remain'] && $tor_size && $tor_size > $peer['remain']) ? ($tor_size - $peer['remain']) : 0;
-                        $compl_perc = ($compl_size) ? floor($compl_size * 100 / $tor_size) : 0;
+                        $compl_perc = $compl_size ? floor($compl_size * 100 / $tor_size) : 0;
 
                         $leechers .= '<nobr><a href="' . $u_prof_href . '" class="leechmed">' . $peer['username'] . '</a>';
                         $leechers .= ($s_mode == 'names') ? ' [' . $compl_perc . '%]' : '';
@@ -478,14 +478,14 @@ if ($tor_reged && $tor_info) {
                 $seeders[strlen($seeders) - 9] = ' ';
                 $template->assign_vars(array(
                     'SEED_LIST' => $seeders,
-                    'SEED_COUNT' => ($seed_count) ?: 0,
+                    'SEED_COUNT' => $seed_count ?: 0,
                 ));
             }
             if ($s_mode != 'full' && $leechers) {
                 $leechers[strlen($leechers) - 9] = ' ';
                 $template->assign_vars(array(
                     'LEECH_LIST' => $leechers,
-                    'LEECH_COUNT' => ($leech_count) ?: 0,
+                    'LEECH_COUNT' => $leech_count ?: 0,
                 ));
             }
         }
@@ -493,7 +493,7 @@ if ($tor_reged && $tor_info) {
 
         // Show "seeder last seen info"
         if (($s_mode == 'count' && !$seed_count) || (!$seeders && !defined('SEEDER_EXIST'))) {
-            $last_seen_time = ($tor_info['seeder_last_seen']) ? delta_time($tor_info['seeder_last_seen']) : trans('messages.NEVER');
+            $last_seen_time = $tor_info['seeder_last_seen'] ? delta_time($tor_info['seeder_last_seen']) : trans('messages.NEVER');
 
             $template->assign_vars(array(
                 'SEEDER_LAST_SEEN' => sprintf(trans('messages.SEEDER_LAST_SEEN'), $last_seen_time),
diff --git a/library/attach_mod/includes/functions_attach.php b/library/attach_mod/includes/functions_attach.php
index 0933c5e24..fa14e8334 100644
--- a/library/attach_mod/includes/functions_attach.php
+++ b/library/attach_mod/includes/functions_attach.php
@@ -19,7 +19,7 @@ if (!function_exists('html_entity_decode')) {
     {
         $trans_table = array_flip(get_html_translation_table(HTML_SPECIALCHARS, $quote_style));
         $trans_table['&#39;'] = "'";
-        return (strtr($given_html, $trans_table));
+        return strtr($given_html, $trans_table);
     }
 }
 
@@ -450,7 +450,7 @@ function user_in_group($user_id, $group_id)
  */
 function amod_realpath($path)
 {
-    return (function_exists('realpath')) ? realpath($path) : $path;
+    return function_exists('realpath') ? realpath($path) : $path;
 }
 
 /**
@@ -488,7 +488,7 @@ function get_var($var_name, $default, $multibyte = false)
     if (!isset($_REQUEST[$var_name]) ||
         (is_array($_REQUEST[$var_name]) && !is_array($default)) ||
         (is_array($default) && !is_array($_REQUEST[$var_name]))) {
-        return (is_array($default)) ? [] : $default;
+        return is_array($default) ? [] : $default;
     }
 
     $var = $_REQUEST[$var_name];
@@ -563,7 +563,7 @@ function attach_mod_sql_build_array($query, $assoc_ary = false)
             } elseif (is_array($var) && is_string($var[0])) {
                 $values[] = $var[0];
             } else {
-                $values[] = (is_bool($var)) ? (int)$var : $var;
+                $values[] = is_bool($var) ? (int)$var : $var;
             }
         }
 
@@ -578,7 +578,7 @@ function attach_mod_sql_build_array($query, $assoc_ary = false)
                 } elseif (is_string($var)) {
                     $values[] = "'" . attach_mod_sql_escape($var) . "'";
                 } else {
-                    $values[] = (is_bool($var)) ? (int)$var : $var;
+                    $values[] = is_bool($var) ? (int)$var : $var;
                 }
             }
             $ary[] = '(' . implode(', ', $values) . ')';
@@ -593,7 +593,7 @@ function attach_mod_sql_build_array($query, $assoc_ary = false)
             } elseif (is_string($var)) {
                 $values[] = "$key = '" . attach_mod_sql_escape($var) . "'";
             } else {
-                $values[] = (is_bool($var)) ? "$key = " . (int)$var : "$key = $var";
+                $values[] = is_bool($var) ? "$key = " . (int)$var : "$key = $var";
             }
         }
         $query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values);
diff --git a/library/attach_mod/includes/functions_delete.php b/library/attach_mod/includes/functions_delete.php
index fe8237720..739ccea0a 100644
--- a/library/attach_mod/includes/functions_delete.php
+++ b/library/attach_mod/includes/functions_delete.php
@@ -134,7 +134,7 @@ function delete_attachment($post_id_array = 0, $attach_id_array = 0, $page = 0,
 			WHERE attach_id IN (' . implode(', ', $attach_id_array) . ")
 				AND $sql_id IN (" . implode(', ', $post_id_array) . ')';
 
-        if (!(OLD_DB()->sql_query($sql))) {
+        if (!OLD_DB()->sql_query($sql)) {
             bb_die(trans('messages.ERROR_DELETED_ATTACHMENTS'));
         }
 
@@ -208,7 +208,7 @@ function delete_attachment($post_id_array = 0, $attach_id_array = 0, $page = 0,
 
                         $sql = 'DELETE FROM ' . BB_ATTACHMENTS_DESC . ' WHERE attach_id = ' . (int)$attachments[$j]['attach_id'];
 
-                        if (!(OLD_DB()->sql_query($sql))) {
+                        if (!OLD_DB()->sql_query($sql)) {
                             bb_die(trans('messages.ERROR_DELETED_ATTACHMENTS'));
                         }
                     }
diff --git a/library/attach_mod/includes/functions_includes.php b/library/attach_mod/includes/functions_includes.php
index 43b1c9e8b..9fcb876ae 100644
--- a/library/attach_mod/includes/functions_includes.php
+++ b/library/attach_mod/includes/functions_includes.php
@@ -19,8 +19,8 @@ function attach_build_auth_levels($is_auth, &$s_auth_can)
     }
 
     // If you want to have the rules window link within the forum view too, comment out the two lines, and comment the third line
-    $s_auth_can .= (($is_auth['auth_attachments']) ? trans('messages.RULES_ATTACH_CAN') : trans('messages.RULES_ATTACH_CANNOT')) . '<br />';
-    $s_auth_can .= (($is_auth['auth_download']) ? trans('messages.RULES_DOWNLOAD_CAN') : trans('messages.RULES_DOWNLOAD_CANNOT')) . '<br />';
+    $s_auth_can .= ($is_auth['auth_attachments'] ? trans('messages.RULES_ATTACH_CAN') : trans('messages.RULES_ATTACH_CANNOT')) . '<br />';
+    $s_auth_can .= ($is_auth['auth_download'] ? trans('messages.RULES_DOWNLOAD_CAN') : trans('messages.RULES_DOWNLOAD_CANNOT')) . '<br />';
 }
 
 /**
@@ -45,7 +45,7 @@ function attachment_quota_settings($admin_mode, $submit = false, $mode)
 
     if ($admin_mode == 'user') {
         // We overwrite submit here... to be sure
-        $submit = (isset($_POST['submit'])) ? true : false;
+        $submit = isset($_POST['submit']) ? true : false;
 
         if (!$submit && $mode != 'save') {
             $user_id = get_var(POST_USERS_URL, 0);
diff --git a/library/attach_mod/includes/functions_thumbs.php b/library/attach_mod/includes/functions_thumbs.php
index f9ae58970..8f4541adc 100644
--- a/library/attach_mod/includes/functions_thumbs.php
+++ b/library/attach_mod/includes/functions_thumbs.php
@@ -79,9 +79,9 @@ function get_supported_image_types($type)
         }
 
         return array(
-            'gd' => ($new_type) ? true : false,
+            'gd' => $new_type ? true : false,
             'format' => $new_type,
-            'version' => (function_exists('imagecreatetruecolor')) ? 2 : 1
+            'version' => function_exists('imagecreatetruecolor') ? 2 : 1
         );
     }
 
diff --git a/library/includes/bbcode.php b/library/includes/bbcode.php
index 9bde8c083..eddf3c2cb 100644
--- a/library/includes/bbcode.php
+++ b/library/includes/bbcode.php
@@ -371,7 +371,7 @@ function extract_search_words($text)
 function add_search_words($post_id, $post_message, $topic_title = '', $only_return_words = false)
 {
     $text = $topic_title . ' ' . $post_message;
-    $words = ($text) ? extract_search_words($text) : array();
+    $words = $text ? extract_search_words($text) : array();
 
     if ($only_return_words || config('tp.search_engine_type') == 'sphinx') {
         return implode("\n", $words);
diff --git a/library/includes/cron/cron_check.php b/library/includes/cron/cron_check.php
index 8d0290c37..25077ce89 100644
--- a/library/includes/cron/cron_check.php
+++ b/library/includes/cron/cron_check.php
@@ -32,7 +32,7 @@ if ($cron_jobs) {
         }
     }
 
-    require(CRON_DIR . 'cron_run.php');
+    require CRON_DIR . 'cron_run.php';
 
     // Update cron_last_check
     bb_update_config(array('cron_last_check' => TIMENOW + 10));
diff --git a/library/includes/cron/cron_run.php b/library/includes/cron/cron_run.php
index 29d04ae57..5dd4eb1ca 100644
--- a/library/includes/cron/cron_run.php
+++ b/library/includes/cron/cron_run.php
@@ -66,7 +66,7 @@ foreach ($cron_jobs as $job) {
         }
 
         set_time_limit(600);
-        require($job_script);
+        require $job_script;
 
         if ($job['log_sql_queries']) {
             OLD_DB()->log_next_query(0);
@@ -86,7 +86,7 @@ foreach ($cron_jobs as $job) {
             bb_log($msg . LOG_LF, CRON_LOG_DIR . '/' . CRON_LOG_FILE);
 
             if ($cron_runtime_log) {
-                $runtime_log_file = ($job['log_file']) ?: $job['cron_script'];
+                $runtime_log_file = $job['log_file'] ?: $job['cron_script'];
                 bb_log($cron_runtime_log . LOG_LF, CRON_LOG_DIR . '/' . basename($runtime_log_file));
             }
         }
diff --git a/library/includes/cron/jobs/prune_forums.php b/library/includes/cron/jobs/prune_forums.php
index 02026f3a1..1a68c511f 100644
--- a/library/includes/cron/jobs/prune_forums.php
+++ b/library/includes/cron/jobs/prune_forums.php
@@ -17,6 +17,6 @@ if (config('tp.prune_enable')) {
     $sql = "SELECT forum_id, prune_days FROM " . BB_FORUMS . " WHERE prune_days != 0";
 
     foreach (OLD_DB()->fetch_rowset($sql) as $row) {
-        topic_delete('prune', $row['forum_id'], (TIMENOW - 86400 * $row['prune_days']));
+        topic_delete('prune', $row['forum_id'], TIMENOW - 86400 * $row['prune_days']);
     }
 }
diff --git a/library/includes/functions.php b/library/includes/functions.php
index 7e9c95ac3..76b47dacd 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -181,7 +181,7 @@ function bf($int, $bf_array_name, $key)
 
 function setbit(&$int, $bit_num, $on)
 {
-    return ($on) ? $int |= (1 << $bit_num) : $int &= ~(1 << $bit_num);
+    return $on ? $int |= (1 << $bit_num) : $int &= ~(1 << $bit_num);
 }
 
 /*
@@ -484,7 +484,7 @@ function declension($int, $expressions, $format = '%1$s %2$s')
         }
     }
 
-    return ($format) ? sprintf($format, $int, $result) : $result;
+    return $format ? sprintf($format, $int, $result) : $result;
 }
 
 // http://forum.dklab.ru/php/advises/UrlreplaceargChangesValueOfParameterInUrl.html
@@ -536,7 +536,7 @@ function humn_size($size, $rounder = null, $min = null, $space = '&nbsp;')
         $ext = 'KB';
         $rounder = 1;
     } else {
-        for ($i = 1, $cnt = count($sizes); ($i < $cnt && $size >= 1024); $i++) {
+        for ($i = 1, $cnt = count($sizes); $i < $cnt && $size >= 1024; $i++) {
             $size /= 1024;
             $ext = $sizes[$i];
             $rnd = $rounders[$i];
@@ -553,7 +553,7 @@ function bt_show_ip($ip, $port = '')
 {
     if (IS_AM) {
         $ip = decode_ip($ip);
-        $ip .= ($port) ? ":$port" : '';
+        $ip .= $port ? ":$port" : '';
         return $ip;
     }
 
@@ -584,7 +584,7 @@ function checkbox_get_val(&$key, &$val, $default = 1, $on = 1, $off = 0)
     } elseif (!isset($_REQUEST[$key]) && isset($_REQUEST['prev_' . $key])) {
         $val = $off;
     } elseif (isset($previous_settings[$key]) && (!IS_GUEST || !empty($search_id))) {
-        $val = ($previous_settings[$key]) ? $on : $off;
+        $val = $previous_settings[$key] ? $on : $off;
     } else {
         $val = $default;
     }
@@ -596,7 +596,7 @@ function select_get_val($key, &$val, $options_ary, $default, $num = true)
 
     if (isset($_REQUEST[$key]) && is_string($_REQUEST[$key])) {
         if (isset($options_ary[$_REQUEST[$key]])) {
-            $val = ($num) ? (int)$_REQUEST[$key] : $_REQUEST[$key];
+            $val = $num ? (int)$_REQUEST[$key] : $_REQUEST[$key];
         }
     } elseif (isset($previous_settings[$key])) {
         $val = $previous_settings[$key];
@@ -629,7 +629,7 @@ function set_var(&$result, $var, $type, $multibyte = false, $strip = true)
             }
         }
 
-        $result = ($strip) ? stripslashes($result) : $result;
+        $result = $strip ? stripslashes($result) : $result;
     }
 }
 
@@ -642,13 +642,13 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false)
 {
     if (!$cookie && isset($_COOKIE[$var_name])) {
         if (!isset($_GET[$var_name]) && !isset($_POST[$var_name])) {
-            return (is_array($default)) ? array() : $default;
+            return is_array($default) ? array() : $default;
         }
         $_REQUEST[$var_name] = $_POST[$var_name] ?? $_GET[$var_name];
     }
 
     if (!isset($_REQUEST[$var_name]) || (is_array($_REQUEST[$var_name]) && !is_array($default)) || (is_array($default) && !is_array($_REQUEST[$var_name]))) {
-        return (is_array($default)) ? array() : $default;
+        return is_array($default) ? array() : $default;
     }
 
     $var = $_REQUEST[$var_name];
@@ -765,7 +765,7 @@ function get_bt_ratio($btu)
 {
     return
         (!empty($btu['u_down_total']) && $btu['u_down_total'] > MIN_DL_FOR_RATIO)
-            ? round((($btu['u_up_total'] + $btu['u_up_release'] + $btu['u_up_bonus']) / $btu['u_down_total']), 2)
+            ? round(($btu['u_up_total'] + $btu['u_up_release'] + $btu['u_up_bonus']) / $btu['u_down_total'], 2)
             : null;
 }
 
@@ -785,19 +785,19 @@ function show_bt_userdata($user_id)
         'USER_RATIO' => get_bt_ratio($btu),
         'MIN_DL_FOR_RATIO' => humn_size(MIN_DL_FOR_RATIO),
         'MIN_DL_BYTES' => MIN_DL_FOR_RATIO,
-        'AUTH_KEY' => ($btu['auth_key']) ?: trans('messages.NONE'),
+        'AUTH_KEY' => $btu['auth_key'] ?: trans('messages.NONE'),
 
         'TD_DL' => humn_size($btu['down_today']),
         'TD_UL' => humn_size($btu['up_today']),
         'TD_REL' => humn_size($btu['up_release_today']),
         'TD_BONUS' => humn_size($btu['up_bonus_today']),
-        'TD_POINTS' => ($btu['auth_key']) ? $btu['points_today'] : '0.00',
+        'TD_POINTS' => $btu['auth_key'] ? $btu['points_today'] : '0.00',
 
         'YS_DL' => humn_size($btu['down_yesterday']),
         'YS_UL' => humn_size($btu['up_yesterday']),
         'YS_REL' => humn_size($btu['up_release_yesterday']),
         'YS_BONUS' => humn_size($btu['up_bonus_yesterday']),
-        'YS_POINTS' => ($btu['auth_key']) ? $btu['points_yesterday'] : '0.00',
+        'YS_POINTS' => $btu['auth_key'] ? $btu['points_yesterday'] : '0.00',
 
         'SPEED_UP' => humn_size($btu['speed_up'], 0, 'KB') . '/s',
         'SPEED_DOWN' => humn_size($btu['speed_down'], 0, 'KB') . '/s',
@@ -971,7 +971,7 @@ function make_jumpbox($selected = 0)
     }
 
     $template->assign_vars(array(
-        'JUMPBOX' => (IS_GUEST) ? $jumpbox['guest'] : $jumpbox['user'],
+        'JUMPBOX' => IS_GUEST ? $jumpbox['guest'] : $jumpbox['user'],
     ));
 }
 
@@ -1020,7 +1020,7 @@ function get_forum_select($mode = 'guest', $name = POST_FORUM_URL, $selected = n
                 trigger_error(__FUNCTION__ . ": invalid mode '$mode'", E_USER_ERROR);
         }
         $cat_title = $forums['c'][$f['cat_id']]['cat_title'];
-        $f_name = ($f['forum_parent']) ? ' |- ' : '';
+        $f_name = $f['forum_parent'] ? ' |- ' : '';
         $f_name .= $f['forum_name'];
 
         while (isset($select[$cat_title][$f_name])) {
@@ -1107,12 +1107,12 @@ function bb_date($gmepoch, $format = false, $friendly_date = true)
         } elseif ($today != 1 && $date_today == ($today - 1) && $date_month == $month && $date_year == $year) {
             $date = 'yesterday' . gmdate($time_format, $gmepoch + (3600 * $tz));
         } elseif ($today == 1 && $month != 1) {
-            $yesterday = date('t', mktime(0, 0, 0, ($month - 1), 1, $year));
+            $yesterday = date('t', mktime(0, 0, 0, $month - 1, 1, $year));
             if ($date_today == $yesterday && $date_month == ($month - 1) && $date_year == $year) {
                 $date = 'yesterday' . gmdate($time_format, $gmepoch + (3600 * $tz));
             }
         } elseif ($today == 1 && $month == 1) {
-            $yesterday = date('t', mktime(0, 0, 0, 12, 1, ($year - 1)));
+            $yesterday = date('t', mktime(0, 0, 0, 12, 1, $year - 1));
             if ($date_today == $yesterday && $date_month == 12 && $date_year == ($year - 1)) {
                 $date = 'yesterday' . gmdate($time_format, $gmepoch + (3600 * $tz));
             }
@@ -1220,12 +1220,12 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
         }
     }
 
-    $pagination = ($page_string) ? '<a class="menu-root" href="#pg-jump">' . trans('messages.GOTO_PAGE') . '</a> :&nbsp;&nbsp;' . $page_string : '';
+    $pagination = $page_string ? '<a class="menu-root" href="#pg-jump">' . trans('messages.GOTO_PAGE') . '</a> :&nbsp;&nbsp;' . $page_string : '';
     $pagination = str_replace('&amp;start=0', '', $pagination);
 
     $template->assign_vars(array(
         'PAGINATION' => $pagination,
-        'PAGE_NUMBER' => sprintf(trans('messages.PAGE_OF'), (floor($start_item / $per_page) + 1), ceil($num_items / $per_page)),
+        'PAGE_NUMBER' => sprintf(trans('messages.PAGE_OF'), floor($start_item / $per_page) + 1, ceil($num_items / $per_page)),
         'PG_BASE_URL' => $base_url,
         'PG_PER_PAGE' => $per_page,
     ));
@@ -1301,7 +1301,7 @@ function bb_die($msg_text)
         if (empty($theme)) {
             $theme = setup_style();
         }
-        require(PAGE_HEADER);
+        require PAGE_HEADER;
     }
 
     // Check for lang variable
@@ -1317,7 +1317,7 @@ function bb_die($msg_text)
     $template->set_filenames(array('bb_die' => 'common.tpl'));
     $template->pparse('bb_die');
 
-    require(PAGE_FOOTER);
+    require PAGE_FOOTER;
 
     exit;
 }
@@ -1566,8 +1566,8 @@ function get_topic_icon($topic, $is_unread = null)
     if ($topic['topic_status'] == TOPIC_MOVED) {
         $folder_image = $images['folder'];
     } else {
-        $folder = ($t_hot) ? $images['folder_hot'] : $images['folder'];
-        $folder_new = ($t_hot) ? $images['folder_hot_new'] : $images['folder_new'];
+        $folder = $t_hot ? $images['folder_hot'] : $images['folder'];
+        $folder_new = $t_hot ? $images['folder_hot_new'] : $images['folder_new'];
 
         if ($topic['topic_type'] == POST_ANNOUNCE) {
             $folder = $images['folder_announce'];
@@ -1579,11 +1579,11 @@ function get_topic_icon($topic, $is_unread = null)
             $folder = $images['folder_locked'];
             $folder_new = $images['folder_locked_new'];
         } elseif ($topic['topic_dl_type'] == TOPIC_DL_TYPE_DL) {
-            $folder = ($t_hot) ? $images['folder_dl_hot'] : $images['folder_dl'];
-            $folder_new = ($t_hot) ? $images['folder_dl_hot_new'] : $images['folder_dl_new'];
+            $folder = $t_hot ? $images['folder_dl_hot'] : $images['folder_dl'];
+            $folder_new = $t_hot ? $images['folder_dl_hot_new'] : $images['folder_dl_new'];
         }
 
-        $folder_image = ($is_unread) ? $folder_new : $folder;
+        $folder_image = $is_unread ? $folder_new : $folder;
     }
 
     return $folder_image;
@@ -1597,7 +1597,7 @@ function build_topic_pagination($url, $replies, $per_page)
         $total_pages = ceil($replies / $per_page);
 
         for ($j = 0, $page = 1; $j < $replies; $j += $per_page, $page++) {
-            $href = ($j) ? "$url&amp;start=$j" : $url;
+            $href = $j ? "$url&amp;start=$j" : $url;
             $pg .= '<a href="' . $href . '" class="topicPG">' . $page . '</a>';
 
             if ($page == 1 && $total_pages > 3) {
@@ -1689,14 +1689,14 @@ function print_page($args, $type = '', $mode = '')
     $gen_simple_header = (is_array($args) && !empty($args['simple']) or $type === 'simple') ? true : $gen_simple_header;
 
     if ($mode !== 'no_header') {
-        require(PAGE_HEADER);
+        require PAGE_HEADER;
     }
 
     $template->set_filenames(array('body' => $tpl));
     $template->pparse('body');
 
     if ($mode !== 'no_footer') {
-        require(PAGE_FOOTER);
+        require PAGE_FOOTER;
     }
 }
 
@@ -1719,7 +1719,7 @@ function caching_output($enabled, $mode, $cache_var_name, $ttl = 300)
 
 function clean_title($str, $replace_underscore = false)
 {
-    $str = ($replace_underscore) ? str_replace('_', ' ', $str) : $str;
+    $str = $replace_underscore ? str_replace('_', ' ', $str) : $str;
     $str = htmlCHR(str_compact($str));
     return $str;
 }
@@ -1727,7 +1727,7 @@ function clean_title($str, $replace_underscore = false)
 function clean_text_match($text, $ltrim_star = true, $die_if_empty = false)
 {
     $text = str_compact($text);
-    $ltrim_chars = ($ltrim_star) ? ' *-!' : ' ';
+    $ltrim_chars = $ltrim_star ? ' *-!' : ' ';
     $wrap_with_quotes = preg_match('#^"[^"]+"$#', $text);
 
     $text = ' ' . str_compact(ltrim($text, $ltrim_chars)) . ' ';
@@ -1817,7 +1817,7 @@ function get_title_match_topics($title_match_sql, array $forum_ids = array())
             log_sphinx_error('wrn', $warning, $title_match_sql);
         }
     } elseif (config('tp.search_engine_type') == 'mysql') {
-        $where_forum = ($forum_ids) ? "AND forum_id IN(" . implode(',', $forum_ids) . ")" : '';
+        $where_forum = $forum_ids ? "AND forum_id IN(" . implode(',', $forum_ids) . ")" : '';
         $search_bool_mode = config('tp.allow_search_in_bool_mode') ? ' IN BOOLEAN MODE' : '';
 
         if ($title_match) {
diff --git a/library/includes/functions_admin.php b/library/includes/functions_admin.php
index 56c6f3c66..b2a6fdb28 100644
--- a/library/includes/functions_admin.php
+++ b/library/includes/functions_admin.php
@@ -238,7 +238,7 @@ function topic_delete($mode_or_topic_id, $forum_id = null, $prune_time = 0, $pru
 	");
     OLD_DB()->add_shutdown_query("DROP TEMPORARY TABLE IF EXISTS $tmp_delete_topics");
 
-    $where_sql = ($prune) ? "forum_id = $forum_id" : "topic_id IN($topic_csv)";
+    $where_sql = $prune ? "forum_id = $forum_id" : "topic_id IN($topic_csv)";
     $where_sql .= ($prune && $prune_time) ? " AND topic_last_post_time < $prune_time" : '';
     $where_sql .= ($prune && !$prune_all) ? " AND topic_type NOT IN(" . POST_ANNOUNCE . "," . POST_STICKY . ")" : '';
 
diff --git a/library/includes/functions_admin_cron.php b/library/includes/functions_admin_cron.php
index 88f049ecf..f4437d89b 100644
--- a/library/includes/functions_admin_cron.php
+++ b/library/includes/functions_admin_cron.php
@@ -21,7 +21,7 @@ function run_jobs($jobs)
     while ($row = OLD_DB()->sql_fetchrow($result)) {
         $job = $row['cron_script'];
         $job_script = INC_DIR . '/cron/jobs/' . $job;
-        require($job_script);
+        require $job_script;
     }
     OLD_DB()->query("
 			UPDATE " . BB_CRON . " SET
diff --git a/library/includes/functions_admin_torrent.php b/library/includes/functions_admin_torrent.php
index 278189382..c95884f0d 100644
--- a/library/includes/functions_admin_torrent.php
+++ b/library/includes/functions_admin_torrent.php
@@ -60,12 +60,12 @@ function set_tpl_vars_bool($default_cfg, $cfg)
     foreach ($default_cfg as $config_name => $config_value) {
         // YES/NO 'checked="checked"'
         $template->assign_vars(array(
-            strtoupper($config_name) . '_YES' => ($cfg[$config_name]) ? HTML_CHECKED : '',
+            strtoupper($config_name) . '_YES' => $cfg[$config_name] ? HTML_CHECKED : '',
             strtoupper($config_name) . '_NO' => (!$cfg[$config_name]) ? HTML_CHECKED : '',
         ));
         // YES/NO lang vars
         $template->assign_vars(array(
-            'L_' . strtoupper($config_name) . '_YES' => ($cfg[$config_name]) ? '<u>' . trans('messages.YES') . '</u>' : trans('messages.YES'),
+            'L_' . strtoupper($config_name) . '_YES' => $cfg[$config_name] ? '<u>' . trans('messages.YES') . '</u>' : trans('messages.YES'),
             'L_' . strtoupper($config_name) . '_NO' => (!$cfg[$config_name]) ? '<u>' . trans('messages.NO') . '</u>' : trans('messages.NO'),
         ));
     }
@@ -91,7 +91,7 @@ function update_config_table($table_name, $default_cfg, $cfg, $type)
             if ($type == 'str') {
                 $config_value = $_POST[$config_name];
             } elseif ($type == 'bool') {
-                $config_value = ($_POST[$config_name]) ? 1 : 0;
+                $config_value = $_POST[$config_name] ? 1 : 0;
             } elseif ($type == 'num') {
                 $config_value = abs((int)$_POST[$config_name]);
             } else {
diff --git a/library/includes/functions_atom.php b/library/includes/functions_atom.php
index b8829415c..ae9e52bd3 100644
--- a/library/includes/functions_atom.php
+++ b/library/includes/functions_atom.php
@@ -168,7 +168,7 @@ function create_atom($file_path, $mode, $id, $title, $topics)
             $topic_title = preg_replace($orig_word, $replacement_word, $topic_title);
         }
         $topic_title = wbr($topic_title);
-        $author_name = ($topic['first_username']) ? wbr($topic['first_username']) : 'Гость';
+        $author_name = $topic['first_username'] ? wbr($topic['first_username']) : 'Гость';
         $last_time = $topic['topic_last_post_time'];
         if ($topic['topic_last_post_edit_time']) {
             $last_time = $topic['topic_last_post_edit_time'];
diff --git a/library/includes/functions_group.php b/library/includes/functions_group.php
index 77df01f28..149bdc2f9 100644
--- a/library/includes/functions_group.php
+++ b/library/includes/functions_group.php
@@ -152,7 +152,7 @@ function delete_permissions($group_id = null, $user_id = null, $cat_id = null)
     $user_id = get_id_csv($user_id);
     $cat_id = get_id_csv($cat_id);
 
-    $forums_join_sql = ($cat_id) ? "
+    $forums_join_sql = $cat_id ? "
 		INNER JOIN " . BB_FORUMS . " f ON(a.forum_id = f.forum_id AND f.cat_id IN($cat_id))
 	" : '';
 
diff --git a/library/includes/functions_post.php b/library/includes/functions_post.php
index ec704db20..1b1a224eb 100644
--- a/library/includes/functions_post.php
+++ b/library/includes/functions_post.php
@@ -71,7 +71,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 
     // Flood control
     $row = null;
-    $where_sql = (IS_GUEST) ? "p.poster_ip = '" . USER_IP . "'" : "p.poster_id = {$userdata['user_id']}";
+    $where_sql = IS_GUEST ? "p.poster_ip = '" . USER_IP . "'" : "p.poster_id = {$userdata['user_id']}";
 
     if ($mode == 'newtopic' || $mode == 'reply') {
         $sql = "SELECT MAX(p.post_time) AS last_post_time FROM " . BB_POSTS . " p WHERE $where_sql";
@@ -231,7 +231,7 @@ function update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $u
                 }
 
                 if ($row = OLD_DB()->sql_fetchrow($result)) {
-                    $forum_update_sql .= ($row['last_post_id']) ? ', forum_last_post_id = ' . $row['last_post_id'] : ', forum_last_post_id = 0';
+                    $forum_update_sql .= $row['last_post_id'] ? ', forum_last_post_id = ' . $row['last_post_id'] : ', forum_last_post_id = 0';
                 }
             }
         } elseif ($post_data['first_post']) {
diff --git a/library/includes/init_bb.php b/library/includes/init_bb.php
index a4aeaf2d1..005701e7f 100644
--- a/library/includes/init_bb.php
+++ b/library/includes/init_bb.php
@@ -426,7 +426,7 @@ if ((empty($_POST) && !defined('IN_ADMIN') && !defined('IN_AJAX') && !file_exist
 
                 TorrentPier\Helpers\CronHelper::trackRunning('start');
 
-                require(CRON_DIR . 'cron_check.php');
+                require CRON_DIR . 'cron_check.php';
 
                 TorrentPier\Helpers\CronHelper::trackRunning('end');
             }
diff --git a/library/includes/online_userlist.php b/library/includes/online_userlist.php
index a40af30c7..bfc91b5a2 100644
--- a/library/includes/online_userlist.php
+++ b/library/includes/online_userlist.php
@@ -75,7 +75,7 @@ foreach (OLD_DB()->fetch_rowset($sql) as $u) {
             $stat[] = "t:<span style=\"color: #1E90FF\">$t</span>";
         }
 
-        $ulist[$level][] = ($stat) ? "$name<span class=\"ou_stat\" style=\"color: #707070\" title=\"{$u['session_ip']}\"> [<b>" . implode(', ', $stat) . '</b>]</span>' : $name;
+        $ulist[$level][] = $stat ? "$name<span class=\"ou_stat\" style=\"color: #707070\" title=\"{$u['session_ip']}\"> [<b>" . implode(', ', $stat) . '</b>]</span>' : $name;
     } else {
         $guests_online = $u['ips'];
         $users_cnt['guest'] = $guests_online;
diff --git a/library/includes/page_footer.php b/library/includes/page_footer.php
index 23a0c47fa..bbfb16cd5 100644
--- a/library/includes/page_footer.php
+++ b/library/includes/page_footer.php
@@ -17,7 +17,7 @@ if (!empty($template)) {
     $template->assign_vars(array(
         'SIMPLE_FOOTER' => !empty($gen_simple_header),
         'POWERED' => 'Tracker software by <a target="_blank" href="https://torrentpier.com">TorrentPier</a> &copy; 2005-' . date('Y'),
-        'SHOW_ADMIN_LINK' => (IS_ADMIN && !defined('IN_ADMIN')),
+        'SHOW_ADMIN_LINK' => IS_ADMIN && !defined('IN_ADMIN'),
         'ADMIN_LINK_HREF' => "admin/index.php",
     ));
 
@@ -41,7 +41,7 @@ if ($show_dbg_info) {
 
     if (!empty($DBS)) {
         $sql_t = $DBS->sql_timetotal;
-        $sql_time_txt = ($sql_t) ? sprintf('%.3f ' . trans('messages.SEC') . ' (%d%%) &middot; ', $sql_t, round($sql_t * 100 / $gen_time)) : '';
+        $sql_time_txt = $sql_t ? sprintf('%.3f ' . trans('messages.SEC') . ' (%d%%) &middot; ', $sql_t, round($sql_t * 100 / $gen_time)) : '';
         $num_q = $DBS->num_queries;
         $stat .= " &nbsp;|&nbsp; MySQL: {$sql_time_txt}{$num_q} " . trans('messages.QUERIES');
     }
diff --git a/library/includes/page_header.php b/library/includes/page_header.php
index 2cc7333cd..bdaaf687c 100644
--- a/library/includes/page_header.php
+++ b/library/includes/page_header.php
@@ -112,12 +112,12 @@ $template->assign_vars(array(
     'CONTENT_ENCODING' => config('language.charset'),
 
     'IN_ADMIN' => defined('IN_ADMIN'),
-    'USER_HIDE_CAT' => (BB_SCRIPT == 'index'),
+    'USER_HIDE_CAT' => BB_SCRIPT == 'index',
 
     'USER_LANG' => $userdata['user_lang'],
 
     'INCLUDE_BBCODE_JS' => !empty($page_cfg['include_bbcode_js']),
-    'USER_OPTIONS_JS' => (IS_GUEST) ? '{}' : json_encode($user->opt_js),
+    'USER_OPTIONS_JS' => IS_GUEST ? '{}' : json_encode($user->opt_js),
 
     'USE_TABLESORTER' => !empty($page_cfg['use_tablesorter']),
 
@@ -279,7 +279,7 @@ if (!empty(config('page.show_torhelp.' . BB_SCRIPT)) && !empty($userdata['torhel
 }
 
 // Login box
-$in_out = ($logged_in) ? 'in' : 'out';
+$in_out = $logged_in ? 'in' : 'out';
 $template->assign_block_vars("switch_user_logged_{$in_out}", array());
 
 if (!IS_GUEST) {
diff --git a/library/includes/posting_tpl.php b/library/includes/posting_tpl.php
index fde083664..af096f93e 100644
--- a/library/includes/posting_tpl.php
+++ b/library/includes/posting_tpl.php
@@ -65,7 +65,7 @@ if ($tpl_data) {
 
 if ($edit_tpl_mode) {
     $template->assign_vars(array(
-        'NO_TPL_ASSIGNED' => !($f_data['forum_tpl_id']),
+        'NO_TPL_ASSIGNED' => !$f_data['forum_tpl_id'],
         'TPL_SELECT' => get_select('forum_tpl', $f_data['forum_tpl_id']),
     ));
 
diff --git a/library/includes/torrent_show_dl_list.php b/library/includes/torrent_show_dl_list.php
index 48cd53c25..447c7bc76 100644
--- a/library/includes/torrent_show_dl_list.php
+++ b/library/includes/torrent_show_dl_list.php
@@ -29,7 +29,7 @@ $show_dl_buttons = ($dl_topic && config('tp.bt_show_dl_list_buttons'));
 
 // link to clear DL-List
 $template->assign_vars(array('S_DL_DELETE' => false));
-if (($is_auth['auth_mod']) && ($t_data['topic_dl_type'] == TOPIC_DL_TYPE_DL)) {
+if ($is_auth['auth_mod'] && ($t_data['topic_dl_type'] == TOPIC_DL_TYPE_DL)) {
     $s_dl_delete = "<br /><a href=\"dl_list.php?mode=dl_delete&amp;" . POST_TOPIC_URL . "=$topic_id&amp;sid=" . $userdata['session_id'] . '">' . trans('messages.DL_LIST_DEL') . '</a>';
     $template->assign_vars(array('S_DL_DELETE' => $s_dl_delete));
 }
diff --git a/library/includes/ucp/email.php b/library/includes/ucp/email.php
index 354147bc0..6231972b6 100644
--- a/library/includes/ucp/email.php
+++ b/library/includes/ucp/email.php
@@ -78,7 +78,7 @@ if ($row = OLD_DB()->fetch_row($sql)) {
         'USERNAME' => profile_url($row),
         'S_HIDDEN_FIELDS' => '',
         'S_POST_ACTION' => "profile.php?mode=email&amp;" . POST_USERS_URL . "=$user_id",
-        'ERROR_MESSAGE' => ($errors) ? implode('<br />', array_unique($errors)) : '',
+        'ERROR_MESSAGE' => $errors ? implode('<br />', array_unique($errors)) : '',
     ));
 
     print_page('usercp_email.tpl');
diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php
index 9146b70b7..5fc370f2d 100644
--- a/library/includes/ucp/register.php
+++ b/library/includes/ucp/register.php
@@ -104,7 +104,7 @@ switch ($mode) {
         // field => can_edit
         $profile_fields = array(
             'user_active' => IS_ADMIN,
-            'username' => (IS_ADMIN || config('tp.allow_namechange')),
+            'username' => IS_ADMIN || config('tp.allow_namechange'),
             'user_password' => true,
             'user_email' => true, // должен быть после user_password
             'user_lang' => true,
@@ -335,19 +335,19 @@ foreach ($profile_fields as $field => $can_edit) {
 
             $update_user_opt = array(
                 #	'user_opt_name'  => ($reg_mode) ? #reg_value : #in_login_change
-                'user_viewemail' => ($reg_mode) ? false : true,
-                'user_viewonline' => ($reg_mode) ? false : true,
-                'user_notify' => ($reg_mode) ? true : true,
-                'user_notify_pm' => ($reg_mode) ? true : true,
-                'user_porn_forums' => ($reg_mode) ? false : true,
-                'user_dls' => ($reg_mode) ? false : true,
-                'user_callseed' => ($reg_mode) ? true : true,
-                'user_retracker' => ($reg_mode) ? true : true,
+                'user_viewemail' => $reg_mode ? false : true,
+                'user_viewonline' => $reg_mode ? false : true,
+                'user_notify' => $reg_mode ? true : true,
+                'user_notify_pm' => $reg_mode ? true : true,
+                'user_porn_forums' => $reg_mode ? false : true,
+                'user_dls' => $reg_mode ? false : true,
+                'user_callseed' => $reg_mode ? true : true,
+                'user_retracker' => $reg_mode ? true : true,
             );
 
             foreach ($update_user_opt as $opt => $can_change_opt) {
                 if ($submit && (isset($_POST[$opt]) && $can_change_opt || $reg_mode)) {
-                    $change_opt = ($reg_mode) ? $can_change_opt : !empty($_POST[$opt]);
+                    $change_opt = $reg_mode ? $can_change_opt : !empty($_POST[$opt]);
                     setbit($user_opt, $bf['user_opt'][$opt], $change_opt);
                 }
                 $tp_data[strtoupper($opt)] = bf($user_opt, 'user_opt', $opt);
@@ -662,19 +662,19 @@ $template->assign_vars($tp_data);
 
 $template->assign_vars(array(
     'PAGE_TITLE' => ($mode == 'editprofile') ? trans('messages.EDIT_PROFILE') . ($adm_edit ? " :: {$pr_data['username']}" : '') : trans('messages.REGISTER'),
-    'SHOW_REG_AGREEMENT' => ($mode == 'register' && !IS_ADMIN),
-    'ERROR_MESSAGE' => ($errors) ? implode('<br />', array_unique($errors)) : '',
+    'SHOW_REG_AGREEMENT' => $mode == 'register' && !IS_ADMIN,
+    'ERROR_MESSAGE' => $errors ? implode('<br />', array_unique($errors)) : '',
     'MODE' => $mode,
-    'EDIT_PROFILE' => ($mode == 'editprofile'),
+    'EDIT_PROFILE' => $mode == 'editprofile',
     'ADM_EDIT' => $adm_edit,
-    'SHOW_PASS' => ($adm_edit || ($mode == 'register' && IS_ADMIN)),
-    'CAPTCHA_HTML' => ($need_captcha) ? bb_captcha('get') : '',
+    'SHOW_PASS' => $adm_edit || ($mode == 'register' && IS_ADMIN),
+    'CAPTCHA_HTML' => $need_captcha ? bb_captcha('get') : '',
 
     'LANGUAGE_SELECT' => language_select($pr_data['user_lang'], 'user_lang'),
     'TIMEZONE_SELECT' => tz_select($pr_data['user_timezone'], 'user_timezone'),
     'USER_TIMEZONE' => $pr_data['user_timezone'],
 
-    'AVATAR_EXPLAIN' => sprintf(trans('messages.AVATAR_EXPLAIN'), config('tp.avatars.max_width'), config('tp.avatars.max_height'), (round(config('tp.avatars.max_size') / 1024))),
+    'AVATAR_EXPLAIN' => sprintf(trans('messages.AVATAR_EXPLAIN'), config('tp.avatars.max_width'), config('tp.avatars.max_height'), round(config('tp.avatars.max_size') / 1024)),
     'AVATAR_DISALLOWED' => bf($pr_data['user_opt'], 'user_opt', 'dis_avatar'),
     'AVATAR_DIS_EXPLAIN' => sprintf(trans('messages.AVATAR_DISABLE'), config('tp.terms_and_conditions_url')),
     'AVATAR_IMG' => get_avatar($pr_data['user_id'], $pr_data['avatar_ext_id'], !bf($pr_data['user_opt'], 'user_opt', 'dis_avatar')),
diff --git a/library/includes/ucp/sendpasswd.php b/library/includes/ucp/sendpasswd.php
index 9bed28e38..dbabe9342 100644
--- a/library/includes/ucp/sendpasswd.php
+++ b/library/includes/ucp/sendpasswd.php
@@ -78,7 +78,7 @@ if (isset($_POST['submit'])) {
 $template->assign_vars(array(
     'USERNAME' => $username,
     'EMAIL' => $email,
-    'CAPTCHA_HTML' => ($need_captcha) ? bb_captcha('get') : '',
+    'CAPTCHA_HTML' => $need_captcha ? bb_captcha('get') : '',
     'S_HIDDEN_FIELDS' => '',
     'S_PROFILE_ACTION' => "profile.php?mode=sendpassword",
 ));
diff --git a/library/includes/ucp/topic_watch.php b/library/includes/ucp/topic_watch.php
index b748ca4b9..04c345534 100644
--- a/library/includes/ucp/topic_watch.php
+++ b/library/includes/ucp/topic_watch.php
@@ -37,7 +37,7 @@ if (!($result = OLD_DB()->sql_query($sql))) {
     bb_die('Could not obtain watch topic information #2');
 }
 $row = OLD_DB()->sql_fetchrow($result);
-$watch_count = ($row['watch_count']) ?: 0;
+$watch_count = $row['watch_count'] ?: 0;
 OLD_DB()->sql_freeresult($result);
 
 if ($watch_count > 0) {
@@ -83,7 +83,7 @@ if ($watch_count > 0) {
         $template->assign_vars(array(
             'MATCHES' => (count($watch) == 1) ? sprintf(trans('messages.FOUND_SEARCH_MATCH'), count($watch)) : sprintf(trans('messages.FOUND_SEARCH_MATCHES'), count($watch)),
             'PAGINATION' => generate_pagination(BB_ROOT . 'profile.php?mode=watch', $watch_count, $per_page, $start),
-            'PAGE_NUMBER' => sprintf(trans('messages.PAGE_OF'), (floor($start / $per_page) + 1), ceil($watch_count / $per_page)),
+            'PAGE_NUMBER' => sprintf(trans('messages.PAGE_OF'), floor($start / $per_page) + 1, ceil($watch_count / $per_page)),
             'U_PER_PAGE' => BB_ROOT . 'profile.php?mode=watch',
             'PER_PAGE' => $per_page,
         ));
diff --git a/library/includes/ucp/viewprofile.php b/library/includes/ucp/viewprofile.php
index 7b5b801ad..a3e532305 100644
--- a/library/includes/ucp/viewprofile.php
+++ b/library/includes/ucp/viewprofile.php
@@ -36,7 +36,7 @@ if (!$ranks = $datastore->get('ranks')) {
 
 $poster_rank = $rank_image = $rank_style = $rank_select = '';
 if ($user_rank = $profiledata['user_rank'] and isset($ranks[$user_rank])) {
-    $rank_image = ($ranks[$user_rank]['rank_image']) ? '<img src="' . $ranks[$user_rank]['rank_image'] . '" alt="" title="" border="0" />' : '';
+    $rank_image = $ranks[$user_rank]['rank_image'] ? '<img src="' . $ranks[$user_rank]['rank_image'] . '" alt="" title="" border="0" />' : '';
     $poster_rank = $ranks[$user_rank]['rank_title'];
     $rank_style = $ranks[$user_rank]['rank_style'];
 }
@@ -79,7 +79,7 @@ $template->assign_vars(array(
     'PROFILE_USER_ID' => $profiledata['user_id'],
     'PROFILE_USER' => $profile_user_id,
     'USER_REGDATE' => bb_date($profiledata['user_regdate'], 'Y-m-d H:i', false),
-    'POSTER_RANK' => ($poster_rank) ? "<span class=\"$rank_style\">" . $poster_rank . "</span>" : trans('messages.USER'),
+    'POSTER_RANK' => $poster_rank ? "<span class=\"$rank_style\">" . $poster_rank . "</span>" : trans('messages.USER'),
     'RANK_IMAGE' => $rank_image,
     'RANK_SELECT' => $rank_select,
     'POSTS' => $profiledata['user_posts'],
@@ -87,8 +87,8 @@ $template->assign_vars(array(
     'EMAIL' => $email,
     'WWW' => $profiledata['user_website'],
     'ICQ' => $profiledata['user_icq'],
-    'LAST_VISIT_TIME' => ($profiledata['user_lastvisit']) ? (bf($profiledata['user_opt'], 'user_opt', 'user_viewonline') && !IS_ADMIN) ? trans('messages.HIDDEN_USER') : bb_date($profiledata['user_lastvisit'], 'Y-m-d H:i', false) : trans('messages.NEVER'),
-    'LAST_ACTIVITY_TIME' => ($profiledata['user_session_time']) ? (bf($profiledata['user_opt'], 'user_opt', 'user_viewonline') && !IS_ADMIN) ? trans('messages.HIDDEN_USER') : bb_date($profiledata['user_session_time'], 'Y-m-d H:i', false) : trans('messages.NEVER'),
+    'LAST_VISIT_TIME' => $profiledata['user_lastvisit'] ? (bf($profiledata['user_opt'], 'user_opt', 'user_viewonline') && !IS_ADMIN) ? trans('messages.HIDDEN_USER') : bb_date($profiledata['user_lastvisit'], 'Y-m-d H:i', false) : trans('messages.NEVER'),
+    'LAST_ACTIVITY_TIME' => $profiledata['user_session_time'] ? (bf($profiledata['user_opt'], 'user_opt', 'user_viewonline') && !IS_ADMIN) ? trans('messages.HIDDEN_USER') : bb_date($profiledata['user_session_time'], 'Y-m-d H:i', false) : trans('messages.NEVER'),
 
     'USER_ACTIVE' => $profiledata['user_active'],
     'LOCATION' => $profiledata['user_from'],
@@ -111,8 +111,8 @@ $template->assign_vars(array(
     'AVATAR_IMG' => get_avatar($profiledata['user_id'], $profiledata['avatar_ext_id'], !bf($profiledata['user_opt'], 'user_opt', 'dis_avatar')),
 
     'SIGNATURE' => $signature,
-    'SHOW_PASSKEY' => (IS_ADMIN || $profile_user_id),
-    'SHOW_ROLE' => (IS_AM || $profile_user_id || $profiledata['user_active']),
+    'SHOW_PASSKEY' => IS_ADMIN || $profile_user_id,
+    'SHOW_ROLE' => IS_AM || $profile_user_id || $profiledata['user_active'],
     'GROUP_MEMBERSHIP' => false,
     'TRAF_STATS' => !(IS_AM || $profile_user_id),
 ));
@@ -155,7 +155,7 @@ if (IS_ADMIN) {
     ));
 } elseif (IS_MOD) {
     $template->assign_vars(array(
-        'SHOW_GROUP_MEMBERSHIP' => ($profiledata['user_level'] != USER),
+        'SHOW_GROUP_MEMBERSHIP' => $profiledata['user_level'] != USER,
     ));
 }
 
diff --git a/library/includes/ucp/viewtorrent.php b/library/includes/ucp/viewtorrent.php
index 11fc99ac4..6caea586f 100644
--- a/library/includes/ucp/viewtorrent.php
+++ b/library/includes/ucp/viewtorrent.php
@@ -16,7 +16,7 @@ $releasing_count = $seeding_count = $leeching_count = 0;
 
 // Auth
 $excluded_forums_csv = $user->get_excluded_forums(AUTH_VIEW);
-$not_auth_forums_sql = ($excluded_forums_csv) ? "
+$not_auth_forums_sql = $excluded_forums_csv ? "
 	AND f.forum_id NOT IN($excluded_forums_csv)
 	AND f.forum_parent NOT IN($excluded_forums_csv)
 " : '';
@@ -54,13 +54,13 @@ if ($releasing) {
         $template->assign_block_vars('released', array(
             'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2',
             'FORUM_NAME' => htmlCHR($row['forum_name']),
-            'TOPIC_TITLE' => ($row['update_time']) ? $topic_title : "<s>$topic_title</s>",
+            'TOPIC_TITLE' => $row['update_time'] ? $topic_title : "<s>$topic_title</s>",
             'U_VIEW_FORUM' => FORUM_URL . $row['forum_id'],
             'U_VIEW_TOPIC' => TOPIC_URL . $row['topic_id'],
             'TOR_TYPE' => is_gold($row['tor_type']),
-            'TOPIC_SEEDERS' => ($row['seeders']) ?: 0,
-            'TOPIC_LEECHERS' => ($row['leechers']) ?: 0,
-            'SPEED_UP' => ($row['speed_up']) ? humn_size($row['speed_up'], 0, 'KB') . '/s' : '-',
+            'TOPIC_SEEDERS' => $row['seeders'] ?: 0,
+            'TOPIC_LEECHERS' => $row['leechers'] ?: 0,
+            'SPEED_UP' => $row['speed_up'] ? humn_size($row['speed_up'], 0, 'KB') . '/s' : '-',
         ));
 
         $releasing_count++;
@@ -74,13 +74,13 @@ if ($seeding) {
         $template->assign_block_vars('seed', array(
             'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2',
             'FORUM_NAME' => htmlCHR($row['forum_name']),
-            'TOPIC_TITLE' => ($row['update_time']) ? $topic_title : "<s>$topic_title</s>",
+            'TOPIC_TITLE' => $row['update_time'] ? $topic_title : "<s>$topic_title</s>",
             'U_VIEW_FORUM' => FORUM_URL . $row['forum_id'],
             'U_VIEW_TOPIC' => TOPIC_URL . $row['topic_id'],
             'TOR_TYPE' => is_gold($row['tor_type']),
-            'TOPIC_SEEDERS' => ($row['seeders']) ?: 0,
-            'TOPIC_LEECHERS' => ($row['leechers']) ?: 0,
-            'SPEED_UP' => ($row['speed_up']) ? humn_size($row['speed_up'], 0, 'KB') . '/s' : '-',
+            'TOPIC_SEEDERS' => $row['seeders'] ?: 0,
+            'TOPIC_LEECHERS' => $row['leechers'] ?: 0,
+            'SPEED_UP' => $row['speed_up'] ? humn_size($row['speed_up'], 0, 'KB') . '/s' : '-',
         ));
 
         $seeding_count++;
@@ -90,20 +90,20 @@ if ($seeding) {
 if ($leeching) {
     foreach ($leeching as $i => $row) {
         $compl_size = ($row['remain'] && $row['size'] && $row['size'] > $row['remain']) ? ($row['size'] - $row['remain']) : 0;
-        $compl_perc = ($compl_size) ? floor($compl_size * 100 / $row['size']) : 0;
+        $compl_perc = $compl_size ? floor($compl_size * 100 / $row['size']) : 0;
         $topic_title = wbr($row['topic_title']);
 
         $template->assign_block_vars('leech', array(
             'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2',
             'FORUM_NAME' => htmlCHR($row['forum_name']),
-            'TOPIC_TITLE' => ($row['update_time']) ? $topic_title : "<s>$topic_title</s>",
+            'TOPIC_TITLE' => $row['update_time'] ? $topic_title : "<s>$topic_title</s>",
             'U_VIEW_FORUM' => FORUM_URL . $row['forum_id'],
             'U_VIEW_TOPIC' => TOPIC_URL . $row['topic_id'],
             'COMPL_PERC' => $compl_perc,
             'TOR_TYPE' => is_gold($row['tor_type']),
-            'TOPIC_SEEDERS' => ($row['seeders']) ?: 0,
-            'TOPIC_LEECHERS' => ($row['leechers']) ?: 0,
-            'SPEED_DOWN' => ($row['speed_down']) ? humn_size($row['speed_down'], 0, 'KB') . '/s' : '-',
+            'TOPIC_SEEDERS' => $row['seeders'] ?: 0,
+            'TOPIC_LEECHERS' => $row['leechers'] ?: 0,
+            'SPEED_DOWN' => $row['speed_down'] ? humn_size($row['speed_down'], 0, 'KB') . '/s' : '-',
         ));
 
         $leeching_count++;
diff --git a/login.php b/login.php
index 4b8a89f87..6866810fc 100644
--- a/login.php
+++ b/login.php
@@ -56,7 +56,7 @@ if (isset($_REQUEST['admin']) && !IS_AM) {
 $mod_admin_login = (IS_AM && !$user->data['session_admin']);
 
 // login username & password
-$login_username = ($mod_admin_login) ? $userdata['username'] : ($_POST['login_username'] ?? '');
+$login_username = $mod_admin_login ? $userdata['username'] : ($_POST['login_username'] ?? '');
 $login_password = $_POST['login_password'] ?? '';
 
 // Проверка на неверную комбинацию логин/пароль
@@ -103,7 +103,7 @@ if (isset($_POST['login'])) {
             if ($login_err > config('tp.invalid_logins')) {
                 $need_captcha = true;
             }
-            OLD_CACHE('bb_login_err')->set('l_err_' . USER_IP, ($login_err + 1), 3600);
+            OLD_CACHE('bb_login_err')->set('l_err_' . USER_IP, $login_err + 1, 3600);
         } else {
             $need_captcha = false;
         }
diff --git a/memberlist.php b/memberlist.php
index 91ae8fd8d..055828cad 100644
--- a/memberlist.php
+++ b/memberlist.php
@@ -135,9 +135,9 @@ for ($i = 224, $cnt = 255; $i <= $cnt; $i++) {
 }
 
 $select_letter .= ':&nbsp;';
-$select_letter .= ($by_letter == 'others') ? '<b>' . trans('messages.OTHERS') . '</b>&nbsp;' : '<a class="genmed" href="' . ("memberlist.php?letter=others&amp;mode=$mode&amp;order=$sort_order") . '">' . trans('messages.OTHERS') . '</a>&nbsp;';
+$select_letter .= ($by_letter == 'others') ? '<b>' . trans('messages.OTHERS') . '</b>&nbsp;' : '<a class="genmed" href="' . "memberlist.php?letter=others&amp;mode=$mode&amp;order=$sort_order" . '">' . trans('messages.OTHERS') . '</a>&nbsp;';
 $select_letter .= ':&nbsp;';
-$select_letter .= ($by_letter == 'all') ? '<b>' . trans('messages.ALL') . '</b>' : '<a class="genmed" href="' . ("memberlist.php?letter=all&amp;mode=$mode&amp;order=$sort_order") . '">' . trans('messages.ALL') . '</a>';
+$select_letter .= ($by_letter == 'all') ? '<b>' . trans('messages.ALL') . '</b>' : '<a class="genmed" href="' . "memberlist.php?letter=all&amp;mode=$mode&amp;order=$sort_order" . '">' . trans('messages.ALL') . '</a>';
 
 $template->assign_vars(array(
     'S_LETTER_SELECT' => $select_letter,
@@ -150,7 +150,7 @@ if ($username) {
     $username = preg_replace('/\*/', '%', clean_username($username));
     $letter_sql = "username LIKE '" . OLD_DB()->escape($username) . "'";
 }
-$sql .= ($letter_sql) ? " AND $letter_sql" : '';
+$sql .= $letter_sql ? " AND $letter_sql" : '';
 $sql .= " ORDER BY $order_by";
 
 if ($result = OLD_DB()->fetch_rowset($sql)) {
@@ -201,7 +201,7 @@ if ($paginationusername) {
 }
 if ($mode != 'topten' || config('tp.topics_per_page') < 10) {
     $sql = "SELECT COUNT(*) AS total FROM " . BB_USERS;
-    $sql .= ($letter_sql) ? " WHERE $letter_sql" : " WHERE user_id NOT IN(". EXCLUDED_USERS .")";
+    $sql .= $letter_sql ? " WHERE $letter_sql" : " WHERE user_id NOT IN(". EXCLUDED_USERS .")";
     if (!$result = OLD_DB()->sql_query($sql)) {
         bb_die('Error getting total users');
     }
diff --git a/modcp.php b/modcp.php
index 0aa349986..afb6194cf 100644
--- a/modcp.php
+++ b/modcp.php
@@ -139,14 +139,14 @@ if (isset($_POST['cancel']) || IS_GUEST) {
     $redirect = 'index.php';
 
     if ($topic_id || $forum_id) {
-        $redirect = ($topic_id) ? TOPIC_URL . $topic_id : FORUM_URL . $forum_id;
+        $redirect = $topic_id ? TOPIC_URL . $topic_id : FORUM_URL . $forum_id;
     }
     redirectToUrl($redirect);
 }
 
 // Start auth check
 $is_auth = auth_user(AUTH_ALL, $forum_id, $userdata);
-$is_moderator = (IS_AM);
+$is_moderator = IS_AM;
 
 if ($mode == 'ip') {
     // Moderator can view IP in all forums
@@ -237,7 +237,7 @@ switch ($mode) {
                 $datastore->update('network_news');
             }
 
-            $msg = ($result) ? trans('messages.TOPICS_REMOVED') : trans('messages.NO_TOPICS_REMOVED');
+            $msg = $result ? trans('messages.TOPICS_REMOVED') : trans('messages.NO_TOPICS_REMOVED');
             bb_die(return_msg_mcp($msg));
         } else {
             print_confirmation(array(
@@ -268,7 +268,7 @@ switch ($mode) {
                 $datastore->update('network_news');
             }
 
-            $msg = ($result) ? trans('messages.TOPICS_MOVED') : trans('messages.NO_TOPICS_MOVED');
+            $msg = $result ? trans('messages.TOPICS_MOVED') : trans('messages.NO_TOPICS_MOVED');
             bb_die(return_msg_mcp($msg));
         } else {
             if (IS_ADMIN) {
@@ -301,7 +301,7 @@ switch ($mode) {
     case 'lock':
     case 'unlock':
         $lock = ($mode == 'lock');
-        $new_topic_status = ($lock) ? TOPIC_LOCKED : TOPIC_UNLOCKED;
+        $new_topic_status = $lock ? TOPIC_LOCKED : TOPIC_UNLOCKED;
 
         $sql = "
 			SELECT topic_id, topic_title
@@ -330,7 +330,7 @@ switch ($mode) {
 		");
 
         // Log action
-        $type = ($lock) ? 'mod_topic_lock' : 'mod_topic_unlock';
+        $type = $lock ? 'mod_topic_lock' : 'mod_topic_unlock';
 
         foreach ($log_topics as $topic_id => $topic_title) {
             $log_action->mod($type, array(
@@ -340,7 +340,7 @@ switch ($mode) {
             ));
         }
 
-        $msg = ($lock) ? trans('messages.TOPICS_LOCKED') : trans('messages.TOPICS_UNLOCKED');
+        $msg = $lock ? trans('messages.TOPICS_LOCKED') : trans('messages.TOPICS_UNLOCKED');
         bb_die(return_msg_mcp($msg));
 
         break;
@@ -349,7 +349,7 @@ switch ($mode) {
     case 'set_download':
     case 'unset_download':
         $set_download = ($mode == 'set_download');
-        $new_dl_type = ($set_download) ? TOPIC_DL_TYPE_DL : TOPIC_DL_TYPE_NORMAL;
+        $new_dl_type = $set_download ? TOPIC_DL_TYPE_DL : TOPIC_DL_TYPE_NORMAL;
 
         OLD_DB()->query("
 			UPDATE " . BB_TOPICS . " SET
@@ -363,7 +363,7 @@ switch ($mode) {
             clear_dl_list($topic_csv);
         }
 
-        $msg = ($set_download) ? trans('messages.TOPICS_DOWN_SETS') : trans('messages.TOPICS_DOWN_UNSETS');
+        $msg = $set_download ? trans('messages.TOPICS_DOWN_SETS') : trans('messages.TOPICS_DOWN_UNSETS');
         bb_die(return_msg_mcp($msg));
 
         break;
@@ -451,7 +451,7 @@ switch ($mode) {
 
                 $sql = "INSERT INTO " . BB_TOPICS . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_first_post_id)
 					VALUES ('" . OLD_DB()->escape($post_subject) . "', $first_poster, " . $topic_time . ", $new_forum_id, " . TOPIC_UNLOCKED . ", " . POST_NORMAL . ", $first_post_id)";
-                if (!(OLD_DB()->sql_query($sql))) {
+                if (!OLD_DB()->sql_query($sql)) {
                     bb_die('Could not insert new topic');
                 }
 
@@ -509,7 +509,7 @@ switch ($mode) {
             // Delete posts
             $result = post_delete(explode(',', $post_id_sql));
 
-            $msg = ($result) ? trans('messages.DELETE_POSTS_SUCCESFULLY') : 'No posts were removed';
+            $msg = $result ? trans('messages.DELETE_POSTS_SUCCESFULLY') : 'No posts were removed';
             bb_die(return_msg_mcp($msg));
         } else {
             $sql = "SELECT u.username, p.*, pt.post_text, p.post_username
@@ -557,7 +557,7 @@ switch ($mode) {
                         'POSTER_NAME' => wbr($poster),
                         'POST_DATE' => $post_date,
                         'MESSAGE' => $message,
-                        'CHECKBOX' => (defined('BEGIN_CHECKBOX')) ? true : false,
+                        'CHECKBOX' => defined('BEGIN_CHECKBOX') ? true : false,
                         'POST_ID' => $post_id,
                         'ROW_ID' => $i,
                         'CB_ID' => 'cb_' . $i,
@@ -677,7 +677,7 @@ switch ($mode) {
     case 'post_pin':
     case 'post_unpin':
         $pin = ($mode == 'post_pin');
-        $new_topic_status = ($pin) ? 1 : 0;
+        $new_topic_status = $pin ? 1 : 0;
 
         if (count($topic_csv)) {
             $sql = "
@@ -706,7 +706,7 @@ switch ($mode) {
 				WHERE topic_id IN($topic_csv)
 			");
 
-            $msg = ($pin) ? trans('messages.POST_PINNED') : trans('messages.POST_UNPINNED');
+            $msg = $pin ? trans('messages.POST_PINNED') : trans('messages.POST_UNPINNED');
             bb_die(return_msg_mcp($msg));
         } elseif ($topic_id) {
             $sql = "
@@ -736,7 +736,7 @@ switch ($mode) {
 				WHERE topic_id IN($topic_csv)
 			");
 
-            $msg = ($pin) ? trans('messages.POST_PINNED') : trans('messages.POST_UNPINNED');
+            $msg = $pin ? trans('messages.POST_PINNED') : trans('messages.POST_UNPINNED');
             bb_die(return_msg_mcp($msg));
         }
         break;
@@ -748,8 +748,8 @@ switch ($mode) {
 
 $template->assign_vars(array('PAGE_TITLE' => trans('messages.MOD_CP')));
 
-require(PAGE_HEADER);
+require PAGE_HEADER;
 
 $template->pparse('body');
 
-require(PAGE_FOOTER);
+require PAGE_FOOTER;
diff --git a/posting.php b/posting.php
index 8def75596..4f40da1c7 100644
--- a/posting.php
+++ b/posting.php
@@ -171,7 +171,7 @@ if ($post_info = OLD_DB()->fetch_row($sql)) {
         $post_data['poster_id'] = $post_info['poster_id'];
 
         $selected_rg = $post_info['poster_rg_id'];
-        $switch_rg_sig = ($post_info['attach_rg_sig']) ? true : false;
+        $switch_rg_sig = $post_info['attach_rg_sig'] ? true : false;
 
         // Can this user edit/delete the post?
         if ($post_info['poster_id'] != $userdata['user_id'] && !$is_auth['auth_mod']) {
@@ -443,13 +443,13 @@ if ($refresh || $error_msg || ($submit && $topic_has_new_posts)) {
 } else {
     // User default entry point
     if ($mode == 'newtopic') {
-        $username = ($userdata['session_logged_in']) ? $userdata['username'] : '';
+        $username = $userdata['session_logged_in'] ? $userdata['username'] : '';
         $subject = $message = '';
     } elseif ($mode == 'reply') {
-        $username = ($userdata['session_logged_in']) ? $userdata['username'] : '';
+        $username = $userdata['session_logged_in'] ? $userdata['username'] : '';
         $subject = $message = '';
     } elseif ($mode == 'quote' || $mode == 'editpost') {
-        $subject = ($post_data['first_post']) ? $post_info['topic_title'] : '';
+        $subject = $post_data['first_post'] ? $post_info['topic_title'] : '';
         $message = $post_info['post_text'];
 
         if ($mode == 'quote') {
@@ -547,7 +547,7 @@ if ($post_info['allow_reg_tracker'] && $post_data['first_post'] && ($topic_dl_ty
 
         $dl_ds = $dl_ch = $dl_hid = '';
         $dl_type_name = 'topic_dl_type';
-        $dl_type_val = ($topic_dl_type) ? 1 : 0;
+        $dl_type_val = $topic_dl_type ? 1 : 0;
 
         if (!$post_info['allow_reg_tracker'] && !$is_auth['auth_mod']) {
             $dl_ds = ' disabled="disabled" ';
@@ -616,16 +616,16 @@ $template->assign_vars(array(
     'U_VIEW_FORUM' => "viewforum.php?" . POST_FORUM_URL . "=$forum_id",
 
     'USERNAME' => @$username,
-    'CAPTCHA_HTML' => (IS_GUEST) ? bb_captcha('get') : '',
+    'CAPTCHA_HTML' => IS_GUEST ? bb_captcha('get') : '',
     'SUBJECT' => $subject,
     'MESSAGE' => $message,
 
     'POSTER_RGROUPS' => isset($poster_rgroups) && !empty($poster_rgroups) ? $poster_rgroups : '',
-    'ATTACH_RG_SIG' => ($switch_rg_sig) ?: false,
+    'ATTACH_RG_SIG' => $switch_rg_sig ?: false,
 
     'U_VIEWTOPIC' => ($mode == 'reply') ? "viewtopic.php?" . POST_TOPIC_URL . "=$topic_id&amp;postorder=desc" : '',
 
-    'S_NOTIFY_CHECKED' => ($notify_user) ? 'checked="checked"' : '',
+    'S_NOTIFY_CHECKED' => $notify_user ? 'checked="checked"' : '',
     'S_TYPE_TOGGLE' => $topic_type_toggle,
     'S_TOPIC_ID' => $topic_id,
     'S_POST_ACTION' => POSTING_URL,
@@ -639,8 +639,8 @@ if ($mode == 'newtopic' || $post_data['first_post']) {
 // Update post time
 if ($mode == 'editpost' && $post_data['last_post'] && !$post_data['first_post']) {
     $template->assign_vars(array(
-        'SHOW_UPDATE_POST_TIME' => ($is_auth['auth_mod'] || ($post_data['poster_post'] && $post_info['post_time'] + 3600 * 3 > TIMENOW)),
-        'UPDATE_POST_TIME_CHECKED' => ($post_data['poster_post'] && ($post_info['post_time'] + 3600 * 2 > TIMENOW)),
+        'SHOW_UPDATE_POST_TIME' => $is_auth['auth_mod'] || ($post_data['poster_post'] && $post_info['post_time'] + 3600 * 3 > TIMENOW),
+        'UPDATE_POST_TIME_CHECKED' => $post_data['poster_post'] && ($post_info['post_time'] + 3600 * 2 > TIMENOW),
     ));
 }
 
@@ -649,8 +649,8 @@ if ($mode == 'reply' && $is_auth['auth_read']) {
     topic_review($topic_id);
 }
 
-require(PAGE_HEADER);
+require PAGE_HEADER;
 
 $template->pparse('body');
 
-require(PAGE_FOOTER);
+require PAGE_FOOTER;
diff --git a/privmsg.php b/privmsg.php
index d8c51b3c8..99c0590b2 100644
--- a/privmsg.php
+++ b/privmsg.php
@@ -928,10 +928,10 @@ if ($mode == 'read') {
         // passed to the script, process it a little, do some checks
         // where neccessary, etc.
         //
-        $to_username = (isset($_POST['username'])) ? clean_username($_POST['username']) : '';
+        $to_username = isset($_POST['username']) ? clean_username($_POST['username']) : '';
 
-        $privmsg_subject = (isset($_POST['subject'])) ? clean_title($_POST['subject']) : '';
-        $privmsg_message = (isset($_POST['message'])) ? prepare_message($_POST['message']) : '';
+        $privmsg_subject = isset($_POST['subject']) ? clean_title($_POST['subject']) : '';
+        $privmsg_message = isset($_POST['message']) ? prepare_message($_POST['message']) : '';
 
         //
         // Do mode specific things
@@ -1034,7 +1034,7 @@ if ($mode == 'read') {
     // Has admin prevented user from sending PM's?
     //
     if (bf($userdata['user_opt'], 'user_opt', 'dis_pm') && $mode != 'edit') {
-        $message = (trans('messages.CANNOT_SEND_PRIVMSG'));
+        $message = trans('messages.CANNOT_SEND_PRIVMSG');
     }
 
     //
@@ -1323,7 +1323,7 @@ if ($mode == 'read') {
     if ($max_pm) {
         $box_limit_percent = min(round(($pm_all_total / $max_pm) * 100), 100);
         $box_limit_img_length = min(round(($pm_all_total / $max_pm) * config('tp.privmsg_graphic_length')), config('tp.privmsg_graphic_length'));
-        $box_limit_remain = max(($max_pm - $pm_all_total), 0);
+        $box_limit_remain = max($max_pm - $pm_all_total, 0);
 
         $template->assign_var('PM_BOX_SIZE_INFO');
 
@@ -1360,7 +1360,7 @@ if ($mode == 'read') {
         'INBOX_LIMIT_IMG_WIDTH' => max(4, $box_limit_img_length),
         'INBOX_LIMIT_PERCENT' => $box_limit_percent,
 
-        'BOX_SIZE_STATUS' => ($l_box_size_status) ?: '',
+        'BOX_SIZE_STATUS' => $l_box_size_status ?: '',
 
         'L_FROM_OR_TO' => ($folder == 'inbox' || $folder == 'savebox') ? trans('messages.FROM') : trans('messages.TO'),
 
@@ -1435,11 +1435,11 @@ if ($mode == 'read') {
 
 $template->assign_vars(array('PAGE_TITLE' => @$page_title));
 
-require(PAGE_HEADER);
+require PAGE_HEADER;
 
 $template->pparse('body');
 
-require(PAGE_FOOTER);
+require PAGE_FOOTER;
 
 //
 // Functions
diff --git a/search.php b/search.php
index 9c70282d4..5da006950 100644
--- a/search.php
+++ b/search.php
@@ -89,7 +89,7 @@ $url = basename(__FILE__);
 
 $anon_id = GUEST_UID;
 $user_id = $userdata['user_id'];
-$lastvisit = (IS_GUEST) ? TIMENOW : $userdata['user_lastvisit'];
+$lastvisit = IS_GUEST ? TIMENOW : $userdata['user_lastvisit'];
 $search_id = (isset($_GET['id']) && verify_id($_GET['id'], SEARCH_ID_LENGTH)) ? $_GET['id'] : '';
 $session_id = $userdata['session_id'];
 
@@ -505,7 +505,7 @@ if ($post_mode) {
                 bb_die(trans('messages.NO_SEARCH_MATCH'));
             }
 
-            $where_id = ($title_match) ? 'topic_id' : 'post_id';
+            $where_id = $title_match ? 'topic_id' : 'post_id';
 
             $SQL['WHERE'][] = "$tbl.$where_id IN($search_match_topics_csv)";
             prevent_huge_searches($SQL);
@@ -525,7 +525,7 @@ if ($post_mode) {
     }
 
     // Build SQL for displaying posts
-    $excluded_forums_sql = ($excluded_forums_csv) ? " AND t.forum_id NOT IN($excluded_forums_csv) " : '';
+    $excluded_forums_sql = $excluded_forums_csv ? " AND t.forum_id NOT IN($excluded_forums_csv) " : '';
 
     $sql = "
 		SELECT
@@ -586,7 +586,7 @@ if ($post_mode) {
         ));
 
         $quote_btn = true;
-        $edit_btn = $delpost_btn = $ip_btn = (IS_AM);
+        $edit_btn = $delpost_btn = $ip_btn = IS_AM;
 
         // Topic posts block
         foreach ($topic_posts as $row_num => $post) {
@@ -628,7 +628,7 @@ else {
         $join_t = ($title_match || $my_topics || $new_topics || $dl_search || $new_posts || in_array($order_val, array($ord_last_p, $ord_created, $ord_name, $ord_repl)));
         $join_s = ($text_match_sql && !$title_match);
         $join_p = ($my_posts || $join_s);
-        $join_dl = ($dl_search);
+        $join_dl = $dl_search;
 
         $tbl = ($join_p && !$join_t) ? 'p' : 't';
         $time_field = ($join_p && !$join_t) ? 'post_time' : 'topic_last_post_time';
@@ -708,7 +708,7 @@ else {
                 bb_die(trans('messages.NO_SEARCH_MATCH'));
             }
 
-            $where_id = ($title_match) ? 't.topic_id' : 'p.post_id';
+            $where_id = $title_match ? 't.topic_id' : 'p.post_id';
 
             $SQL['WHERE'][] = "$where_id IN($search_match_topics_csv)";
             prevent_huge_searches($SQL);
@@ -794,7 +794,7 @@ else {
             'FORUM_ID' => $forum_id,
             'FORUM_NAME' => $forum_name_html[$forum_id],
             'TOPIC_ID' => $topic_id,
-            'HREF_TOPIC_ID' => ($moved) ? $topic['topic_moved_id'] : $topic['topic_id'],
+            'HREF_TOPIC_ID' => $moved ? $topic['topic_moved_id'] : $topic['topic_id'],
             'TOPIC_TITLE' => wbr($topic['topic_title']),
             'IS_UNREAD' => $is_unread,
             'TOPIC_ICON' => get_topic_icon($topic, $is_unread),
@@ -803,7 +803,7 @@ else {
             'ATTACH' => $topic['topic_attachment'],
             'STATUS' => $topic['topic_status'],
             'TYPE' => $topic['topic_type'],
-            'DL' => ($topic['topic_dl_type'] == TOPIC_DL_TYPE_DL),
+            'DL' => $topic['topic_dl_type'] == TOPIC_DL_TYPE_DL,
             'POLL' => $topic['topic_vote'],
             'DL_CLASS' => isset($topic['dl_status']) ? $dl_link_css[$topic['dl_status']] : '',
 
@@ -818,19 +818,19 @@ else {
 if ($items_display) {
     $items_count = count($items_found);
     $pages = (!$items_count) ? 1 : ceil($items_count / $per_page);
-    $url = ($search_id) ? url_arg($url, 'id', $search_id) : $url;
+    $url = $search_id ? url_arg($url, 'id', $search_id) : $url;
 
     generate_pagination($url, $items_count, $per_page, $start);
 
     $template->assign_vars(array(
         'PAGE_TITLE' => trans('messages.SEARCH'),
 
-        'SEARCH_MATCHES' => ($items_count) ? sprintf(trans('messages.FOUND_SEARCH_MATCHES'), $items_count) : '',
+        'SEARCH_MATCHES' => $items_count ? sprintf(trans('messages.FOUND_SEARCH_MATCHES'), $items_count) : '',
         'DISPLAY_AS_POSTS' => $post_mode,
 
-        'DL_CONTROLS' => ($dl_search && $dl_user_id_val == $user_id),
+        'DL_CONTROLS' => $dl_search && $dl_user_id_val == $user_id,
         'DL_ACTION' => 'dl_list.php',
-        'MY_POSTS' => (!$post_mode && $my_posts && $user->id == $poster_id_val),
+        'MY_POSTS' => !$post_mode && $my_posts && $user->id == $poster_id_val,
     ));
 
     print_page('search_results.tpl');
diff --git a/tracker.php b/tracker.php
index ba148e1bd..50f5b75dd 100644
--- a/tracker.php
+++ b/tracker.php
@@ -25,7 +25,7 @@ $user->session_start(array('req_login' => config('tp.bt_tor_browse_only_reg')));
 
 set_die_append_msg();
 
-$tor_search_limit = (IS_AM) ? 2000 : 500;
+$tor_search_limit = IS_AM ? 2000 : 500;
 $forum_select_size = 25; // forum select box max rows
 $max_forum_name_len = 60; // inside forum select box
 $max_forums_selected = 50;
@@ -702,8 +702,8 @@ if ($allowed_forums) {
             $size = $tor['size'];
             $tor_magnet = create_magnet($tor['info_hash'], $passkey['auth_key'], $userdata['session_logged_in']);
             $compl = $tor['complete_count'];
-            $dl_sp = ($dl) ? humn_size($dl, 0, 'KB') . '/s' : '0 KB/s';
-            $ul_sp = ($ul) ? humn_size($ul, 0, 'KB') . '/s' : '0 KB/s';
+            $dl_sp = $dl ? humn_size($dl, 0, 'KB') . '/s' : '0 KB/s';
+            $ul_sp = $ul ? humn_size($ul, 0, 'KB') . '/s' : '0 KB/s';
 
             $dl_class = isset($tor['dl_status']) ? $dl_link_css[$tor['dl_status']] : 'genmed';
             $row_class = !($row_num & 1) ? $row_class_1 : $row_class_2;
@@ -715,21 +715,21 @@ if ($allowed_forums) {
 
             $template->assign_block_vars('tor', array(
                 'CAT_ID' => $cat_id,
-                'CAT_TITLE' => ($cat_id) ? $cat_title_html[$cat_id] : '',
+                'CAT_TITLE' => $cat_id ? $cat_title_html[$cat_id] : '',
                 'FORUM_ID' => $forum_id,
-                'FORUM_NAME' => ($forum_id) ? $forum_name_html[$forum_id] : '',
+                'FORUM_NAME' => $forum_id ? $forum_name_html[$forum_id] : '',
                 'TOPIC_ID' => $tor['topic_id'],
                 'TOPIC_TITLE' => wbr($tor['topic_title']),
                 'TOPIC_TIME' => bb_date($tor['topic_time'], 'd-M-y') . ' <b>&middot;</b> ' . delta_time($tor['topic_time']),
                 'POST_ID' => $tor['post_id'],
                 'POSTER_ID' => $poster_id,
-                'USERNAME' => ($hide_author) ? '' : profile_url(array('username' => $tor['username'], 'user_rank' => $tor['user_rank'])),
+                'USERNAME' => $hide_author ? '' : profile_url(array('username' => $tor['username'], 'user_rank' => $tor['user_rank'])),
 
                 'ROW_CLASS' => $row_class,
                 'ROW_NUM' => $row_num,
                 'DL_CLASS' => $dl_class,
-                'IS_NEW' => (!IS_GUEST && $tor['reg_time'] > $lastvisit),
-                'USER_AUTHOR' => (!IS_GUEST && $poster_id == $user_id),
+                'IS_NEW' => !IS_GUEST && $tor['reg_time'] > $lastvisit,
+                'USER_AUTHOR' => !IS_GUEST && $poster_id == $user_id,
 
                 'ATTACH_ID' => $att_id,
                 'MAGNET' => $tor_magnet,
@@ -744,7 +744,7 @@ if ($allowed_forums) {
                 'UL_SPEED' => $ul_sp,
                 'DL_SPEED' => $dl_sp,
                 'SEEDS' => $seeds ?: 0,
-                'SEEDS_TITLE' => ($seeds) ? trans('messages.SEEDERS') : (trans('messages.SEED_NOT_SEEN') . ":\n " . (($s_last) ? bb_date($s_last, $date_format) : trans('messages.NEVER'))),
+                'SEEDS_TITLE' => $seeds ? trans('messages.SEEDERS') : (trans('messages.SEED_NOT_SEEN') . ":\n " . ($s_last ? bb_date($s_last, $date_format) : trans('messages.NEVER'))),
                 'LEECHS' => $leechs ?: 0,
                 'COMPLETED' => $compl ?: 0,
                 'REPLIES' => $tor['topic_replies'],
@@ -794,7 +794,7 @@ foreach ($cat_forum['c'] as $cat_id => $forums_ary) {
             $class .= isset($cat_forum['forums_with_sf'][$forum_id]) ? ' has_sf' : '';
             $style = " class=\"$class\"";
         }
-        $selected = (isset($search_in_forums_fary[$forum_id])) ? HTML_SELECTED : '';
+        $selected = isset($search_in_forums_fary[$forum_id]) ? HTML_SELECTED : '';
         $opt .= '<option id="fs-' . $forum_id . '" value="' . $forum_id . '"' . $style . $selected . '>' . (isset($cat_forum['subforums'][$forum_id]) ? HTML_SF_SPACER : '') . $forum_name . "&nbsp;</option>\n";
     }
 
diff --git a/viewforum.php b/viewforum.php
index 7c942aa2d..8ee834f5d 100644
--- a/viewforum.php
+++ b/viewforum.php
@@ -33,11 +33,11 @@ $anon = GUEST_UID;
 // Start session
 $user->session_start();
 
-$lastvisit = (IS_GUEST) ? TIMENOW : $userdata['user_lastvisit'];
+$lastvisit = IS_GUEST ? TIMENOW : $userdata['user_lastvisit'];
 
 // Caching output
 $req_page = "forum_f{$forum_id}";
-$req_page .= ($start) ? "_start{$start}" : '';
+$req_page .= $start ? "_start{$start}" : '';
 
 define('REQUESTED_PAGE', $req_page);
 caching_output(IS_GUEST, 'send', REQUESTED_PAGE . '_guest');
@@ -67,7 +67,7 @@ $moderation = (!empty($_REQUEST['mod']) && $is_auth['auth_mod']);
 
 if (!$is_auth['auth_view']) {
     if (IS_GUEST) {
-        $redirect = ($start) ? "&start=$start" : '';
+        $redirect = $start ? "&start=$start" : '';
         redirectToUrl(LOGIN_URL . "?redirect=" . FORUM_URL . $forum_id . $redirect);
     }
     // The user is not authed to read this forum ...
@@ -130,7 +130,7 @@ if ($forums['forum'][$forum_id]['allow_porno_topic'] && bf($userdata['user_opt']
 
 if (!$forum_data['forum_parent'] && isset($forums['f'][$forum_id]['subforums']) && $show_subforums) {
     $not_auth_forums = $user->get_excluded_forums(AUTH_VIEW);
-    $ignore_forum_sql = ($not_auth_forums) ? "AND f.forum_id NOT IN($not_auth_forums)" : '';
+    $ignore_forum_sql = $not_auth_forums ? "AND f.forum_id NOT IN($not_auth_forums)" : '';
 
     $sql = "
 		SELECT
@@ -273,7 +273,7 @@ $order_method = get_forum_display_sort_option($order_value, 'field', 'order');
 
 $order_sql = "ORDER BY t.topic_type DESC, $sort_method $order_method";
 
-$limit_topics_time_sql = ($topic_days) ? "AND t.topic_last_post_time > " . (TIMENOW - 86400 * $topic_days) : '';
+$limit_topics_time_sql = $topic_days ? "AND t.topic_last_post_time > " . (TIMENOW - 86400 * $topic_days) : '';
 
 $select_tor_sql = $join_tor_sql = '';
 $join_dl = (config('tp.show_dl_status_in_forum') && !IS_GUEST);
@@ -288,14 +288,14 @@ if ($forum_data['allow_reg_tracker']) {
 		bt.auth_key, tor.info_hash, tor.size AS tor_size, tor.reg_time, tor.complete_count, tor.seeder_last_seen, tor.attach_id, tor.tor_status, tor.tor_type,
 		sn.seeders, sn.leechers
 	';
-    $select_tor_sql .= ($join_dl) ? ', dl.user_status AS dl_status' : '';
+    $select_tor_sql .= $join_dl ? ', dl.user_status AS dl_status' : '';
 
     $join_tor_sql = "
 		LEFT JOIN " . BB_BT_TORRENTS . " tor ON(t.topic_id = tor.topic_id)
 		LEFT JOIN " . BB_BT_USERS . " bt  ON(bt.user_id = {$userdata['user_id']})
 		LEFT JOIN " . BB_BT_TRACKER_SNAP . " sn  ON(tor.topic_id = sn.topic_id)
 	";
-    $join_tor_sql .= ($join_dl) ? " LEFT JOIN " . BB_BT_DLSTATUS . " dl ON(dl.user_id = {$userdata['user_id']} AND dl.topic_id = t.topic_id)" : '';
+    $join_tor_sql .= $join_dl ? " LEFT JOIN " . BB_BT_DLSTATUS . " dl ON(dl.user_id = {$userdata['user_id']} AND dl.topic_id = t.topic_id)" : '';
 }
 
 // Title match
@@ -376,14 +376,14 @@ $template->assign_vars(array(
 
 // User authorisation levels output
 $u_auth = array();
-$u_auth[] = ($is_auth['auth_post']) ? trans('messages.RULES_POST_CAN') : trans('messages.RULES_POST_CANNOT');
-$u_auth[] = ($is_auth['auth_reply']) ? trans('messages.RULES_REPLY_CAN') : trans('messages.RULES_REPLY_CANNOT');
-$u_auth[] = ($is_auth['auth_edit']) ? trans('messages.RULES_EDIT_CAN') : trans('messages.RULES_EDIT_CANNOT');
-$u_auth[] = ($is_auth['auth_delete']) ? trans('messages.RULES_DELETE_CAN') : trans('messages.RULES_DELETE_CANNOT');
-$u_auth[] = ($is_auth['auth_vote']) ? trans('messages.RULES_VOTE_CAN') : trans('messages.RULES_VOTE_CANNOT');
-$u_auth[] = ($is_auth['auth_attachments']) ? trans('messages.RULES_ATTACH_CAN') : trans('messages.RULES_ATTACH_CANNOT');
-$u_auth[] = ($is_auth['auth_download']) ? trans('messages.RULES_DOWNLOAD_CAN') : trans('messages.RULES_DOWNLOAD_CANNOT');
-$u_auth[] = ($is_auth['auth_mod']) ? trans('messages.RULES_MODERATE') : '';
+$u_auth[] = $is_auth['auth_post'] ? trans('messages.RULES_POST_CAN') : trans('messages.RULES_POST_CANNOT');
+$u_auth[] = $is_auth['auth_reply'] ? trans('messages.RULES_REPLY_CAN') : trans('messages.RULES_REPLY_CANNOT');
+$u_auth[] = $is_auth['auth_edit'] ? trans('messages.RULES_EDIT_CAN') : trans('messages.RULES_EDIT_CANNOT');
+$u_auth[] = $is_auth['auth_delete'] ? trans('messages.RULES_DELETE_CAN') : trans('messages.RULES_DELETE_CANNOT');
+$u_auth[] = $is_auth['auth_vote'] ? trans('messages.RULES_VOTE_CAN') : trans('messages.RULES_VOTE_CANNOT');
+$u_auth[] = $is_auth['auth_attachments'] ? trans('messages.RULES_ATTACH_CAN') : trans('messages.RULES_ATTACH_CANNOT');
+$u_auth[] = $is_auth['auth_download'] ? trans('messages.RULES_DOWNLOAD_CAN') : trans('messages.RULES_DOWNLOAD_CANNOT');
+$u_auth[] = $is_auth['auth_mod'] ? trans('messages.RULES_MODERATE') : '';
 $u_auth = implode("<br />\n", $u_auth);
 
 $template->assign_vars(array(
@@ -402,11 +402,11 @@ $template->assign_vars(array(
     'FOLDER_DOWNLOAD_IMG' => $images['folder_dl'],
 
     'SHOW_ONLY_NEW_MENU' => true,
-    'ONLY_NEW_POSTS_ON' => ($only_new == ONLY_NEW_POSTS),
-    'ONLY_NEW_TOPICS_ON' => ($only_new == ONLY_NEW_TOPICS),
+    'ONLY_NEW_POSTS_ON' => $only_new == ONLY_NEW_POSTS,
+    'ONLY_NEW_TOPICS_ON' => $only_new == ONLY_NEW_TOPICS,
 
     'TITLE_MATCH' => htmlCHR($title_match),
-    'SELECT_TPP' => ($select_tpp) ? build_select('tpp', $select_tpp, $topics_per_page, null, null, 'onchange="$(\'#tpp\').submit();"') : '',
+    'SELECT_TPP' => $select_tpp ? build_select('tpp', $select_tpp, $topics_per_page, null, null, 'onchange="$(\'#tpp\').submit();"') : '',
     'T_POST_NEW_TOPIC' => ($forum_data['forum_status'] == FORUM_LOCKED) ? trans('messages.FORUM_LOCKED') : $post_new_topic,
     'S_AUTH_LIST' => $u_auth,
     'U_VIEW_FORUM' => FORUM_URL . $forum_id,
diff --git a/viewtopic.php b/viewtopic.php
index 4f48f03fb..45cfe4a81 100644
--- a/viewtopic.php
+++ b/viewtopic.php
@@ -133,7 +133,7 @@ set_die_append_msg($forum_id);
 // Find newest post
 if (($next_topic_id || @$_GET['view'] === 'newest') && !IS_GUEST && $topic_id) {
     $post_time = 'post_time >= ' . get_last_read($topic_id, $forum_id);
-    $post_id_altern = ($next_topic_id) ? '' : ' OR post_id = ' . $t_data['topic_last_post_id'];
+    $post_id_altern = $next_topic_id ? '' : ' OR post_id = ' . $t_data['topic_last_post_id'];
 
     $sql = "SELECT post_id, post_time
 		FROM " . BB_POSTS . "
@@ -164,7 +164,7 @@ $is_auth = auth_user(AUTH_ALL, $forum_id, $userdata, $t_data);
 
 if (!$is_auth['auth_read']) {
     if (IS_GUEST) {
-        $redirect = ($post_id) ? POST_URL . "$post_id#$post_id" : TOPIC_URL . $topic_id;
+        $redirect = $post_id ? POST_URL . "$post_id#$post_id" : TOPIC_URL . $topic_id;
         $redirect .= ($start && !$post_id) ? "&start=$start" : '';
         redirectToUrl(LOGIN_URL . "?redirect=$redirect");
     }
@@ -391,13 +391,13 @@ $template->set_filenames(array('body' => 'viewtopic.tpl'));
 //
 // User authorisation levels output
 //
-$s_auth_can = (($is_auth['auth_post']) ? trans('messages.RULES_POST_CAN') : trans('messages.RULES_POST_CANNOT')) . '<br />';
-$s_auth_can .= (($is_auth['auth_reply']) ? trans('messages.RULES_REPLY_CAN') : trans('messages.RULES_REPLY_CANNOT')) . '<br />';
-$s_auth_can .= (($is_auth['auth_edit']) ? trans('messages.RULES_EDIT_CAN') : trans('messages.RULES_EDIT_CANNOT')) . '<br />';
-$s_auth_can .= (($is_auth['auth_delete']) ? trans('messages.RULES_DELETE_CAN') : trans('messages.RULES_DELETE_CANNOT')) . '<br />';
-$s_auth_can .= (($is_auth['auth_vote']) ? trans('messages.RULES_VOTE_CAN') : trans('messages.RULES_VOTE_CANNOT')) . '<br />';
-$s_auth_can .= (($is_auth['auth_attachments']) ? trans('messages.RULES_ATTACH_CAN') : trans('messages.RULES_ATTACH_CANNOT')) . '<br />';
-$s_auth_can .= (($is_auth['auth_download']) ? trans('messages.RULES_DOWNLOAD_CAN') : trans('messages.RULES_DOWNLOAD_CANNOT')) . '<br />';
+$s_auth_can = ($is_auth['auth_post'] ? trans('messages.RULES_POST_CAN') : trans('messages.RULES_POST_CANNOT')) . '<br />';
+$s_auth_can .= ($is_auth['auth_reply'] ? trans('messages.RULES_REPLY_CAN') : trans('messages.RULES_REPLY_CANNOT')) . '<br />';
+$s_auth_can .= ($is_auth['auth_edit'] ? trans('messages.RULES_EDIT_CAN') : trans('messages.RULES_EDIT_CANNOT')) . '<br />';
+$s_auth_can .= ($is_auth['auth_delete'] ? trans('messages.RULES_DELETE_CAN') : trans('messages.RULES_DELETE_CANNOT')) . '<br />';
+$s_auth_can .= ($is_auth['auth_vote'] ? trans('messages.RULES_VOTE_CAN') : trans('messages.RULES_VOTE_CANNOT')) . '<br />';
+$s_auth_can .= ($is_auth['auth_attachments'] ? trans('messages.RULES_ATTACH_CAN') : trans('messages.RULES_ATTACH_CANNOT')) . '<br />';
+$s_auth_can .= ($is_auth['auth_download'] ? trans('messages.RULES_DOWNLOAD_CAN') : trans('messages.RULES_DOWNLOAD_CANNOT')) . '<br />';
 
 // Moderator output
 $topic_mod = '';
@@ -424,10 +424,10 @@ $s_watching_topic = $s_watching_topic_img = '';
 if ($can_watch_topic) {
     if ($is_watching_topic) {
         $s_watching_topic = "<a href=\"" . TOPIC_URL . $topic_id . "&amp;unwatch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '">' . trans('messages.STOP_WATCHING_TOPIC') . '</a>';
-        $s_watching_topic_img = (isset($images['topic_un_watch'])) ? "<a href=\"" . TOPIC_URL . "$topic_id&amp;unwatch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_un_watch'] . '" alt="' . trans('messages.STOP_WATCHING_TOPIC') . '" title="' . trans('messages.STOP_WATCHING_TOPIC') . '" border="0"></a>' : '';
+        $s_watching_topic_img = isset($images['topic_un_watch']) ? "<a href=\"" . TOPIC_URL . "$topic_id&amp;unwatch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_un_watch'] . '" alt="' . trans('messages.STOP_WATCHING_TOPIC') . '" title="' . trans('messages.STOP_WATCHING_TOPIC') . '" border="0"></a>' : '';
     } else {
         $s_watching_topic = "<a href=\"" . TOPIC_URL . $topic_id . "&amp;watch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '">' . trans('messages.START_WATCHING_TOPIC') . '</a>';
-        $s_watching_topic_img = (isset($images['Topic_watch'])) ? "<a href=\"" . TOPIC_URL . "$topic_id&amp;watch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['Topic_watch'] . '" alt="' . trans('messages.START_WATCHING_TOPIC') . '" title="' . trans('messages.START_WATCHING_TOPIC') . '" border="0"></a>' : '';
+        $s_watching_topic_img = isset($images['Topic_watch']) ? "<a href=\"" . TOPIC_URL . "$topic_id&amp;watch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['Topic_watch'] . '" alt="' . trans('messages.START_WATCHING_TOPIC') . '" title="' . trans('messages.START_WATCHING_TOPIC') . '" border="0"></a>' : '';
     }
 }
 
@@ -483,7 +483,7 @@ $template->assign_vars(array(
     'T_POST_REPLY' => $reply_alt,
 
     'HIDE_AVATAR' => $user->opt_js['h_av'],
-    'HIDE_RANK_IMG' => ($user->opt_js['h_rnk_i'] && config('tp.show_rank_image')),
+    'HIDE_RANK_IMG' => $user->opt_js['h_rnk_i'] && config('tp.show_rank_image'),
     'HIDE_POST_IMG' => $user->opt_js['h_post_i'],
     'HIDE_SMILE' => $user->opt_js['h_smile'],
     'HIDE_SIGNATURE' => $user->opt_js['h_sig'],
@@ -516,8 +516,8 @@ $template->assign_vars(array(
     'U_SEARCH_SELF' => "search.php?uid={$userdata['user_id']}&t=$topic_id&dm=1",
 
     'TOPIC_HAS_POLL' => $topic_has_poll,
-    'POLL_IS_EDITABLE' => (!$poll_time_expired),
-    'POLL_IS_FINISHED' => ($t_data['topic_vote'] == POLL_FINISHED),
+    'POLL_IS_EDITABLE' => !$poll_time_expired,
+    'POLL_IS_FINISHED' => $t_data['topic_vote'] == POLL_FINISHED,
     'CAN_MANAGE_POLL' => $can_manage_poll,
     'CAN_ADD_POLL' => $can_add_poll,
 ));
@@ -580,10 +580,10 @@ for ($i = 0; $i < $total_posts; $i++) {
     $mc_comment = $postrow[$i]['mc_comment'];
     $mc_user_id = profile_url(array('username' => $postrow[$i]['mc_username'], 'user_id' => $postrow[$i]['mc_user_id'], 'user_rank' => $postrow[$i]['mc_user_rank']));
 
-    $rg_id = ($postrow[$i]['poster_rg_id']) ?: 0;
+    $rg_id = $postrow[$i]['poster_rg_id'] ?: 0;
     $rg_avatar = get_avatar(GROUP_AVATAR_MASK . $rg_id, $postrow[$i]['rg_avatar_id']);
-    $rg_name = ($postrow[$i]['group_name']) ? htmlCHR($postrow[$i]['group_name']) : '';
-    $rg_signature = ($postrow[$i]['group_signature']) ? bbcode2html(htmlCHR($postrow[$i]['group_signature'])) : '';
+    $rg_name = $postrow[$i]['group_name'] ? htmlCHR($postrow[$i]['group_name']) : '';
+    $rg_signature = $postrow[$i]['group_signature'] ? bbcode2html(htmlCHR($postrow[$i]['group_signature'])) : '';
 
     $poster_avatar = '';
     if (!$user->opt_js['h_av'] && $poster_id != GUEST_UID) {
@@ -594,7 +594,7 @@ for ($i = 0; $i < $total_posts; $i++) {
     $user_rank = $postrow[$i]['user_rank'];
     if (!$user->opt_js['h_rnk_i'] and isset($ranks[$user_rank])) {
         $rank_image = (config('tp.show_rank_image') && $ranks[$user_rank]['rank_image']) ? '<img src="' . $ranks[$user_rank]['rank_image'] . '" alt="" title="" border="0" />' : '';
-        $poster_rank = (config('tp.show_rank_text')) ? $ranks[$user_rank]['rank_title'] : '';
+        $poster_rank = config('tp.show_rank_text') ? $ranks[$user_rank]['rank_title'] : '';
     }
 
     // Handle anon users posting with usernames
@@ -695,7 +695,7 @@ for ($i = 0; $i < $total_posts; $i++) {
     $template->assign_block_vars('postrow', array(
         'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2',
         'POST_ID' => $post_id,
-        'IS_NEWEST' => ($post_id == $newest),
+        'IS_NEWEST' => $post_id == $newest,
         'POSTER_NAME' => profile_url(array('username' => $poster, 'user_rank' => $user_rank)),
         'POSTER_NAME_JS' => addslashes($poster),
         'POSTER_RANK' => $poster_rank,
@@ -776,14 +776,14 @@ if (config('tp.show_quick_reply')) {
             'QUICK_REPLY' => true,
             'QR_POST_ACTION' => POSTING_URL,
             'QR_TOPIC_ID' => $topic_id,
-            'CAPTCHA_HTML' => (IS_GUEST) ? bb_captcha('get') : '',
+            'CAPTCHA_HTML' => IS_GUEST ? bb_captcha('get') : '',
         ));
 
         if (!IS_GUEST) {
             $notify_user = bf($userdata['user_opt'], 'user_opt', 'user_notify');
 
             $template->assign_vars(array(
-                'QR_NOTIFY_CHECKED' => ($notify_user) ? $notify_user && $is_watching_topic : $is_watching_topic,
+                'QR_NOTIFY_CHECKED' => $notify_user ? $notify_user && $is_watching_topic : $is_watching_topic,
             ));
         }
     }

From e23622d9d826ea5db70698ec94e9fda5f44a87af Mon Sep 17 00:00:00 2001
From: Yuriy Pikhtarev <iglix@me.com>
Date: Fri, 30 Jun 2017 21:50:00 +0300
Subject: [PATCH 3/8] Unnecessary double quotes.

---
 _ide_helper.php                               |   2 +-
 admin/stats/tr_stats.php                      |   2 +-
 bt/announce.php                               |  40 +-
 bt/scrape.php                                 |   6 +-
 callseed.php                                  |  26 +-
 common.php                                    |   2 +-
 dl.php                                        |   4 +-
 dl_list.php                                   |  12 +-
 feed.php                                      |   2 +-
 group.php                                     | 102 ++---
 group_edit.php                                |   6 +-
 index.php                                     |  22 +-
 .../TorrentPier/TorrentPier/Legacy/Attach.php |   2 +-
 .../TorrentPier/Legacy/Cache/File.php         |   4 +-
 .../TorrentPier/Legacy/Cache/Sqlite.php       |  18 +-
 .../TorrentPier/Legacy/Cache/SqliteCommon.php |   6 +-
 .../TorrentPier/Legacy/Common/User.php        |  84 ++--
 .../TorrentPier/Legacy/Datastore/File.php     |   2 +-
 .../TorrentPier/Legacy/Datastore/Sqlite.php   |   8 +-
 .../Legacy/Datastore/SqliteCommon.php         |   6 +-
 .../TorrentPier/Legacy/LogAction.php          |   2 +-
 .../TorrentPier/TorrentPier/Legacy/Poll.php   |  10 +-
 .../TorrentPier/Legacy/Sitemap.php            |   4 +-
 .../TorrentPier/TorrentPier/Legacy/SqlDb.php  |   4 +-
 library/ajax/avatar.php                       |   2 +-
 library/ajax/change_tor_status.php            |  12 +-
 library/ajax/change_torrent.php               |  12 +-
 library/ajax/change_user_opt.php              |   2 +-
 library/ajax/change_user_rank.php             |   2 +-
 library/ajax/edit_group_profile.php           |   2 +-
 library/ajax/edit_user_profile.php            |   2 +-
 library/ajax/group_membership.php             |   8 +-
 library/ajax/index_data.php                   |   4 +-
 library/ajax/manage_user.php                  |   6 +-
 library/ajax/mod_action.php                   |  10 +-
 library/ajax/post_mod_comment.php             |   6 +-
 library/ajax/posts.php                        |  30 +-
 library/ajax/topic_tpl.php                    |  10 +-
 library/ajax/view_post.php                    |  12 +-
 library/ajax/view_torrent.php                 |   2 +-
 library/attach_mod/displaying_torrent.php     |  44 +-
 .../attach_mod/includes/functions_attach.php  |  18 +-
 .../attach_mod/includes/functions_delete.php  |   8 +-
 .../includes/functions_includes.php           |   2 +-
 library/includes/bbcode.php                   |  10 +-
 library/includes/cron/cron_check.php          |   6 +-
 library/includes/cron/cron_run.php            |  12 +-
 .../includes/cron/jobs/attach_maintenance.php |  58 +--
 .../includes/cron/jobs/board_maintenance.php  |  10 +-
 library/includes/cron/jobs/cache_gc.php       |   2 +-
 library/includes/cron/jobs/clean_dlstat.php   |  40 +-
 library/includes/cron/jobs/clean_log.php      |   8 +-
 .../cron/jobs/clean_search_results.php        |   4 +-
 .../includes/cron/jobs/flash_topic_view.php   |  10 +-
 library/includes/cron/jobs/prune_forums.php   |   2 +-
 .../cron/jobs/prune_inactive_users.php        |  12 +-
 .../includes/cron/jobs/prune_topic_moved.php  |   6 +-
 .../includes/cron/jobs/sessions_cleanup.php   |  12 +-
 .../cron/jobs/tr_cleanup_and_dlstat.php       | 102 ++---
 .../includes/cron/jobs/tr_complete_count.php  |  24 +-
 library/includes/cron/jobs/tr_maintenance.php |  18 +-
 .../includes/cron/jobs/tr_make_snapshot.php   |  92 ++---
 library/includes/cron/jobs/tr_seed_bonus.php  |  14 +-
 .../cron/jobs/tr_update_seeder_last_seen.php  |  10 +-
 .../includes/cron/jobs/update_forums_atom.php |   2 +-
 .../datastore/build_attach_extensions.php     |   8 +-
 .../includes/datastore/build_cat_forums.php   |  16 +-
 .../includes/datastore/build_moderators.php   |  48 +--
 library/includes/datastore/build_ranks.php    |   2 +-
 library/includes/datastore/build_smilies.php  |   2 +-
 library/includes/datastore/build_stats.php    |  22 +-
 library/includes/functions.php                | 118 +++---
 library/includes/functions_admin.php          | 246 ++++++------
 library/includes/functions_admin_cron.php     |  18 +-
 library/includes/functions_atom.php           |  50 +--
 library/includes/functions_group.php          | 104 ++---
 library/includes/functions_post.php           | 104 ++---
 library/includes/functions_torrent.php        |  66 +--
 library/includes/functions_validate.php       |  10 +-
 library/includes/online_userlist.php          |   4 +-
 library/includes/page_footer.php              |   4 +-
 library/includes/page_header.php              |  44 +-
 library/includes/posting_tpl.php              |   8 +-
 library/includes/sessions.php                 |   8 +-
 library/includes/torrent_show_dl_list.php     |  12 +-
 library/includes/ucp/activate.php             |  12 +-
 library/includes/ucp/bonus.php                |   2 +-
 library/includes/ucp/email.php                |   8 +-
 library/includes/ucp/register.php             |   8 +-
 library/includes/ucp/sendpasswd.php           |   6 +-
 library/includes/ucp/topic_watch.php          |  10 +-
 library/includes/ucp/viewprofile.php          |   8 +-
 library/includes/ucp/viewtorrent.php          |   4 +-
 login.php                                     |   8 +-
 memberlist.php                                |  14 +-
 modcp.php                                     |  74 ++--
 poll.php                                      |  16 +-
 posting.php                                   |  58 +--
 privmsg.php                                   | 376 +++++++++---------
 search.php                                    |  50 +--
 styles/templates/default/tpl_config.php       |   2 +-
 tracker.php                                   |  34 +-
 viewforum.php                                 |  50 +--
 viewtopic.php                                 | 114 +++---
 104 files changed, 1386 insertions(+), 1386 deletions(-)

diff --git a/_ide_helper.php b/_ide_helper.php
index b11cd182b..307a6de77 100644
--- a/_ide_helper.php
+++ b/_ide_helper.php
@@ -8,7 +8,7 @@
  */
 
 namespace {
-    exit("This file should not be included, only analyzed by your IDE");
+    exit('This file should not be included, only analyzed by your IDE');
 
     class Eloquent extends \Illuminate\Database\Eloquent\Model{
 
diff --git a/admin/stats/tr_stats.php b/admin/stats/tr_stats.php
index 398079b8d..3a07c08b3 100644
--- a/admin/stats/tr_stats.php
+++ b/admin/stats/tr_stats.php
@@ -31,7 +31,7 @@ echo '<br /><br /><table border="1" cellspacing="0" cellpadding="6" align="cente
 
 foreach ($sql as $i => $query) {
     $row = mysqli_fetch_row(OLD_DB()->query($query));
-    echo "<tr><td>" . trans('messages.TR_STATS.' . $i) . "</td><td><b>{$row[0]}</b></td>";
+    echo '<tr><td>' . trans('messages.TR_STATS.' . $i) . "</td><td><b>{$row[0]}</b></td>";
 }
 
 echo '</table>';
diff --git a/bt/announce.php b/bt/announce.php
index fe5ed95e7..e410d09f6 100644
--- a/bt/announce.php
+++ b/bt/announce.php
@@ -185,8 +185,8 @@ if ($stopped) {
 
 // Get last peer info from DB
 if (!OLD_CACHE('tr_cache')->used && !$lp_info) {
-    $lp_info = OLD_DB()->fetch_row("
-		SELECT * FROM " . BB_BT_TRACKER . " WHERE peer_hash = '$peer_hash' LIMIT 1
+    $lp_info = OLD_DB()->fetch_row('
+		SELECT * FROM ' . BB_BT_TRACKER . " WHERE peer_hash = '$peer_hash' LIMIT 1
 	");
 
     if (DBG_LOG) {
@@ -208,10 +208,10 @@ if ($lp_info) {
     $info_hash_sql = rtrim(OLD_DB()->escape($info_hash), ' ');
     $passkey_sql = OLD_DB()->escape($passkey);
 
-    $sql = "
+    $sql = '
 		SELECT tor.topic_id, tor.poster_id, tor.tor_type, u.*
-		FROM " . BB_BT_TORRENTS . " tor
-		LEFT JOIN " . BB_BT_USERS . " u ON u.auth_key = '$passkey_sql'
+		FROM ' . BB_BT_TORRENTS . ' tor
+		LEFT JOIN ' . BB_BT_USERS . " u ON u.auth_key = '$passkey_sql'
 		WHERE tor.info_hash = '$info_hash_sql'
 		LIMIT 1
 	";
@@ -248,16 +248,16 @@ if ($lp_info) {
 
         // Limit active torrents
         if (null === config('tp.unlimited_users.' . $user_id) && config('tracker.limit_active_tor') && ((config('tracker.limit_seed_count') && $seeder) || (config('tracker.limit_leech_count') && !$seeder))) {
-            $sql = "SELECT COUNT(DISTINCT topic_id) AS active_torrents
-				FROM " . BB_BT_TRACKER . "
+            $sql = 'SELECT COUNT(DISTINCT topic_id) AS active_torrents
+				FROM ' . BB_BT_TRACKER . "
 				WHERE user_id = $user_id
 					AND seeder = $seeder
 					AND topic_id != $topic_id";
 
             if (!$seeder && config('tracker.leech_expire_factor') && $user_ratio < 0.5) {
-                $sql .= " AND update_time > " . (TIMENOW - 60 * config('tracker.leech_expire_factor'));
+                $sql .= ' AND update_time > ' . (TIMENOW - 60 * config('tracker.leech_expire_factor'));
             }
-            $sql .= "	GROUP BY user_id";
+            $sql .= '	GROUP BY user_id';
 
             if ($row = OLD_DB()->fetch_row($sql)) {
                 if ($seeder && config('tracker.limit_seed_count') && $row['active_torrents'] >= config('tracker.limit_seed_count')) {
@@ -270,17 +270,17 @@ if ($lp_info) {
 
         // Limit concurrent IPs
         if (config('tracker.limit_concurrent_ips') && ((config('tracker.limit_seed_ips') && $seeder) || (config('tracker.limit_leech_ips') && !$seeder))) {
-            $sql = "SELECT COUNT(DISTINCT ip) AS ips
-				FROM " . BB_BT_TRACKER . "
+            $sql = 'SELECT COUNT(DISTINCT ip) AS ips
+				FROM ' . BB_BT_TRACKER . "
 				WHERE topic_id = $topic_id
 					AND user_id = $user_id
 					AND seeder = $seeder
 					AND ip != '$ip_sql'";
 
             if (!$seeder && config('tracker.leech_expire_factor')) {
-                $sql .= " AND update_time > " . (TIMENOW - 60 * config('tracker.leech_expire_factor'));
+                $sql .= ' AND update_time > ' . (TIMENOW - 60 * config('tracker.leech_expire_factor'));
             }
-            $sql .= "	GROUP BY topic_id";
+            $sql .= '	GROUP BY topic_id';
 
             if ($row = OLD_DB()->fetch_row($sql)) {
                 if ($seeder && config('tracker.limit_seed_ips') && $row['ips'] >= config('tracker.limit_seed_ips')) {
@@ -329,7 +329,7 @@ $peer_info_updated = false;
 $update_time = $stopped ? 0 : TIMENOW;
 
 if ($lp_info) {
-    $sql = "UPDATE " . BB_BT_TRACKER . " SET update_time = $update_time";
+    $sql = 'UPDATE ' . BB_BT_TRACKER . " SET update_time = $update_time";
 
     $sql .= ", seeder = $seeder";
     $sql .= ($releaser != $lp_info['releaser']) ? ", releaser = $releaser" : '';
@@ -347,7 +347,7 @@ if ($lp_info) {
     $sql .= ", speed_down = $speed_down";
 
     $sql .= " WHERE peer_hash = '$peer_hash'";
-    $sql .= " LIMIT 1";
+    $sql .= ' LIMIT 1';
 
     OLD_DB()->query($sql);
 
@@ -362,7 +362,7 @@ if (!$lp_info || !$peer_info_updated) {
     $columns = 'peer_hash,    topic_id,  user_id,   ip,       port,  seeder,  releaser, tor_type,  uploaded,  downloaded, remain, speed_up,  speed_down,  up_add,  down_add,  update_time';
     $values = "'$peer_hash', $topic_id, $user_id, '$ip_sql', $port, $seeder, $releaser, $tor_type, $uploaded, $downloaded, $left, $speed_up, $speed_down, $up_add, $down_add, $update_time";
 
-    OLD_DB()->query("REPLACE INTO " . BB_BT_TRACKER . " ($columns) VALUES ($values)");
+    OLD_DB()->query('REPLACE INTO ' . BB_BT_TRACKER . " ($columns) VALUES ($values)");
 
     if (DBG_LOG) {
         dbg_log(' ', 'this_peer-insert');
@@ -404,9 +404,9 @@ if (!$output) {
     $numwant = (int)config('tracker.numwant');
     $compact_mode = (config('tracker.compact_mode') || !empty($compact));
 
-    $rowset = OLD_DB()->fetch_rowset("
+    $rowset = OLD_DB()->fetch_rowset('
 		SELECT ip, port
-		FROM " . BB_BT_TRACKER . "
+		FROM ' . BB_BT_TRACKER . "
 		WHERE topic_id = $topic_id
 		ORDER BY RAND()
 		LIMIT $numwant
@@ -433,9 +433,9 @@ if (!$output) {
     $leechers = 0;
 
     if (config('tracker.scrape')) {
-        $row = OLD_DB()->fetch_row("
+        $row = OLD_DB()->fetch_row('
 			SELECT seeders, leechers
-			FROM " . BB_BT_TRACKER_SNAP . "
+			FROM ' . BB_BT_TRACKER_SNAP . "
 			WHERE topic_id = $topic_id
 			LIMIT 1
 		");
diff --git a/bt/scrape.php b/bt/scrape.php
index dd66aadc9..c83937af8 100644
--- a/bt/scrape.php
+++ b/bt/scrape.php
@@ -45,10 +45,10 @@ require __DIR__ . '/includes/init_tr.php';
 
 $info_hash_sql = rtrim(OLD_DB()->escape($info_hash), ' ');
 
-$row = OLD_DB()->fetch_row("
+$row = OLD_DB()->fetch_row('
 		SELECT tor.complete_count, snap.seeders, snap.leechers
-		FROM " . BB_BT_TORRENTS . " tor
-		LEFT JOIN " . BB_BT_TRACKER_SNAP . " snap ON (snap.topic_id = tor.topic_id)
+		FROM ' . BB_BT_TORRENTS . ' tor
+		LEFT JOIN ' . BB_BT_TRACKER_SNAP . " snap ON (snap.topic_id = tor.topic_id)
 		WHERE tor.info_hash = '$info_hash_sql'
 		LIMIT 1
 ");
diff --git a/callseed.php b/callseed.php
index d85a780ca..c1e69385c 100644
--- a/callseed.php
+++ b/callseed.php
@@ -29,24 +29,24 @@ if ($t_data['seeders'] > 2) {
 
 $ban_user_id = [];
 
-$sql = OLD_DB()->fetch_rowset("SELECT ban_userid FROM " . BB_BANLIST . " WHERE ban_userid != 0");
+$sql = OLD_DB()->fetch_rowset('SELECT ban_userid FROM ' . BB_BANLIST . ' WHERE ban_userid != 0');
 
 foreach ($sql as $row) {
     $ban_user_id[] = ',' . $row['ban_userid'];
 }
 $ban_user_id = implode('', $ban_user_id);
 
-$user_list = OLD_DB()->fetch_rowset("
+$user_list = OLD_DB()->fetch_rowset('
 	SELECT DISTINCT dl.user_id, u.user_opt, tr.user_id as active_dl
-	FROM " . BB_BT_DLSTATUS . " dl
-	LEFT JOIN " . BB_USERS . " u  ON(u.user_id = dl.user_id)
-	LEFT JOIN " . BB_BT_TRACKER . " tr ON(tr.user_id = dl.user_id)
+	FROM ' . BB_BT_DLSTATUS . ' dl
+	LEFT JOIN ' . BB_USERS . ' u  ON(u.user_id = dl.user_id)
+	LEFT JOIN ' . BB_BT_TRACKER . " tr ON(tr.user_id = dl.user_id)
 	WHERE dl.topic_id = $topic_id
-		AND dl.user_status IN (" . DL_STATUS_COMPLETE . ", " . DL_STATUS_DOWN . ")
-		AND dl.user_id NOT IN ({$userdata['user_id']}, " . EXCLUDED_USERS . $ban_user_id . ")
+		AND dl.user_status IN (" . DL_STATUS_COMPLETE . ', ' . DL_STATUS_DOWN . ")
+		AND dl.user_id NOT IN ({$userdata['user_id']}, " . EXCLUDED_USERS . $ban_user_id . ')
 		AND u.user_active = 1
 	GROUP BY dl.user_id
-");
+');
 
 $subject = sprintf(trans('messages.CALLSEED_SUBJECT'), $t_data['topic_title']);
 $message = sprintf(trans('messages.CALLSEED_TEXT'), make_url(TOPIC_URL . $topic_id), $t_data['topic_title'], make_url(DOWNLOAD_URL . $t_data['attach_id']));
@@ -65,20 +65,20 @@ if ($user_list) {
     send_pm($t_data['poster_id'], $subject, $message, BOT_UID);
 }
 
-OLD_DB()->query("UPDATE " . BB_BT_TORRENTS . " SET call_seed_time = " . TIMENOW . " WHERE topic_id = $topic_id");
+OLD_DB()->query('UPDATE ' . BB_BT_TORRENTS . ' SET call_seed_time = ' . TIMENOW . " WHERE topic_id = $topic_id");
 
 meta_refresh(TOPIC_URL . $topic_id);
 bb_die(trans('messages.CALLSEED_MSG_OK'));
 
 function topic_info($topic_id)
 {
-    $sql = "
+    $sql = '
 		SELECT
 			tor.poster_id, tor.forum_id, tor.attach_id, tor.call_seed_time,
 			t.topic_title, sn.seeders
-		FROM      " . BB_BT_TORRENTS . " tor
-		LEFT JOIN " . BB_TOPICS . " t  USING(topic_id)
-		LEFT JOIN " . BB_BT_TRACKER_SNAP . " sn USING(topic_id)
+		FROM      ' . BB_BT_TORRENTS . ' tor
+		LEFT JOIN ' . BB_TOPICS . ' t  USING(topic_id)
+		LEFT JOIN ' . BB_BT_TRACKER_SNAP . " sn USING(topic_id)
 		WHERE tor.topic_id = $topic_id
 	";
 
diff --git a/common.php b/common.php
index c65833fe1..360d105db 100644
--- a/common.php
+++ b/common.php
@@ -410,7 +410,7 @@ function log_request($file = '', $prepend_str = false, $add_post = true)
     }
 
     if (!empty($_POST) && $add_post) {
-        $str[] = "post: " . str_compact(urldecode(http_build_query($_POST)));
+        $str[] = 'post: ' . str_compact(urldecode(http_build_query($_POST)));
     }
     $str = implode("\t", $str) . "\n";
     bb_log($str, $file);
diff --git a/dl.php b/dl.php
index 595396d56..806830c43 100644
--- a/dl.php
+++ b/dl.php
@@ -31,7 +31,7 @@ function send_file_to_browser($attachment, $upload_dir)
     $gotit = false;
 
     if (@!file_exists(@amod_realpath($filename))) {
-        bb_die(trans('messages.ERROR_NO_ATTACHMENT') . "<br /><br />" . $filename . "<br /><br />" . trans('messages.TOR_NOT_FOUND'));
+        bb_die(trans('messages.ERROR_NO_ATTACHMENT') . '<br /><br />' . $filename . '<br /><br />' . trans('messages.TOR_NOT_FOUND'));
     } else {
         $gotit = true;
     }
@@ -67,7 +67,7 @@ function send_file_to_browser($attachment, $upload_dir)
         }
         readfile($filename);
     } else {
-        bb_die(trans('messages.ERROR_NO_ATTACHMENT') . "<br /><br />" . $filename . "<br /><br />" . trans('messages.TOR_NOT_FOUND'));
+        bb_die(trans('messages.ERROR_NO_ATTACHMENT') . '<br /><br />' . $filename . '<br /><br />' . trans('messages.TOR_NOT_FOUND'));
     }
 
     exit;
diff --git a/dl_list.php b/dl_list.php
index 4c59bfda0..80fcc7557 100644
--- a/dl_list.php
+++ b/dl_list.php
@@ -39,10 +39,10 @@ if ($mode == 'set_dl_status' || $mode == 'set_topics_dl_status') {
 $full_url = isset($_POST['full_url']) ? str_replace('&amp;', '&', htmlspecialchars($_POST['full_url'])) : '';
 
 if (isset($_POST['redirect_type']) && $_POST['redirect_type'] == 'search') {
-    $redirect_type = "search.php";
+    $redirect_type = 'search.php';
     $redirect = $full_url ?: "$dl_key=1";
 } else {
-    $redirect_type = (!$topic_id) ? "viewforum.php" : "viewtopic.php";
+    $redirect_type = (!$topic_id) ? 'viewforum.php' : 'viewtopic.php';
     $redirect = $full_url ?: ((!$topic_id) ? POST_FORUM_URL . "=$forum_id" : POST_TOPIC_URL . "=$topic_id");
 }
 
@@ -64,7 +64,7 @@ if (isset($_POST['cancel']) && $_POST['cancel']) {
 // Delete DL-list
 if ($mode == 'dl_delete' && $topic_id) {
     if (!IS_ADMIN) {
-        $sql = "SELECT forum_id FROM " . BB_TOPICS . " WHERE topic_id = $topic_id LIMIT 1";
+        $sql = 'SELECT forum_id FROM ' . BB_TOPICS . " WHERE topic_id = $topic_id LIMIT 1";
 
         if (!$row = OLD_DB()->sql_fetchrow(OLD_DB()->sql_query($sql))) {
             bb_die('Could not obtain forum_id for this topic');
@@ -112,7 +112,7 @@ if ($mode == 'set_topics_dl_status') {
 
 // Get existing topics
 if ($req_topics_sql = implode(',', $req_topics_ary)) {
-    $sql = "SELECT topic_id FROM " . BB_TOPICS . " WHERE topic_id IN($req_topics_sql)";
+    $sql = 'SELECT topic_id FROM ' . BB_TOPICS . " WHERE topic_id IN($req_topics_sql)";
 
     foreach (OLD_DB()->fetch_rowset($sql) as $row) {
         $topics_ary[] = $row['topic_id'];
@@ -131,9 +131,9 @@ if ($topics_ary && ($mode == 'set_dl_status' || $mode == 'set_topics_dl_status')
     }
     $new_dlstatus_sql = OLD_DB()->build_array('MULTI_INSERT', $new_dlstatus_ary);
 
-    OLD_DB()->query("REPLACE INTO " . BB_BT_DLSTATUS . " $new_dlstatus_sql");
+    OLD_DB()->query('REPLACE INTO ' . BB_BT_DLSTATUS . " $new_dlstatus_sql");
 
     redirectToUrl("$redirect_type?$redirect");
 }
 
-redirectToUrl("index.php");
+redirectToUrl('index.php');
diff --git a/feed.php b/feed.php
index ee6649e84..8fff8c79a 100644
--- a/feed.php
+++ b/feed.php
@@ -25,7 +25,7 @@ if (!$mode) {
 if ($mode == 'get_feed_url' && ($type == 'f' || $type == 'u') && $id >= 0) {
     if ($type == 'f') {
         // Check if the user has actually sent a forum ID
-        $sql = "SELECT allow_reg_tracker, forum_name FROM " . BB_FORUMS . " WHERE forum_id = $id LIMIT 1";
+        $sql = 'SELECT allow_reg_tracker, forum_name FROM ' . BB_FORUMS . " WHERE forum_id = $id LIMIT 1";
         if (!$forum_data = OLD_DB()->fetch_row($sql)) {
             if ($id == 0) {
                 $forum_data = array();
diff --git a/group.php b/group.php
index bff1ee874..e2c272d8a 100644
--- a/group.php
+++ b/group.php
@@ -26,11 +26,11 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$
     $joined = bb_date($row['user_regdate']);
     $user_time = (!empty($row['user_time'])) ? bb_date($row['user_time']) : trans('messages.NONE');
     $posts = $row['user_posts'] ?: 0;
-    $pm = '<a class="txtb" href="' . (PM_URL . "?mode=post&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '">' . trans('messages.SEND_PM_TXTB') . '</a>';
+    $pm = '<a class="txtb" href="' . (PM_URL . '?mode=post&amp;' . POST_USERS_URL . '=' . $row['user_id']) . '">' . trans('messages.SEND_PM_TXTB') . '</a>';
     $avatar = get_avatar($row['user_id'], $row['avatar_ext_id'], !bf($row['user_opt'], 'user_opt', 'dis_avatar'), '', 50, 50);
 
     if (bf($row['user_opt'], 'user_opt', 'user_viewemail') || $group_mod) {
-        $email_uri = config('tp.board_email_form') ? ("profile.php?mode=email&amp;" . POST_USERS_URL . "=" . $row['user_id']) : 'mailto:' . $row['user_email'];
+        $email_uri = config('tp.board_email_form') ? ('profile.php?mode=email&amp;' . POST_USERS_URL . '=' . $row['user_id']) : 'mailto:' . $row['user_email'];
         $email = '<a class="editable" href="' . $email_uri . '">' . $row['user_email'] . '</a>';
     } else {
         $email = '';
@@ -82,16 +82,16 @@ if (!$group_id) {
 			IF(g.group_moderator = ug.user_id, 1, 0) AS is_group_mod,
 			COUNT(ug2.user_id) AS members, SUM(ug2.user_pending) AS candidates
 		FROM
-			" . BB_GROUPS . " g
+			" . BB_GROUPS . ' g
 		LEFT JOIN
-			" . BB_USER_GROUP . " ug ON
+			' . BB_USER_GROUP . ' ug ON
 			    ug.group_id = g.group_id
-			AND ug.user_id = " . $userdata['user_id'] . "
+			AND ug.user_id = ' . $userdata['user_id'] . '
 		LEFT JOIN
-			" . BB_USER_GROUP . " ug2 ON
+			' . BB_USER_GROUP . ' ug2 ON
 			    ug2.group_id = g.group_id
 		LEFT JOIN
-			" . BB_USERS . " u ON g.group_moderator = u.user_id
+			' . BB_USERS . ' u ON g.group_moderator = u.user_id
 		WHERE
 			g.group_single_user = 0
 		GROUP BY g.group_id
@@ -100,7 +100,7 @@ if (!$group_id) {
 			membership   DESC,
 			g.group_type ASC,
 			g.group_name ASC
-	";
+	';
 
     foreach (OLD_DB()->fetch_rowset($sql) as $row) {
         if ($row['is_group_mod']) {
@@ -173,14 +173,14 @@ if (!$group_id) {
         bb_die(trans('messages.THIS_CLOSED_GROUP'));
     }
 
-    $sql = "SELECT g.group_id, g.group_name, ug.user_id, u.user_email, u.username, u.user_lang
-		FROM " . BB_GROUPS . " g
-		LEFT JOIN " . BB_USERS . " u ON(u.user_id = g.group_moderator)
-		LEFT JOIN " . BB_USER_GROUP . " ug ON(ug.group_id = g.group_id AND ug.user_id = {$userdata['user_id']})
+    $sql = 'SELECT g.group_id, g.group_name, ug.user_id, u.user_email, u.username, u.user_lang
+		FROM ' . BB_GROUPS . ' g
+		LEFT JOIN ' . BB_USERS . ' u ON(u.user_id = g.group_moderator)
+		LEFT JOIN ' . BB_USER_GROUP . " ug ON(ug.group_id = g.group_id AND ug.user_id = {$userdata['user_id']})
 		WHERE g.group_id = $group_id
 			AND group_single_user = 0
-			AND g.group_type = " . GROUP_OPEN . "
-		LIMIT 1";
+			AND g.group_type = " . GROUP_OPEN . '
+		LIMIT 1';
 
     $row = $moderator = OLD_DB()->fetch_row($sql);
 
@@ -266,8 +266,8 @@ if (!$group_id) {
                 }
 
                 if (!empty($_POST['approve'])) {
-                    OLD_DB()->query("
-						UPDATE " . BB_USER_GROUP . " SET
+                    OLD_DB()->query('
+						UPDATE ' . BB_USER_GROUP . " SET
 							user_pending = 0
 						WHERE user_id IN($sql_in)
 							AND group_id = $group_id
@@ -275,8 +275,8 @@ if (!$group_id) {
 
                     update_user_level($sql_in);
                 } elseif (!empty($_POST['deny']) || !empty($_POST['remove'])) {
-                    OLD_DB()->query("
-						DELETE FROM " . BB_USER_GROUP . "
+                    OLD_DB()->query('
+						DELETE FROM ' . BB_USER_GROUP . "
 						WHERE user_id IN($sql_in)
 							AND group_id = $group_id
 					");
@@ -287,8 +287,8 @@ if (!$group_id) {
                 }
                 // Email users when they are approved
                 if (!empty($_POST['approve']) && config('tp.group_send_email')) {
-                    $sql_select = "SELECT username, user_email, user_lang
-						FROM " . BB_USERS . "
+                    $sql_select = 'SELECT username, user_email, user_lang
+						FROM ' . BB_USERS . "
 						WHERE user_id IN($sql_in)";
 
                     if (!$result = OLD_DB()->sql_query($sql_select)) {
@@ -319,20 +319,20 @@ if (!$group_id) {
     // END approve or deny
 
     // Get moderator details for this group
-    $group_moderator = OLD_DB()->fetch_row("
+    $group_moderator = OLD_DB()->fetch_row('
 		SELECT *
-		FROM " . BB_USERS . "
-		WHERE user_id = " . $group_info['group_moderator'] . "
-	");
+		FROM ' . BB_USERS . '
+		WHERE user_id = ' . $group_info['group_moderator'] . '
+	');
 
     // Current user membership
     $is_group_member = $is_group_pending_member = false;
 
-    $sql = "SELECT user_pending
-		FROM " . BB_USER_GROUP . "
+    $sql = 'SELECT user_pending
+		FROM ' . BB_USER_GROUP . "
 		WHERE group_id = $group_id
-			AND user_id = " . $userdata['user_id'] . "
-		LIMIT 1";
+			AND user_id = " . $userdata['user_id'] . '
+		LIMIT 1';
 
     if ($row = OLD_DB()->fetch_row($sql)) {
         if ($row['user_pending'] == 0) {
@@ -405,10 +405,10 @@ if (!$group_id) {
         'MOD_EMAIL' => $email,
         'MOD_WWW' => $www,
         'MOD_TIME' => (!empty($group_info['mod_time'])) ? bb_date($group_info['mod_time']) : trans('messages.NONE'),
-        'U_SEARCH_USER' => "search.php?mode=searchuser",
+        'U_SEARCH_USER' => 'search.php?mode=searchuser',
         'U_SEARCH_RELEASES' => "tracker.php?srg=$group_id",
-        'U_GROUP_RELEASES' => "group.php?view=releases&amp;" . POST_GROUPS_URL . "=$group_id",
-        'U_GROUP_MEMBERS' => "group.php?view=members&amp;" . POST_GROUPS_URL . "=$group_id",
+        'U_GROUP_RELEASES' => 'group.php?view=releases&amp;' . POST_GROUPS_URL . "=$group_id",
+        'U_GROUP_MEMBERS' => 'group.php?view=members&amp;' . POST_GROUPS_URL . "=$group_id",
         'U_GROUP_CONFIG' => "group_edit.php?g=$group_id",
         'RELEASE_GROUP' => $group_info['release_group'] ? true : false,
         'GROUP_TYPE' => $group_type,
@@ -423,7 +423,7 @@ if (!$group_id) {
         'S_MODE_SELECT' => $select_sort_mode,
         'S_ORDER_SELECT' => $select_sort_order,
 
-        'S_GROUP_ACTION' => "group.php?" . POST_GROUPS_URL . "=$group_id",
+        'S_GROUP_ACTION' => 'group.php?' . POST_GROUPS_URL . "=$group_id",
     ));
 
     switch ($view_mode) {
@@ -436,26 +436,26 @@ if (!$group_id) {
             }
 
             // Count releases for pagination
-            $all_releases = OLD_DB()->fetch_rowset("
+            $all_releases = OLD_DB()->fetch_rowset('
 				SELECT p.topic_id, p.forum_id, p.poster_id, t.topic_title, t.topic_time, f.forum_name, u.username, u.avatar_ext_id, u.user_opt, u.user_rank
-				FROM " . BB_POSTS . " p
-				LEFT JOIN " . BB_TOPICS . " t ON(p.topic_id = t.topic_id)
-				LEFT JOIN " . BB_FORUMS . " f ON(p.forum_id= f.forum_id)
-				LEFT JOIN " . BB_USERS . " u ON(p.poster_id = u.user_id)
+				FROM ' . BB_POSTS . ' p
+				LEFT JOIN ' . BB_TOPICS . ' t ON(p.topic_id = t.topic_id)
+				LEFT JOIN ' . BB_FORUMS . ' f ON(p.forum_id= f.forum_id)
+				LEFT JOIN ' . BB_USERS . " u ON(p.poster_id = u.user_id)
 				WHERE p.poster_rg_id = $group_id
 				ORDER BY t.topic_time DESC
 				LIMIT $rel_limit
 			");
             $count_releases = count($all_releases);
 
-            generate_pagination(GROUP_URL . $group_id . "&amp;view=releases", $count_releases, $per_page, $start);
+            generate_pagination(GROUP_URL . $group_id . '&amp;view=releases', $count_releases, $per_page, $start);
 
-            $sql = "
+            $sql = '
 				SELECT p.topic_id, p.forum_id, p.poster_id, t.topic_title, t.topic_time, f.forum_name, u.username, u.avatar_ext_id, u.user_opt, u.user_rank
-				FROM " . BB_POSTS . " p
-				LEFT JOIN " . BB_TOPICS . " t ON(p.topic_id = t.topic_id)
-				LEFT JOIN " . BB_FORUMS . " f ON(p.forum_id= f.forum_id)
-				LEFT JOIN " . BB_USERS . " u ON(p.poster_id = u.user_id)
+				FROM ' . BB_POSTS . ' p
+				LEFT JOIN ' . BB_TOPICS . ' t ON(p.topic_id = t.topic_id)
+				LEFT JOIN ' . BB_FORUMS . ' f ON(p.forum_id= f.forum_id)
+				LEFT JOIN ' . BB_USERS . " u ON(p.poster_id = u.user_id)
 				WHERE p.poster_rg_id = $group_id
 				ORDER BY t.topic_time DESC
 				LIMIT $start, $per_page
@@ -490,24 +490,24 @@ if (!$group_id) {
         default:
 
             // Members
-            $count_members = OLD_DB()->fetch_rowset("
+            $count_members = OLD_DB()->fetch_rowset('
 				SELECT u.username, u.user_rank, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, ug.user_pending, ug.user_time
-				FROM " . BB_USER_GROUP . " ug, " . BB_USERS . " u
+				FROM ' . BB_USER_GROUP . ' ug, ' . BB_USERS . " u
 				WHERE ug.group_id = $group_id
 					AND ug.user_pending = 0
-					AND ug.user_id <> " . $group_moderator['user_id'] . "
+					AND ug.user_id <> " . $group_moderator['user_id'] . '
 					AND u.user_id = ug.user_id
 				ORDER BY u.username
-			");
+			');
             $count_members = count($count_members);
 
             // Get user information for this group
             $modgroup_pending_count = 0;
 
             // Members
-            $group_members = OLD_DB()->fetch_rowset("
+            $group_members = OLD_DB()->fetch_rowset('
 				SELECT u.username, u.avatar_ext_id, u.user_rank, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, ug.user_pending, ug.user_time
-				FROM " . BB_USER_GROUP . " ug, " . BB_USERS . " u
+				FROM ' . BB_USER_GROUP . ' ug, ' . BB_USERS . " u
 				WHERE ug.group_id = $group_id
 					AND ug.user_pending = 0
 					AND ug.user_id <> " . $group_moderator['user_id'] . "
@@ -561,9 +561,9 @@ if (!$group_id) {
 
             // Pending
             if ($is_moderator) {
-                $modgroup_pending_list = OLD_DB()->fetch_rowset("
+                $modgroup_pending_list = OLD_DB()->fetch_rowset('
 					SELECT u.username, u.avatar_ext_id, u.user_rank, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email
-					FROM " . BB_USER_GROUP . " ug, " . BB_USERS . " u
+					FROM ' . BB_USER_GROUP . ' ug, ' . BB_USERS . " u
 					WHERE ug.group_id = $group_id
 						AND ug.user_pending = 1
 						AND u.user_id = ug.user_id
diff --git a/group_edit.php b/group_edit.php
index 3394eeb6b..9fe771f2d 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -39,13 +39,13 @@ if ($is_moderator) {
         if (!empty($_FILES['avatar']['name']) && config('tp.group_avatars.up_allowed')) {
             $upload = new TorrentPier\Legacy\Common\Upload();
 
-            if ($upload->init(config('tp.group_avatars'), $_FILES['avatar']) and $upload->store('avatar', array("user_id" => GROUP_AVATAR_MASK . $group_id, "avatar_ext_id" => $group_info['avatar_ext_id']))) {
+            if ($upload->init(config('tp.group_avatars'), $_FILES['avatar']) and $upload->store('avatar', array('user_id' => GROUP_AVATAR_MASK . $group_id, 'avatar_ext_id' => $group_info['avatar_ext_id']))) {
                 $avatar_ext_id = (int)$upload->file_ext_id;
             } else {
                 bb_die(implode($upload->errors));
             }
 
-            OLD_DB()->query("UPDATE " . BB_GROUPS . " SET avatar_ext_id = $avatar_ext_id WHERE group_id = $group_id");
+            OLD_DB()->query('UPDATE ' . BB_GROUPS . " SET avatar_ext_id = $avatar_ext_id WHERE group_id = $group_id");
         }
     }
 
@@ -76,7 +76,7 @@ if ($is_moderator) {
         'S_GROUP_CLOSED_CHECKED' => ($group_info['group_type'] == GROUP_CLOSED) ? ' checked="checked"' : '',
         'S_GROUP_HIDDEN_CHECKED' => ($group_info['group_type'] == GROUP_HIDDEN) ? ' checked="checked"' : '',
         'S_HIDDEN_FIELDS' => $s_hidden_fields,
-        'S_GROUP_CONFIG_ACTION' => "group_edit.php?" . POST_GROUPS_URL . "=$group_id",
+        'S_GROUP_CONFIG_ACTION' => 'group_edit.php?' . POST_GROUPS_URL . "=$group_id",
 
         'AVATAR_EXPLAIN' => sprintf(trans('messages.AVATAR_EXPLAIN'), config('tp.group_avatars.max_width'), config('tp.group_avatars.max_height'), round(config('tp.group_avatars.max_size') / 1024)),
         'AVATAR_IMG' => get_avatar(GROUP_AVATAR_MASK . $group_id, $group_info['avatar_ext_id']),
diff --git a/index.php b/index.php
index 10929184b..ef589ef37 100644
--- a/index.php
+++ b/index.php
@@ -74,7 +74,7 @@ $only_new = $user->opt_js['only_new'];
 
 // Validate requested category id
 if ($viewcat && !($viewcat =& $forums['c'][$viewcat]['cat_id'])) {
-    redirectToUrl("index.php");
+    redirectToUrl('index.php');
 }
 
 // Forums
@@ -88,14 +88,14 @@ $forums_join_sql .= $excluded_forums_csv ? "
 " : '';
 
 // Posts
-$posts_join_sql = "p.post_id = f.forum_last_post_id";
+$posts_join_sql = 'p.post_id = f.forum_last_post_id';
 $posts_join_sql .= ($only_new == ONLY_NEW_POSTS) ? "
 	AND p.post_time > $lastvisit
 " : '';
 $join_p_type = ($only_new == ONLY_NEW_POSTS) ? 'INNER JOIN' : 'LEFT JOIN';
 
 // Topics
-$topics_join_sql = "t.topic_last_post_id = p.post_id";
+$topics_join_sql = 't.topic_last_post_id = p.post_id';
 $topics_join_sql .= ($only_new == ONLY_NEW_TOPICS) ? "
 	AND t.topic_time > $lastvisit
 " : '';
@@ -108,13 +108,13 @@ $sql = "
 		t.topic_id AS last_topic_id, t.topic_title AS last_topic_title,
 		u.user_id AS last_post_user_id, u.user_rank AS last_post_user_rank,
 		IF(p.poster_id = $anon, p.post_username, u.username) AS last_post_username
-	FROM         " . BB_CATEGORIES . " c
-	INNER JOIN   " . BB_FORUMS . " f ON($forums_join_sql)
+	FROM         " . BB_CATEGORIES . ' c
+	INNER JOIN   ' . BB_FORUMS . " f ON($forums_join_sql)
 	$join_p_type " . BB_POSTS . " p ON($posts_join_sql)
 	$join_t_type " . BB_TOPICS . " t ON($topics_join_sql)
-	LEFT JOIN    " . BB_USERS . " u ON(u.user_id = p.poster_id)
+	LEFT JOIN    " . BB_USERS . ' u ON(u.user_id = p.poster_id)
 	ORDER BY c.cat_order, f.forum_order
-";
+';
 
 $replace_in_parent = array(
     'last_post_id',
@@ -191,7 +191,7 @@ foreach ($cat_forums as $cid => $c) {
     $template->assign_block_vars('h_c', array(
         'H_C_ID' => $cid,
         'H_C_TITLE' => $cat_title_html[$cid],
-        'H_C_CHEKED' => in_array($cid, preg_split("/[-]+/", $hide_cat_opt)) ? 'checked' : '',
+        'H_C_CHEKED' => in_array($cid, preg_split('/[-]+/', $hide_cat_opt)) ? 'checked' : '',
     ));
 
     $template->assign_vars(array(
@@ -297,10 +297,10 @@ $template->assign_vars(array(
     'ONLY_NEW_POSTS_ON' => $only_new == ONLY_NEW_POSTS,
     'ONLY_NEW_TOPICS_ON' => $only_new == ONLY_NEW_TOPICS,
 
-    'U_SEARCH_NEW' => "search.php?new=1",
+    'U_SEARCH_NEW' => 'search.php?new=1',
     'U_SEARCH_SELF_BY_MY' => "search.php?uid={$userdata['user_id']}&amp;o=1",
-    'U_SEARCH_LATEST' => "search.php?search_id=latest",
-    'U_SEARCH_UNANSWERED' => "search.php?search_id=unanswered",
+    'U_SEARCH_LATEST' => 'search.php?search_id=latest',
+    'U_SEARCH_UNANSWERED' => 'search.php?search_id=unanswered',
 
     'SHOW_LAST_TOPIC' => $show_last_topic,
 ));
diff --git a/library/TorrentPier/TorrentPier/Legacy/Attach.php b/library/TorrentPier/TorrentPier/Legacy/Attach.php
index e0d46d924..66eb10c55 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Attach.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Attach.php
@@ -847,7 +847,7 @@ class Attach
                     // Remove non-latin characters
                     $this->attach_filename = preg_replace('#([\xC2\xC3])([\x80-\xBF])#', 'chr(ord(\'$1\')<<6&0xC0|ord(\'$2\')&0x3F)', $this->attach_filename);
                     $this->attach_filename = rawurlencode($this->attach_filename);
-                    $this->attach_filename = preg_replace("/(%[0-9A-F]{1,2})/i", '', $this->attach_filename);
+                    $this->attach_filename = preg_replace('/(%[0-9A-F]{1,2})/i', '', $this->attach_filename);
                     $this->attach_filename = trim($this->attach_filename . time());
                 }
                 $this->attach_filename = str_replace(['&amp;', '&', ' '], '_', $this->attach_filename);
diff --git a/library/TorrentPier/TorrentPier/Legacy/Cache/File.php b/library/TorrentPier/TorrentPier/Legacy/Cache/File.php
index ea4f12534..053f7570b 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Cache/File.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Cache/File.php
@@ -91,7 +91,7 @@ class File extends Common
             if (is_dir($this->dir)) {
                 if ($dh = opendir($this->dir)) {
                     while (($file = readdir($dh)) !== false) {
-                        if ($file != "." && $file != "..") {
+                        if ($file != '.' && $file != '..') {
                             $filename = $this->dir . $file;
 
                             unlink($filename);
@@ -112,7 +112,7 @@ class File extends Common
         if (is_dir($this->dir)) {
             if ($dh = opendir($this->dir)) {
                 while (($file = readdir($dh)) !== false) {
-                    if ($file != "." && $file != "..") {
+                    if ($file != '.' && $file != '..') {
                         $filename = $this->dir . $file;
 
                         require $filename;
diff --git a/library/TorrentPier/TorrentPier/Legacy/Cache/Sqlite.php b/library/TorrentPier/TorrentPier/Legacy/Cache/Sqlite.php
index c8d4d00b7..d9c1e2b11 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Cache/Sqlite.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Cache/Sqlite.php
@@ -55,12 +55,12 @@ class Sqlite extends Common
         array_deep($name_sql, 'SQLite3::escapeString');
 
         // get available items
-        $rowset = $this->db->fetch_rowset("
+        $rowset = $this->db->fetch_rowset('
 			SELECT cache_name, cache_value
-			FROM " . $this->cfg['table_name'] . "
-			WHERE cache_name IN('$this->prefix_sql" . implode("','$this->prefix_sql", $name_sql) . "') AND cache_expire_time > " . TIMENOW . "
-			LIMIT " . count($name) . "
-		");
+			FROM ' . $this->cfg['table_name'] . "
+			WHERE cache_name IN('$this->prefix_sql" . implode("','$this->prefix_sql", $name_sql) . "') AND cache_expire_time > " . TIMENOW . '
+			LIMIT ' . count($name) . '
+		');
 
         $this->db->debug('start', 'unserialize()');
         foreach ($rowset as $row) {
@@ -90,7 +90,7 @@ class Sqlite extends Common
         $expire = TIMENOW + $ttl;
         $value_sql = SQLite3::escapeString(serialize($value));
 
-        $result = $this->db->query("REPLACE INTO " . $this->cfg['table_name'] . " (cache_name, cache_expire_time, cache_value) VALUES ('$name_sql', $expire, '$value_sql')");
+        $result = $this->db->query('REPLACE INTO ' . $this->cfg['table_name'] . " (cache_name, cache_expire_time, cache_value) VALUES ('$name_sql', $expire, '$value_sql')");
         return (bool)$result;
     }
 
@@ -98,16 +98,16 @@ class Sqlite extends Common
     {
         if ($name) {
             $this->db->shard($this->prefix . $name);
-            $result = $this->db->query("DELETE FROM " . $this->cfg['table_name'] . " WHERE cache_name = '" . SQLite3::escapeString($this->prefix . $name) . "'");
+            $result = $this->db->query('DELETE FROM ' . $this->cfg['table_name'] . " WHERE cache_name = '" . SQLite3::escapeString($this->prefix . $name) . "'");
         } else {
-            $result = $this->db->query("DELETE FROM " . $this->cfg['table_name']);
+            $result = $this->db->query('DELETE FROM ' . $this->cfg['table_name']);
         }
         return (bool)$result;
     }
 
     public function gc($expire_time = TIMENOW)
     {
-        $result = $this->db->query("DELETE FROM " . $this->cfg['table_name'] . " WHERE cache_expire_time < $expire_time");
+        $result = $this->db->query('DELETE FROM ' . $this->cfg['table_name'] . " WHERE cache_expire_time < $expire_time");
         return $result ? $this->db->changes() : 0;
     }
 }
diff --git a/library/TorrentPier/TorrentPier/Legacy/Cache/SqliteCommon.php b/library/TorrentPier/TorrentPier/Legacy/Cache/SqliteCommon.php
index a8bf50015..813d1e479 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Cache/SqliteCommon.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Cache/SqliteCommon.php
@@ -164,16 +164,16 @@ class SqliteCommon extends Common
     {
         if ($name) {
             $this->db->shard($this->prefix . $name);
-            $result = $this->db->query("DELETE FROM " . $this->cfg['table_name'] . " WHERE cache_name = '" . SQLite3::escapeString($this->prefix . $name) . "'");
+            $result = $this->db->query('DELETE FROM ' . $this->cfg['table_name'] . " WHERE cache_name = '" . SQLite3::escapeString($this->prefix . $name) . "'");
         } else {
-            $result = $this->db->query("DELETE FROM " . $this->cfg['table_name']);
+            $result = $this->db->query('DELETE FROM ' . $this->cfg['table_name']);
         }
         return (bool)$result;
     }
 
     public function gc($expire_time = TIMENOW)
     {
-        $result = $this->db->query("DELETE FROM " . $this->cfg['table_name'] . " WHERE cache_expire_time < $expire_time");
+        $result = $this->db->query('DELETE FROM ' . $this->cfg['table_name'] . " WHERE cache_expire_time < $expire_time");
         return $result ? sqlite_changes($this->db->dbh) : 0;
     }
 
diff --git a/library/TorrentPier/TorrentPier/Legacy/Common/User.php b/library/TorrentPier/TorrentPier/Legacy/Common/User.php
index 375aa1cd5..5b67a8d2e 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Common/User.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Common/User.php
@@ -110,23 +110,23 @@ class User
         if ($session_id || !$this->sessiondata['uk']) {
             $SQL = OLD_DB()->get_empty_sql_array();
 
-            $SQL['SELECT'][] = "u.*, s.*";
+            $SQL['SELECT'][] = 'u.*, s.*';
 
-            $SQL['FROM'][] = BB_SESSIONS . " s";
-            $SQL['INNER JOIN'][] = BB_USERS . " u ON(u.user_id = s.session_user_id)";
+            $SQL['FROM'][] = BB_SESSIONS . ' s';
+            $SQL['INNER JOIN'][] = BB_USERS . ' u ON(u.user_id = s.session_user_id)';
 
             if ($session_id) {
                 $SQL['WHERE'][] = "s.session_id = '$session_id'";
 
                 if (config('tp.torhelp_enabled')) {
-                    $SQL['SELECT'][] = "th.topic_id_csv AS torhelp";
-                    $SQL['LEFT JOIN'][] = BB_BT_TORHELP . " th ON(u.user_id = th.user_id)";
+                    $SQL['SELECT'][] = 'th.topic_id_csv AS torhelp';
+                    $SQL['LEFT JOIN'][] = BB_BT_TORHELP . ' th ON(u.user_id = th.user_id)';
                 }
 
                 $userdata_cache_id = $session_id;
             } else {
                 $SQL['WHERE'][] = "s.session_ip = '" . USER_IP . "'";
-                $SQL['WHERE'][] = "s.session_user_id = " . GUEST_UID;
+                $SQL['WHERE'][] = 's.session_user_id = ' . GUEST_UID;
 
                 $userdata_cache_id = USER_IP;
             }
@@ -159,9 +159,9 @@ class User
 
                 // Only update session a minute or so after last update
                 if ($update_sessions_table) {
-                    OLD_DB()->query("
-						UPDATE " . BB_SESSIONS . " SET
-							session_time = " . TIMENOW . "
+                    OLD_DB()->query('
+						UPDATE ' . BB_SESSIONS . ' SET
+							session_time = ' . TIMENOW . "
 						WHERE session_id = '$session_id'
 						LIMIT 1
 					");
@@ -234,7 +234,7 @@ class User
             $where_sql = 'ban_ip = ' . USER_IP;
             $where_sql .= $login ? " OR ban_userid = $user_id" : '';
 
-            $sql = "SELECT ban_id FROM " . BB_BANLIST . " WHERE $where_sql LIMIT 1";
+            $sql = 'SELECT ban_id FROM ' . BB_BANLIST . " WHERE $where_sql LIMIT 1";
 
             if (OLD_DB()->fetch_row($sql)) {
                 header('Location: https://torrentpier.com/banned/');
@@ -254,7 +254,7 @@ class User
                 'session_logged_in' => (int)$login,
                 'session_admin' => (int)$mod_admin_session,
             ]);
-            $sql = "INSERT INTO " . BB_SESSIONS . $args;
+            $sql = 'INSERT INTO ' . BB_SESSIONS . $args;
 
             if (OLD_DB()->query($sql)) {
                 break;
@@ -275,9 +275,9 @@ class User
             }
 
             if ($last_visit != $this->data['user_lastvisit']) {
-                OLD_DB()->query("
-					UPDATE " . BB_USERS . " SET
-						user_session_time = " . TIMENOW . ",
+                OLD_DB()->query('
+					UPDATE ' . BB_USERS . ' SET
+						user_session_time = ' . TIMENOW . ",
 						user_lastvisit = $last_visit,
 						user_last_ip = '" . USER_IP . "',
 						user_reg_ip = IF(user_reg_ip = '', '" . USER_IP . "', user_reg_ip)
@@ -326,17 +326,17 @@ class User
      */
     public function session_end($update_lastvisit = false, $set_cookie = true)
     {
-        OLD_DB()->query("
-			DELETE FROM " . BB_SESSIONS . "
+        OLD_DB()->query('
+			DELETE FROM ' . BB_SESSIONS . "
 			WHERE session_id = '{$this->data['session_id']}'
 		");
 
         if (!IS_GUEST) {
             if ($update_lastvisit) {
-                OLD_DB()->query("
-					UPDATE " . BB_USERS . " SET
-						user_session_time = " . TIMENOW . ",
-						user_lastvisit = " . TIMENOW . ",
+                OLD_DB()->query('
+					UPDATE ' . BB_USERS . ' SET
+						user_session_time = ' . TIMENOW . ',
+						user_lastvisit = ' . TIMENOW . ",
 						user_last_ip = '" . USER_IP . "',
 						user_reg_ip = IF(user_reg_ip = '', '" . USER_IP . "', user_reg_ip)
 					WHERE user_id = {$this->data['user_id']}
@@ -347,8 +347,8 @@ class User
             if (isset($_REQUEST['reset_autologin'])) {
                 $this->create_autologin_id($this->data, false);
 
-                OLD_DB()->query("
-					DELETE FROM " . BB_SESSIONS . "
+                OLD_DB()->query('
+					DELETE FROM ' . BB_SESSIONS . "
 					WHERE session_user_id = '{$this->data['user_id']}'
 				");
             }
@@ -376,15 +376,15 @@ class User
             $username_sql = str_replace("\\'", "''", $username);
             $password_sql = md5(md5($password));
 
-            $sql = "
+            $sql = '
 				SELECT *
-				FROM " . BB_USERS . "
+				FROM ' . BB_USERS . "
 				WHERE username = '$username_sql'
 				  AND user_password = '$password_sql'
 				  AND user_active = 1
-				  AND user_id != " . GUEST_UID . "
+				  AND user_id != " . GUEST_UID . '
 				LIMIT 1
-			";
+			';
 
             if ($userdata = OLD_DB()->fetch_row($sql)) {
                 if (!$userdata['username'] || !$userdata['user_password'] || $userdata['user_id'] == GUEST_UID || md5(md5($password)) !== $userdata['user_password'] || !$userdata['user_active']) {
@@ -393,10 +393,10 @@ class User
 
                 // Start mod/admin session
                 if ($mod_admin_login) {
-                    OLD_DB()->query("
-						UPDATE " . BB_SESSIONS . " SET
-							session_admin = " . $this->data['user_level'] . "
-						WHERE session_user_id = " . $this->data['user_id'] . "
+                    OLD_DB()->query('
+						UPDATE ' . BB_SESSIONS . ' SET
+							session_admin = ' . $this->data['user_level'] . '
+						WHERE session_user_id = ' . $this->data['user_id'] . "
 							AND session_id = '" . $this->data['session_id'] . "'
 					");
                     $this->data['session_admin'] = $this->data['user_level'];
@@ -407,15 +407,15 @@ class User
 
                 if ($new_session_userdata = $this->session_create($userdata, false)) {
                     // Removing guest sessions from this IP
-                    OLD_DB()->query("
-						DELETE FROM " . BB_SESSIONS . "
+                    OLD_DB()->query('
+						DELETE FROM ' . BB_SESSIONS . "
 						WHERE session_ip = '" . USER_IP . "'
-							AND session_user_id = " . GUEST_UID . "
-					");
+							AND session_user_id = " . GUEST_UID . '
+					');
 
                     return $new_session_userdata;
                 } else {
-                    trigger_error("Could not start session : login", E_USER_ERROR);
+                    trigger_error('Could not start session : login', E_USER_ERROR);
                 }
             }
         }
@@ -519,12 +519,12 @@ class User
     {
         $autologin_id = $create_new ? make_rand_str(LOGIN_KEY_LENGTH) : '';
 
-        OLD_DB()->query("
-			UPDATE " . BB_USERS . " SET
+        OLD_DB()->query('
+			UPDATE ' . BB_USERS . " SET
 				autologin_id = '$autologin_id'
-			WHERE user_id = " . (int)$userdata['user_id'] . "
+			WHERE user_id = " . (int)$userdata['user_id'] . '
 			LIMIT 1
-		");
+		');
 
         return $autologin_id;
     }
@@ -585,9 +585,9 @@ class User
     {
         if ($type === 'all_forums') {
             // Update session time
-            OLD_DB()->query("
-				UPDATE " . BB_SESSIONS . " SET
-					session_time = " . TIMENOW . "
+            OLD_DB()->query('
+				UPDATE ' . BB_SESSIONS . ' SET
+					session_time = ' . TIMENOW . "
 				WHERE session_id = '{$this->data['session_id']}'
 				LIMIT 1
 			");
diff --git a/library/TorrentPier/TorrentPier/Legacy/Datastore/File.php b/library/TorrentPier/TorrentPier/Legacy/Datastore/File.php
index 9ff225f7b..8ed387a79 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Datastore/File.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Datastore/File.php
@@ -54,7 +54,7 @@ class File extends Common
         if (is_dir($dir)) {
             if ($dh = opendir($dir)) {
                 while (($file = readdir($dh)) !== false) {
-                    if ($file != "." && $file != "..") {
+                    if ($file != '.' && $file != '..') {
                         $filename = $dir . $file;
 
                         unlink($filename);
diff --git a/library/TorrentPier/TorrentPier/Legacy/Datastore/Sqlite.php b/library/TorrentPier/TorrentPier/Legacy/Datastore/Sqlite.php
index 4b2450206..7b0d9a21e 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Datastore/Sqlite.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Datastore/Sqlite.php
@@ -47,14 +47,14 @@ class Sqlite extends Common
         $ds_title = SQLite3::escapeString($this->prefix . $item_name);
         $ds_data = SQLite3::escapeString(serialize($item_data));
 
-        $result = $this->db->query("REPLACE INTO " . $this->cfg['table_name'] . " (ds_title, ds_data) VALUES ('$ds_title', '$ds_data')");
+        $result = $this->db->query('REPLACE INTO ' . $this->cfg['table_name'] . " (ds_title, ds_data) VALUES ('$ds_title', '$ds_data')");
 
         return (bool)$result;
     }
 
     public function clean()
     {
-        $this->db->query("DELETE FROM " . $this->cfg['table_name']);
+        $this->db->query('DELETE FROM ' . $this->cfg['table_name']);
     }
 
     public function _fetch_from_store()
@@ -69,9 +69,9 @@ class Sqlite extends Common
         array_deep($items, 'SQLite3::escapeString');
         $items_list = $prefix_sql . implode("','$prefix_sql", $items);
 
-        $rowset = $this->db->fetch_rowset("SELECT ds_title, ds_data FROM " . $this->cfg['table_name'] . " WHERE ds_title IN ('$items_list')");
+        $rowset = $this->db->fetch_rowset('SELECT ds_title, ds_data FROM ' . $this->cfg['table_name'] . " WHERE ds_title IN ('$items_list')");
 
-        $this->db->debug('start', "unserialize()");
+        $this->db->debug('start', 'unserialize()');
         foreach ($rowset as $row) {
             $this->data[substr($row['ds_title'], $prefix_len)] = unserialize($row['ds_data']);
         }
diff --git a/library/TorrentPier/TorrentPier/Legacy/Datastore/SqliteCommon.php b/library/TorrentPier/TorrentPier/Legacy/Datastore/SqliteCommon.php
index e3436158e..69f6f85a9 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Datastore/SqliteCommon.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Datastore/SqliteCommon.php
@@ -164,16 +164,16 @@ class SqliteCommon extends Common
     {
         if ($name) {
             $this->db->shard($this->prefix . $name);
-            $result = $this->db->query("DELETE FROM " . $this->cfg['table_name'] . " WHERE cache_name = '" . SQLite3::escapeString($this->prefix . $name) . "'");
+            $result = $this->db->query('DELETE FROM ' . $this->cfg['table_name'] . " WHERE cache_name = '" . SQLite3::escapeString($this->prefix . $name) . "'");
         } else {
-            $result = $this->db->query("DELETE FROM " . $this->cfg['table_name']);
+            $result = $this->db->query('DELETE FROM ' . $this->cfg['table_name']);
         }
         return (bool)$result;
     }
 
     public function gc($expire_time = TIMENOW)
     {
-        $result = $this->db->query("DELETE FROM " . $this->cfg['table_name'] . " WHERE cache_expire_time < $expire_time");
+        $result = $this->db->query('DELETE FROM ' . $this->cfg['table_name'] . " WHERE cache_expire_time < $expire_time");
         return $result ? sqlite_changes($this->db->dbh) : 0;
     }
 
diff --git a/library/TorrentPier/TorrentPier/Legacy/LogAction.php b/library/TorrentPier/TorrentPier/Legacy/LogAction.php
index d0c6bebc6..93db899d9 100644
--- a/library/TorrentPier/TorrentPier/Legacy/LogAction.php
+++ b/library/TorrentPier/TorrentPier/Legacy/LogAction.php
@@ -84,7 +84,7 @@ class LogAction
         ];
         $sql_args = OLD_DB()->build_array('INSERT', $sql_ary);
 
-        OLD_DB()->query("INSERT INTO " . BB_LOG . " $sql_args");
+        OLD_DB()->query('INSERT INTO ' . BB_LOG . " $sql_args");
     }
 
     /**
diff --git a/library/TorrentPier/TorrentPier/Legacy/Poll.php b/library/TorrentPier/TorrentPier/Legacy/Poll.php
index da00c163d..73aac67bf 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Poll.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Poll.php
@@ -74,9 +74,9 @@ class Poll
         }
         $sql_args = OLD_DB()->build_array('MULTI_INSERT', $sql_ary);
 
-        OLD_DB()->query("REPLACE INTO " . BB_POLL_VOTES . $sql_args);
+        OLD_DB()->query('REPLACE INTO ' . BB_POLL_VOTES . $sql_args);
 
-        OLD_DB()->query("UPDATE " . BB_TOPICS . " SET topic_vote = 1 WHERE topic_id = $topic_id");
+        OLD_DB()->query('UPDATE ' . BB_TOPICS . " SET topic_vote = 1 WHERE topic_id = $topic_id");
     }
 
     /**
@@ -86,7 +86,7 @@ class Poll
      */
     public function delete_poll($topic_id)
     {
-        OLD_DB()->query("UPDATE " . BB_TOPICS . " SET topic_vote = 0 WHERE topic_id = $topic_id");
+        OLD_DB()->query('UPDATE ' . BB_TOPICS . " SET topic_vote = 0 WHERE topic_id = $topic_id");
         $this->delete_votes_data($topic_id);
     }
 
@@ -97,8 +97,8 @@ class Poll
      */
     public function delete_votes_data($topic_id)
     {
-        OLD_DB()->query("DELETE FROM " . BB_POLL_VOTES . " WHERE topic_id = $topic_id");
-        OLD_DB()->query("DELETE FROM " . BB_POLL_USERS . " WHERE topic_id = $topic_id");
+        OLD_DB()->query('DELETE FROM ' . BB_POLL_VOTES . " WHERE topic_id = $topic_id");
+        OLD_DB()->query('DELETE FROM ' . BB_POLL_USERS . " WHERE topic_id = $topic_id");
         OLD_CACHE('bb_poll_data')->rm("poll_$topic_id");
     }
 }
diff --git a/library/TorrentPier/TorrentPier/Legacy/Sitemap.php b/library/TorrentPier/TorrentPier/Legacy/Sitemap.php
index 137343ec5..40618bffb 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Sitemap.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Sitemap.php
@@ -37,7 +37,7 @@ class Sitemap
         $not_forums_id = $forums['not_auth_forums']['guest_view'];
         $ignore_forum_sql = $not_forums_id ? "WHERE forum_id NOT IN($not_forums_id)" : '';
 
-        $sql = OLD_DB()->sql_query("SELECT forum_id, forum_name FROM " . BB_FORUMS . " " . $ignore_forum_sql . " ORDER BY forum_id ASC");
+        $sql = OLD_DB()->sql_query('SELECT forum_id, forum_name FROM ' . BB_FORUMS . ' ' . $ignore_forum_sql . ' ORDER BY forum_id ASC');
 
         while ($row = OLD_DB()->sql_fetchrow($sql)) {
             $forumUrls[] = [
@@ -67,7 +67,7 @@ class Sitemap
         $not_forums_id = $forums['not_auth_forums']['guest_view'];
         $ignore_forum_sql = $not_forums_id ? "WHERE forum_id NOT IN($not_forums_id)" : '';
 
-        $sql = OLD_DB()->sql_query("SELECT topic_id, topic_title, topic_time FROM " . BB_TOPICS . " " . $ignore_forum_sql . " ORDER BY topic_time ASC");
+        $sql = OLD_DB()->sql_query('SELECT topic_id, topic_title, topic_time FROM ' . BB_TOPICS . ' ' . $ignore_forum_sql . ' ORDER BY topic_time ASC');
 
         while ($row = OLD_DB()->sql_fetchrow($sql)) {
             $topicUrls[] = [
diff --git a/library/TorrentPier/TorrentPier/Legacy/SqlDb.php b/library/TorrentPier/TorrentPier/Legacy/SqlDb.php
index 83239d057..3c16d2039 100644
--- a/library/TorrentPier/TorrentPier/Legacy/SqlDb.php
+++ b/library/TorrentPier/TorrentPier/Legacy/SqlDb.php
@@ -603,7 +603,7 @@ class SqlDb
 
         if (!empty($this->shutdown['post_html'])) {
             $post_html_sql = $this->build_array('MULTI_INSERT', $this->shutdown['post_html']);
-            $this->query("REPLACE INTO " . BB_POSTS_HTML . " $post_html_sql");
+            $this->query('REPLACE INTO ' . BB_POSTS_HTML . " $post_html_sql");
         }
 
         if (!empty($this->shutdown['__sql'])) {
@@ -642,7 +642,7 @@ class SqlDb
      */
     public function unlock()
     {
-        if ($this->locked && $this->sql_query("UNLOCK TABLES")) {
+        if ($this->locked && $this->sql_query('UNLOCK TABLES')) {
             $this->locked = false;
         }
 
diff --git a/library/ajax/avatar.php b/library/ajax/avatar.php
index 1ba699e71..1da6852d4 100644
--- a/library/ajax/avatar.php
+++ b/library/ajax/avatar.php
@@ -34,7 +34,7 @@ switch ($mode) {
         $this->ajax_die('Invalid mode');
 }
 
-OLD_DB()->query("UPDATE " . BB_USERS . " SET avatar_ext_id = $new_ext_id WHERE user_id = $user_id");
+OLD_DB()->query('UPDATE ' . BB_USERS . " SET avatar_ext_id = $new_ext_id WHERE user_id = $user_id");
 
 cache_rm_user_sessions($user_id);
 
diff --git a/library/ajax/change_tor_status.php b/library/ajax/change_tor_status.php
index b43438779..f64b35ea9 100644
--- a/library/ajax/change_tor_status.php
+++ b/library/ajax/change_tor_status.php
@@ -24,12 +24,12 @@ if (config('tp.tor_comment')) {
     $comment = (string)$this->request['comment'];
 }
 
-$tor = OLD_DB()->fetch_row("
+$tor = OLD_DB()->fetch_row('
 	SELECT
 		tor.poster_id, tor.forum_id, tor.topic_id, tor.tor_status, tor.checked_time, tor.checked_user_id, f.cat_id, t.topic_title
-	FROM       " . BB_BT_TORRENTS . " tor
-	INNER JOIN " . BB_FORUMS . " f ON(f.forum_id = tor.forum_id)
-	INNER JOIN " . BB_TOPICS . " t ON(t.topic_id = tor.topic_id)
+	FROM       ' . BB_BT_TORRENTS . ' tor
+	INNER JOIN ' . BB_FORUMS . ' f ON(f.forum_id = tor.forum_id)
+	INNER JOIN ' . BB_TOPICS . " t ON(t.topic_id = tor.topic_id)
 	WHERE tor.attach_id = $attach_id
 	LIMIT 1
 ");
@@ -68,7 +68,7 @@ switch ($mode) {
             if (!IS_ADMIN) {
                 $this->verify_mod_rights($tor['forum_id']);
             }
-            OLD_DB()->query("UPDATE " . BB_TOPICS . " SET topic_status = " . TOPIC_UNLOCKED . " WHERE topic_id = {$tor['topic_id']}");
+            OLD_DB()->query('UPDATE ' . BB_TOPICS . ' SET topic_status = ' . TOPIC_UNLOCKED . " WHERE topic_id = {$tor['topic_id']}");
         } else {
             $this->verify_mod_rights($tor['forum_id']);
         }
@@ -77,7 +77,7 @@ switch ($mode) {
         if ($tor['tor_status'] != TOR_NOT_APPROVED && $tor['checked_user_id'] != $userdata['user_id'] && $tor['checked_time'] + 2 * 3600 > TIMENOW) {
             if (empty($this->request['confirmed'])) {
                 $msg = trans('messages.TOR_STATUS_OF') . ' ' . trans('messages.TOR_STATUS_NAME.' . $tor['tor_status']) . "\n\n";
-                $msg .= ($username = get_username($tor['checked_user_id'])) ? trans('messages.TOR_STATUS_CHANGED') . html_entity_decode($username) . ", " . delta_time($tor['checked_time']) . trans('messages.TOR_BACK') . "\n\n" : "";
+                $msg .= ($username = get_username($tor['checked_user_id'])) ? trans('messages.TOR_STATUS_CHANGED') . html_entity_decode($username) . ', ' . delta_time($tor['checked_time']) . trans('messages.TOR_BACK') . "\n\n" : '';
                 $msg .= trans('messages.PROCEED') . '?';
                 $this->prompt_for_confirm($msg);
             }
diff --git a/library/ajax/change_torrent.php b/library/ajax/change_torrent.php
index b2ec702a0..b3d72ef65 100644
--- a/library/ajax/change_torrent.php
+++ b/library/ajax/change_torrent.php
@@ -22,18 +22,18 @@ if (!isset($this->request['type'])) {
 $attach_id = (int)$this->request['attach_id'];
 $type = (string)$this->request['type'];
 
-$torrent = OLD_DB()->fetch_row("
+$torrent = OLD_DB()->fetch_row('
 		SELECT
 			a.post_id, d.physical_filename, d.extension, d.tracker_status,
 			t.topic_first_post_id,
 			p.poster_id, p.topic_id, p.forum_id,
 			f.allow_reg_tracker
 		FROM
-			" . BB_ATTACHMENTS . " a,
-			" . BB_ATTACHMENTS_DESC . " d,
-			" . BB_POSTS . " p,
-			" . BB_TOPICS . " t,
-			" . BB_FORUMS . " f
+			' . BB_ATTACHMENTS . ' a,
+			' . BB_ATTACHMENTS_DESC . ' d,
+			' . BB_POSTS . ' p,
+			' . BB_TOPICS . ' t,
+			' . BB_FORUMS . " f
 		WHERE
 			    a.attach_id = $attach_id
 			AND d.attach_id = $attach_id
diff --git a/library/ajax/change_user_opt.php b/library/ajax/change_user_opt.php
index 692566009..a3126ad94 100644
--- a/library/ajax/change_user_opt.php
+++ b/library/ajax/change_user_opt.php
@@ -30,7 +30,7 @@ foreach ($bf['user_opt'] as $opt_name => $opt_bit) {
     }
 }
 
-OLD_DB()->query("UPDATE " . BB_USERS . " SET user_opt = {$u_data['user_opt']} WHERE user_id = $user_id");
+OLD_DB()->query('UPDATE ' . BB_USERS . " SET user_opt = {$u_data['user_opt']} WHERE user_id = $user_id");
 
 // Удаляем данные из кеша
 cache_rm_user_sessions($user_id);
diff --git a/library/ajax/change_user_rank.php b/library/ajax/change_user_rank.php
index 8fb281c3e..a4421104b 100644
--- a/library/ajax/change_user_rank.php
+++ b/library/ajax/change_user_rank.php
@@ -24,7 +24,7 @@ if ($rank_id != 0 && !isset($ranks[$rank_id])) {
     $this->ajax_die("invalid rank_id: $rank_id");
 }
 
-OLD_DB()->query("UPDATE " . BB_USERS . " SET user_rank = $rank_id WHERE user_id = $user_id");
+OLD_DB()->query('UPDATE ' . BB_USERS . " SET user_rank = $rank_id WHERE user_id = $user_id");
 
 cache_rm_user_sessions($user_id);
 
diff --git a/library/ajax/edit_group_profile.php b/library/ajax/edit_group_profile.php
index 1ff3793cf..6e0b69d0e 100644
--- a/library/ajax/edit_group_profile.php
+++ b/library/ajax/edit_group_profile.php
@@ -54,4 +54,4 @@ switch ($mode) {
 }
 
 $value_sql = OLD_DB()->escape($value, true);
-OLD_DB()->query("UPDATE " . BB_GROUPS . " SET $mode = $value_sql WHERE group_id = $group_id");
+OLD_DB()->query('UPDATE ' . BB_GROUPS . " SET $mode = $value_sql WHERE group_id = $group_id");
diff --git a/library/ajax/edit_user_profile.php b/library/ajax/edit_user_profile.php
index fedd8e5ca..81bc4b4a8 100644
--- a/library/ajax/edit_user_profile.php
+++ b/library/ajax/edit_user_profile.php
@@ -93,7 +93,7 @@ switch ($field) {
         break;
 
     case 'user_twitter':
-        if ($value && !preg_match("#^[a-zA-Z0-9_]{1,15}$#", $value)) {
+        if ($value && !preg_match('#^[a-zA-Z0-9_]{1,15}$#', $value)) {
             $this->ajax_die(trans('messages.TWITTER_ERROR'));
         }
         $this->response['new_value'] = $this->request['value'];
diff --git a/library/ajax/group_membership.php b/library/ajax/group_membership.php
index 49b104dba..4a968f5f4 100644
--- a/library/ajax/group_membership.php
+++ b/library/ajax/group_membership.php
@@ -23,11 +23,11 @@ if (!$mode = (string)$this->request['mode']) {
 
 switch ($mode) {
     case 'get_group_list':
-        $sql = "
+        $sql = '
 					SELECT ug.user_pending, g.group_id, g.group_type, g.group_name, g.group_moderator, self.user_id AS can_view
-					FROM       " . BB_USER_GROUP . " ug
-					INNER JOIN " . BB_GROUPS . " g ON(g.group_id = ug.group_id AND g.group_single_user = 0)
-					 LEFT JOIN " . BB_USER_GROUP . " self ON(self.group_id = g.group_id AND self.user_id = {$user->id} AND self.user_pending = 0)
+					FROM       ' . BB_USER_GROUP . ' ug
+					INNER JOIN ' . BB_GROUPS . ' g ON(g.group_id = ug.group_id AND g.group_single_user = 0)
+					 LEFT JOIN ' . BB_USER_GROUP . " self ON(self.group_id = g.group_id AND self.user_id = {$user->id} AND self.user_pending = 0)
 					WHERE ug.user_id = $user_id
 					ORDER BY g.group_name
 				";
diff --git a/library/ajax/index_data.php b/library/ajax/index_data.php
index 8948613ca..e43bdc281 100644
--- a/library/ajax/index_data.php
+++ b/library/ajax/index_data.php
@@ -68,7 +68,7 @@ switch ($mode) {
 
         if (isset($mod['mod_groups'][$forum_id])) {
             foreach ($mod['mod_groups'][$forum_id] as $group_id) {
-                $moderators[] = '<a href="' . "group.php?" . POST_GROUPS_URL . "=" . $group_id . '">' . $mod['name_groups'][$group_id] . '</a>';
+                $moderators[] = '<a href="' . 'group.php?' . POST_GROUPS_URL . '=' . $group_id . '">' . $mod['name_groups'][$group_id] . '</a>';
             }
         }
 
@@ -88,7 +88,7 @@ switch ($mode) {
         }
         if ($tz != config('tp.board_timezone')) {
             // Set current user timezone
-            OLD_DB()->query("UPDATE " . BB_USERS . " SET user_timezone = $tz WHERE user_id = " . $userdata['user_id']);
+            OLD_DB()->query('UPDATE ' . BB_USERS . " SET user_timezone = $tz WHERE user_id = " . $userdata['user_id']);
             config(['tp.board_timezone' => $tz]);
             cache_rm_user_sessions($userdata['user_id']);
         }
diff --git a/library/ajax/manage_user.php b/library/ajax/manage_user.php
index 80d1c0024..21e98c322 100644
--- a/library/ajax/manage_user.php
+++ b/library/ajax/manage_user.php
@@ -47,7 +47,7 @@ switch ($mode) {
         }
 
         if (IS_ADMIN) {
-            $user_topics = OLD_DB()->fetch_rowset("SELECT topic_id FROM " . BB_TOPICS . " WHERE topic_poster = $user_id", 'topic_id');
+            $user_topics = OLD_DB()->fetch_rowset('SELECT topic_id FROM ' . BB_TOPICS . " WHERE topic_poster = $user_id", 'topic_id');
             $deleted_topics = topic_delete($user_topics);
             $deleted_posts = post_delete('user', $user_id);
 
@@ -83,7 +83,7 @@ switch ($mode) {
             $this->prompt_for_confirm(trans('messages.DEACTIVATE_CONFIRM'));
         }
 
-        OLD_DB()->query("UPDATE " . BB_USERS . " SET user_active = '1' WHERE user_id = " . $user_id);
+        OLD_DB()->query('UPDATE ' . BB_USERS . " SET user_active = '1' WHERE user_id = " . $user_id);
 
         $this->response['info'] = trans('messages.USER_ACTIVATE_ON');
 
@@ -98,7 +98,7 @@ switch ($mode) {
             $this->prompt_for_confirm(trans('messages.ACTIVATE_CONFIRM'));
         }
 
-        OLD_DB()->query("UPDATE " . BB_USERS . " SET user_active = '0' WHERE user_id = " . $user_id);
+        OLD_DB()->query('UPDATE ' . BB_USERS . " SET user_active = '0' WHERE user_id = " . $user_id);
         delete_user_sessions($user_id);
 
         $this->response['info'] = trans('messages.USER_ACTIVATE_OFF');
diff --git a/library/ajax/mod_action.php b/library/ajax/mod_action.php
index 28705cf8e..04d04b733 100644
--- a/library/ajax/mod_action.php
+++ b/library/ajax/mod_action.php
@@ -25,7 +25,7 @@ switch ($mode) {
             $this->ajax_die(trans('messages.STATUS_DOES_EXIST') . $new_status);
         }
 
-        $topic_ids = OLD_DB()->fetch_rowset("SELECT attach_id FROM " . BB_BT_TORRENTS . " WHERE topic_id IN($topics)", 'attach_id');
+        $topic_ids = OLD_DB()->fetch_rowset('SELECT attach_id FROM ' . BB_BT_TORRENTS . " WHERE topic_id IN($topics)", 'attach_id');
 
         foreach ($topic_ids as $attach_id) {
             change_tor_status($attach_id, $status);
@@ -46,14 +46,14 @@ switch ($mode) {
             $this->ajax_die(trans('messages.DONT_MESSAGE_TITLE'));
         }
 
-        if (!$t_data = OLD_DB()->fetch_row("SELECT forum_id FROM " . BB_TOPICS . " WHERE topic_id = $topic_id LIMIT 1")) {
+        if (!$t_data = OLD_DB()->fetch_row('SELECT forum_id FROM ' . BB_TOPICS . " WHERE topic_id = $topic_id LIMIT 1")) {
             $this->ajax_die(trans('messages.INVALID_TOPIC_ID_DB'));
         }
         $this->verify_mod_rights($t_data['forum_id']);
 
         $topic_title_sql = OLD_DB()->escape($new_title);
 
-        OLD_DB()->query("UPDATE " . BB_TOPICS . " SET topic_title = '$topic_title_sql' WHERE topic_id = $topic_id");
+        OLD_DB()->query('UPDATE ' . BB_TOPICS . " SET topic_title = '$topic_title_sql' WHERE topic_id = $topic_id");
 
         // Обновление кеша новостей на главной
         $news_forums = array_flip(explode(',', config('tp.latest_news_forum_id')));
@@ -80,13 +80,13 @@ switch ($mode) {
             $this->ajax_die(trans('messages.NO_USER_ID_SPECIFIED'));
         }
 
-        $reg_ip = OLD_DB()->fetch_rowset("SELECT username, user_id, user_rank FROM " . BB_USERS . "
+        $reg_ip = OLD_DB()->fetch_rowset('SELECT username, user_id, user_rank FROM ' . BB_USERS . "
 			WHERE user_reg_ip = '{$profiledata['user_reg_ip']}'
 				AND user_reg_ip != ''
 				AND user_id != {$profiledata['user_id']}
 			ORDER BY username ASC");
 
-        $last_ip = OLD_DB()->fetch_rowset("SELECT username, user_id, user_rank FROM " . BB_USERS . "
+        $last_ip = OLD_DB()->fetch_rowset('SELECT username, user_id, user_rank FROM ' . BB_USERS . "
 			WHERE user_last_ip = '{$profiledata['user_last_ip']}'
 				AND user_last_ip != ''
 				AND user_id != {$profiledata['user_id']}");
diff --git a/library/ajax/post_mod_comment.php b/library/ajax/post_mod_comment.php
index dbf1eaea4..221506d0d 100644
--- a/library/ajax/post_mod_comment.php
+++ b/library/ajax/post_mod_comment.php
@@ -20,10 +20,10 @@ if (!$mc_text = prepare_message($mc_text)) {
     $this->ajax_die(trans('messages.EMPTY_MESSAGE'));
 }
 
-$post = OLD_DB()->fetch_row("
+$post = OLD_DB()->fetch_row('
 	SELECT
 		p.post_id, p.poster_id
-	FROM      " . BB_POSTS . " p
+	FROM      ' . BB_POSTS . " p
 	WHERE p.post_id = $post_id
 ");
 if (!$post) {
@@ -36,7 +36,7 @@ $data = array(
     'mc_user_id' => $mc_type ? $userdata['user_id'] : 0,
 );
 $sql_args = OLD_DB()->build_array('UPDATE', $data);
-OLD_DB()->query("UPDATE " . BB_POSTS . " SET $sql_args WHERE post_id = $post_id");
+OLD_DB()->query('UPDATE ' . BB_POSTS . " SET $sql_args WHERE post_id = $post_id");
 
 if ($mc_type && $post['poster_id'] != $userdata['user_id']) {
     $subject = sprintf(trans('messages.MC_COMMENT_PM_SUBJECT'), trans('messages.MC_COMMENT.' . $mc_type . '.type'));
diff --git a/library/ajax/posts.php b/library/ajax/posts.php
index 17b4eefb5..7a5543094 100644
--- a/library/ajax/posts.php
+++ b/library/ajax/posts.php
@@ -18,8 +18,8 @@ if (!isset($this->request['type'])) {
 }
 if (isset($this->request['post_id'])) {
     $post_id = (int)$this->request['post_id'];
-    $post = OLD_DB()->fetch_row("SELECT t.*, f.*, p.*, pt.post_text
-		FROM " . BB_TOPICS . " t, " . BB_FORUMS . " f, " . BB_POSTS . " p, " . BB_POSTS_TEXT . " pt
+    $post = OLD_DB()->fetch_row('SELECT t.*, f.*, p.*, pt.post_text
+		FROM ' . BB_TOPICS . ' t, ' . BB_FORUMS . ' f, ' . BB_POSTS . ' p, ' . BB_POSTS_TEXT . " pt
 		WHERE p.post_id = $post_id
 			AND t.topic_id = p.topic_id
 			AND f.forum_id = t.forum_id
@@ -35,8 +35,8 @@ if (isset($this->request['post_id'])) {
     }
 } elseif (isset($this->request['topic_id'])) {
     $topic_id = (int)$this->request['topic_id'];
-    $post = OLD_DB()->fetch_row("SELECT t.*, f.*
-			FROM " . BB_TOPICS . " t, " . BB_FORUMS . " f
+    $post = OLD_DB()->fetch_row('SELECT t.*, f.*
+			FROM ' . BB_TOPICS . ' t, ' . BB_FORUMS . " f
 			WHERE t.topic_id = $topic_id
 				AND f.forum_id = t.forum_id
 			LIMIT 1");
@@ -80,7 +80,7 @@ switch ($this->request['type']) {
         }
 
         $quote_username = ($post['post_username'] != '') ? $post['post_username'] : get_username($post['poster_id']);
-        $message = "[quote=\"" . $quote_username . "\"][qpost=" . $post['post_id'] . "]" . $post['post_text'] . "[/quote]\r";
+        $message = '[quote="' . $quote_username . '"][qpost=' . $post['post_id'] . ']' . $post['post_text'] . "[/quote]\r";
 
         // hide user passkey
         $message = preg_replace('#(?<=\?uk=)[a-zA-Z0-9]{10}(?=&)#', 'passkey', $message);
@@ -92,7 +92,7 @@ switch ($this->request['type']) {
         }
 
         if ($post['post_id'] == $post['topic_first_post_id']) {
-            $message = "[quote]" . $post['topic_title'] . "[/quote]\r";
+            $message = '[quote]' . $post['topic_title'] . "[/quote]\r";
         }
         if (mb_strlen($message, 'UTF-8') > 1000) {
             $this->response['redirect'] = make_url(POSTING_URL . '?mode=quote&p=' . $post_id);
@@ -135,9 +135,9 @@ switch ($this->request['type']) {
                             $this->ajax_die(sprintf(trans('messages.MAX_SMILIES_PER_POST'), config('tp.max_smilies')));
                         }
                     }
-                    OLD_DB()->query("UPDATE " . BB_POSTS_TEXT . " SET post_text = '" . OLD_DB()->escape($text) . "' WHERE post_id = $post_id");
+                    OLD_DB()->query('UPDATE ' . BB_POSTS_TEXT . " SET post_text = '" . OLD_DB()->escape($text) . "' WHERE post_id = $post_id");
                     if ($post['topic_last_post_id'] != $post['post_id'] && $userdata['user_id'] == $post['poster_id']) {
-                        OLD_DB()->query("UPDATE " . BB_POSTS . " SET post_edit_time = '" . TIMENOW . "', post_edit_count = post_edit_count + 1 WHERE post_id = $post_id");
+                        OLD_DB()->query('UPDATE ' . BB_POSTS . " SET post_edit_time = '" . TIMENOW . "', post_edit_count = post_edit_count + 1 WHERE post_id = $post_id");
                     }
                     $s_text = str_replace('\n', "\n", $text);
                     $s_topic_title = str_replace('\n', "\n", $post['topic_title']);
@@ -231,7 +231,7 @@ switch ($this->request['type']) {
         // Flood control
         $where_sql = IS_GUEST ? "p.poster_ip = '" . USER_IP . "'" : "p.poster_id = {$userdata['user_id']}";
 
-        $sql = "SELECT MAX(p.post_time) AS last_post_time FROM " . BB_POSTS . " p WHERE $where_sql";
+        $sql = 'SELECT MAX(p.post_time) AS last_post_time FROM ' . BB_POSTS . " p WHERE $where_sql";
         if ($row = OLD_DB()->fetch_row($sql) and $row['last_post_time']) {
             if ($userdata['user_level'] == USER) {
                 if (TIMENOW - $row['last_post_time'] < config('tp.flood_interval')) {
@@ -242,14 +242,14 @@ switch ($this->request['type']) {
 
         // Double Post Control
         if (!empty($row['last_post_time']) && !IS_AM) {
-            $sql = "
+            $sql = '
 				SELECT pt.post_text
-				FROM " . BB_POSTS . " p, " . BB_POSTS_TEXT . " pt
+				FROM ' . BB_POSTS . ' p, ' . BB_POSTS_TEXT . " pt
 				WHERE $where_sql
-					AND p.post_time = " . (int)$row['last_post_time'] . "
+					AND p.post_time = " . (int)$row['last_post_time'] . '
 					AND pt.post_id = p.post_id
 				LIMIT 1
-			";
+			';
 
             if ($row = OLD_DB()->fetch_row($sql)) {
                 $last_msg = OLD_DB()->escape($row['post_text']);
@@ -267,9 +267,9 @@ switch ($this->request['type']) {
             }
         }
 
-        OLD_DB()->sql_query("INSERT INTO " . BB_POSTS . " (topic_id, forum_id, poster_id, post_time, poster_ip) VALUES ($topic_id, " . $post['forum_id'] . ", " . $userdata['user_id'] . ", '" . TIMENOW . "', '" . USER_IP . "')");
+        OLD_DB()->sql_query('INSERT INTO ' . BB_POSTS . " (topic_id, forum_id, poster_id, post_time, poster_ip) VALUES ($topic_id, " . $post['forum_id'] . ', ' . $userdata['user_id'] . ", '" . TIMENOW . "', '" . USER_IP . "')");
         $post_id = OLD_DB()->sql_nextid();
-        OLD_DB()->sql_query("INSERT INTO " . BB_POSTS_TEXT . " (post_id, post_text) VALUES ($post_id, '" . OLD_DB()->escape($message) . "')");
+        OLD_DB()->sql_query('INSERT INTO ' . BB_POSTS_TEXT . " (post_id, post_text) VALUES ($post_id, '" . OLD_DB()->escape($message) . "')");
 
         update_post_stats('reply', $post, $post['forum_id'], $topic_id, $post_id, $userdata['user_id']);
 
diff --git a/library/ajax/topic_tpl.php b/library/ajax/topic_tpl.php
index 66eda8172..4ca07212c 100644
--- a/library/ajax/topic_tpl.php
+++ b/library/ajax/topic_tpl.php
@@ -29,7 +29,7 @@ switch ($mode) {
         if (!$tpl_id = (int)$this->request['tpl_id']) {
             $this->ajax_die('Выбранный шаблон не найден, создайте новый (empty tpl_id)');
         }
-        if (!$tpl_data = OLD_DB()->fetch_row("SELECT * FROM " . BB_TOPIC_TPL . " WHERE tpl_id = $tpl_id LIMIT 1")) {
+        if (!$tpl_data = OLD_DB()->fetch_row('SELECT * FROM ' . BB_TOPIC_TPL . " WHERE tpl_id = $tpl_id LIMIT 1")) {
             $this->ajax_die("Шаблон [id: $tpl_id] не найден в БД");
         }
         break;
@@ -109,13 +109,13 @@ switch ($mode) {
             $this->response['msg'] = 'Шаблоны в этом форуме отключены';
         } // включение
         else {
-            if (!$tpl_name = OLD_DB()->fetch_row("SELECT tpl_name FROM " . BB_TOPIC_TPL . " WHERE tpl_id = $tpl_id LIMIT 1", 'tpl_name')) {
+            if (!$tpl_name = OLD_DB()->fetch_row('SELECT tpl_name FROM ' . BB_TOPIC_TPL . " WHERE tpl_id = $tpl_id LIMIT 1", 'tpl_name')) {
                 $this->ajax_die("Шаблон [id: $tpl_id] не найден в БД");
             }
             $new_tpl_id = $tpl_id;
             $this->response['msg'] = "Включен шаблон $tpl_name";
         }
-        OLD_DB()->query("UPDATE " . BB_FORUMS . " SET forum_tpl_id = $new_tpl_id WHERE forum_id = $forum_id");
+        OLD_DB()->query('UPDATE ' . BB_FORUMS . " SET forum_tpl_id = $new_tpl_id WHERE forum_id = $forum_id");
         break;
 
     // сохранение изменений
@@ -126,7 +126,7 @@ switch ($mode) {
             $msg .= 'Шаблон был отредактирован: ' . html_entity_decode($last_edit_by_username) . ', ' . delta_time($tpl_data['tpl_last_edit_tm']) . " назад\n\n";
             $this->ajax_die($msg);
         }
-        $sql = "UPDATE " . BB_TOPIC_TPL . " SET " . OLD_DB()->build_array('UPDATE', $sql_args) . " WHERE tpl_id = $tpl_id";
+        $sql = 'UPDATE ' . BB_TOPIC_TPL . ' SET ' . OLD_DB()->build_array('UPDATE', $sql_args) . " WHERE tpl_id = $tpl_id";
         if (!@OLD_DB()->query($sql)) {
             $sql_error = OLD_DB()->sql_error();
         }
@@ -138,7 +138,7 @@ switch ($mode) {
 
     // создание нового шаблона
     case 'new':
-        $sql = "INSERT INTO " . BB_TOPIC_TPL . OLD_DB()->build_array('INSERT', $sql_args);
+        $sql = 'INSERT INTO ' . BB_TOPIC_TPL . OLD_DB()->build_array('INSERT', $sql_args);
         if (!@OLD_DB()->query($sql)) {
             $sql_error = OLD_DB()->sql_error();
         }
diff --git a/library/ajax/view_post.php b/library/ajax/view_post.php
index 02dd592f3..53d4dcc1c 100644
--- a/library/ajax/view_post.php
+++ b/library/ajax/view_post.php
@@ -17,18 +17,18 @@ $post_id = (int)@$this->request['post_id'];
 $topic_id = (int)@$this->request['topic_id'];
 
 if (!$post_id) {
-    $post_id = OLD_DB()->fetch_row("SELECT topic_first_post_id FROM " . BB_TOPICS . " WHERE topic_id = $topic_id", 'topic_first_post_id');
+    $post_id = OLD_DB()->fetch_row('SELECT topic_first_post_id FROM ' . BB_TOPICS . " WHERE topic_id = $topic_id", 'topic_first_post_id');
 }
 
-$sql = "
+$sql = '
 	SELECT
 	  p.*,
 	  h.post_html, IF(h.post_html IS NULL, pt.post_text, NULL) AS post_text,
 	  f.auth_read
-	FROM       " . BB_POSTS . " p
-	INNER JOIN " . BB_POSTS_TEXT . " pt ON(pt.post_id = p.post_id)
-	 LEFT JOIN " . BB_POSTS_HTML . " h  ON(h.post_id = pt.post_id)
-	INNER JOIN " . BB_FORUMS . " f  ON(f.forum_id = p.forum_id)
+	FROM       ' . BB_POSTS . ' p
+	INNER JOIN ' . BB_POSTS_TEXT . ' pt ON(pt.post_id = p.post_id)
+	 LEFT JOIN ' . BB_POSTS_HTML . ' h  ON(h.post_id = pt.post_id)
+	INNER JOIN ' . BB_FORUMS . " f  ON(f.forum_id = p.forum_id)
 	WHERE
 	  p.post_id = $post_id
 	LIMIT 1
diff --git a/library/ajax/view_torrent.php b/library/ajax/view_torrent.php
index 44d8fef81..57ff39a4e 100644
--- a/library/ajax/view_torrent.php
+++ b/library/ajax/view_torrent.php
@@ -16,7 +16,7 @@ if (!isset($this->request['attach_id'])) {
 }
 $attach_id = (int)$this->request['attach_id'];
 
-$torrent = OLD_DB()->fetch_row("SELECT attach_id, physical_filename FROM " . BB_ATTACHMENTS_DESC . " WHERE attach_id = $attach_id LIMIT 1");
+$torrent = OLD_DB()->fetch_row('SELECT attach_id, physical_filename FROM ' . BB_ATTACHMENTS_DESC . " WHERE attach_id = $attach_id LIMIT 1");
 if (!$torrent) {
     $this->ajax_die(trans('messages.ERROR_BUILD'));
 }
diff --git a/library/attach_mod/displaying_torrent.php b/library/attach_mod/displaying_torrent.php
index a2515b2b7..bf5d602a9 100644
--- a/library/attach_mod/displaying_torrent.php
+++ b/library/attach_mod/displaying_torrent.php
@@ -78,7 +78,7 @@ $tor_auth_del = ($tor_auth && $tor_reged);
 $tracker_link = $tor_reged ? trans('messages.BT_REG_YES') : trans('messages.BT_REG_NO');
 
 $download_link = DOWNLOAD_URL . $attach_id;
-$description = $comment ?: preg_replace("#.torrent$#i", '', $display_name);
+$description = $comment ?: preg_replace('#.torrent$#i', '', $display_name);
 
 if ($tor_auth_reg || $tor_auth_del) {
     $reg_tor_url = '<a class="txtb" href="#" onclick="ajax.exec({ action: \'change_torrent\', attach_id : ' . $attach_id . ', type: \'reg\'}); return false;">' . trans('messages.BT_REG_ON_TRACKER') . '</a>';
@@ -107,9 +107,9 @@ if (!$tor_reged) {
         $template->assign_block_vars('postrow.attach.tor_not_reged.comment', array('COMMENT' => $comment));
     }
 } else {
-    $sql = "SELECT bt.*, u.user_id, u.username, u.user_rank
-		FROM " . BB_BT_TORRENTS . " bt
-		LEFT JOIN " . BB_USERS . " u ON(bt.checked_user_id = u.user_id)
+    $sql = 'SELECT bt.*, u.user_id, u.username, u.user_rank
+		FROM ' . BB_BT_TORRENTS . ' bt
+		LEFT JOIN ' . BB_USERS . " u ON(bt.checked_user_id = u.user_id)
 		WHERE bt.attach_id = $attach_id";
 
     if (!$result = OLD_DB()->sql_query($sql)) {
@@ -120,7 +120,7 @@ if (!$tor_reged) {
 }
 
 if ($tor_reged && !$tor_info) {
-    OLD_DB()->query("UPDATE " . BB_ATTACHMENTS_DESC . " SET tracker_status = 0 WHERE attach_id = $attach_id");
+    OLD_DB()->query('UPDATE ' . BB_ATTACHMENTS_DESC . " SET tracker_status = 0 WHERE attach_id = $attach_id");
 
     bb_die('Torrent status fixed');
 }
@@ -142,7 +142,7 @@ if ($tor_reged && $tor_info) {
     $tor_type = $tor_info['tor_type'];
 
     // Magnet link
-    $passkey = OLD_DB()->fetch_row("SELECT auth_key FROM " . BB_BT_USERS . " WHERE user_id = " . (int)$bt_user_id . " LIMIT 1");
+    $passkey = OLD_DB()->fetch_row('SELECT auth_key FROM ' . BB_BT_USERS . ' WHERE user_id = ' . (int)$bt_user_id . ' LIMIT 1');
     $tor_magnet = create_magnet($tor_info['info_hash'], $passkey['auth_key'], $userdata['session_logged_in']);
 
     // ratio limits
@@ -152,14 +152,14 @@ if ($tor_reged && $tor_info) {
     $user_ratio = 0;
 
     if (($min_ratio_dl || $min_ratio_warn) && $bt_user_id != $poster_id) {
-        $sql = "SELECT u.*, dl.user_status
-			FROM " . BB_BT_USERS . " u
-			LEFT JOIN " . BB_BT_DLSTATUS . " dl ON dl.user_id = $bt_user_id AND dl.topic_id = $bt_topic_id
+        $sql = 'SELECT u.*, dl.user_status
+			FROM ' . BB_BT_USERS . ' u
+			LEFT JOIN ' . BB_BT_DLSTATUS . " dl ON dl.user_id = $bt_user_id AND dl.topic_id = $bt_topic_id
 			WHERE u.user_id = $bt_user_id
 			LIMIT 1";
     } else {
-        $sql = "SELECT user_status
-			FROM " . BB_BT_DLSTATUS . "
+        $sql = 'SELECT user_status
+			FROM ' . BB_BT_DLSTATUS . "
 			WHERE user_id = $bt_user_id
 				AND topic_id = $bt_topic_id
 			LIMIT 1";
@@ -270,24 +270,24 @@ if ($tor_reged && $tor_info) {
         }
         // SQL for each mode
         if ($s_mode == 'count') {
-            $sql = "SELECT seeders, leechers, speed_up, speed_down
-				FROM " . BB_BT_TRACKER_SNAP . "
+            $sql = 'SELECT seeders, leechers, speed_up, speed_down
+				FROM ' . BB_BT_TRACKER_SNAP . "
 				WHERE topic_id = $tor_id
 				LIMIT 1";
         } elseif ($s_mode == 'names') {
-            $sql = "SELECT tr.user_id, tr.ip, tr.port, tr.remain, tr.seeder, u.username, u.user_rank
-				FROM " . BB_BT_TRACKER . " tr, " . BB_USERS . " u
+            $sql = 'SELECT tr.user_id, tr.ip, tr.port, tr.remain, tr.seeder, u.username, u.user_rank
+				FROM ' . BB_BT_TRACKER . ' tr, ' . BB_USERS . " u
 				WHERE tr.topic_id = $tor_id
 					AND u.user_id = tr.user_id
 				ORDER BY u.username
 				LIMIT $show_peers_limit";
         } else {
-            $sql = "SELECT
+            $sql = 'SELECT
 					tr.user_id, tr.ip, tr.port, tr.uploaded, tr.downloaded, tr.remain,
 					tr.seeder, tr.releaser, tr.speed_up, tr.speed_down, tr.update_time,
 					tr.complete_percent, u.username, u.user_rank
-				FROM " . BB_BT_TRACKER . " tr
-				LEFT JOIN " . BB_USERS . " u ON u.user_id = tr.user_id
+				FROM ' . BB_BT_TRACKER . ' tr
+				LEFT JOIN ' . BB_USERS . " u ON u.user_id = tr.user_id
 				WHERE tr.topic_id = $tor_id
 				ORDER BY $full_mode_order $full_mode_sort_dir
 				LIMIT $show_peers_limit";
@@ -362,7 +362,7 @@ if ($tor_reged && $tor_info) {
             }
 
             foreach ($peers as $pid => $peer) {
-                $u_prof_href = ($s_mode == 'count') ? '#' : "profile.php?mode=viewprofile&amp;u=" . $peer['user_id'] . "#torrent";
+                $u_prof_href = ($s_mode == 'count') ? '#' : 'profile.php?mode=viewprofile&amp;u=' . $peer['user_id'] . '#torrent';
 
                 // Full details mode
                 if ($s_mode == 'full') {
@@ -382,7 +382,7 @@ if ($tor_reged && $tor_info) {
 
                         if (!defined('SEEDER_EXIST')) {
                             define('SEEDER_EXIST', true);
-                            $seed_order_action = "viewtopic.php?" . POST_TOPIC_URL . "=$bt_topic_id&amp;spmode=full#seeders";
+                            $seed_order_action = 'viewtopic.php?' . POST_TOPIC_URL . "=$bt_topic_id&amp;spmode=full#seeders";
 
                             $template->assign_block_vars("$x_full", array(
                                 'SEED_ORD_ACT' => $seed_order_action,
@@ -404,7 +404,7 @@ if ($tor_reged && $tor_info) {
 
                         if (!defined('LEECHER_EXIST')) {
                             define('LEECHER_EXIST', true);
-                            $leech_order_action = "viewtopic.php?" . POST_TOPIC_URL . "=$bt_topic_id&amp;spmode=full#leechers";
+                            $leech_order_action = 'viewtopic.php?' . POST_TOPIC_URL . "=$bt_topic_id&amp;spmode=full#leechers";
 
                             $template->assign_block_vars("$x_full", array(
                                 'LEECH_ORD_ACT' => $leech_order_action,
@@ -514,7 +514,7 @@ if ($tor_reged && $tor_info) {
 if (config('tp.bt_allow_spmode_change') && $s_mode != 'full') {
     $template->assign_vars(array(
         'PEERS_FULL_LINK' => true,
-        'SPMODE_FULL_HREF' => "viewtopic.php?" . POST_TOPIC_URL . "=$bt_topic_id&amp;spmode=full#seeders",
+        'SPMODE_FULL_HREF' => 'viewtopic.php?' . POST_TOPIC_URL . "=$bt_topic_id&amp;spmode=full#seeders",
     ));
 }
 
diff --git a/library/attach_mod/includes/functions_attach.php b/library/attach_mod/includes/functions_attach.php
index fa14e8334..e9bf8605d 100644
--- a/library/attach_mod/includes/functions_attach.php
+++ b/library/attach_mod/includes/functions_attach.php
@@ -345,9 +345,9 @@ function attachment_sync_topic($topics)
     $posts_without_attach = $topics_without_attach = [];
 
     // Check orphan post_attachment markers
-    $sql = "SELECT p.post_id
-		FROM " . BB_POSTS . " p
-		LEFT JOIN " . BB_ATTACHMENTS . " a USING(post_id)
+    $sql = 'SELECT p.post_id
+		FROM ' . BB_POSTS . ' p
+		LEFT JOIN ' . BB_ATTACHMENTS . " a USING(post_id)
 		WHERE p.topic_id IN($topics)
 			AND p.post_attachment = 1
 			AND a.post_id IS NULL";
@@ -357,13 +357,13 @@ function attachment_sync_topic($topics)
             $posts_without_attach[] = $row['post_id'];
         }
         if ($posts_sql = implode(',', $posts_without_attach)) {
-            OLD_DB()->query("UPDATE " . BB_POSTS . " SET post_attachment = 0 WHERE post_id IN($posts_sql)");
+            OLD_DB()->query('UPDATE ' . BB_POSTS . " SET post_attachment = 0 WHERE post_id IN($posts_sql)");
         }
     }
 
     // Update missing topic_attachment markers
-    OLD_DB()->query("
-		UPDATE " . BB_TOPICS . " t, " . BB_POSTS . " p SET
+    OLD_DB()->query('
+		UPDATE ' . BB_TOPICS . ' t, ' . BB_POSTS . " p SET
 			t.topic_attachment = 1
 		WHERE p.topic_id IN($topics)
 			AND p.post_attachment = 1
@@ -371,8 +371,8 @@ function attachment_sync_topic($topics)
 	");
 
     // Fix orphan topic_attachment markers
-    $sql = "SELECT t.topic_id
-		FROM " . BB_POSTS . " p, " . BB_TOPICS . " t
+    $sql = 'SELECT t.topic_id
+		FROM ' . BB_POSTS . ' p, ' . BB_TOPICS . " t
 		WHERE t.topic_id = p.topic_id
 			AND t.topic_id IN($topics)
 			AND t.topic_attachment = 1
@@ -384,7 +384,7 @@ function attachment_sync_topic($topics)
             $topics_without_attach[] = $row['topic_id'];
         }
         if ($topics_sql = implode(',', $topics_without_attach)) {
-            OLD_DB()->query("UPDATE " . BB_TOPICS . " SET topic_attachment = 0 WHERE topic_id IN($topics_sql)");
+            OLD_DB()->query('UPDATE ' . BB_TOPICS . " SET topic_attachment = 0 WHERE topic_id IN($topics_sql)");
         }
     }
 }
diff --git a/library/attach_mod/includes/functions_delete.php b/library/attach_mod/includes/functions_delete.php
index 739ccea0a..b3c09d3ba 100644
--- a/library/attach_mod/includes/functions_delete.php
+++ b/library/attach_mod/includes/functions_delete.php
@@ -140,7 +140,7 @@ function delete_attachment($post_id_array = 0, $attach_id_array = 0, $page = 0,
 
         //bt
         if ($sql_id == 'post_id') {
-            $sql = "SELECT topic_id FROM " . BB_BT_TORRENTS . " WHERE attach_id IN(" . implode(',', $attach_id_array) . ")";
+            $sql = 'SELECT topic_id FROM ' . BB_BT_TORRENTS . ' WHERE attach_id IN(' . implode(',', $attach_id_array) . ')';
 
             if (!$result = OLD_DB()->sql_query($sql)) {
                 bb_die(trans('messages.ERROR_DELETED_ATTACHMENTS'));
@@ -154,7 +154,7 @@ function delete_attachment($post_id_array = 0, $attach_id_array = 0, $page = 0,
 
             if ($torrents_sql = implode(',', $torrents_sql)) {
                 // Remove peers from tracker
-                $sql = "DELETE FROM " . BB_BT_TRACKER . "
+                $sql = 'DELETE FROM ' . BB_BT_TRACKER . "
 					WHERE topic_id IN($torrents_sql)";
 
                 if (!OLD_DB()->sql_query($sql)) {
@@ -162,8 +162,8 @@ function delete_attachment($post_id_array = 0, $attach_id_array = 0, $page = 0,
                 }
             }
             // Delete torrents
-            $sql = "DELETE FROM " . BB_BT_TORRENTS . "
-				WHERE attach_id IN(" . implode(',', $attach_id_array) . ")";
+            $sql = 'DELETE FROM ' . BB_BT_TORRENTS . '
+				WHERE attach_id IN(' . implode(',', $attach_id_array) . ')';
 
             if (!OLD_DB()->sql_query($sql)) {
                 bb_die(trans('messages.ERROR_DELETED_ATTACHMENTS'));
diff --git a/library/attach_mod/includes/functions_includes.php b/library/attach_mod/includes/functions_includes.php
index 9fcb876ae..778ec9034 100644
--- a/library/attach_mod/includes/functions_includes.php
+++ b/library/attach_mod/includes/functions_includes.php
@@ -37,7 +37,7 @@ function attachment_quota_settings($admin_mode, $submit = false, $mode)
     }
 
     include ATTACH_DIR . '/includes/functions_selects.php';
-    if (!function_exists("process_quota_settings")) {
+    if (!function_exists('process_quota_settings')) {
         include ATTACH_DIR . '/includes/functions_admin.php';
     }
 
diff --git a/library/includes/bbcode.php b/library/includes/bbcode.php
index eddf3c2cb..259e5fab4 100644
--- a/library/includes/bbcode.php
+++ b/library/includes/bbcode.php
@@ -165,7 +165,7 @@ function generate_smilies($mode)
                 $template->assign_block_vars('switch_smilies_extra', array());
 
                 $template->assign_vars(array(
-                    'U_MORE_SMILIES' => POSTING_URL . "?mode=smilies",
+                    'U_MORE_SMILIES' => POSTING_URL . '?mode=smilies',
                 ));
             }
 
@@ -377,10 +377,10 @@ function add_search_words($post_id, $post_message, $topic_title = '', $only_retu
         return implode("\n", $words);
     }
 
-    OLD_DB()->query("DELETE FROM " . BB_POSTS_SEARCH . " WHERE post_id = $post_id");
+    OLD_DB()->query('DELETE FROM ' . BB_POSTS_SEARCH . " WHERE post_id = $post_id");
 
     if ($words_sql = OLD_DB()->escape(implode("\n", $words))) {
-        OLD_DB()->query("REPLACE INTO " . BB_POSTS_SEARCH . " (post_id, search_words) VALUES ($post_id, '$words_sql')");
+        OLD_DB()->query('REPLACE INTO ' . BB_POSTS_SEARCH . " (post_id, search_words) VALUES ($post_id, '$words_sql')");
     }
 }
 
@@ -417,7 +417,7 @@ function get_words_rate($text)
 
 function hide_passkey($str)
 {
-    return preg_replace("#\?" . config('tp.passkey_key') . "=[a-zA-Z0-9]{" . BT_AUTH_KEY_LENGTH . "}#", "?" . config('tp.passkey_key') . "=passkey", $str);
+    return preg_replace("#\?" . config('tp.passkey_key') . '=[a-zA-Z0-9]{' . BT_AUTH_KEY_LENGTH . '}#', '?' . config('tp.passkey_key') . '=passkey', $str);
 }
 
 function get_parsed_post($postrow, $mode = 'full', $return_chars = 600)
@@ -441,5 +441,5 @@ function get_parsed_post($postrow, $mode = 'full', $return_chars = 600)
 
 function update_post_html($postrow)
 {
-    OLD_DB()->query("DELETE FROM " . BB_POSTS_HTML . " WHERE post_id = " . (int)$postrow['post_id']);
+    OLD_DB()->query('DELETE FROM ' . BB_POSTS_HTML . ' WHERE post_id = ' . (int)$postrow['post_id']);
 }
diff --git a/library/includes/cron/cron_check.php b/library/includes/cron/cron_check.php
index 25077ce89..e6cd0c7ca 100644
--- a/library/includes/cron/cron_check.php
+++ b/library/includes/cron/cron_check.php
@@ -14,12 +14,12 @@ if (!defined('BB_ROOT')) {
 bb_log(date('H:i:s - ') . getmypid() . ' --x- SELECT jobs' . LOG_LF, CRON_LOG_DIR . '/cron_check');
 
 // Get cron jobs
-$cron_jobs = OLD_DB()->fetch_rowset("
-	SELECT * FROM " . BB_CRON . "
+$cron_jobs = OLD_DB()->fetch_rowset('
+	SELECT * FROM ' . BB_CRON . '
 	WHERE cron_active = 1
 		AND next_run <= NOW()
 	ORDER BY run_order
-");
+');
 
 // Run cron jobs
 if ($cron_jobs) {
diff --git a/library/includes/cron/cron_run.php b/library/includes/cron/cron_run.php
index 5dd4eb1ca..e289c4181 100644
--- a/library/includes/cron/cron_run.php
+++ b/library/includes/cron/cron_run.php
@@ -14,7 +14,7 @@ if (!defined('BB_ROOT')) {
 define('IN_CRON', true);
 
 // Set SESSION vars
-OLD_DB()->query("
+OLD_DB()->query('
 	SET SESSION
 	  myisam_sort_buffer_size = 16*1024*1024
 	, bulk_insert_buffer_size =  8*1024*1024
@@ -24,10 +24,10 @@ OLD_DB()->query("
 	, sort_buffer_size        =  4*1024*1024
 	, tmp_table_size          = 80*1024*1024
 	, group_concat_max_len    =  1*1024*1024
-");
+');
 
 // Restore vars at shutdown
-OLD_DB()->add_shutdown_query("
+OLD_DB()->add_shutdown_query('
 	SET SESSION
 	  myisam_sort_buffer_size = DEFAULT
 	, bulk_insert_buffer_size = DEFAULT
@@ -37,7 +37,7 @@ OLD_DB()->add_shutdown_query("
 	, sort_buffer_size        = DEFAULT
 	, tmp_table_size          = DEFAULT
 	, group_concat_max_len    = DEFAULT
-");
+');
 
 // $cron_jobs obtained in cron_check.php
 foreach ($cron_jobs as $job) {
@@ -91,8 +91,8 @@ foreach ($cron_jobs as $job) {
             }
         }
 
-        OLD_DB()->query("
-			UPDATE " . BB_CRON . " SET
+        OLD_DB()->query('
+			UPDATE ' . BB_CRON . " SET
 				last_run = NOW(),
 				run_counter = run_counter + 1,
 				next_run =
diff --git a/library/includes/cron/jobs/attach_maintenance.php b/library/includes/cron/jobs/attach_maintenance.php
index 7e5b7d8b7..8ccbfd7f5 100644
--- a/library/includes/cron/jobs/attach_maintenance.php
+++ b/library/includes/cron/jobs/attach_maintenance.php
@@ -64,10 +64,10 @@ if ($dir = @opendir($attach_dir)) {
 
 if ($check_attachments) {
     // Delete bad records
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE a, d
-		FROM      " . BB_ATTACHMENTS_DESC . " d
-		LEFT JOIN " . BB_ATTACHMENTS . " a USING(attach_id)
+		FROM      ' . BB_ATTACHMENTS_DESC . ' d
+		LEFT JOIN ' . BB_ATTACHMENTS . " a USING(attach_id)
 		WHERE (
 		     d.physical_filename = ''
 		  OR d.real_filename = ''
@@ -98,8 +98,8 @@ if ($check_attachments) {
         }
     }
     // Find DB records for attachments that exist in DB but not exist in file system
-    $sql = "SELECT d.attach_id
-		FROM " . BB_ATTACHMENTS_DESC . " d
+    $sql = 'SELECT d.attach_id
+		FROM ' . BB_ATTACHMENTS_DESC . " d
 		LEFT JOIN $tmp_attach_tbl f USING(physical_filename)
 		WHERE f.physical_filename IS NULL
 		LIMIT $sql_limit";
@@ -108,9 +108,9 @@ if ($check_attachments) {
         $orphan_db_attach[] = $row['attach_id'];
     }
     // Attachment exist in DESC_TABLE but not exist in ATTACH_TABLE
-    $sql = "SELECT d.attach_id
-		FROM " . BB_ATTACHMENTS_DESC . " d
-		LEFT JOIN " . BB_ATTACHMENTS . " a USING(attach_id)
+    $sql = 'SELECT d.attach_id
+		FROM ' . BB_ATTACHMENTS_DESC . ' d
+		LEFT JOIN ' . BB_ATTACHMENTS . " a USING(attach_id)
 		WHERE a.attach_id IS NULL
 		LIMIT $sql_limit";
 
@@ -118,9 +118,9 @@ if ($check_attachments) {
         $orphan_db_attach[] = $row['attach_id'];
     }
     // Attachment exist in ATTACH_TABLE but not exist in DESC_TABLE
-    $sql = "SELECT a.attach_id
-		FROM " . BB_ATTACHMENTS . " a
-		LEFT JOIN " . BB_ATTACHMENTS_DESC . " d USING(attach_id)
+    $sql = 'SELECT a.attach_id
+		FROM ' . BB_ATTACHMENTS . ' a
+		LEFT JOIN ' . BB_ATTACHMENTS_DESC . " d USING(attach_id)
 		WHERE d.attach_id IS NULL
 		LIMIT $sql_limit";
 
@@ -128,9 +128,9 @@ if ($check_attachments) {
         $orphan_db_attach[] = $row['attach_id'];
     }
     // Attachments without post
-    $sql = "SELECT a.attach_id
-		FROM " . BB_ATTACHMENTS . " a
-		LEFT JOIN " . BB_POSTS . " p USING(post_id)
+    $sql = 'SELECT a.attach_id
+		FROM ' . BB_ATTACHMENTS . ' a
+		LEFT JOIN ' . BB_POSTS . " p USING(post_id)
 		WHERE p.post_id IS NULL
 		LIMIT $sql_limit";
 
@@ -140,15 +140,15 @@ if ($check_attachments) {
     // Delete all orphan attachments
     if ($orphans_sql = implode(',', $orphan_db_attach)) {
         if ($fix_errors) {
-            OLD_DB()->query("DELETE FROM " . BB_ATTACHMENTS_DESC . " WHERE attach_id IN($orphans_sql)");
-            OLD_DB()->query("DELETE FROM " . BB_ATTACHMENTS . " WHERE attach_id IN($orphans_sql)");
+            OLD_DB()->query('DELETE FROM ' . BB_ATTACHMENTS_DESC . " WHERE attach_id IN($orphans_sql)");
+            OLD_DB()->query('DELETE FROM ' . BB_ATTACHMENTS . " WHERE attach_id IN($orphans_sql)");
         }
     }
 
     // Torrents without attachments
-    $sql = "SELECT tor.topic_id
-		FROM " . BB_BT_TORRENTS . " tor
-		LEFT JOIN " . BB_ATTACHMENTS_DESC . " d USING(attach_id)
+    $sql = 'SELECT tor.topic_id
+		FROM ' . BB_BT_TORRENTS . ' tor
+		LEFT JOIN ' . BB_ATTACHMENTS_DESC . " d USING(attach_id)
 		WHERE d.attach_id IS NULL
 		LIMIT $sql_limit";
 
@@ -158,39 +158,39 @@ if ($check_attachments) {
     // Delete all orphan torrents
     if ($orphans_sql = implode(',', $orphan_tor)) {
         if ($fix_errors) {
-            OLD_DB()->query("DELETE FROM " . BB_BT_TORRENTS . " WHERE topic_id IN($orphans_sql)");
+            OLD_DB()->query('DELETE FROM ' . BB_BT_TORRENTS . " WHERE topic_id IN($orphans_sql)");
         }
     }
 
     // Check post_attachment markers
-    $sql = "SELECT p.post_id
-		FROM " . BB_POSTS . " p
-		LEFT JOIN " . BB_ATTACHMENTS . " a USING(post_id)
+    $sql = 'SELECT p.post_id
+		FROM ' . BB_POSTS . ' p
+		LEFT JOIN ' . BB_ATTACHMENTS . ' a USING(post_id)
 		WHERE p.post_attachment = 1
-		AND a.post_id IS NULL";
+		AND a.post_id IS NULL';
 
     foreach (OLD_DB()->fetch_rowset($sql) as $row) {
         $posts_without_attach[] = $row['post_id'];
     }
     if ($posts_sql = implode(',', $posts_without_attach)) {
         if ($fix_errors) {
-            OLD_DB()->query("UPDATE " . BB_POSTS . " SET post_attachment = 0 WHERE post_id IN($posts_sql)");
+            OLD_DB()->query('UPDATE ' . BB_POSTS . " SET post_attachment = 0 WHERE post_id IN($posts_sql)");
         }
     }
     // Check topic_attachment markers
-    $sql = "SELECT t.topic_id
-		FROM " . BB_POSTS . " p, " . BB_TOPICS . " t
+    $sql = 'SELECT t.topic_id
+		FROM ' . BB_POSTS . ' p, ' . BB_TOPICS . ' t
 		WHERE t.topic_id = p.topic_id
 			AND t.topic_attachment = 1
 		GROUP BY p.topic_id
-		HAVING SUM(p.post_attachment) = 0";
+		HAVING SUM(p.post_attachment) = 0';
 
     foreach (OLD_DB()->fetch_rowset($sql) as $row) {
         $topics_without_attach[] = $row['topic_id'];
     }
     if ($topics_sql = implode(',', $topics_without_attach)) {
         if ($fix_errors) {
-            OLD_DB()->query("UPDATE " . BB_TOPICS . " SET topic_attachment = 0 WHERE topic_id IN($topics_sql)");
+            OLD_DB()->query('UPDATE ' . BB_TOPICS . " SET topic_attachment = 0 WHERE topic_id IN($topics_sql)");
         }
     }
 }
diff --git a/library/includes/cron/jobs/board_maintenance.php b/library/includes/cron/jobs/board_maintenance.php
index f22e22b6f..1c68c7363 100644
--- a/library/includes/cron/jobs/board_maintenance.php
+++ b/library/includes/cron/jobs/board_maintenance.php
@@ -21,7 +21,7 @@ sync_all_forums();
 // Чистка bb_poll_users
 if ($poll_max_days = (int)config('tp.poll_max_days')) {
     $per_cycle = 20000;
-    $row = OLD_DB()->fetch_row("SELECT MIN(topic_id) AS start_id, MAX(topic_id) AS finish_id FROM " . BB_POLL_USERS);
+    $row = OLD_DB()->fetch_row('SELECT MIN(topic_id) AS start_id, MAX(topic_id) AS finish_id FROM ' . BB_POLL_USERS);
     $start_id = (int)$row['start_id'];
     $finish_id = (int)$row['finish_id'];
 
@@ -29,8 +29,8 @@ if ($poll_max_days = (int)config('tp.poll_max_days')) {
         set_time_limit(600);
         $end_id = $start_id + $per_cycle - 1;
 
-        OLD_DB()->query("
-			DELETE FROM " . BB_POLL_USERS . "
+        OLD_DB()->query('
+			DELETE FROM ' . BB_POLL_USERS . "
 			WHERE topic_id BETWEEN $start_id AND $end_id
 				AND vote_dt < DATE_SUB(NOW(), INTERVAL $poll_max_days DAY)
 		");
@@ -44,9 +44,9 @@ if ($poll_max_days = (int)config('tp.poll_max_days')) {
 }
 
 // Чистка user_newpasswd
-OLD_DB()->query("UPDATE " . BB_USERS . " SET user_newpasswd = '' WHERE user_lastvisit < " . (TIMENOW - 7 * 86400));
+OLD_DB()->query('UPDATE ' . BB_USERS . " SET user_newpasswd = '' WHERE user_lastvisit < " . (TIMENOW - 7 * 86400));
 
 // Чистка кеша постов
 if ($posts_days = (int)config('tp.posts_cache_days_keep')) {
-    OLD_DB()->query("DELETE FROM " . BB_POSTS_HTML . " WHERE post_html_time < DATE_SUB(NOW(), INTERVAL $posts_days DAY)");
+    OLD_DB()->query('DELETE FROM ' . BB_POSTS_HTML . " WHERE post_html_time < DATE_SUB(NOW(), INTERVAL $posts_days DAY)");
 }
diff --git a/library/includes/cron/jobs/cache_gc.php b/library/includes/cron/jobs/cache_gc.php
index 3f9bce293..8205495fa 100644
--- a/library/includes/cron/jobs/cache_gc.php
+++ b/library/includes/cron/jobs/cache_gc.php
@@ -16,6 +16,6 @@ global $cron_runtime_log;
 foreach (config('tp.cache.engines') as $cache_name => $cache_val) {
     if (method_exists(OLD_CACHE($cache_name), 'gc')) {
         $changes = OLD_CACHE($cache_name)->gc();
-        $cron_runtime_log = date('Y-m-d H:i:s') . " -- " . str_pad("$cache_name ", 25, '-', STR_PAD_RIGHT) . " del: $changes\n";
+        $cron_runtime_log = date('Y-m-d H:i:s') . ' -- ' . str_pad("$cache_name ", 25, '-', STR_PAD_RIGHT) . " del: $changes\n";
     }
 }
diff --git a/library/includes/cron/jobs/clean_dlstat.php b/library/includes/cron/jobs/clean_dlstat.php
index 146ca83d1..0b51462ff 100644
--- a/library/includes/cron/jobs/clean_dlstat.php
+++ b/library/includes/cron/jobs/clean_dlstat.php
@@ -32,54 +32,54 @@ foreach ($keeping_dlstat as $dl_status => $days_to_keep) {
 }
 
 if ($delete_dlstat_sql = implode(') OR (', $delete_dlstat_sql)) {
-    OLD_DB()->query("DELETE QUICK FROM " . BB_BT_DLSTATUS . " WHERE ($delete_dlstat_sql)");
+    OLD_DB()->query('DELETE QUICK FROM ' . BB_BT_DLSTATUS . " WHERE ($delete_dlstat_sql)");
 }
 
 // Delete orphans
-OLD_DB()->query("
+OLD_DB()->query('
 	DELETE QUICK dl
-	FROM " . BB_BT_DLSTATUS . " dl
-	LEFT JOIN " . BB_USERS . " u USING(user_id)
+	FROM ' . BB_BT_DLSTATUS . ' dl
+	LEFT JOIN ' . BB_USERS . ' u USING(user_id)
 	WHERE u.user_id IS NULL
-");
+');
 
-OLD_DB()->query("
+OLD_DB()->query('
 	DELETE QUICK dl
-	FROM " . BB_BT_DLSTATUS . " dl
-	LEFT JOIN " . BB_TOPICS . " t USING(topic_id)
+	FROM ' . BB_BT_DLSTATUS . ' dl
+	LEFT JOIN ' . BB_TOPICS . ' t USING(topic_id)
 	WHERE t.topic_id IS NULL
-");
+');
 
 // Tor-Stats cleanup
 if ($torstat_days_keep = (int)config('tp.torstat_days_keep')) {
-    OLD_DB()->query("DELETE QUICK FROM " . BB_BT_TORSTAT . " WHERE last_modified_torstat < DATE_SUB(NOW(), INTERVAL $torstat_days_keep DAY)");
+    OLD_DB()->query('DELETE QUICK FROM ' . BB_BT_TORSTAT . " WHERE last_modified_torstat < DATE_SUB(NOW(), INTERVAL $torstat_days_keep DAY)");
 }
 
-OLD_DB()->query("
+OLD_DB()->query('
 	DELETE QUICK tst
-	FROM " . BB_BT_TORSTAT . " tst
-	LEFT JOIN " . BB_BT_TORRENTS . " tor USING(topic_id)
+	FROM ' . BB_BT_TORSTAT . ' tst
+	LEFT JOIN ' . BB_BT_TORRENTS . ' tor USING(topic_id)
 	WHERE tor.topic_id IS NULL
-");
+');
 
-OLD_DB()->query("
+OLD_DB()->query('
 	UPDATE
-		" . BB_BT_USERS . "
+		' . BB_BT_USERS . '
 	SET
 		up_yesterday         = up_today,
 		down_yesterday       = down_today,
 		up_release_yesterday = up_release_today,
 		up_bonus_yesterday   = up_bonus_today,
 		points_yesterday     = points_today
-");
+');
 
-OLD_DB()->query("
+OLD_DB()->query('
 	UPDATE
-		" . BB_BT_USERS . "
+		' . BB_BT_USERS . '
 	SET
 		up_today             = 0,
 		down_today           = 0,
 		up_release_today     = 0,
 		up_bonus_today       = 0,
 		points_today         = 0
-");
+');
diff --git a/library/includes/cron/jobs/clean_log.php b/library/includes/cron/jobs/clean_log.php
index 9da507cc5..25cbb0fae 100644
--- a/library/includes/cron/jobs/clean_log.php
+++ b/library/includes/cron/jobs/clean_log.php
@@ -13,7 +13,7 @@ if (!defined('BB_ROOT')) {
 
 $log_days_keep = (int)config('tp.log_days_keep');
 
-OLD_DB()->query("
-	DELETE FROM " . BB_LOG . "
-	WHERE log_time < " . (TIMENOW - 86400 * $log_days_keep) . "
-");
+OLD_DB()->query('
+	DELETE FROM ' . BB_LOG . '
+	WHERE log_time < ' . (TIMENOW - 86400 * $log_days_keep) . '
+');
diff --git a/library/includes/cron/jobs/clean_search_results.php b/library/includes/cron/jobs/clean_search_results.php
index 58cfd4c32..cbb4597e4 100644
--- a/library/includes/cron/jobs/clean_search_results.php
+++ b/library/includes/cron/jobs/clean_search_results.php
@@ -13,7 +13,7 @@ if (!defined('BB_ROOT')) {
 
 $search_results_expire = TIMENOW - 3 * 3600;
 
-OLD_DB()->query("
-	DELETE FROM " . BB_SEARCH . "
+OLD_DB()->query('
+	DELETE FROM ' . BB_SEARCH . "
 	WHERE search_time < $search_results_expire
 ");
diff --git a/library/includes/cron/jobs/flash_topic_view.php b/library/includes/cron/jobs/flash_topic_view.php
index 24201df3a..c9751603b 100644
--- a/library/includes/cron/jobs/flash_topic_view.php
+++ b/library/includes/cron/jobs/flash_topic_view.php
@@ -18,18 +18,18 @@ OLD_DB()->lock(array(
 ));
 
 // Flash buffered records
-OLD_DB()->query("
+OLD_DB()->query('
 	UPDATE
-		" . BB_TOPICS . " t,
-		" . BUF_TOPIC_VIEW . " buf
+		' . BB_TOPICS . ' t,
+		' . BUF_TOPIC_VIEW . ' buf
 	SET
 		t.topic_views = t.topic_views + buf.topic_views
 	WHERE
 		t.topic_id = buf.topic_id
-");
+');
 
 // Delete buffered records
-OLD_DB()->query("DELETE buf FROM " . BUF_TOPIC_VIEW . " buf");
+OLD_DB()->query('DELETE buf FROM ' . BUF_TOPIC_VIEW . ' buf');
 
 // Unlock tables
 OLD_DB()->unlock();
diff --git a/library/includes/cron/jobs/prune_forums.php b/library/includes/cron/jobs/prune_forums.php
index 1a68c511f..31c36f01e 100644
--- a/library/includes/cron/jobs/prune_forums.php
+++ b/library/includes/cron/jobs/prune_forums.php
@@ -14,7 +14,7 @@ if (!defined('BB_ROOT')) {
 require_once INC_DIR . '/functions_admin.php';
 
 if (config('tp.prune_enable')) {
-    $sql = "SELECT forum_id, prune_days FROM " . BB_FORUMS . " WHERE prune_days != 0";
+    $sql = 'SELECT forum_id, prune_days FROM ' . BB_FORUMS . ' WHERE prune_days != 0';
 
     foreach (OLD_DB()->fetch_rowset($sql) as $row) {
         topic_delete('prune', $row['forum_id'], TIMENOW - 86400 * $row['prune_days']);
diff --git a/library/includes/cron/jobs/prune_inactive_users.php b/library/includes/cron/jobs/prune_inactive_users.php
index 4dea49e62..a2fee0816 100644
--- a/library/includes/cron/jobs/prune_inactive_users.php
+++ b/library/includes/cron/jobs/prune_inactive_users.php
@@ -21,12 +21,12 @@ while (true) {
     $prune_users = $not_activated_users = $not_active_users = array();
 
     if ($not_activated_days = (int)config('tp.user_not_activated_days_keep')) {
-        $sql = OLD_DB()->fetch_rowset("SELECT user_id FROM " . BB_USERS . "
+        $sql = OLD_DB()->fetch_rowset('SELECT user_id FROM ' . BB_USERS . '
 			WHERE user_level      = 0
 			AND user_lastvisit    = 0
 			AND user_session_time = 0
-			AND user_regdate      <= " . (TIMENOW - 86400 * $not_activated_days) . "
-			AND user_id           NOT IN(" . EXCLUDED_USERS . ")
+			AND user_regdate      <= ' . (TIMENOW - 86400 * $not_activated_days) . '
+			AND user_id           NOT IN(' . EXCLUDED_USERS . ")
 			LIMIT $users_per_cycle");
 
         foreach ($sql as $row) {
@@ -35,11 +35,11 @@ while (true) {
     }
 
     if ($not_active_days = (int)config('tp.user_not_active_days_keep')) {
-        $sql = OLD_DB()->fetch_rowset("SELECT user_id FROM " . BB_USERS . "
+        $sql = OLD_DB()->fetch_rowset('SELECT user_id FROM ' . BB_USERS . '
 			WHERE user_level   = 0
 			AND user_posts     = 0
-			AND user_lastvisit <= " . (TIMENOW - 86400 * $not_active_days) . "
-			AND user_id        NOT IN(" . EXCLUDED_USERS . ")
+			AND user_lastvisit <= ' . (TIMENOW - 86400 * $not_active_days) . '
+			AND user_id        NOT IN(' . EXCLUDED_USERS . ")
 			LIMIT $users_per_cycle");
 
         foreach ($sql as $row) {
diff --git a/library/includes/cron/jobs/prune_topic_moved.php b/library/includes/cron/jobs/prune_topic_moved.php
index 9b0064396..2c27c4b19 100644
--- a/library/includes/cron/jobs/prune_topic_moved.php
+++ b/library/includes/cron/jobs/prune_topic_moved.php
@@ -14,9 +14,9 @@ if (!defined('BB_ROOT')) {
 if (config('tp.topic_moved_days_keep')) {
     $prune_time = TIMENOW - 86400 * config('tp.topic_moved_days_keep');
 
-    OLD_DB()->query("
-		DELETE FROM " . BB_TOPICS . "
-		WHERE topic_status = " . TOPIC_MOVED . "
+    OLD_DB()->query('
+		DELETE FROM ' . BB_TOPICS . '
+		WHERE topic_status = ' . TOPIC_MOVED . "
 			AND topic_time < $prune_time
 	");
 }
diff --git a/library/includes/cron/jobs/sessions_cleanup.php b/library/includes/cron/jobs/sessions_cleanup.php
index 96cf8caea..e714ffb26 100644
--- a/library/includes/cron/jobs/sessions_cleanup.php
+++ b/library/includes/cron/jobs/sessions_cleanup.php
@@ -24,15 +24,15 @@ OLD_DB()->lock(array(
 ));
 
 // Update user's session time
-OLD_DB()->query("
+OLD_DB()->query('
 	UPDATE
-		" . BB_USERS . " u,
-		" . BB_SESSIONS . " s
+		' . BB_USERS . ' u,
+		' . BB_SESSIONS . ' s
 	SET
 		u.user_session_time = IF(u.user_session_time < s.session_time, s.session_time, u.user_session_time)
 	WHERE
 				u.user_id = s.session_user_id
-		AND s.session_user_id != " . GUEST_UID . "
+		AND s.session_user_id != ' . GUEST_UID . "
 		AND (
 			(s.session_time < $user_session_expire_time AND s.session_admin = 0)
 			OR
@@ -44,9 +44,9 @@ OLD_DB()->unlock();
 // ############################ Tables UNLOCKED ##############################
 
 // Delete staled sessions
-OLD_DB()->query("
+OLD_DB()->query('
 	DELETE s
-	FROM " . BB_SESSIONS . " s
+	FROM ' . BB_SESSIONS . " s
 	WHERE
 		(s.session_time < $user_session_gc_time AND s.session_admin = 0)
 		OR
diff --git a/library/includes/cron/jobs/tr_cleanup_and_dlstat.php b/library/includes/cron/jobs/tr_cleanup_and_dlstat.php
index fa892b879..dc8f49f9b 100644
--- a/library/includes/cron/jobs/tr_cleanup_and_dlstat.php
+++ b/library/includes/cron/jobs/tr_cleanup_and_dlstat.php
@@ -18,11 +18,11 @@ define('OLD_BB_BT_LAST_TORSTAT', 'old_bt_last_torstat');
 define('NEW_BB_BT_LAST_USERSTAT', 'new_bt_last_userstat');
 define('OLD_BB_BT_LAST_USERSTAT', 'old_bt_last_userstat');
 
-OLD_DB()->query("DROP TABLE IF EXISTS " . NEW_BB_BT_LAST_TORSTAT . ", " . NEW_BB_BT_LAST_USERSTAT);
-OLD_DB()->query("DROP TABLE IF EXISTS " . OLD_BB_BT_LAST_TORSTAT . ", " . OLD_BB_BT_LAST_USERSTAT);
+OLD_DB()->query('DROP TABLE IF EXISTS ' . NEW_BB_BT_LAST_TORSTAT . ', ' . NEW_BB_BT_LAST_USERSTAT);
+OLD_DB()->query('DROP TABLE IF EXISTS ' . OLD_BB_BT_LAST_TORSTAT . ', ' . OLD_BB_BT_LAST_USERSTAT);
 
-OLD_DB()->query("CREATE TABLE " . NEW_BB_BT_LAST_TORSTAT . " LIKE " . BB_BT_LAST_TORSTAT);
-OLD_DB()->query("CREATE TABLE " . NEW_BB_BT_LAST_USERSTAT . " LIKE " . BB_BT_LAST_USERSTAT);
+OLD_DB()->query('CREATE TABLE ' . NEW_BB_BT_LAST_TORSTAT . ' LIKE ' . BB_BT_LAST_TORSTAT);
+OLD_DB()->query('CREATE TABLE ' . NEW_BB_BT_LAST_USERSTAT . ' LIKE ' . BB_BT_LAST_USERSTAT);
 
 OLD_DB()->expect_slow_query(600);
 
@@ -35,33 +35,33 @@ if (config('tracker.update_dlstat')) {
     ));
 
     // Get PER TORRENT user's dlstat from tracker
-    OLD_DB()->query("
-		INSERT INTO " . NEW_BB_BT_LAST_TORSTAT . "
+    OLD_DB()->query('
+		INSERT INTO ' . NEW_BB_BT_LAST_TORSTAT . "
 			(topic_id, user_id, dl_status, up_add, down_add, release_add, speed_up, speed_down)
 		SELECT
 			topic_id, user_id, IF(releaser, $releaser, seeder), SUM(up_add), SUM(down_add), IF(releaser, SUM(up_add), 0), SUM(speed_up), SUM(speed_down)
-		FROM " . BB_BT_TRACKER . "
+		FROM " . BB_BT_TRACKER . '
 		WHERE (up_add != 0 OR down_add != 0)
 		GROUP BY topic_id, user_id, releaser, seeder
-	");
+	');
 
     // Reset up/down additions in tracker
-    OLD_DB()->query("UPDATE " . BB_BT_TRACKER . " SET up_add = 0, down_add = 0");
+    OLD_DB()->query('UPDATE ' . BB_BT_TRACKER . ' SET up_add = 0, down_add = 0');
 
     OLD_DB()->unlock();
     // ############################ Tables UNLOCKED ##############################
 }
 
 // Update last seeder info in BUF
-OLD_DB()->query("
-	REPLACE INTO " . BUF_LAST_SEEDER . "
+OLD_DB()->query('
+	REPLACE INTO ' . BUF_LAST_SEEDER . '
 		(topic_id, seeder_last_seen)
 	SELECT
-		topic_id, " . TIMENOW . "
-	FROM " . BB_BT_TRACKER . "
+		topic_id, ' . TIMENOW . '
+	FROM ' . BB_BT_TRACKER . '
 	WHERE seeder = 1
 	GROUP BY topic_id
-");
+');
 
 // Clean peers table
 if (config('tracker.autoclean')) {
@@ -69,40 +69,40 @@ if (config('tracker.autoclean')) {
     $expire_factor = max((float)config('tracker.expire_factor'), 1);
     $peer_expire_time = TIMENOW - floor($announce_interval * $expire_factor);
 
-    OLD_DB()->query("DELETE FROM " . BB_BT_TRACKER . " WHERE update_time < $peer_expire_time");
+    OLD_DB()->query('DELETE FROM ' . BB_BT_TRACKER . " WHERE update_time < $peer_expire_time");
 }
 
 // Update dlstat (part 2)
 if (config('tracker.update_dlstat')) {
     // Set "only 1 seeder" bonus
-    OLD_DB()->query("
+    OLD_DB()->query('
 		UPDATE
-			" . NEW_BB_BT_LAST_TORSTAT . " tb,
-			" . BB_BT_TRACKER_SNAP . " sn
+			' . NEW_BB_BT_LAST_TORSTAT . ' tb,
+			' . BB_BT_TRACKER_SNAP . ' sn
 		SET
 			tb.bonus_add = tb.up_add
 		WHERE
 			tb.topic_id = sn.topic_id
 				AND sn.seeders = 1
 				AND tb.up_add != 0
-				AND tb.dl_status = " . DL_STATUS_COMPLETE . "
-	");
+				AND tb.dl_status = ' . DL_STATUS_COMPLETE . '
+	');
 
     // Get SUMMARIZED user's dlstat
-    OLD_DB()->query("
-		INSERT INTO " . NEW_BB_BT_LAST_USERSTAT . "
+    OLD_DB()->query('
+		INSERT INTO ' . NEW_BB_BT_LAST_USERSTAT . '
 			(user_id, up_add, down_add, release_add, bonus_add, speed_up, speed_down)
 		SELECT
 			user_id, SUM(up_add), SUM(down_add), SUM(release_add), SUM(bonus_add), SUM(speed_up), SUM(speed_down)
-		FROM " . NEW_BB_BT_LAST_TORSTAT . "
+		FROM ' . NEW_BB_BT_LAST_TORSTAT . '
 		GROUP BY user_id
-	");
+	');
 
     // Update TOTAL user's dlstat
-    OLD_DB()->query("
+    OLD_DB()->query('
 		UPDATE
-			" . BB_BT_USERS . " u,
-			" . NEW_BB_BT_LAST_USERSTAT . " ub
+			' . BB_BT_USERS . ' u,
+			' . NEW_BB_BT_LAST_USERSTAT . ' ub
 		SET
 			u.u_up_total       = u.u_up_total       + ub.up_add,
 			u.u_down_total     = u.u_down_total     + ub.down_add,
@@ -113,47 +113,47 @@ if (config('tracker.update_dlstat')) {
 			u.up_release_today = u.up_release_today + ub.release_add,
 			u.up_bonus_today   = u.up_bonus_today   + ub.bonus_add
 		WHERE u.user_id = ub.user_id
-	");
+	');
 
     // Delete from dl_list what exists in BUF but not exsits in NEW
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE dl
-		FROM " . BB_BT_DLSTATUS . " dl
-		INNER JOIN " . NEW_BB_BT_LAST_TORSTAT . " buf USING(user_id, topic_id)
+		FROM ' . BB_BT_DLSTATUS . ' dl
+		INNER JOIN ' . NEW_BB_BT_LAST_TORSTAT . ' buf USING(user_id, topic_id)
 		WHERE buf.user_id IS NULL
 			AND buf.topic_id IS NULL
-	");
+	');
 
     // Update DL-Status
-    OLD_DB()->query("
-		REPLACE INTO " . BB_BT_DLSTATUS . "
+    OLD_DB()->query('
+		REPLACE INTO ' . BB_BT_DLSTATUS . '
 			(user_id, topic_id, user_status)
 		SELECT
 			user_id, topic_id, dl_status
-		FROM " . NEW_BB_BT_LAST_TORSTAT . "
-	");
+		FROM ' . NEW_BB_BT_LAST_TORSTAT . '
+	');
 
     // Update PER TORRENT DL-Status (for "completed" counter)
-    OLD_DB()->query("
-		INSERT IGNORE INTO " . BB_BT_TORSTAT . "
+    OLD_DB()->query('
+		INSERT IGNORE INTO ' . BB_BT_TORSTAT . '
 			(topic_id, user_id)
 		SELECT
 			topic_id, user_id
-		FROM " . NEW_BB_BT_LAST_TORSTAT . "
-		WHERE dl_status = " . DL_STATUS_COMPLETE . "
-	");
+		FROM ' . NEW_BB_BT_LAST_TORSTAT . '
+		WHERE dl_status = ' . DL_STATUS_COMPLETE . '
+	');
 }
 
-OLD_DB()->query("
+OLD_DB()->query('
 	RENAME TABLE
-	" . BB_BT_LAST_TORSTAT . " TO " . OLD_BB_BT_LAST_TORSTAT . ",
-	" . NEW_BB_BT_LAST_TORSTAT . " TO " . BB_BT_LAST_TORSTAT . "
-");
-OLD_DB()->query("DROP TABLE IF EXISTS " . NEW_BB_BT_LAST_TORSTAT . ", " . OLD_BB_BT_LAST_TORSTAT);
+	' . BB_BT_LAST_TORSTAT . ' TO ' . OLD_BB_BT_LAST_TORSTAT . ',
+	' . NEW_BB_BT_LAST_TORSTAT . ' TO ' . BB_BT_LAST_TORSTAT . '
+');
+OLD_DB()->query('DROP TABLE IF EXISTS ' . NEW_BB_BT_LAST_TORSTAT . ', ' . OLD_BB_BT_LAST_TORSTAT);
 
-OLD_DB()->query("
+OLD_DB()->query('
 	RENAME TABLE
-	" . BB_BT_LAST_USERSTAT . " TO " . OLD_BB_BT_LAST_USERSTAT . ",
-	" . NEW_BB_BT_LAST_USERSTAT . " TO " . BB_BT_LAST_USERSTAT . "
-");
-OLD_DB()->query("DROP TABLE IF EXISTS " . NEW_BB_BT_LAST_USERSTAT . ", " . OLD_BB_BT_LAST_USERSTAT);
+	' . BB_BT_LAST_USERSTAT . ' TO ' . OLD_BB_BT_LAST_USERSTAT . ',
+	' . NEW_BB_BT_LAST_USERSTAT . ' TO ' . BB_BT_LAST_USERSTAT . '
+');
+OLD_DB()->query('DROP TABLE IF EXISTS ' . NEW_BB_BT_LAST_USERSTAT . ', ' . OLD_BB_BT_LAST_USERSTAT);
diff --git a/library/includes/cron/jobs/tr_complete_count.php b/library/includes/cron/jobs/tr_complete_count.php
index 4398604a9..406480e34 100644
--- a/library/includes/cron/jobs/tr_complete_count.php
+++ b/library/includes/cron/jobs/tr_complete_count.php
@@ -13,40 +13,40 @@ if (!defined('BB_ROOT')) {
 
 if (config('tp.ocelot.enabled')) {
     // Update TORRENT "completed" counters
-    OLD_DB()->query("
+    OLD_DB()->query('
 		UPDATE
-			" . BB_BT_TORRENTS . " tor,
-			" . BB_BT_TRACKER_SNAP . " snap
+			' . BB_BT_TORRENTS . ' tor,
+			' . BB_BT_TRACKER_SNAP . ' snap
 		SET
 			tor.complete_count = snap.complete
 		WHERE
 			tor.topic_id = snap.topic_id
-	");
+	');
 } else {
     // Get complete counts
-    OLD_DB()->query("
+    OLD_DB()->query('
 		CREATE TEMPORARY TABLE tmp_complete_count
 		SELECT
 			topic_id, COUNT(*) AS compl_cnt
-		FROM " . BB_BT_TORSTAT . "
+		FROM ' . BB_BT_TORSTAT . '
 		WHERE completed = 0
 		GROUP BY topic_id
-	");
+	');
 
     // Update USER "completed" counters
-    OLD_DB()->query("UPDATE " . BB_BT_TORSTAT . " SET completed = 1");
+    OLD_DB()->query('UPDATE ' . BB_BT_TORSTAT . ' SET completed = 1');
 
     // Update TORRENT "completed" counters
-    OLD_DB()->query("
+    OLD_DB()->query('
 		UPDATE
-			" . BB_BT_TORRENTS . " tor,
+			' . BB_BT_TORRENTS . ' tor,
 			tmp_complete_count tmp
 		SET
 			tor.complete_count = tor.complete_count + tmp.compl_cnt
 		WHERE
 			tor.topic_id = tmp.topic_id
-	");
+	');
 
     // Drop tmp table
-    OLD_DB()->query("DROP TEMPORARY TABLE tmp_complete_count");
+    OLD_DB()->query('DROP TEMPORARY TABLE tmp_complete_count');
 }
diff --git a/library/includes/cron/jobs/tr_maintenance.php b/library/includes/cron/jobs/tr_maintenance.php
index d999c76a4..900c7e5d1 100644
--- a/library/includes/cron/jobs/tr_maintenance.php
+++ b/library/includes/cron/jobs/tr_maintenance.php
@@ -21,8 +21,8 @@ $limit_sql = 3000;
 
 $topics_sql = $attach_sql = array();
 
-$sql = "SELECT topic_id, attach_id
-	FROM " . BB_BT_TORRENTS . "
+$sql = 'SELECT topic_id, attach_id
+	FROM ' . BB_BT_TORRENTS . "
 	WHERE reg_time < $never_seen_time
 		AND seeder_last_seen < $last_seen_time
 	LIMIT $limit_sql";
@@ -36,16 +36,16 @@ $attach_sql = implode(',', $attach_sql);
 
 if ($dead_tor_sql && $attach_sql) {
     // Delete torstat
-    OLD_DB()->query("
-		DELETE FROM " . BB_BT_TORSTAT . "
+    OLD_DB()->query('
+		DELETE FROM ' . BB_BT_TORSTAT . "
 		WHERE topic_id IN($dead_tor_sql)
 	");
 
     // Update attach
-    OLD_DB()->query("
+    OLD_DB()->query('
 		UPDATE
-			" . BB_ATTACHMENTS_DESC . " a,
-			" . BB_BT_TORRENTS . " tor
+			' . BB_ATTACHMENTS_DESC . ' a,
+			' . BB_BT_TORRENTS . " tor
 		SET
 			a.tracker_status = 0,
 			a.download_count = tor.complete_count
@@ -55,8 +55,8 @@ if ($dead_tor_sql && $attach_sql) {
 	");
 
     // Remove torrents
-    OLD_DB()->query("
-		DELETE FROM " . BB_BT_TORRENTS . "
+    OLD_DB()->query('
+		DELETE FROM ' . BB_BT_TORRENTS . "
 		WHERE topic_id IN($dead_tor_sql)
 	");
 }
diff --git a/library/includes/cron/jobs/tr_make_snapshot.php b/library/includes/cron/jobs/tr_make_snapshot.php
index 4692dd2a3..25e882b89 100644
--- a/library/includes/cron/jobs/tr_make_snapshot.php
+++ b/library/includes/cron/jobs/tr_make_snapshot.php
@@ -20,12 +20,12 @@ if (!config('tp.ocelot.enabled')) {
     define('NEW_BB_BT_TRACKER_SNAP', 'new_tracker_snap');
     define('OLD_BB_BT_TRACKER_SNAP', 'old_tracker_snap');
 
-    OLD_DB()->query("DROP TABLE IF EXISTS " . NEW_BB_BT_TRACKER_SNAP . ", " . OLD_BB_BT_TRACKER_SNAP);
-    OLD_DB()->query("CREATE TABLE " . NEW_BB_BT_TRACKER_SNAP . " LIKE " . BB_BT_TRACKER_SNAP);
+    OLD_DB()->query('DROP TABLE IF EXISTS ' . NEW_BB_BT_TRACKER_SNAP . ', ' . OLD_BB_BT_TRACKER_SNAP);
+    OLD_DB()->query('CREATE TABLE ' . NEW_BB_BT_TRACKER_SNAP . ' LIKE ' . BB_BT_TRACKER_SNAP);
 }
 
 $per_cycle = 50000;
-$row = OLD_DB()->fetch_row("SELECT MIN(topic_id) AS start_id, MAX(topic_id) AS finish_id FROM " . BB_BT_TRACKER);
+$row = OLD_DB()->fetch_row('SELECT MIN(topic_id) AS start_id, MAX(topic_id) AS finish_id FROM ' . BB_BT_TRACKER);
 $start_id = (int)$row['start_id'];
 $finish_id = (int)$row['finish_id'];
 
@@ -36,19 +36,19 @@ while (true) {
     $val = array();
 
     if (!config('tp.ocelot.enabled')) {
-        $sql = "
+        $sql = '
 			SELECT
 				topic_id, SUM(seeder) AS seeders, (COUNT(*) - SUM(seeder)) AS leechers,
 				SUM(speed_up) AS speed_up, SUM(speed_down) AS speed_down
-			FROM " . BB_BT_TRACKER . "
+			FROM ' . BB_BT_TRACKER . "
 			WHERE topic_id BETWEEN $start_id AND $end_id
 			GROUP BY topic_id
 		";
     } else {
-        $sql = "
+        $sql = '
 			SELECT
 				topic_id, SUM(speed_up) AS speed_up, SUM(speed_down) AS speed_down
-			FROM " . BB_BT_TRACKER . "
+			FROM ' . BB_BT_TRACKER . "
 			WHERE topic_id BETWEEN $start_id AND $end_id
 			GROUP BY topic_id
 		";
@@ -60,18 +60,18 @@ while (true) {
 
     if ($val) {
         if (!config('tp.ocelot.enabled')) {
-            OLD_DB()->query("
-				REPLACE INTO " . NEW_BB_BT_TRACKER_SNAP . "
+            OLD_DB()->query('
+				REPLACE INTO ' . NEW_BB_BT_TRACKER_SNAP . '
 				(topic_id, seeders, leechers, speed_up, speed_down)
-				VALUES(" . implode('),(', $val) . ")
-			");
+				VALUES(' . implode('),(', $val) . ')
+			');
         } else {
-            OLD_DB()->query("
-				INSERT INTO " . BB_BT_TRACKER_SNAP . "
+            OLD_DB()->query('
+				INSERT INTO ' . BB_BT_TRACKER_SNAP . '
 				(topic_id, speed_up, speed_down)
-				VALUES(" . implode('),(', $val) . ")
+				VALUES(' . implode('),(', $val) . ')
 				ON DUPLICATE KEY UPDATE speed_up = VALUES(speed_up), speed_down = VALUES(speed_down)
-			");
+			');
         }
     }
 
@@ -83,13 +83,13 @@ while (true) {
 }
 
 if (!config('tp.ocelot.enabled')) {
-    OLD_DB()->query("
+    OLD_DB()->query('
 		RENAME TABLE
-		" . BB_BT_TRACKER_SNAP . " TO " . OLD_BB_BT_TRACKER_SNAP . ",
-		" . NEW_BB_BT_TRACKER_SNAP . " TO " . BB_BT_TRACKER_SNAP . "
-	");
+		' . BB_BT_TRACKER_SNAP . ' TO ' . OLD_BB_BT_TRACKER_SNAP . ',
+		' . NEW_BB_BT_TRACKER_SNAP . ' TO ' . BB_BT_TRACKER_SNAP . '
+	');
 
-    OLD_DB()->query("DROP TABLE IF EXISTS " . NEW_BB_BT_TRACKER_SNAP . ", " . OLD_BB_BT_TRACKER_SNAP);
+    OLD_DB()->query('DROP TABLE IF EXISTS ' . NEW_BB_BT_TRACKER_SNAP . ', ' . OLD_BB_BT_TRACKER_SNAP);
 }
 
 //
@@ -98,29 +98,29 @@ if (!config('tp.ocelot.enabled')) {
 define('NEW_BB_BT_DLSTATUS_SNAP', 'new_dlstatus_snap');
 define('OLD_BB_BT_DLSTATUS_SNAP', 'old_dlstatus_snap');
 
-OLD_DB()->query("DROP TABLE IF EXISTS " . NEW_BB_BT_DLSTATUS_SNAP . ", " . OLD_BB_BT_DLSTATUS_SNAP);
+OLD_DB()->query('DROP TABLE IF EXISTS ' . NEW_BB_BT_DLSTATUS_SNAP . ', ' . OLD_BB_BT_DLSTATUS_SNAP);
 
-OLD_DB()->query("CREATE TABLE " . NEW_BB_BT_DLSTATUS_SNAP . " LIKE " . BB_BT_DLSTATUS_SNAP);
+OLD_DB()->query('CREATE TABLE ' . NEW_BB_BT_DLSTATUS_SNAP . ' LIKE ' . BB_BT_DLSTATUS_SNAP);
 
 if (config('tp.bt_show_dl_list') && config('tp.bt_dl_list_only_count')) {
-    OLD_DB()->query("
-		INSERT INTO " . NEW_BB_BT_DLSTATUS_SNAP . "
+    OLD_DB()->query('
+		INSERT INTO ' . NEW_BB_BT_DLSTATUS_SNAP . '
 			(topic_id, dl_status, users_count)
 		SELECT
 			topic_id, user_status, COUNT(*)
-		FROM " . BB_BT_DLSTATUS . "
-		WHERE user_status != " . DL_STATUS_RELEASER . "
+		FROM ' . BB_BT_DLSTATUS . '
+		WHERE user_status != ' . DL_STATUS_RELEASER . '
 		GROUP BY topic_id, user_status
-	");
+	');
 }
 
-OLD_DB()->query("
+OLD_DB()->query('
 	RENAME TABLE
-	" . BB_BT_DLSTATUS_SNAP . " TO " . OLD_BB_BT_DLSTATUS_SNAP . ",
-	" . NEW_BB_BT_DLSTATUS_SNAP . " TO " . BB_BT_DLSTATUS_SNAP . "
-");
+	' . BB_BT_DLSTATUS_SNAP . ' TO ' . OLD_BB_BT_DLSTATUS_SNAP . ',
+	' . NEW_BB_BT_DLSTATUS_SNAP . ' TO ' . BB_BT_DLSTATUS_SNAP . '
+');
 
-OLD_DB()->query("DROP TABLE IF EXISTS " . NEW_BB_BT_DLSTATUS_SNAP . ", " . OLD_BB_BT_DLSTATUS_SNAP);
+OLD_DB()->query('DROP TABLE IF EXISTS ' . NEW_BB_BT_DLSTATUS_SNAP . ', ' . OLD_BB_BT_DLSTATUS_SNAP);
 
 //
 // TORHELP
@@ -138,14 +138,14 @@ if (config('tp.torhelp_enabled')) {
     define('NEW_BB_BT_TORHELP', 'new_torhelp');
     define('OLD_BB_BT_TORHELP', 'old_torhelp');
 
-    OLD_DB()->query("DROP TABLE IF EXISTS " . NEW_BB_BT_TORHELP . ", " . OLD_BB_BT_TORHELP);
+    OLD_DB()->query('DROP TABLE IF EXISTS ' . NEW_BB_BT_TORHELP . ', ' . OLD_BB_BT_TORHELP);
 
-    OLD_DB()->query("CREATE TABLE " . NEW_BB_BT_TORHELP . " LIKE " . BB_BT_TORHELP);
+    OLD_DB()->query('CREATE TABLE ' . NEW_BB_BT_TORHELP . ' LIKE ' . BB_BT_TORHELP);
 
     // Select users
-    $sql = "
+    $sql = '
 		SELECT DISTINCT session_user_id AS uid
-		FROM " . BB_SESSIONS . "
+		FROM ' . BB_SESSIONS . "
 		WHERE session_time > (UNIX_TIMESTAMP() - $user_last_seen_online*60)
 		  AND session_user_id != " . GUEST_UID . "
 		ORDER BY session_time DESC
@@ -158,13 +158,13 @@ if (config('tp.torhelp_enabled')) {
     }
 
     if ($online_users_csv = implode(',', $online_users_ary)) {
-        OLD_DB()->query("
-			INSERT INTO " . NEW_BB_BT_TORHELP . " (user_id, topic_id_csv)
+        OLD_DB()->query('
+			INSERT INTO ' . NEW_BB_BT_TORHELP . ' (user_id, topic_id_csv)
 			SELECT
 			  dl.user_id, GROUP_CONCAT(dl.topic_id)
-			FROM       " . BB_BT_TRACKER_SNAP . " trsn
-			INNER JOIN " . BB_BT_TORRENTS . " tor ON (tor.topic_id = trsn.topic_id)
-			INNER JOIN " . BB_BT_DLSTATUS . " dl  ON (dl.topic_id = tor.topic_id)
+			FROM       ' . BB_BT_TRACKER_SNAP . ' trsn
+			INNER JOIN ' . BB_BT_TORRENTS . ' tor ON (tor.topic_id = trsn.topic_id)
+			INNER JOIN ' . BB_BT_DLSTATUS . " dl  ON (dl.topic_id = tor.topic_id)
 			WHERE
 			      trsn.seeders          <=  $tor_min_seeders
 			  AND trsn.leechers         >=  $tor_min_leechers
@@ -179,13 +179,13 @@ if (config('tp.torhelp_enabled')) {
 		");
     }
 
-    OLD_DB()->query("
+    OLD_DB()->query('
 		RENAME TABLE
-		" . BB_BT_TORHELP . " TO " . OLD_BB_BT_TORHELP . ",
-		" . NEW_BB_BT_TORHELP . " TO " . BB_BT_TORHELP . "
-	");
+		' . BB_BT_TORHELP . ' TO ' . OLD_BB_BT_TORHELP . ',
+		' . NEW_BB_BT_TORHELP . ' TO ' . BB_BT_TORHELP . '
+	');
 
-    OLD_DB()->query("DROP TABLE IF EXISTS " . NEW_BB_BT_TORHELP . ", " . OLD_BB_BT_TORHELP);
+    OLD_DB()->query('DROP TABLE IF EXISTS ' . NEW_BB_BT_TORHELP . ', ' . OLD_BB_BT_TORHELP);
 }
 
 OLD_DB()->expect_slow_query(10);
diff --git a/library/includes/cron/jobs/tr_seed_bonus.php b/library/includes/cron/jobs/tr_seed_bonus.php
index 39d8545fa..dac5ca98f 100644
--- a/library/includes/cron/jobs/tr_seed_bonus.php
+++ b/library/includes/cron/jobs/tr_seed_bonus.php
@@ -23,9 +23,9 @@ if (config('tp.seed_bonus_enabled') && config('tp.seed_bonus_points') && config(
 
     $tor_size = (config('tp.seed_bonus_tor_size') * 1073741824);
 
-    OLD_DB()->query("INSERT INTO tmp_bonus
+    OLD_DB()->query('INSERT INTO tmp_bonus
 		SELECT bt.user_id, count(bt.seeder) AS release_count
-			FROM " . BB_BT_TRACKER . " bt, " . BB_BT_TORRENTS . " tor
+			FROM ' . BB_BT_TRACKER . ' bt, ' . BB_BT_TORRENTS . " tor
 			WHERE tor.topic_id = bt.topic_id
 				AND tor.size   > $tor_size
 				AND bt.seeder  > 0
@@ -44,8 +44,8 @@ if (config('tp.seed_bonus_enabled') && config('tp.seed_bonus_points') && config(
         $release = (int)$seed_release[$i];
         $user_regdate = (TIMENOW - config('tp.seed_bonus_user_regdate') * 86400);
 
-        OLD_DB()->query("
-			UPDATE " . BB_USERS . " u, " . BB_BT_USERS . " bu, tmp_bonus b
+        OLD_DB()->query('
+			UPDATE ' . BB_USERS . ' u, ' . BB_BT_USERS . " bu, tmp_bonus b
 			SET
 				u.user_points       = u.user_points + '$user_points',
 				bu.points_today     = bu.points_today + '$user_points',
@@ -56,9 +56,9 @@ if (config('tp.seed_bonus_enabled') && config('tp.seed_bonus_points') && config(
 				AND b.release_count <= $release
 				AND u.user_regdate  <  $user_regdate
 				AND u.user_active   =  1
-				AND u.user_id       not IN(" . EXCLUDED_USERS . ")
-		");
+				AND u.user_id       not IN(" . EXCLUDED_USERS . ')
+		');
     }
 
-    OLD_DB()->query("DROP TEMPORARY TABLE IF EXISTS tmp_bonus");
+    OLD_DB()->query('DROP TEMPORARY TABLE IF EXISTS tmp_bonus');
 }
diff --git a/library/includes/cron/jobs/tr_update_seeder_last_seen.php b/library/includes/cron/jobs/tr_update_seeder_last_seen.php
index 0bc8bd44f..dc3d68218 100644
--- a/library/includes/cron/jobs/tr_update_seeder_last_seen.php
+++ b/library/includes/cron/jobs/tr_update_seeder_last_seen.php
@@ -11,14 +11,14 @@ if (!defined('BB_ROOT')) {
     die(basename(__FILE__));
 }
 
-OLD_DB()->query("
+OLD_DB()->query('
 	UPDATE
-		" . BUF_LAST_SEEDER . " b,
-		" . BB_BT_TORRENTS . " tor
+		' . BUF_LAST_SEEDER . ' b,
+		' . BB_BT_TORRENTS . ' tor
 	SET
 		tor.seeder_last_seen = b.seeder_last_seen
 	WHERE
 		tor.topic_id = b.topic_id
-");
+');
 
-OLD_DB()->query("TRUNCATE TABLE " . BUF_LAST_SEEDER);
+OLD_DB()->query('TRUNCATE TABLE ' . BUF_LAST_SEEDER);
diff --git a/library/includes/cron/jobs/update_forums_atom.php b/library/includes/cron/jobs/update_forums_atom.php
index 4254d36dd..28e6b8d77 100644
--- a/library/includes/cron/jobs/update_forums_atom.php
+++ b/library/includes/cron/jobs/update_forums_atom.php
@@ -14,7 +14,7 @@ if (!defined('BB_ROOT')) {
 require_once INC_DIR . '/functions_atom.php';
 
 $timecheck = TIMENOW - 600;
-$forums_data = OLD_DB()->fetch_rowset("SELECT forum_id, allow_reg_tracker, forum_name FROM " . BB_FORUMS);
+$forums_data = OLD_DB()->fetch_rowset('SELECT forum_id, allow_reg_tracker, forum_name FROM ' . BB_FORUMS);
 
 if (file_exists(config('tp.atom.path') . '/f/0.atom')) {
     if (filemtime(config('tp.atom.path') . '/f/0.atom') <= $timecheck) {
diff --git a/library/includes/datastore/build_attach_extensions.php b/library/includes/datastore/build_attach_extensions.php
index 1aeeaf8d8..c2a60260c 100644
--- a/library/includes/datastore/build_attach_extensions.php
+++ b/library/includes/datastore/build_attach_extensions.php
@@ -12,15 +12,15 @@ if (!defined('BB_ROOT')) {
 }
 
 // Don't count on forbidden extensions table, because it is not allowed to allow forbidden extensions at all
-$extensions = OLD_DB()->fetch_rowset("
+$extensions = OLD_DB()->fetch_rowset('
 	SELECT
 	  e.extension, g.cat_id, g.download_mode, g.upload_icon
 	FROM
-	  " . BB_EXTENSIONS . " e,
-	  " . BB_EXTENSION_GROUPS . " g
+	  ' . BB_EXTENSIONS . ' e,
+	  ' . BB_EXTENSION_GROUPS . ' g
 	WHERE
 	      e.group_id = g.group_id
 	  AND g.allow_group = 1
-");
+');
 
 $this->store('attach_extensions', $extensions);
diff --git a/library/includes/datastore/build_cat_forums.php b/library/includes/datastore/build_cat_forums.php
index 1ab463d0c..cddf94ab6 100644
--- a/library/includes/datastore/build_cat_forums.php
+++ b/library/includes/datastore/build_cat_forums.php
@@ -44,19 +44,19 @@ $forum_store_fields += array_flip(array(
 ));
 
 // Categories
-$sql = "SELECT * FROM " . BB_CATEGORIES . " ORDER BY cat_order";
+$sql = 'SELECT * FROM ' . BB_CATEGORIES . ' ORDER BY cat_order';
 
 foreach (OLD_DB()->fetch_rowset($sql) as $row) {
     $data['c'][$row['cat_id']] = $row;
     $data['cat_title_html'][$row['cat_id']] = htmlCHR($row['cat_title']);
 }
 
-$sql = "
+$sql = '
 	SELECT f.*
-	FROM " . BB_FORUMS . " f, " . BB_CATEGORIES . " c
+	FROM ' . BB_FORUMS . ' f, ' . BB_CATEGORIES . ' c
 	WHERE f.cat_id = c.cat_id
 	ORDER BY c.cat_order, f.forum_order
-";
+';
 
 foreach (OLD_DB()->fetch_rowset($sql) as $row) {
     $fid = $row['forum_id'];
@@ -131,9 +131,9 @@ $this->store('viewtopic_forum_select', $data);
 if (config('tp.show_latest_news') && $news_forum_ids = config('tp.latest_news_forum_id')) {
     $news_count = max(config('tp.latest_news_count'), 1);
 
-    $data = OLD_DB()->fetch_rowset("
+    $data = OLD_DB()->fetch_rowset('
 		SELECT topic_id, topic_time, topic_title, forum_id
-		FROM " . BB_TOPICS . "
+		FROM ' . BB_TOPICS . "
 		WHERE forum_id IN ($news_forum_ids)
 			AND topic_moved_id = 0
 		ORDER BY topic_time DESC
@@ -149,9 +149,9 @@ if (config('tp.show_latest_news') && $news_forum_ids = config('tp.latest_news_fo
 if (config('tp.show_network_news') && $net_forum_ids = config('tp.network_news_forum_id')) {
     $net_count = max(config('tp.network_news_count'), 1);
 
-    $data = OLD_DB()->fetch_rowset("
+    $data = OLD_DB()->fetch_rowset('
 		SELECT topic_id, topic_time, topic_title, forum_id
-		FROM " . BB_TOPICS . "
+		FROM ' . BB_TOPICS . "
 		WHERE forum_id IN ($net_forum_ids)
 			AND topic_moved_id = 0
 		ORDER BY topic_time DESC
diff --git a/library/includes/datastore/build_moderators.php b/library/includes/datastore/build_moderators.php
index 759ed482f..685062009 100644
--- a/library/includes/datastore/build_moderators.php
+++ b/library/includes/datastore/build_moderators.php
@@ -22,16 +22,16 @@ $data = array(
 
 // name_users
 // mod_users
-$sql = "
+$sql = '
 	SELECT
 		aa.forum_id, u.user_id, u.username
 	FROM
-		" . BB_AUTH_ACCESS . " aa,
-		" . BB_USER_GROUP . " ug,
-		" . BB_GROUPS . " g,
-		" . BB_USERS . " u
+		' . BB_AUTH_ACCESS . ' aa,
+		' . BB_USER_GROUP . ' ug,
+		' . BB_GROUPS . ' g,
+		' . BB_USERS . ' u
 	WHERE
-				aa.forum_perm & " . BF_AUTH_MOD . "
+				aa.forum_perm & ' . BF_AUTH_MOD . '
 		AND ug.group_id = aa.group_id
 		AND ug.user_pending = 0
 		AND g.group_id = ug.group_id
@@ -41,7 +41,7 @@ $sql = "
 		aa.forum_id, u.user_id
 	ORDER BY
 		u.username
-";
+';
 
 foreach (OLD_DB()->fetch_rowset($sql) as $row) {
     $data['name_users'][$row['user_id']] = $row['username'];
@@ -50,22 +50,22 @@ foreach (OLD_DB()->fetch_rowset($sql) as $row) {
 
 // name_groups
 // mod_groups
-$sql = "
+$sql = '
 	SELECT
 		aa.forum_id, g.group_id, g.group_name
 	FROM
-		" . BB_AUTH_ACCESS . " aa,
-		" . BB_GROUPS . " g
+		' . BB_AUTH_ACCESS . ' aa,
+		' . BB_GROUPS . ' g
 	WHERE
-				aa.forum_perm & " . BF_AUTH_MOD . "
+				aa.forum_perm & ' . BF_AUTH_MOD . '
 		AND g.group_id = aa.group_id
 		AND g.group_single_user = 0
-		AND g.group_type != " . GROUP_HIDDEN . "
+		AND g.group_type != ' . GROUP_HIDDEN . '
 	GROUP BY
 		aa.forum_id, g.group_id
 	ORDER BY
 		g.group_name
-";
+';
 
 foreach (OLD_DB()->fetch_rowset($sql) as $row) {
     $data['name_groups'][$row['group_id']] = $row['group_name'];
@@ -73,16 +73,16 @@ foreach (OLD_DB()->fetch_rowset($sql) as $row) {
 }
 
 // moderators
-$sql = "
+$sql = '
 	SELECT
 		u.user_id, u.username
 	FROM
-		" . BB_AUTH_ACCESS . " aa,
-		" . BB_USER_GROUP . " ug,
-		" . BB_GROUPS . " g,
-		" . BB_USERS . " u
+		' . BB_AUTH_ACCESS . ' aa,
+		' . BB_USER_GROUP . ' ug,
+		' . BB_GROUPS . ' g,
+		' . BB_USERS . ' u
 	WHERE
-				aa.forum_perm & " . BF_AUTH_MOD . "
+				aa.forum_perm & ' . BF_AUTH_MOD . '
 		AND ug.group_id = aa.group_id
 		AND ug.user_pending = 0
 		AND g.group_id = ug.group_id
@@ -91,19 +91,19 @@ $sql = "
 		u.user_id
 	ORDER BY
 		u.username
-";
+';
 
 foreach (OLD_DB()->fetch_rowset($sql) as $row) {
     $data['moderators'][$row['user_id']] = $row['username'];
 }
 
 // admins
-$sql = "
+$sql = '
 	SELECT user_id, username
-	FROM " . BB_USERS . "
-	WHERE user_level = " . ADMIN . "
+	FROM ' . BB_USERS . '
+	WHERE user_level = ' . ADMIN . '
 	ORDER BY username
-";
+';
 
 foreach (OLD_DB()->fetch_rowset($sql) as $row) {
     $data['admins'][$row['user_id']] = $row['username'];
diff --git a/library/includes/datastore/build_ranks.php b/library/includes/datastore/build_ranks.php
index d0d91c32a..b879fcf13 100644
--- a/library/includes/datastore/build_ranks.php
+++ b/library/includes/datastore/build_ranks.php
@@ -13,7 +13,7 @@ if (!defined('BB_ROOT')) {
 
 $ranks = array();
 
-$sql = "SELECT rank_id, rank_title, rank_image, rank_style FROM " . BB_RANKS;
+$sql = 'SELECT rank_id, rank_title, rank_image, rank_style FROM ' . BB_RANKS;
 
 foreach (OLD_DB()->fetch_rowset($sql) as $row) {
     $ranks[$row['rank_id']] = $row;
diff --git a/library/includes/datastore/build_smilies.php b/library/includes/datastore/build_smilies.php
index 0178ae988..914a27b71 100644
--- a/library/includes/datastore/build_smilies.php
+++ b/library/includes/datastore/build_smilies.php
@@ -13,7 +13,7 @@ if (!defined('BB_ROOT')) {
 
 $smilies = [];
 
-$rowset = OLD_DB()->fetch_rowset("SELECT * FROM " . BB_SMILIES);
+$rowset = OLD_DB()->fetch_rowset('SELECT * FROM ' . BB_SMILIES);
 sort($rowset);
 
 foreach ($rowset as $smile) {
diff --git a/library/includes/datastore/build_stats.php b/library/includes/datastore/build_stats.php
index d9fdc2c74..292cd28d9 100644
--- a/library/includes/datastore/build_stats.php
+++ b/library/includes/datastore/build_stats.php
@@ -14,27 +14,27 @@ if (!defined('BB_ROOT')) {
 $data = [];
 
 // usercount
-$row = OLD_DB()->fetch_row("SELECT COUNT(*) AS usercount FROM " . BB_USERS . " WHERE user_id NOT IN(" . EXCLUDED_USERS . ")");
+$row = OLD_DB()->fetch_row('SELECT COUNT(*) AS usercount FROM ' . BB_USERS . ' WHERE user_id NOT IN(' . EXCLUDED_USERS . ')');
 $data['usercount'] = number_format($row['usercount']);
 
 // newestuser
-$row = OLD_DB()->fetch_row("SELECT user_id, username, user_rank FROM " . BB_USERS . " WHERE user_active = 1 ORDER BY user_id DESC LIMIT 1");
+$row = OLD_DB()->fetch_row('SELECT user_id, username, user_rank FROM ' . BB_USERS . ' WHERE user_active = 1 ORDER BY user_id DESC LIMIT 1');
 $data['newestuser'] = $row;
 
 // post/topic count
-$row = OLD_DB()->fetch_row("SELECT SUM(forum_topics) AS topiccount, SUM(forum_posts) AS postcount FROM " . BB_FORUMS);
+$row = OLD_DB()->fetch_row('SELECT SUM(forum_topics) AS topiccount, SUM(forum_posts) AS postcount FROM ' . BB_FORUMS);
 $data['postcount'] = number_format($row['postcount']);
 $data['topiccount'] = number_format($row['topiccount']);
 
 // Tracker stats
 if (config('tp.tor_stats')) {
     // torrents stat
-    $row = OLD_DB()->fetch_row("SELECT COUNT(topic_id) AS torrentcount, SUM(size) AS size FROM " . BB_BT_TORRENTS);
+    $row = OLD_DB()->fetch_row('SELECT COUNT(topic_id) AS torrentcount, SUM(size) AS size FROM ' . BB_BT_TORRENTS);
     $data['torrentcount'] = number_format($row['torrentcount']);
     $data['size'] = $row['size'];
 
     // peers stat
-    $row = OLD_DB()->fetch_row("SELECT SUM(seeders) AS seeders, SUM(leechers) AS leechers, ((SUM(speed_up) + SUM(speed_down))/2) AS speed FROM " . BB_BT_TRACKER_SNAP);
+    $row = OLD_DB()->fetch_row('SELECT SUM(seeders) AS seeders, SUM(leechers) AS leechers, ((SUM(speed_up) + SUM(speed_down))/2) AS speed FROM ' . BB_BT_TRACKER_SNAP);
     $data['seeders'] = number_format($row['seeders']);
     $data['leechers'] = number_format($row['leechers']);
     $data['peers'] = number_format($row['seeders'] + $row['leechers']);
@@ -43,9 +43,9 @@ if (config('tp.tor_stats')) {
 
 // gender stat
 if (config('tp.gender')) {
-    $male = OLD_DB()->fetch_row("SELECT COUNT(user_id) AS male FROM " . BB_USERS . " WHERE user_gender = " . MALE . " AND user_id NOT IN(" . EXCLUDED_USERS . ")");
-    $female = OLD_DB()->fetch_row("SELECT COUNT(user_id) AS female FROM " . BB_USERS . " WHERE user_gender = " . FEMALE . " AND user_id NOT IN(" . EXCLUDED_USERS . ")");
-    $unselect = OLD_DB()->fetch_row("SELECT COUNT(user_id) AS unselect FROM " . BB_USERS . " WHERE user_gender = 0 AND user_id NOT IN(" . EXCLUDED_USERS . ")");
+    $male = OLD_DB()->fetch_row('SELECT COUNT(user_id) AS male FROM ' . BB_USERS . ' WHERE user_gender = ' . MALE . ' AND user_id NOT IN(' . EXCLUDED_USERS . ')');
+    $female = OLD_DB()->fetch_row('SELECT COUNT(user_id) AS female FROM ' . BB_USERS . ' WHERE user_gender = ' . FEMALE . ' AND user_id NOT IN(' . EXCLUDED_USERS . ')');
+    $unselect = OLD_DB()->fetch_row('SELECT COUNT(user_id) AS unselect FROM ' . BB_USERS . ' WHERE user_gender = 0 AND user_id NOT IN(' . EXCLUDED_USERS . ')');
 
     $data['male'] = $male['male'];
     $data['female'] = $female['female'];
@@ -54,9 +54,9 @@ if (config('tp.gender')) {
 
 // birthday stat
 if (config('tp.birthday_check_day') && config('tp.birthday_enabled')) {
-    $sql = OLD_DB()->fetch_rowset("SELECT user_id, username, user_rank , user_birthday
-		FROM " . BB_USERS . "
-		WHERE user_id NOT IN(" . EXCLUDED_USERS . ")
+    $sql = OLD_DB()->fetch_rowset('SELECT user_id, username, user_rank , user_birthday
+		FROM ' . BB_USERS . '
+		WHERE user_id NOT IN(' . EXCLUDED_USERS . ")
 			AND user_birthday != '0000-00-00'
 			AND user_active = 1
 		ORDER BY user_level DESC, username
diff --git a/library/includes/functions.php b/library/includes/functions.php
index 76b47dacd..6fd30d78d 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -262,16 +262,16 @@ function auth_user($type, $forum_id, $ug_data, array $f_access = array(), $group
     //
     // Get user or group permissions
     //
-    $forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "AND aa.forum_id = " . (int)$forum_id : '';
+    $forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? 'AND aa.forum_id = ' . (int)$forum_id : '';
 
     // GROUP mode
     if (!empty($ug_data['group_id'])) {
         $is_guest = false;
         $is_admin = false;
 
-        $sql = "SELECT aa.forum_id, aa.forum_perm
-			FROM " . BB_AUTH_ACCESS . " aa
-			WHERE aa.group_id = " . (int)$ug_data['group_id'] . "
+        $sql = 'SELECT aa.forum_id, aa.forum_perm
+			FROM ' . BB_AUTH_ACCESS . ' aa
+			WHERE aa.group_id = ' . (int)$ug_data['group_id'] . "
 				$forum_match_sql";
 
         foreach (OLD_DB()->fetch_rowset($sql) as $row) {
@@ -285,15 +285,15 @@ function auth_user($type, $forum_id, $ug_data, array $f_access = array(), $group
         if ($group_perm != UG_PERM_BOTH) {
             $group_single_user = ($group_perm == UG_PERM_USER_ONLY) ? 1 : 0;
 
-            $sql = "
+            $sql = '
 				SELECT
 					aa.forum_id, BIT_OR(aa.forum_perm) AS forum_perm
 				FROM
-					" . BB_USER_GROUP . " ug,
-					" . BB_GROUPS . " g,
-					" . BB_AUTH_ACCESS . " aa
+					' . BB_USER_GROUP . ' ug,
+					' . BB_GROUPS . ' g,
+					' . BB_AUTH_ACCESS . ' aa
 				WHERE
-					    ug.user_id = " . (int)$ug_data['user_id'] . "
+					    ug.user_id = ' . (int)$ug_data['user_id'] . "
 					AND ug.user_pending = 0
 					AND g.group_id = ug.group_id
 					AND g.group_single_user = $group_single_user
@@ -307,9 +307,9 @@ function auth_user($type, $forum_id, $ug_data, array $f_access = array(), $group
             }
         } else {
             if (!$is_guest && !$is_admin) {
-                $sql = "SELECT SQL_CACHE aa.forum_id, aa.forum_perm
-					FROM " . BB_AUTH_ACCESS_SNAP . " aa
-					WHERE aa.user_id = " . (int)$ug_data['user_id'] . "
+                $sql = 'SELECT SQL_CACHE aa.forum_id, aa.forum_perm
+					FROM ' . BB_AUTH_ACCESS_SNAP . ' aa
+					WHERE aa.user_id = ' . (int)$ug_data['user_id'] . "
 						$forum_match_sql";
 
                 foreach (OLD_DB()->fetch_rowset($sql) as $row) {
@@ -393,7 +393,7 @@ function get_select($select, $selected = null, $return_as = 'html', $first_opt =
 
     switch ($select) {
         case 'groups':
-            $sql = "SELECT group_id, group_name FROM " . BB_GROUPS . " WHERE group_single_user = 0 ORDER BY group_name";
+            $sql = 'SELECT group_id, group_name FROM ' . BB_GROUPS . ' WHERE group_single_user = 0 ORDER BY group_name';
             foreach (OLD_DB()->fetch_rowset($sql) as $row) {
                 $select_ary[$row['group_name']] = $row['group_id'];
             }
@@ -401,7 +401,7 @@ function get_select($select, $selected = null, $return_as = 'html', $first_opt =
             break;
 
         case 'forum_tpl':
-            $sql = "SELECT tpl_id, tpl_name FROM " . BB_TOPIC_TPL . " ORDER BY tpl_name";
+            $sql = 'SELECT tpl_id, tpl_name FROM ' . BB_TOPIC_TPL . ' ORDER BY tpl_name';
             $select_ary[$first_opt] = 0;
             foreach (OLD_DB()->fetch_rowset($sql) as $row) {
                 $select_ary[$row['tpl_name']] = $row['tpl_id'];
@@ -703,13 +703,13 @@ function get_username($user_id)
     }
     if (is_array($user_id)) {
         $usernames = array();
-        foreach (OLD_DB()->fetch_rowset("SELECT user_id, username FROM " . BB_USERS . " WHERE user_id IN(" . get_id_csv($user_id) . ")") as $row) {
+        foreach (OLD_DB()->fetch_rowset('SELECT user_id, username FROM ' . BB_USERS . ' WHERE user_id IN(' . get_id_csv($user_id) . ')') as $row) {
             $usernames[$row['user_id']] = $row['username'];
         }
         return $usernames;
     }
 
-    $row = OLD_DB()->fetch_row("SELECT username FROM " . BB_USERS . " WHERE user_id = $user_id LIMIT 1");
+    $row = OLD_DB()->fetch_row('SELECT username FROM ' . BB_USERS . " WHERE user_id = $user_id LIMIT 1");
     return $row['username'];
 }
 
@@ -718,7 +718,7 @@ function get_user_id($username)
     if (empty($username)) {
         return false;
     }
-    $row = OLD_DB()->fetch_row("SELECT user_id FROM " . BB_USERS . " WHERE username = '" . OLD_DB()->escape($username) . "' LIMIT 1");
+    $row = OLD_DB()->fetch_row('SELECT user_id FROM ' . BB_USERS . " WHERE username = '" . OLD_DB()->escape($username) . "' LIMIT 1");
     return $row['user_id'];
 }
 
@@ -742,20 +742,20 @@ function str_short($text, $max_length, $space = ' ')
 
 function wbr($text, $max_word_length = HTML_WBR_LENGTH)
 {
-    return preg_replace("/([\w\->;:.,~!?(){}@#$%^*\/\\\\]{" . $max_word_length . "})/ui", '$1<wbr>', $text);
+    return preg_replace("/([\w\->;:.,~!?(){}@#$%^*\/\\\\]{" . $max_word_length . '})/ui', '$1<wbr>', $text);
 }
 
 function get_bt_userdata($user_id)
 {
     if (!$btu = OLD_CACHE('bb_cache')->get('btu_' . $user_id)) {
-        $btu = OLD_DB()->fetch_row("
+        $btu = OLD_DB()->fetch_row('
 			SELECT bt.*, SUM(tr.speed_up) AS speed_up, SUM(tr.speed_down) AS speed_down
-			FROM      " . BB_BT_USERS . " bt
-			LEFT JOIN " . BB_BT_TRACKER . " tr ON (bt.user_id = tr.user_id)
-			WHERE bt.user_id = " . (int)$user_id . "
+			FROM      ' . BB_BT_USERS . ' bt
+			LEFT JOIN ' . BB_BT_TRACKER . ' tr ON (bt.user_id = tr.user_id)
+			WHERE bt.user_id = ' . (int)$user_id . '
 			GROUP BY bt.user_id
 			LIMIT 1
-		");
+		');
         OLD_CACHE('bb_cache')->set('btu_' . $user_id, $btu, 300);
     }
     return $btu;
@@ -852,16 +852,16 @@ function get_db_stat($mode)
 {
     switch ($mode) {
         case 'usercount':
-            $sql = "SELECT COUNT(user_id) AS total FROM " . BB_USERS;
+            $sql = 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS;
             break;
 
         case 'newestuser':
-            $sql = "SELECT user_id, username FROM " . BB_USERS . " WHERE user_id <> " . GUEST_UID . " ORDER BY user_id DESC LIMIT 1";
+            $sql = 'SELECT user_id, username FROM ' . BB_USERS . ' WHERE user_id <> ' . GUEST_UID . ' ORDER BY user_id DESC LIMIT 1';
             break;
 
         case 'postcount':
         case 'topiccount':
-            $sql = "SELECT SUM(forum_topics) AS topic_total, SUM(forum_posts) AS post_total FROM " . BB_FORUMS;
+            $sql = 'SELECT SUM(forum_topics) AS topic_total, SUM(forum_posts) AS post_total FROM ' . BB_FORUMS;
             break;
     }
 
@@ -935,21 +935,21 @@ function get_userdata($u, $force_name = false, $allow_guest = false)
 
     $u_data = array();
     $name_search = false;
-    $exclude_anon_sql = (!$allow_guest) ? "AND user_id != " . GUEST_UID : '';
+    $exclude_anon_sql = (!$allow_guest) ? 'AND user_id != ' . GUEST_UID : '';
 
     if ($force_name || !is_numeric($u)) {
         $name_search = true;
         $where_sql = "WHERE username = '" . OLD_DB()->escape(clean_username($u)) . "'";
     } else {
-        $where_sql = "WHERE user_id = " . (int)$u;
+        $where_sql = 'WHERE user_id = ' . (int)$u;
     }
 
-    $sql = "SELECT * FROM " . BB_USERS . " $where_sql $exclude_anon_sql LIMIT 1";
+    $sql = 'SELECT * FROM ' . BB_USERS . " $where_sql $exclude_anon_sql LIMIT 1";
 
     if (!$u_data = OLD_DB()->fetch_row($sql)) {
         if (!is_int($u) && !$name_search) {
             $where_sql = "WHERE username = '" . OLD_DB()->escape(clean_username($u)) . "'";
-            $sql = "SELECT * FROM " . BB_USERS . " $where_sql $exclude_anon_sql LIMIT 1";
+            $sql = 'SELECT * FROM ' . BB_USERS . " $where_sql $exclude_anon_sql LIMIT 1";
             $u_data = OLD_DB()->fetch_row($sql);
         }
     }
@@ -1171,9 +1171,9 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
     if ($total_pages > ((2 * ($begin_end + $from_middle)) + 2)) {
         $init_page_max = ($total_pages > $begin_end) ? $begin_end : $total_pages;
         for ($i = 1; $i < $init_page_max + 1; $i++) {
-            $page_string .= ($i == $on_page) ? '<b>' . $i . '</b>' : '<a href="' . $base_url . "&amp;start=" . (($i - 1) * $per_page) . '">' . $i . '</a>';
+            $page_string .= ($i == $on_page) ? '<b>' . $i . '</b>' : '<a href="' . $base_url . '&amp;start=' . (($i - 1) * $per_page) . '">' . $i . '</a>';
             if ($i < $init_page_max) {
-                $page_string .= ", ";
+                $page_string .= ', ';
             }
         }
         if ($total_pages > $begin_end) {
@@ -1185,7 +1185,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
                 $init_page_max = ($on_page < $total_pages - ($begin_end + $from_middle)) ? $on_page : $total_pages - ($begin_end + $from_middle);
 
                 for ($i = $init_page_min - $from_middle; $i < $init_page_max + ($from_middle + 1); $i++) {
-                    $page_string .= ($i == $on_page) ? '<b>' . $i . '</b>' : '<a href="' . $base_url . "&amp;start=" . (($i - 1) * $per_page) . '">' . $i . '</a>';
+                    $page_string .= ($i == $on_page) ? '<b>' . $i . '</b>' : '<a href="' . $base_url . '&amp;start=' . (($i - 1) * $per_page) . '">' . $i . '</a>';
                     if ($i < $init_page_max + $from_middle) {
                         $page_string .= ', ';
                     }
@@ -1195,15 +1195,15 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
                 $page_string .= '&nbsp;...&nbsp;';
             }
             for ($i = $total_pages - ($begin_end - 1); $i < $total_pages + 1; $i++) {
-                $page_string .= ($i == $on_page) ? '<b>' . $i . '</b>' : '<a href="' . $base_url . "&amp;start=" . (($i - 1) * $per_page) . '">' . $i . '</a>';
+                $page_string .= ($i == $on_page) ? '<b>' . $i . '</b>' : '<a href="' . $base_url . '&amp;start=' . (($i - 1) * $per_page) . '">' . $i . '</a>';
                 if ($i < $total_pages) {
-                    $page_string .= ", ";
+                    $page_string .= ', ';
                 }
             }
         }
     } else {
         for ($i = 1; $i < $total_pages + 1; $i++) {
-            $page_string .= ($i == $on_page) ? '<b>' . $i . '</b>' : '<a href="' . $base_url . "&amp;start=" . (($i - 1) * $per_page) . '">' . $i . '</a>';
+            $page_string .= ($i == $on_page) ? '<b>' . $i . '</b>' : '<a href="' . $base_url . '&amp;start=' . (($i - 1) * $per_page) . '">' . $i . '</a>';
             if ($i < $total_pages) {
                 $page_string .= ', ';
             }
@@ -1212,11 +1212,11 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 
     if ($add_prevnext_text) {
         if ($on_page > 1) {
-            $page_string = ' <a href="' . $base_url . "&amp;start=" . (($on_page - 2) * $per_page) . '">' . trans('messages.PREVIOUS_PAGE') . '</a>&nbsp;&nbsp;' . $page_string;
+            $page_string = ' <a href="' . $base_url . '&amp;start=' . (($on_page - 2) * $per_page) . '">' . trans('messages.PREVIOUS_PAGE') . '</a>&nbsp;&nbsp;' . $page_string;
         }
 
         if ($on_page < $total_pages) {
-            $page_string .= '&nbsp;&nbsp;<a href="' . $base_url . "&amp;start=" . ($on_page * $per_page) . '">' . trans('messages.NEXT_PAGE') . '</a>';
+            $page_string .= '&nbsp;&nbsp;<a href="' . $base_url . '&amp;start=' . ($on_page * $per_page) . '">' . trans('messages.NEXT_PAGE') . '</a>';
         }
     }
 
@@ -1257,7 +1257,7 @@ function obtain_word_list(&$orig_word, &$replacement_word)
     }
 
     if (!$sql = OLD_CACHE('bb_cache')->get('censored')) {
-        $sql = OLD_DB()->fetch_rowset("SELECT word, replacement FROM " . BB_WORDS);
+        $sql = OLD_DB()->fetch_rowset('SELECT word, replacement FROM ' . BB_WORDS);
         if (!$sql) {
             $sql = array(array('word' => 1, 'replacement' => 1));
         }
@@ -1518,8 +1518,8 @@ if (!function_exists('array_intersect_key')) {
 
 function clear_dl_list($topics_csv)
 {
-    OLD_DB()->query("DELETE FROM " . BB_BT_DLSTATUS . " WHERE topic_id IN($topics_csv)");
-    OLD_DB()->query("DELETE FROM " . BB_BT_DLSTATUS_SNAP . " WHERE topic_id IN($topics_csv)");
+    OLD_DB()->query('DELETE FROM ' . BB_BT_DLSTATUS . " WHERE topic_id IN($topics_csv)");
+    OLD_DB()->query('DELETE FROM ' . BB_BT_DLSTATUS_SNAP . " WHERE topic_id IN($topics_csv)");
 }
 
 // $ids - array(id1,id2,..) or (string) id
@@ -1540,20 +1540,20 @@ function get_id_ary($ids)
 
 function get_topic_title($topic_id)
 {
-    $row = OLD_DB()->fetch_row("
-		SELECT topic_title FROM " . BB_TOPICS . " WHERE topic_id = " . (int)$topic_id . "
-	");
+    $row = OLD_DB()->fetch_row('
+		SELECT topic_title FROM ' . BB_TOPICS . ' WHERE topic_id = ' . (int)$topic_id . '
+	');
     return $row['topic_title'];
 }
 
 function forum_exists($forum_id)
 {
-    return OLD_DB()->fetch_row("SELECT forum_id FROM " . BB_FORUMS . " WHERE forum_id = $forum_id LIMIT 1");
+    return OLD_DB()->fetch_row('SELECT forum_id FROM ' . BB_FORUMS . " WHERE forum_id = $forum_id LIMIT 1");
 }
 
 function cat_exists($cat_id)
 {
-    return OLD_DB()->fetch_row("SELECT cat_id FROM " . BB_CATEGORIES . " WHERE cat_id = $cat_id LIMIT 1");
+    return OLD_DB()->fetch_row('SELECT cat_id FROM ' . BB_CATEGORIES . " WHERE cat_id = $cat_id LIMIT 1");
 }
 
 function get_topic_icon($topic, $is_unread = null)
@@ -1624,9 +1624,9 @@ function get_poll_data_items_js($topic_id)
     $items = array();
 
     if (!$poll_data = OLD_CACHE('bb_poll_data')->get("poll_$topic_id")) {
-        $poll_data = OLD_DB()->fetch_rowset("
+        $poll_data = OLD_DB()->fetch_rowset('
 			SELECT topic_id, vote_id, vote_text, vote_result
-			FROM " . BB_POLL_VOTES . "
+			FROM ' . BB_POLL_VOTES . "
 			WHERE topic_id IN($topic_id_csv)
 			ORDER BY topic_id, vote_id
 		");
@@ -1817,17 +1817,17 @@ function get_title_match_topics($title_match_sql, array $forum_ids = array())
             log_sphinx_error('wrn', $warning, $title_match_sql);
         }
     } elseif (config('tp.search_engine_type') == 'mysql') {
-        $where_forum = $forum_ids ? "AND forum_id IN(" . implode(',', $forum_ids) . ")" : '';
+        $where_forum = $forum_ids ? 'AND forum_id IN(' . implode(',', $forum_ids) . ')' : '';
         $search_bool_mode = config('tp.allow_search_in_bool_mode') ? ' IN BOOLEAN MODE' : '';
 
         if ($title_match) {
             $where_id = 'topic_id';
-            $sql = "SELECT topic_id FROM " . BB_TOPICS . "
+            $sql = 'SELECT topic_id FROM ' . BB_TOPICS . "
 					WHERE MATCH (topic_title) AGAINST ('$title_match_sql'$search_bool_mode)
 					$where_forum";
         } else {
             $where_id = 'post_id';
-            $sql = "SELECT p.post_id FROM " . BB_POSTS . " p, " . BB_POSTS_SEARCH . " ps
+            $sql = 'SELECT p.post_id FROM ' . BB_POSTS . ' p, ' . BB_POSTS_SEARCH . " ps
 				WHERE ps.post_id = p.post_id
 					AND MATCH (ps.search_words) AGAINST ('$title_match_sql'$search_bool_mode)
 					$where_forum";
@@ -1901,18 +1901,18 @@ function send_pm($user_id, $subject, $message, $poster_id = BOT_UID)
 
     if ($poster_id == BOT_UID) {
         $poster_ip = '7f000001';
-    } elseif ($row = OLD_DB()->fetch_row("SELECT user_reg_ip FROM " . BB_USERS . " WHERE user_id = $poster_id")) {
+    } elseif ($row = OLD_DB()->fetch_row('SELECT user_reg_ip FROM ' . BB_USERS . " WHERE user_id = $poster_id")) {
         $poster_ip = $row['user_reg_ip'];
     } else {
         $poster_id = $userdata['user_id'];
         $poster_ip = USER_IP;
     }
 
-    OLD_DB()->query("INSERT INTO " . BB_PRIVMSGS . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip) VALUES (" . PRIVMSGS_NEW_MAIL . ", '$subject', {$poster_id}, $user_id, " . TIMENOW . ", '$poster_ip')");
+    OLD_DB()->query('INSERT INTO ' . BB_PRIVMSGS . ' (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip) VALUES (' . PRIVMSGS_NEW_MAIL . ", '$subject', {$poster_id}, $user_id, " . TIMENOW . ", '$poster_ip')");
     $pm_id = OLD_DB()->sql_nextid();
 
-    OLD_DB()->query("INSERT INTO " . BB_PRIVMSGS_TEXT . " (privmsgs_text_id, privmsgs_text) VALUES ($pm_id, '$message')");
-    OLD_DB()->query("UPDATE " . BB_USERS . " SET user_new_privmsg = user_new_privmsg + 1, user_last_privmsg = " . TIMENOW . ", user_newest_pm_id = $pm_id WHERE user_id = $user_id");
+    OLD_DB()->query('INSERT INTO ' . BB_PRIVMSGS_TEXT . " (privmsgs_text_id, privmsgs_text) VALUES ($pm_id, '$message')");
+    OLD_DB()->query('UPDATE ' . BB_USERS . ' SET user_new_privmsg = user_new_privmsg + 1, user_last_privmsg = ' . TIMENOW . ", user_newest_pm_id = $pm_id WHERE user_id = $user_id");
 }
 
 function profile_url($data)
@@ -2027,7 +2027,7 @@ function update_atom($type, $id)
             break;
 
         case 'topic':
-            $topic_poster = (int)OLD_DB()->fetch_row("SELECT topic_poster FROM " . BB_TOPICS . " WHERE topic_id = $id LIMIT 1", 'topic_poster');
+            $topic_poster = (int)OLD_DB()->fetch_row('SELECT topic_poster FROM ' . BB_TOPICS . " WHERE topic_id = $id LIMIT 1", 'topic_poster');
             update_user_feed($topic_poster, get_username($topic_poster));
             break;
     }
@@ -2041,9 +2041,9 @@ function hash_search($hash)
         bb_die(sprintf(trans('messages.HASH_INVALID'), $hash));
     }
 
-    $info_hash = OLD_DB()->escape(pack("H*", $hash));
+    $info_hash = OLD_DB()->escape(pack('H*', $hash));
 
-    if ($row = OLD_DB()->fetch_row("SELECT topic_id FROM " . BB_BT_TORRENTS . " WHERE info_hash = '$info_hash'")) {
+    if ($row = OLD_DB()->fetch_row('SELECT topic_id FROM ' . BB_BT_TORRENTS . " WHERE info_hash = '$info_hash'")) {
         redirectToUrl(TOPIC_URL . $row['topic_id']);
     } else {
         bb_die(sprintf(trans('messages.HASH_NOT_FOUND'), $hash));
@@ -2089,7 +2089,7 @@ function bb_captcha($mode, $callback = '')
         case 'check':
             $resp = $reCaptcha->verify(
                 request_var('g-recaptcha-response', ''),
-                $_SERVER["REMOTE_ADDR"]
+                $_SERVER['REMOTE_ADDR']
             );
             if ($resp->isSuccess()) {
                 return true;
diff --git a/library/includes/functions_admin.php b/library/includes/functions_admin.php
index b2a6fdb28..6cf8dea6a 100644
--- a/library/includes/functions_admin.php
+++ b/library/includes/functions_admin.php
@@ -13,7 +13,7 @@ if (!defined('BB_ROOT')) {
 
 function sync_all_forums()
 {
-    foreach (OLD_DB()->fetch_rowset("SELECT forum_id FROM " . BB_FORUMS) as $row) {
+    foreach (OLD_DB()->fetch_rowset('SELECT forum_id FROM ' . BB_FORUMS) as $row) {
         sync('forum', $row['forum_id']);
     }
 }
@@ -42,7 +42,7 @@ function sync($type, $id)
 
             // начальное обнуление значений
             $forum_ary = explode(',', $forum_csv);
-            OLD_DB()->query("REPLACE INTO $tmp_sync_forums (forum_id) VALUES(" . implode('),(', $forum_ary) . ")");
+            OLD_DB()->query("REPLACE INTO $tmp_sync_forums (forum_id) VALUES(" . implode('),(', $forum_ary) . ')');
 
             OLD_DB()->query("
 				REPLACE INTO $tmp_sync_forums
@@ -59,14 +59,14 @@ function sync($type, $id)
 
             OLD_DB()->query("
 				UPDATE
-					$tmp_sync_forums tmp, " . BB_FORUMS . " f
+					$tmp_sync_forums tmp, " . BB_FORUMS . ' f
 				SET
 					f.forum_last_post_id = tmp.forum_last_post_id,
 					f.forum_posts        = tmp.forum_posts,
 					f.forum_topics       = tmp.forum_topics
 				WHERE
 					f.forum_id = tmp.forum_id
-			");
+			');
 
             OLD_DB()->query("DROP TEMPORARY TABLE $tmp_sync_forums");
 
@@ -81,7 +81,7 @@ function sync($type, $id)
             }
 
             // Проверка на остаточные записи об уже удаленных топиках
-            OLD_DB()->query("DELETE FROM " . BB_TOPICS . " WHERE topic_first_post_id NOT IN (SELECT post_id FROM " . BB_POSTS . ")");
+            OLD_DB()->query('DELETE FROM ' . BB_TOPICS . ' WHERE topic_first_post_id NOT IN (SELECT post_id FROM ' . BB_POSTS . ')');
 
             $tmp_sync_topics = 'tmp_sync_topics';
 
@@ -109,17 +109,17 @@ function sync($type, $id)
 					MAX(p.post_id) AS topic_last_post_id,
 					MAX(p.post_time) AS topic_last_post_time,
 					IF(MAX(a.attach_id), 1, 0) AS topic_attachment
-				FROM      " . BB_TOPICS . " t
-				LEFT JOIN " . BB_POSTS . " p ON(p.topic_id = t.topic_id)
-				LEFT JOIN " . BB_ATTACHMENTS . " a ON(a.post_id = p.post_id)
-				WHERE t.topic_status != " . TOPIC_MOVED . "
+				FROM      " . BB_TOPICS . ' t
+				LEFT JOIN ' . BB_POSTS . ' p ON(p.topic_id = t.topic_id)
+				LEFT JOIN ' . BB_ATTACHMENTS . ' a ON(a.post_id = p.post_id)
+				WHERE t.topic_status != ' . TOPIC_MOVED . "
 					$where_sql
 				GROUP BY t.topic_id
 			");
 
             OLD_DB()->query("
 				UPDATE
-					$tmp_sync_topics tmp, " . BB_TOPICS . " t
+					$tmp_sync_topics tmp, " . BB_TOPICS . ' t
 				SET
 					t.topic_replies        = tmp.total_posts - 1,
 					t.topic_first_post_id  = tmp.topic_first_post_id,
@@ -128,9 +128,9 @@ function sync($type, $id)
 					t.topic_attachment     = tmp.topic_attachment
 				WHERE
 					t.topic_id = tmp.topic_id
-			");
+			');
 
-            if ($topics = OLD_DB()->fetch_rowset("SELECT topic_id FROM " . $tmp_sync_topics . " WHERE total_posts = 0", 'topic_id')) {
+            if ($topics = OLD_DB()->fetch_rowset('SELECT topic_id FROM ' . $tmp_sync_topics . ' WHERE total_posts = 0', 'topic_id')) {
                 topic_delete($topics);
             }
 
@@ -158,31 +158,31 @@ function sync($type, $id)
             OLD_DB()->add_shutdown_query("DROP TEMPORARY TABLE IF EXISTS $tmp_user_posts");
 
             // Set posts count = 0 and then update to real count
-            $where_user_sql = (!$all_users) ? "AND user_id IN($user_csv)" : "AND user_posts != 0";
+            $where_user_sql = (!$all_users) ? "AND user_id IN($user_csv)" : 'AND user_posts != 0';
             $where_post_sql = (!$all_users) ? "AND poster_id IN($user_csv)" : '';
 
             OLD_DB()->query("
 				REPLACE INTO $tmp_user_posts
 					SELECT user_id, 0
-					FROM " . BB_USERS . "
-					WHERE user_id != " . GUEST_UID . "
+					FROM " . BB_USERS . '
+					WHERE user_id != ' . GUEST_UID . "
 						$where_user_sql
 				UNION
 					SELECT poster_id, COUNT(*)
-					FROM " . BB_POSTS . "
-					WHERE poster_id != " . GUEST_UID . "
+					FROM " . BB_POSTS . '
+					WHERE poster_id != ' . GUEST_UID . "
 						$where_post_sql
 					GROUP BY poster_id
 			");
 
             OLD_DB()->query("
 				UPDATE
-					$tmp_user_posts tmp, " . BB_USERS . " u
+					$tmp_user_posts tmp, " . BB_USERS . ' u
 				SET
 					u.user_posts = tmp.user_posts
 				WHERE
 					u.user_id = tmp.user_id
-			");
+			');
 
             OLD_DB()->query("DROP TEMPORARY TABLE $tmp_user_posts");
 
@@ -207,9 +207,9 @@ function topic_delete($mode_or_topic_id, $forum_id = null, $prune_time = 0, $pru
     } else {
         $where_sql = ($forum_csv = get_id_csv($forum_id)) ? "AND forum_id IN($forum_csv)" : '';
 
-        $sql = "
+        $sql = '
 			SELECT topic_id, forum_id, topic_title, topic_status
-			FROM " . BB_TOPICS . "
+			FROM ' . BB_TOPICS . "
 			WHERE topic_id IN($topic_csv)
 				$where_sql
 		";
@@ -240,7 +240,7 @@ function topic_delete($mode_or_topic_id, $forum_id = null, $prune_time = 0, $pru
 
     $where_sql = $prune ? "forum_id = $forum_id" : "topic_id IN($topic_csv)";
     $where_sql .= ($prune && $prune_time) ? " AND topic_last_post_time < $prune_time" : '';
-    $where_sql .= ($prune && !$prune_all) ? " AND topic_type NOT IN(" . POST_ANNOUNCE . "," . POST_STICKY . ")" : '';
+    $where_sql .= ($prune && !$prune_all) ? ' AND topic_type NOT IN(' . POST_ANNOUNCE . ',' . POST_STICKY . ')' : '';
 
     OLD_DB()->query("INSERT INTO $tmp_delete_topics SELECT topic_id FROM " . BB_TOPICS . " WHERE $where_sql");
 
@@ -267,11 +267,11 @@ function topic_delete($mode_or_topic_id, $forum_id = null, $prune_time = 0, $pru
     OLD_DB()->query("
 		INSERT INTO $tmp_user_posts
 			SELECT p.poster_id, COUNT(p.post_id)
-			FROM " . $tmp_delete_topics . " del, " . BB_POSTS . " p
+			FROM " . $tmp_delete_topics . ' del, ' . BB_POSTS . ' p
 			WHERE p.topic_id = del.topic_id
-				AND p.poster_id != " . GUEST_UID . "
+				AND p.poster_id != ' . GUEST_UID . '
 			GROUP BY p.poster_id
-	");
+	');
 
     // Get array for atom update
     $atom_csv = array();
@@ -281,39 +281,39 @@ function topic_delete($mode_or_topic_id, $forum_id = null, $prune_time = 0, $pru
 
     OLD_DB()->query("
 		UPDATE
-			$tmp_user_posts tmp, " . BB_USERS . " u
+			$tmp_user_posts tmp, " . BB_USERS . ' u
 		SET
 			u.user_posts = u.user_posts - tmp.user_posts
 		WHERE
 			u.user_id = tmp.user_id
-	");
+	');
 
     OLD_DB()->query("DROP TEMPORARY TABLE $tmp_user_posts");
 
     // Delete votes
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE pv, pu
-		FROM      " . $tmp_delete_topics . " del
-		LEFT JOIN " . BB_POLL_VOTES . " pv USING(topic_id)
-		LEFT JOIN " . BB_POLL_USERS . " pu USING(topic_id)
-	");
+		FROM      ' . $tmp_delete_topics . ' del
+		LEFT JOIN ' . BB_POLL_VOTES . ' pv USING(topic_id)
+		LEFT JOIN ' . BB_POLL_USERS . ' pu USING(topic_id)
+	');
 
     // Delete attachments (from disk)
     $attach_dir = get_attachments_dir();
 
-    $result = OLD_DB()->query("
+    $result = OLD_DB()->query('
 		SELECT
 			d.physical_filename
 		FROM
-			" . $tmp_delete_topics . " del,
-			" . BB_POSTS . " p,
-			" . BB_ATTACHMENTS . " a,
-			" . BB_ATTACHMENTS_DESC . " d
+			' . $tmp_delete_topics . ' del,
+			' . BB_POSTS . ' p,
+			' . BB_ATTACHMENTS . ' a,
+			' . BB_ATTACHMENTS_DESC . ' d
 		WHERE
 			    p.topic_id = del.topic_id
 			AND a.post_id = p.post_id
 			AND d.attach_id = a.attach_id
-	");
+	');
 
     while ($row = OLD_DB()->fetch_next($result)) {
         if ($filename = basename($row['physical_filename'])) {
@@ -324,40 +324,40 @@ function topic_delete($mode_or_topic_id, $forum_id = null, $prune_time = 0, $pru
     unset($row, $result);
 
     // Delete posts, posts_text, attachments (from DB)
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE p, pt, ps, a, d, ph
-		FROM      " . $tmp_delete_topics . " del
-		LEFT JOIN " . BB_POSTS . " p  ON(p.topic_id = del.topic_id)
-		LEFT JOIN " . BB_POSTS_TEXT . " pt ON(pt.post_id = p.post_id)
-		LEFT JOIN " . BB_POSTS_HTML . " ph ON(ph.post_id = p.post_id)
-		LEFT JOIN " . BB_POSTS_SEARCH . " ps ON(ps.post_id = p.post_id)
-		LEFT JOIN " . BB_ATTACHMENTS . " a  ON(a.post_id = p.post_id)
-		LEFT JOIN " . BB_ATTACHMENTS_DESC . " d  ON(d.attach_id = a.attach_id)
-	");
+		FROM      ' . $tmp_delete_topics . ' del
+		LEFT JOIN ' . BB_POSTS . ' p  ON(p.topic_id = del.topic_id)
+		LEFT JOIN ' . BB_POSTS_TEXT . ' pt ON(pt.post_id = p.post_id)
+		LEFT JOIN ' . BB_POSTS_HTML . ' ph ON(ph.post_id = p.post_id)
+		LEFT JOIN ' . BB_POSTS_SEARCH . ' ps ON(ps.post_id = p.post_id)
+		LEFT JOIN ' . BB_ATTACHMENTS . ' a  ON(a.post_id = p.post_id)
+		LEFT JOIN ' . BB_ATTACHMENTS_DESC . ' d  ON(d.attach_id = a.attach_id)
+	');
 
     // Delete topics, topics watch
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE t, tw
-		FROM      " . $tmp_delete_topics . " del
-		LEFT JOIN " . BB_TOPICS . " t  USING(topic_id)
-		LEFT JOIN " . BB_TOPICS_WATCH . " tw USING(topic_id)
-	");
+		FROM      ' . $tmp_delete_topics . ' del
+		LEFT JOIN ' . BB_TOPICS . ' t  USING(topic_id)
+		LEFT JOIN ' . BB_TOPICS_WATCH . ' tw USING(topic_id)
+	');
 
     // Delete topic moved stubs
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE t
-		FROM " . $tmp_delete_topics . " del, " . BB_TOPICS . " t
+		FROM ' . $tmp_delete_topics . ' del, ' . BB_TOPICS . ' t
 		WHERE t.topic_moved_id = del.topic_id
-	");
+	');
 
     // Delete torrents
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE tor, tr, dl
-		FROM      " . $tmp_delete_topics . " del
-		LEFT JOIN " . BB_BT_TORRENTS . " tor USING(topic_id)
-		LEFT JOIN " . BB_BT_TRACKER . " tr  USING(topic_id)
-		LEFT JOIN " . BB_BT_DLSTATUS . " dl  USING(topic_id)
-	");
+		FROM      ' . $tmp_delete_topics . ' del
+		LEFT JOIN ' . BB_BT_TORRENTS . ' tor USING(topic_id)
+		LEFT JOIN ' . BB_BT_TRACKER . ' tr  USING(topic_id)
+		LEFT JOIN ' . BB_BT_DLSTATUS . ' dl  USING(topic_id)
+	');
 
     // Log action
     if ($prune) {
@@ -409,7 +409,7 @@ function topic_move($topic_id, $to_forum_id, $from_forum_id = null, $leave_shado
     // Get topics info
     $where_sql = ($forum_csv = get_id_csv($from_forum_id)) ? "AND forum_id IN($forum_csv)" : '';
 
-    $sql = "SELECT * FROM " . BB_TOPICS . " WHERE topic_id IN($topic_csv) AND topic_status != " . TOPIC_MOVED . " $where_sql";
+    $sql = 'SELECT * FROM ' . BB_TOPICS . " WHERE topic_id IN($topic_csv) AND topic_status != " . TOPIC_MOVED . " $where_sql";
 
     $topics = array();
     $sync_forums = array($to_forum_id => true);
@@ -447,13 +447,13 @@ function topic_move($topic_id, $to_forum_id, $from_forum_id = null, $leave_shado
             );
         }
         if ($sql_args = OLD_DB()->build_array('MULTI_INSERT', $shadows)) {
-            OLD_DB()->query("INSERT INTO " . BB_TOPICS . $sql_args);
+            OLD_DB()->query('INSERT INTO ' . BB_TOPICS . $sql_args);
         }
     }
 
-    OLD_DB()->query("UPDATE " . BB_TOPICS . " SET forum_id = $to_forum_id WHERE topic_id IN($topic_csv)");
-    OLD_DB()->query("UPDATE " . BB_POSTS . " SET forum_id = $to_forum_id WHERE topic_id IN($topic_csv)");
-    OLD_DB()->query("UPDATE " . BB_BT_TORRENTS . " SET forum_id = $to_forum_id WHERE topic_id IN($topic_csv)");
+    OLD_DB()->query('UPDATE ' . BB_TOPICS . " SET forum_id = $to_forum_id WHERE topic_id IN($topic_csv)");
+    OLD_DB()->query('UPDATE ' . BB_POSTS . " SET forum_id = $to_forum_id WHERE topic_id IN($topic_csv)");
+    OLD_DB()->query('UPDATE ' . BB_BT_TORRENTS . " SET forum_id = $to_forum_id WHERE topic_id IN($topic_csv)");
 
     // Bot
     if ($insert_bot_msg) {
@@ -498,7 +498,7 @@ function post_delete($mode_or_post_id, $user_id = null, $exclude_first = true)
 
         // фильтр заглавных сообщений в теме
         if ($exclude_first) {
-            $sql = "SELECT topic_first_post_id FROM " . BB_TOPICS . " WHERE topic_first_post_id IN($post_csv)";
+            $sql = 'SELECT topic_first_post_id FROM ' . BB_TOPICS . " WHERE topic_first_post_id IN($post_csv)";
 
             if ($first_posts = OLD_DB()->fetch_rowset($sql, 'topic_first_post_id')) {
                 $posts_without_first = array_diff(explode(',', $post_csv), $first_posts);
@@ -514,18 +514,18 @@ function post_delete($mode_or_post_id, $user_id = null, $exclude_first = true)
     $log_topics = $sync_forums = $sync_topics = $sync_users = array();
 
     if ($del_user_posts) {
-        $sync_topics = OLD_DB()->fetch_rowset("SELECT DISTINCT topic_id FROM " . BB_POSTS . " WHERE poster_id IN($user_csv)", 'topic_id');
+        $sync_topics = OLD_DB()->fetch_rowset('SELECT DISTINCT topic_id FROM ' . BB_POSTS . " WHERE poster_id IN($user_csv)", 'topic_id');
 
         if ($topic_csv = get_id_csv($sync_topics)) {
-            foreach (OLD_DB()->fetch_rowset("SELECT DISTINCT forum_id FROM " . BB_TOPICS . " WHERE topic_id IN($topic_csv)") as $row) {
+            foreach (OLD_DB()->fetch_rowset('SELECT DISTINCT forum_id FROM ' . BB_TOPICS . " WHERE topic_id IN($topic_csv)") as $row) {
                 $sync_forums[$row['forum_id']] = true;
             }
         }
         $sync_users = explode(',', $user_csv);
     } else {
-        $sql = "
+        $sql = '
 			SELECT p.topic_id, p.forum_id, t.topic_title
-			FROM " . BB_POSTS . " p, " . BB_TOPICS . " t
+			FROM ' . BB_POSTS . ' p, ' . BB_TOPICS . " t
 			WHERE p.post_id IN($post_csv)
 				AND t.topic_id = p.topic_id
 			GROUP BY t.topic_id
@@ -537,7 +537,7 @@ function post_delete($mode_or_post_id, $user_id = null, $exclude_first = true)
             $sync_forums[$row['forum_id']] = true;
         }
 
-        $sync_users = OLD_DB()->fetch_rowset("SELECT DISTINCT poster_id FROM " . BB_POSTS . " WHERE post_id IN($post_csv)", 'poster_id');
+        $sync_users = OLD_DB()->fetch_rowset('SELECT DISTINCT poster_id FROM ' . BB_POSTS . " WHERE post_id IN($post_csv)", 'poster_id');
     }
 
     // Get all post_id for deleting
@@ -555,7 +555,7 @@ function post_delete($mode_or_post_id, $user_id = null, $exclude_first = true)
         $where_sql = "poster_id IN($user_csv)";
 
         $exclude_posts_ary = array();
-        foreach (OLD_DB()->fetch_rowset("SELECT topic_first_post_id FROM " . BB_TOPICS . " WHERE topic_poster IN($user_csv)") as $row) {
+        foreach (OLD_DB()->fetch_rowset('SELECT topic_first_post_id FROM ' . BB_TOPICS . " WHERE topic_poster IN($user_csv)") as $row) {
             $exclude_posts_ary[] = $row['topic_first_post_id'];
         }
         if ($exclude_posts_csv = get_id_csv($exclude_posts_ary)) {
@@ -578,17 +578,17 @@ function post_delete($mode_or_post_id, $user_id = null, $exclude_first = true)
     // Delete attachments (from disk)
     $attach_dir = get_attachments_dir();
 
-    $result = OLD_DB()->query("
+    $result = OLD_DB()->query('
 		SELECT
 			d.physical_filename
 		FROM
-			" . $tmp_delete_posts . " del,
-			" . BB_ATTACHMENTS . " a,
-			" . BB_ATTACHMENTS_DESC . " d
+			' . $tmp_delete_posts . ' del,
+			' . BB_ATTACHMENTS . ' a,
+			' . BB_ATTACHMENTS_DESC . ' d
 		WHERE
 			    a.post_id = del.post_id
 			AND d.attach_id = a.attach_id
-	");
+	');
 
     while ($row = OLD_DB()->fetch_next($result)) {
         if ($filename = basename($row['physical_filename'])) {
@@ -599,17 +599,17 @@ function post_delete($mode_or_post_id, $user_id = null, $exclude_first = true)
     unset($row, $result);
 
     // Delete posts, posts_text, attachments (from DB)
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE p, pt, ps, tor, a, d, ph
-		FROM      " . $tmp_delete_posts . " del
-		LEFT JOIN " . BB_POSTS . " p   ON(p.post_id  = del.post_id)
-		LEFT JOIN " . BB_POSTS_TEXT . " pt  ON(pt.post_id  = del.post_id)
-		LEFT JOIN " . BB_POSTS_HTML . " ph  ON(ph.post_id  = del.post_id)
-		LEFT JOIN " . BB_POSTS_SEARCH . " ps  ON(ps.post_id  = del.post_id)
-		LEFT JOIN " . BB_BT_TORRENTS . " tor ON(tor.post_id = del.post_id)
-		LEFT JOIN " . BB_ATTACHMENTS . " a   ON(a.post_id  = del.post_id)
-		LEFT JOIN " . BB_ATTACHMENTS_DESC . " d   ON(d.attach_id = a.attach_id)
-	");
+		FROM      ' . $tmp_delete_posts . ' del
+		LEFT JOIN ' . BB_POSTS . ' p   ON(p.post_id  = del.post_id)
+		LEFT JOIN ' . BB_POSTS_TEXT . ' pt  ON(pt.post_id  = del.post_id)
+		LEFT JOIN ' . BB_POSTS_HTML . ' ph  ON(ph.post_id  = del.post_id)
+		LEFT JOIN ' . BB_POSTS_SEARCH . ' ps  ON(ps.post_id  = del.post_id)
+		LEFT JOIN ' . BB_BT_TORRENTS . ' tor ON(tor.post_id = del.post_id)
+		LEFT JOIN ' . BB_ATTACHMENTS . ' a   ON(a.post_id  = del.post_id)
+		LEFT JOIN ' . BB_ATTACHMENTS_DESC . ' d   ON(d.attach_id = a.attach_id)
+	');
 
     // Log action
     if ($del_user_posts) {
@@ -651,7 +651,7 @@ function user_delete($user_id, $delete_posts = false)
     if (!$user_csv = get_id_csv($user_id)) {
         return false;
     }
-    if (!$user_id = OLD_DB()->fetch_rowset("SELECT user_id FROM " . BB_USERS . " WHERE user_id IN($user_csv)", 'user_id')) {
+    if (!$user_id = OLD_DB()->fetch_rowset('SELECT user_id FROM ' . BB_USERS . " WHERE user_id IN($user_csv)", 'user_id')) {
         return false;
     }
     $user_csv = get_id_csv($user_id);
@@ -662,7 +662,7 @@ function user_delete($user_id, $delete_posts = false)
     ));
 
     // Avatar
-    $result = OLD_DB()->query("SELECT user_id, avatar_ext_id FROM " . BB_USERS . " WHERE avatar_ext_id > 0 AND user_id IN($user_csv)");
+    $result = OLD_DB()->query('SELECT user_id, avatar_ext_id FROM ' . BB_USERS . " WHERE avatar_ext_id > 0 AND user_id IN($user_csv)");
 
     while ($row = OLD_DB()->fetch_next($result)) {
         delete_avatar($row['user_id'], $row['avatar_ext_id']);
@@ -671,60 +671,60 @@ function user_delete($user_id, $delete_posts = false)
     if ($delete_posts) {
         post_delete('user', $user_id);
     } else {
-        OLD_DB()->query("UPDATE " . BB_POSTS . " SET poster_id = " . DELETED . " WHERE poster_id IN($user_csv)");
+        OLD_DB()->query('UPDATE ' . BB_POSTS . ' SET poster_id = ' . DELETED . " WHERE poster_id IN($user_csv)");
     }
 
-    OLD_DB()->query("UPDATE " . BB_GROUPS . " SET group_moderator = 2 WHERE group_single_user = 0 AND group_moderator IN($user_csv)");
-    OLD_DB()->query("UPDATE " . BB_TOPICS . " SET topic_poster = " . DELETED . " WHERE topic_poster IN($user_csv)");
-    OLD_DB()->query("UPDATE " . BB_BT_TORRENTS . " SET poster_id = " . DELETED . " WHERE poster_id IN($user_csv)");
+    OLD_DB()->query('UPDATE ' . BB_GROUPS . " SET group_moderator = 2 WHERE group_single_user = 0 AND group_moderator IN($user_csv)");
+    OLD_DB()->query('UPDATE ' . BB_TOPICS . ' SET topic_poster = ' . DELETED . " WHERE topic_poster IN($user_csv)");
+    OLD_DB()->query('UPDATE ' . BB_BT_TORRENTS . ' SET poster_id = ' . DELETED . " WHERE poster_id IN($user_csv)");
 
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE ug, g, a, qt1, qt2
-		FROM " . BB_USER_GROUP . " ug
-		LEFT JOIN " . BB_GROUPS . " g   ON(g.group_id = ug.group_id AND g.group_single_user = 1)
-		LEFT JOIN " . BB_AUTH_ACCESS . " a   ON(a.group_id = g.group_id)
-		LEFT JOIN " . BB_QUOTA . " qt1 ON(qt1.user_id = ug.user_id)
-		LEFT JOIN " . BB_QUOTA . " qt2 ON(qt2.group_id = g.group_id)
+		FROM ' . BB_USER_GROUP . ' ug
+		LEFT JOIN ' . BB_GROUPS . ' g   ON(g.group_id = ug.group_id AND g.group_single_user = 1)
+		LEFT JOIN ' . BB_AUTH_ACCESS . ' a   ON(a.group_id = g.group_id)
+		LEFT JOIN ' . BB_QUOTA . ' qt1 ON(qt1.user_id = ug.user_id)
+		LEFT JOIN ' . BB_QUOTA . " qt2 ON(qt2.group_id = g.group_id)
 		WHERE ug.user_id IN($user_csv)
 	");
 
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE u, ban, pu, s, tw, asn
-		FROM " . BB_USERS . " u
-		LEFT JOIN " . BB_BANLIST . " ban ON(ban.ban_userid = u.user_id)
-		LEFT JOIN " . BB_POLL_USERS . " pu  ON(pu.user_id = u.user_id)
-		LEFT JOIN " . BB_SESSIONS . " s   ON(s.session_user_id = u.user_id)
-		LEFT JOIN " . BB_TOPICS_WATCH . " tw  ON(tw.user_id = u.user_id)
-		LEFT JOIN " . BB_AUTH_ACCESS_SNAP . " asn ON(asn.user_id = u.user_id)
+		FROM ' . BB_USERS . ' u
+		LEFT JOIN ' . BB_BANLIST . ' ban ON(ban.ban_userid = u.user_id)
+		LEFT JOIN ' . BB_POLL_USERS . ' pu  ON(pu.user_id = u.user_id)
+		LEFT JOIN ' . BB_SESSIONS . ' s   ON(s.session_user_id = u.user_id)
+		LEFT JOIN ' . BB_TOPICS_WATCH . ' tw  ON(tw.user_id = u.user_id)
+		LEFT JOIN ' . BB_AUTH_ACCESS_SNAP . " asn ON(asn.user_id = u.user_id)
 		WHERE u.user_id IN($user_csv)
 	");
 
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE btu, tr
-		FROM " . BB_BT_USERS . " btu
-		LEFT JOIN " . BB_BT_TRACKER . " tr  ON(tr.user_id = btu.user_id)
+		FROM ' . BB_BT_USERS . ' btu
+		LEFT JOIN ' . BB_BT_TRACKER . " tr  ON(tr.user_id = btu.user_id)
 		WHERE btu.user_id IN($user_csv)
 	");
 
     // PM
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE pm, pmt
-		FROM " . BB_PRIVMSGS . " pm
-		LEFT JOIN " . BB_PRIVMSGS_TEXT . " pmt ON(pmt.privmsgs_text_id = pm.privmsgs_id)
+		FROM ' . BB_PRIVMSGS . ' pm
+		LEFT JOIN ' . BB_PRIVMSGS_TEXT . " pmt ON(pmt.privmsgs_text_id = pm.privmsgs_id)
 		WHERE pm.privmsgs_from_userid IN($user_csv)
-			AND pm.privmsgs_type IN(" . PRIVMSGS_SENT_MAIL . ',' . PRIVMSGS_SAVED_OUT_MAIL . ")
-	");
+			AND pm.privmsgs_type IN(" . PRIVMSGS_SENT_MAIL . ',' . PRIVMSGS_SAVED_OUT_MAIL . ')
+	');
 
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE pm, pmt
-		FROM " . BB_PRIVMSGS . " pm
-		LEFT JOIN " . BB_PRIVMSGS_TEXT . " pmt ON(pmt.privmsgs_text_id = pm.privmsgs_id)
+		FROM ' . BB_PRIVMSGS . ' pm
+		LEFT JOIN ' . BB_PRIVMSGS_TEXT . " pmt ON(pmt.privmsgs_text_id = pm.privmsgs_id)
 		WHERE pm.privmsgs_to_userid IN($user_csv)
-			AND pm.privmsgs_type IN(" . PRIVMSGS_READ_MAIL . ',' . PRIVMSGS_SAVED_IN_MAIL . ")
-	");
+			AND pm.privmsgs_type IN(" . PRIVMSGS_READ_MAIL . ',' . PRIVMSGS_SAVED_IN_MAIL . ')
+	');
 
-    OLD_DB()->query("UPDATE " . BB_PRIVMSGS . " SET privmsgs_from_userid = " . DELETED . " WHERE privmsgs_from_userid IN($user_csv)");
-    OLD_DB()->query("UPDATE " . BB_PRIVMSGS . " SET privmsgs_to_userid = " . DELETED . " WHERE privmsgs_to_userid IN($user_csv)");
+    OLD_DB()->query('UPDATE ' . BB_PRIVMSGS . ' SET privmsgs_from_userid = ' . DELETED . " WHERE privmsgs_from_userid IN($user_csv)");
+    OLD_DB()->query('UPDATE ' . BB_PRIVMSGS . ' SET privmsgs_to_userid = ' . DELETED . " WHERE privmsgs_to_userid IN($user_csv)");
 
     // Delete user feed
     foreach (explode(',', $user_csv) as $user_id) {
@@ -738,7 +738,7 @@ function get_usernames_for_log($user_id)
     $users_log_msg = array();
 
     if ($user_csv = get_id_csv($user_id)) {
-        $sql = "SELECT user_id, username FROM " . BB_USERS . " WHERE user_id IN($user_csv)";
+        $sql = 'SELECT user_id, username FROM ' . BB_USERS . " WHERE user_id IN($user_csv)";
 
         foreach (OLD_DB()->fetch_rowset($sql) as $row) {
             $users_log_msg[] = "<b>$row[username]</b> [$row[user_id]]";
diff --git a/library/includes/functions_admin_cron.php b/library/includes/functions_admin_cron.php
index f4437d89b..0f6b26433 100644
--- a/library/includes/functions_admin_cron.php
+++ b/library/includes/functions_admin_cron.php
@@ -13,7 +13,7 @@ function run_jobs($jobs)
 
     define('IN_CRON', true);
 
-    $sql = "SELECT cron_script FROM " . BB_CRON . " WHERE cron_id IN ($jobs)";
+    $sql = 'SELECT cron_script FROM ' . BB_CRON . " WHERE cron_id IN ($jobs)";
     if (!$result = OLD_DB()->sql_query($sql)) {
         bb_die('Could not obtain cron script');
     }
@@ -23,8 +23,8 @@ function run_jobs($jobs)
         $job_script = INC_DIR . '/cron/jobs/' . $job;
         require $job_script;
     }
-    OLD_DB()->query("
-			UPDATE " . BB_CRON . " SET
+    OLD_DB()->query('
+			UPDATE ' . BB_CRON . " SET
 				last_run = NOW(),
 				run_counter = run_counter + 1,
 				next_run =
@@ -52,14 +52,14 @@ function run_jobs($jobs)
 
 function delete_jobs($jobs)
 {
-    OLD_DB()->query("DELETE FROM " . BB_CRON . " WHERE cron_id IN ($jobs)");
+    OLD_DB()->query('DELETE FROM ' . BB_CRON . " WHERE cron_id IN ($jobs)");
     return;
 }
 
 function toggle_active($jobs, $cron_action)
 {
     $active = ($cron_action == 'disable') ? 0 : 1;
-    OLD_DB()->query("UPDATE " . BB_CRON . " SET cron_active = $active WHERE cron_id IN ($jobs)");
+    OLD_DB()->query('UPDATE ' . BB_CRON . " SET cron_active = $active WHERE cron_id IN ($jobs)");
     return;
 }
 
@@ -85,7 +85,7 @@ function validate_cron_post($cron_arr)
 
 function insert_cron_job($cron_arr)
 {
-    $row = OLD_DB()->fetch_row("SELECT cron_title, cron_script FROM " . BB_CRON . " WHERE cron_title = '" . $_POST['cron_title'] . "' or cron_script = '" . $_POST['cron_script'] . "' ");
+    $row = OLD_DB()->fetch_row('SELECT cron_title, cron_script FROM ' . BB_CRON . " WHERE cron_title = '" . $_POST['cron_title'] . "' or cron_script = '" . $_POST['cron_script'] . "' ");
 
     if ($row) {
         if ($_POST['cron_script'] == $row['cron_script']) {
@@ -94,7 +94,7 @@ function insert_cron_job($cron_arr)
             $errMess = trans('messages.TITLE_DUPLICATE');
         }
 
-        $message = $errMess . "<br /><br />" . sprintf(trans('messages.CLICK_RETURN_JOBS_ADDED'), "<a href=\"javascript:history.back(-1)\">", "</a>") . "<br /><br />" . sprintf(trans('messages.CLICK_RETURN_JOBS'), "<a href=\"admin_cron.php?mode=list\">", "</a>") . "<br /><br />" . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), "<a href=\"index.php?pane=right\">", "</a>");
+        $message = $errMess . '<br /><br />' . sprintf(trans('messages.CLICK_RETURN_JOBS_ADDED'), '<a href="javascript:history.back(-1)">', '</a>') . '<br /><br />' . sprintf(trans('messages.CLICK_RETURN_JOBS'), '<a href="admin_cron.php?mode=list">', '</a>') . '<br /><br />' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '<a href="index.php?pane=right">', '</a>');
 
         bb_die($message);
     }
@@ -115,7 +115,7 @@ function insert_cron_job($cron_arr)
     $disable_board = $cron_arr['disable_board'];
     $run_counter = $cron_arr['run_counter'];
 
-    OLD_DB()->query("INSERT INTO " . BB_CRON . " (cron_active, cron_title, cron_script, schedule, run_day, run_time, run_order, last_run, next_run, run_interval, log_enabled, log_file, log_sql_queries, disable_board, run_counter) VALUES (
+    OLD_DB()->query('INSERT INTO ' . BB_CRON . " (cron_active, cron_title, cron_script, schedule, run_day, run_time, run_order, last_run, next_run, run_interval, log_enabled, log_file, log_sql_queries, disable_board, run_counter) VALUES (
 	$cron_active, '$cron_title', '$cron_script', '$schedule', '$run_day', '$run_time', '$run_order', '$last_run', '$next_run', '$run_interval', $log_enabled, '$log_file', $log_sql_queries, $disable_board, '$run_counter')");
 }
 
@@ -138,7 +138,7 @@ function update_cron_job($cron_arr)
     $disable_board = $cron_arr['disable_board'];
     $run_counter = $cron_arr['run_counter'];
 
-    OLD_DB()->query("UPDATE " . BB_CRON . " SET
+    OLD_DB()->query('UPDATE ' . BB_CRON . " SET
 		cron_active = '$cron_active',
 		cron_title = '$cron_title',
 		cron_script = '$cron_script',
diff --git a/library/includes/functions_atom.php b/library/includes/functions_atom.php
index ae9e52bd3..db200cc24 100644
--- a/library/includes/functions_atom.php
+++ b/library/includes/functions_atom.php
@@ -23,24 +23,24 @@ function update_forum_feed($forum_id, $forum_data)
     }
     if ($forum_id > 0 && $forum_data['allow_reg_tracker']) {
         $select_tor_sql = ', tor.size AS tor_size, tor.tor_status';
-        $join_tor_sql = "LEFT JOIN " . BB_BT_TORRENTS . " tor ON(t.topic_id = tor.topic_id)";
+        $join_tor_sql = 'LEFT JOIN ' . BB_BT_TORRENTS . ' tor ON(t.topic_id = tor.topic_id)';
     }
     if ($forum_id == 0) {
-        $sql = "
+        $sql = '
 			SELECT
 				t.topic_id, t.topic_title, t.topic_status,
 				u1.username AS first_username,
 				p1.post_time AS topic_first_post_time, p1.post_edit_time AS topic_first_post_edit_time,
 				p2.post_time AS topic_last_post_time, p2.post_edit_time AS topic_last_post_edit_time,
 				tor.size AS tor_size, tor.tor_status
-			FROM      " . BB_BT_TORRENTS . " tor
-			LEFT JOIN " . BB_TOPICS . " t   ON(tor.topic_id = t.topic_id)
-			LEFT JOIN " . BB_USERS . " u1  ON(t.topic_poster = u1.user_id)
-			LEFT JOIN " . BB_POSTS . " p1  ON(t.topic_first_post_id = p1.post_id)
-			LEFT JOIN " . BB_POSTS . " p2  ON(t.topic_last_post_id = p2.post_id)
+			FROM      ' . BB_BT_TORRENTS . ' tor
+			LEFT JOIN ' . BB_TOPICS . ' t   ON(tor.topic_id = t.topic_id)
+			LEFT JOIN ' . BB_USERS . ' u1  ON(t.topic_poster = u1.user_id)
+			LEFT JOIN ' . BB_POSTS . ' p1  ON(t.topic_first_post_id = p1.post_id)
+			LEFT JOIN ' . BB_POSTS . ' p2  ON(t.topic_last_post_id = p2.post_id)
 			ORDER BY t.topic_last_post_time DESC
 			LIMIT 100
-		";
+		';
     } elseif ($forum_id > 0) {
         $sql = "
 			SELECT
@@ -49,10 +49,10 @@ function update_forum_feed($forum_id, $forum_data)
 				p1.post_time AS topic_first_post_time, p1.post_edit_time AS topic_first_post_edit_time,
 				p2.post_time AS topic_last_post_time, p2.post_edit_time AS topic_last_post_edit_time
 				$select_tor_sql
-			FROM      " . BB_TOPICS . " t
-			LEFT JOIN " . BB_USERS . " u1  ON(t.topic_poster = u1.user_id)
-			LEFT JOIN " . BB_POSTS . " p1  ON(t.topic_first_post_id = p1.post_id)
-			LEFT JOIN " . BB_POSTS . " p2  ON(t.topic_last_post_id = p2.post_id)
+			FROM      " . BB_TOPICS . ' t
+			LEFT JOIN ' . BB_USERS . ' u1  ON(t.topic_poster = u1.user_id)
+			LEFT JOIN ' . BB_POSTS . ' p1  ON(t.topic_first_post_id = p1.post_id)
+			LEFT JOIN ' . BB_POSTS . " p2  ON(t.topic_last_post_id = p2.post_id)
 				$join_tor_sql
 			WHERE t.forum_id = $forum_id
 			ORDER BY t.topic_last_post_time DESC
@@ -88,18 +88,18 @@ function update_forum_feed($forum_id, $forum_data)
 function update_user_feed($user_id, $username)
 {
     $file_path = config('tp.atom.path') . '/u/' . floor($user_id / 5000) . '/' . ($user_id % 100) . '/' . $user_id . '.atom';
-    $sql = "
+    $sql = '
 		SELECT
 			t.topic_id, t.topic_title, t.topic_status,
 			u1.username AS first_username,
 			p1.post_time AS topic_first_post_time, p1.post_edit_time AS topic_first_post_edit_time,
 			p2.post_time AS topic_last_post_time, p2.post_edit_time AS topic_last_post_edit_time,
 			tor.size AS tor_size, tor.tor_status
-		FROM      " . BB_TOPICS . " t
-		LEFT JOIN " . BB_USERS . " u1  ON(t.topic_poster = u1.user_id)
-		LEFT JOIN " . BB_POSTS . " p1  ON(t.topic_first_post_id = p1.post_id)
-		LEFT JOIN " . BB_POSTS . " p2  ON(t.topic_last_post_id = p2.post_id)
-		LEFT JOIN " . BB_BT_TORRENTS . " tor ON(t.topic_id = tor.topic_id)
+		FROM      ' . BB_TOPICS . ' t
+		LEFT JOIN ' . BB_USERS . ' u1  ON(t.topic_poster = u1.user_id)
+		LEFT JOIN ' . BB_POSTS . ' p1  ON(t.topic_first_post_id = p1.post_id)
+		LEFT JOIN ' . BB_POSTS . ' p2  ON(t.topic_last_post_id = p2.post_id)
+		LEFT JOIN ' . BB_BT_TORRENTS . " tor ON(t.topic_id = tor.topic_id)
 		WHERE t.topic_poster = $user_id
 		ORDER BY t.topic_last_post_time DESC
 		LIMIT 50
@@ -147,13 +147,13 @@ function create_atom($file_path, $mode, $id, $title, $topics)
         $time = bb_date($last_time, 'H:i:s', 0);
         break;
     }
-    $atom = "";
+    $atom = '';
     $atom .= "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n";
-    $atom .= "<feed xmlns=\"http://www.w3.org/2005/Atom\" xml:base=\"http://" . config('tp.server_name') . config('tp.script_path') . "\">\n";
+    $atom .= '<feed xmlns="http://www.w3.org/2005/Atom" xml:base="http://' . config('tp.server_name') . config('tp.script_path') . "\">\n";
     $atom .= "<title>$title</title>\n";
-    $atom .= "<updated>" . $date . "T$time+00:00</updated>\n";
+    $atom .= '<updated>' . $date . "T$time+00:00</updated>\n";
     $atom .= "<id>tag:rto.feed,2000:/$mode/$id</id>\n";
-    $atom .= "<link href=\"http://" . config('tp.server_name') . config('tp.script_path') . "\" />\n";
+    $atom .= '<link href="http://' . config('tp.server_name') . config('tp.script_path') . "\" />\n";
     foreach ($topics as $topic) {
         $topic_id = $topic['topic_id'];
         $tor_size = '';
@@ -185,12 +185,12 @@ function create_atom($file_path, $mode, $id, $title, $topics)
         $atom .= "	<author>\n";
         $atom .= "		<name>$author_name</name>\n";
         $atom .= "	</author>\n";
-        $atom .= "	<updated>" . $date . "T$time+00:00</updated>\n";
-        $atom .= "	<id>tag:rto.feed," . $date . ":/t/$topic_id</id>\n";
+        $atom .= '	<updated>' . $date . "T$time+00:00</updated>\n";
+        $atom .= '	<id>tag:rto.feed,' . $date . ":/t/$topic_id</id>\n";
         $atom .= "	<link href=\"viewtopic.php?t=$topic_id\" />\n";
         $atom .= "</entry>\n";
     }
-    $atom .= "</feed>";
+    $atom .= '</feed>';
     @unlink($file_path);
     $fp = fopen($file_path, 'wb');
     fwrite($fp, $atom);
diff --git a/library/includes/functions_group.php b/library/includes/functions_group.php
index 149bdc2f9..bf629b0ae 100644
--- a/library/includes/functions_group.php
+++ b/library/includes/functions_group.php
@@ -33,28 +33,28 @@ function update_user_level($user_id)
 
     OLD_DB()->query("
 		REPLACE INTO $tmp_table (user_id, user_level)
-			SELECT u.user_id, " . USER . "
-			FROM " . BB_USERS . " u
-			WHERE user_level NOT IN(" . USER . "," . ADMIN . ")
+			SELECT u.user_id, " . USER . '
+			FROM ' . BB_USERS . ' u
+			WHERE user_level NOT IN(' . USER . ',' . ADMIN . ")
 				$users_in
 		UNION
-			SELECT DISTINCT ug.user_id, " . GROUP_MEMBER . "
-			FROM " . BB_GROUPS . " g, " . BB_USER_GROUP . " ug
+			SELECT DISTINCT ug.user_id, " . GROUP_MEMBER . '
+			FROM ' . BB_GROUPS . ' g, ' . BB_USER_GROUP . " ug
 			WHERE g.group_single_user = 0
 				AND ug.group_id = g.group_id
 				AND ug.user_pending = 0
 					$user_groups_in
 		UNION
-			SELECT DISTINCT ug.user_id, " . MOD . "
-			FROM " . BB_AUTH_ACCESS . " aa, " . BB_USER_GROUP . " ug
-			WHERE aa.forum_perm & " . BF_AUTH_MOD . "
+			SELECT DISTINCT ug.user_id, " . MOD . '
+			FROM ' . BB_AUTH_ACCESS . ' aa, ' . BB_USER_GROUP . ' ug
+			WHERE aa.forum_perm & ' . BF_AUTH_MOD . "
 				AND ug.group_id = aa.group_id
 				AND ug.user_pending = 0
 					$user_groups_in
 	");
 
-    OLD_DB()->query("
-		UPDATE " . BB_USERS . " u, $tmp_table lev SET
+    OLD_DB()->query('
+		UPDATE ' . BB_USERS . " u, $tmp_table lev SET
 			u.user_level = lev.user_level
 		WHERE lev.user_id = u.user_id
 			AND u.user_level NOT IN(" . ADMIN . ")
@@ -72,15 +72,15 @@ function delete_group($group_id)
 {
     $group_id = (int)$group_id;
 
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE ug, g, aa
-		FROM " . BB_USER_GROUP . " ug
-		LEFT JOIN " . BB_GROUPS . " g ON(g.group_id = $group_id)
+		FROM ' . BB_USER_GROUP . ' ug
+		LEFT JOIN ' . BB_GROUPS . " g ON(g.group_id = $group_id)
 		LEFT JOIN " . BB_AUTH_ACCESS . " aa ON(aa.group_id = $group_id)
 		WHERE ug.group_id = $group_id
 	");
 
-    OLD_DB()->query("UPDATE " . BB_POSTS . " SET attach_rg_sig = 0, poster_rg_id = 0 WHERE poster_rg_id = " . $group_id);
+    OLD_DB()->query('UPDATE ' . BB_POSTS . ' SET attach_rg_sig = 0, poster_rg_id = 0 WHERE poster_rg_id = ' . $group_id);
 
     update_user_level('all');
 }
@@ -93,7 +93,7 @@ function add_user_into_group($group_id, $user_id, $user_pending = 0, $user_time
         'user_pending' => (int)$user_pending,
         'user_time' => (int)$user_time,
     ));
-    OLD_DB()->query("REPLACE INTO " . BB_USER_GROUP . $args);
+    OLD_DB()->query('REPLACE INTO ' . BB_USER_GROUP . $args);
 
     if (!$user_pending) {
         update_user_level($user_id);
@@ -102,23 +102,23 @@ function add_user_into_group($group_id, $user_id, $user_pending = 0, $user_time
 
 function delete_user_group($group_id, $user_id)
 {
-    OLD_DB()->query("
-		DELETE FROM " . BB_USER_GROUP . "
-		WHERE user_id = " . (int)$user_id . "
-			AND group_id = " . (int)$group_id . "
-	");
+    OLD_DB()->query('
+		DELETE FROM ' . BB_USER_GROUP . '
+		WHERE user_id = ' . (int)$user_id . '
+			AND group_id = ' . (int)$group_id . '
+	');
 
     update_user_level($user_id);
 }
 
 function create_user_group($user_id)
 {
-    OLD_DB()->query("INSERT INTO " . BB_GROUPS . " (group_single_user) VALUES (1)");
+    OLD_DB()->query('INSERT INTO ' . BB_GROUPS . ' (group_single_user) VALUES (1)');
 
     $group_id = (int)OLD_DB()->sql_nextid();
     $user_id = (int)$user_id;
 
-    OLD_DB()->query("INSERT INTO " . BB_USER_GROUP . " (user_id, group_id, user_time) VALUES ($user_id, $group_id, " . TIMENOW . ")");
+    OLD_DB()->query('INSERT INTO ' . BB_USER_GROUP . " (user_id, group_id, user_time) VALUES ($user_id, $group_id, " . TIMENOW . ')');
 
     return $group_id;
 }
@@ -126,21 +126,21 @@ function create_user_group($user_id)
 function get_group_data($group_id)
 {
     if ($group_id === 'all') {
-        $sql = "SELECT g.*, u.username AS moderator_name, aa.group_id AS auth_mod
-			FROM " . BB_GROUPS . " g
-			LEFT JOIN " . BB_USERS . " u ON(g.group_moderator = u.user_id)
-			LEFT JOIN " . BB_AUTH_ACCESS . " aa ON(aa.group_id = g.group_id AND aa.forum_perm & " . BF_AUTH_MOD . ")
+        $sql = 'SELECT g.*, u.username AS moderator_name, aa.group_id AS auth_mod
+			FROM ' . BB_GROUPS . ' g
+			LEFT JOIN ' . BB_USERS . ' u ON(g.group_moderator = u.user_id)
+			LEFT JOIN ' . BB_AUTH_ACCESS . ' aa ON(aa.group_id = g.group_id AND aa.forum_perm & ' . BF_AUTH_MOD . ')
 			WHERE g.group_single_user = 0
 			GROUP BY g.group_id
-			ORDER BY g.group_name";
+			ORDER BY g.group_name';
     } else {
-        $sql = "SELECT g.*, u.username AS moderator_name, aa.group_id AS auth_mod
-			FROM " . BB_GROUPS . " g
-			LEFT JOIN " . BB_USERS . " u ON(g.group_moderator = u.user_id)
-			LEFT JOIN " . BB_AUTH_ACCESS . " aa ON(aa.group_id = g.group_id AND aa.forum_perm & " . BF_AUTH_MOD . ")
-			WHERE g.group_id = " . (int)$group_id . "
+        $sql = 'SELECT g.*, u.username AS moderator_name, aa.group_id AS auth_mod
+			FROM ' . BB_GROUPS . ' g
+			LEFT JOIN ' . BB_USERS . ' u ON(g.group_moderator = u.user_id)
+			LEFT JOIN ' . BB_AUTH_ACCESS . ' aa ON(aa.group_id = g.group_id AND aa.forum_perm & ' . BF_AUTH_MOD . ')
+			WHERE g.group_id = ' . (int)$group_id . '
 				AND g.group_single_user = 0
-			LIMIT 1";
+			LIMIT 1';
     }
     $method = ($group_id === 'all') ? 'fetch_rowset' : 'fetch_row';
     return OLD_DB()->$method($sql);
@@ -152,15 +152,15 @@ function delete_permissions($group_id = null, $user_id = null, $cat_id = null)
     $user_id = get_id_csv($user_id);
     $cat_id = get_id_csv($cat_id);
 
-    $forums_join_sql = $cat_id ? "
-		INNER JOIN " . BB_FORUMS . " f ON(a.forum_id = f.forum_id AND f.cat_id IN($cat_id))
+    $forums_join_sql = $cat_id ? '
+		INNER JOIN ' . BB_FORUMS . " f ON(a.forum_id = f.forum_id AND f.cat_id IN($cat_id))
 	" : '';
 
     if ($group_id) {
-        OLD_DB()->query("DELETE a FROM " . BB_AUTH_ACCESS . " a $forums_join_sql WHERE a.group_id IN($group_id)");
+        OLD_DB()->query('DELETE a FROM ' . BB_AUTH_ACCESS . " a $forums_join_sql WHERE a.group_id IN($group_id)");
     }
     if ($user_id) {
-        OLD_DB()->query("DELETE a FROM " . BB_AUTH_ACCESS_SNAP . " a $forums_join_sql WHERE a.user_id IN($user_id)");
+        OLD_DB()->query('DELETE a FROM ' . BB_AUTH_ACCESS_SNAP . " a $forums_join_sql WHERE a.user_id IN($user_id)");
     }
 }
 
@@ -181,7 +181,7 @@ function store_permissions($group_id, $auth_ary)
     }
     $values = OLD_DB()->build_array('MULTI_INSERT', $values);
 
-    OLD_DB()->query("INSERT INTO " . BB_AUTH_ACCESS . $values);
+    OLD_DB()->query('INSERT INTO ' . BB_AUTH_ACCESS . $values);
 }
 
 function update_user_permissions($user_id = 'all')
@@ -192,17 +192,17 @@ function update_user_permissions($user_id = 'all')
     $delete_in = ($user_id !== 'all') ? " WHERE user_id IN($user_id)" : '';
     $users_in = ($user_id !== 'all') ? "AND ug.user_id IN($user_id)" : '';
 
-    OLD_DB()->query("DELETE FROM " . BB_AUTH_ACCESS_SNAP . $delete_in);
+    OLD_DB()->query('DELETE FROM ' . BB_AUTH_ACCESS_SNAP . $delete_in);
 
-    OLD_DB()->query("
-		INSERT INTO " . BB_AUTH_ACCESS_SNAP . "
+    OLD_DB()->query('
+		INSERT INTO ' . BB_AUTH_ACCESS_SNAP . '
 			(user_id, forum_id, forum_perm)
 		SELECT
 			ug.user_id, aa.forum_id, BIT_OR(aa.forum_perm)
 		FROM
-			" . BB_USER_GROUP . " ug,
-			" . BB_GROUPS . " g,
-			" . BB_AUTH_ACCESS . " aa
+			' . BB_USER_GROUP . ' ug,
+			' . BB_GROUPS . ' g,
+			' . BB_AUTH_ACCESS . " aa
 		WHERE
 			    ug.user_pending = 0
 				$users_in
@@ -216,19 +216,19 @@ function update_user_permissions($user_id = 'all')
 function delete_orphan_usergroups()
 {
     // GROUP_SINGLE_USER without AUTH_ACCESS
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE g
-		FROM " . BB_GROUPS . " g
-		LEFT JOIN " . BB_AUTH_ACCESS . " aa USING(group_id)
+		FROM ' . BB_GROUPS . ' g
+		LEFT JOIN ' . BB_AUTH_ACCESS . ' aa USING(group_id)
 		WHERE g.group_single_user = 1
 			AND aa.group_id IS NULL
-	");
+	');
 
     // orphan USER_GROUP (against GROUP table)
-    OLD_DB()->query("
+    OLD_DB()->query('
 		DELETE ug
-		FROM " . BB_USER_GROUP . " ug
-		LEFT JOIN " . BB_GROUPS . " g USING(group_id)
+		FROM ' . BB_USER_GROUP . ' ug
+		LEFT JOIN ' . BB_GROUPS . ' g USING(group_id)
 		WHERE g.group_id IS NULL
-	");
+	');
 }
diff --git a/library/includes/functions_post.php b/library/includes/functions_post.php
index 1b1a224eb..b50fb88eb 100644
--- a/library/includes/functions_post.php
+++ b/library/includes/functions_post.php
@@ -74,7 +74,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
     $where_sql = IS_GUEST ? "p.poster_ip = '" . USER_IP . "'" : "p.poster_id = {$userdata['user_id']}";
 
     if ($mode == 'newtopic' || $mode == 'reply') {
-        $sql = "SELECT MAX(p.post_time) AS last_post_time FROM " . BB_POSTS . " p WHERE $where_sql";
+        $sql = 'SELECT MAX(p.post_time) AS last_post_time FROM ' . BB_POSTS . " p WHERE $where_sql";
 
         if ($row = OLD_DB()->fetch_row($sql) && $row['last_post_time']) {
             if ($userdata['user_level'] == USER) {
@@ -87,15 +87,15 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 
     // Double Post Control
     if ($mode != 'editpost' && !empty($row['last_post_time']) && !IS_AM) {
-        $sql = "
+        $sql = '
 			SELECT pt.post_text
-			FROM " . BB_POSTS . " p, " . BB_POSTS_TEXT . " pt
+			FROM ' . BB_POSTS . ' p, ' . BB_POSTS_TEXT . " pt
 			WHERE
 					$where_sql
-				AND p.post_time = " . (int)$row['last_post_time'] . "
+				AND p.post_time = " . (int)$row['last_post_time'] . '
 				AND pt.post_id = p.post_id
 			LIMIT 1
-		";
+		';
 
         if ($row = OLD_DB()->fetch_row($sql)) {
             $last_msg = OLD_DB()->escape($row['post_text']);
@@ -109,16 +109,16 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
     if ($mode == 'newtopic' || ($mode == 'editpost' && $post_data['first_post'])) {
         $topic_dl_type = (isset($_POST['topic_dl_type']) && ($post_info['allow_reg_tracker'] || $is_auth['auth_mod'])) ? TOPIC_DL_TYPE_DL : TOPIC_DL_TYPE_NORMAL;
 
-        $sql_insert = "
+        $sql_insert = '
 			INSERT INTO
-				" . BB_TOPICS . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_dl_type)
+				' . BB_TOPICS . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_dl_type)
 			VALUES
 				('$post_subject', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_dl_type)
 		";
 
-        $sql_update = "
+        $sql_update = '
 			UPDATE
-				" . BB_TOPICS . "
+				' . BB_TOPICS . "
 			SET
 				topic_title = '$post_subject',
 				topic_type = $topic_type,
@@ -127,7 +127,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 				topic_id = $topic_id
 		";
 
-        $sql = ($mode != "editpost") ? $sql_insert : $sql_update;
+        $sql = ($mode != 'editpost') ? $sql_insert : $sql_update;
 
         if (!OLD_DB()->sql_query($sql)) {
             bb_die('Error in posting #1');
@@ -138,15 +138,15 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
         }
     }
 
-    $edited_sql = ($mode == 'editpost' && !$post_data['last_post'] && $post_data['poster_post']) ? ", post_edit_time = $current_time, post_edit_count = post_edit_count + 1" : "";
+    $edited_sql = ($mode == 'editpost' && !$post_data['last_post'] && $post_data['poster_post']) ? ", post_edit_time = $current_time, post_edit_count = post_edit_count + 1" : '';
 
     if ($update_post_time && $mode == 'editpost' && $post_data['last_post'] && !$post_data['first_post']) {
         $edited_sql .= ", post_time = $current_time ";
         //lpt
-        OLD_DB()->sql_query("UPDATE " . BB_TOPICS . " SET topic_last_post_time = $current_time WHERE topic_id = $topic_id");
+        OLD_DB()->sql_query('UPDATE ' . BB_TOPICS . " SET topic_last_post_time = $current_time WHERE topic_id = $topic_id");
     }
 
-    $sql = ($mode != "editpost") ? "INSERT INTO " . BB_POSTS . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, poster_rg_id, attach_rg_sig) VALUES ($topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '" . USER_IP . "', $poster_rg_id, $attach_rg_sig)" : "UPDATE " . BB_POSTS . " SET post_username = '$post_username'" . $edited_sql . ", poster_rg_id = $poster_rg_id, attach_rg_sig = $attach_rg_sig WHERE post_id = $post_id";
+    $sql = ($mode != 'editpost') ? 'INSERT INTO ' . BB_POSTS . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, poster_rg_id, attach_rg_sig) VALUES ($topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '" . USER_IP . "', $poster_rg_id, $attach_rg_sig)" : 'UPDATE ' . BB_POSTS . " SET post_username = '$post_username'" . $edited_sql . ", poster_rg_id = $poster_rg_id, attach_rg_sig = $attach_rg_sig WHERE post_id = $post_id";
     if (!OLD_DB()->sql_query($sql)) {
         bb_die('Error in posting #2');
     }
@@ -155,7 +155,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
         $post_id = OLD_DB()->sql_nextid();
     }
 
-    $sql = ($mode != 'editpost') ? "INSERT INTO " . BB_POSTS_TEXT . " (post_id, post_text) VALUES ($post_id, '$post_message')" : "UPDATE " . BB_POSTS_TEXT . " SET post_text = '$post_message' WHERE post_id = $post_id";
+    $sql = ($mode != 'editpost') ? 'INSERT INTO ' . BB_POSTS_TEXT . " (post_id, post_text) VALUES ($post_id, '$post_message')" : 'UPDATE ' . BB_POSTS_TEXT . " SET post_text = '$post_message' WHERE post_id = $post_id";
     if (!OLD_DB()->sql_query($sql)) {
         bb_die('Error in posting #3');
     }
@@ -210,8 +210,8 @@ function update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $u
             } else {
                 $topic_update_sql .= 'topic_replies = topic_replies - 1';
 
-                $sql = "SELECT MAX(post_id) AS last_post_id, MAX(post_time) AS topic_last_post_time
-					FROM " . BB_POSTS . "
+                $sql = 'SELECT MAX(post_id) AS last_post_id, MAX(post_time) AS topic_last_post_time
+					FROM ' . BB_POSTS . "
 					WHERE topic_id = $topic_id";
                 if (!($result = OLD_DB()->sql_query($sql))) {
                     bb_die('Error in deleting post #1');
@@ -223,8 +223,8 @@ function update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $u
             }
 
             if ($post_data['last_topic']) {
-                $sql = "SELECT MAX(post_id) AS last_post_id
-					FROM " . BB_POSTS . "
+                $sql = 'SELECT MAX(post_id) AS last_post_id
+					FROM ' . BB_POSTS . "
 					WHERE forum_id = $forum_id";
                 if (!($result = OLD_DB()->sql_query($sql))) {
                     bb_die('Error in deleting post #2');
@@ -235,7 +235,7 @@ function update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $u
                 }
             }
         } elseif ($post_data['first_post']) {
-            $sql = "SELECT MIN(post_id) AS first_post_id FROM " . BB_POSTS . " WHERE topic_id = $topic_id";
+            $sql = 'SELECT MIN(post_id) AS first_post_id FROM ' . BB_POSTS . " WHERE topic_id = $topic_id";
             if (!($result = OLD_DB()->sql_query($sql))) {
                 bb_die('Error in deleting post #3');
             }
@@ -247,23 +247,23 @@ function update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $u
             $topic_update_sql .= 'topic_replies = topic_replies - 1';
         }
     } else {
-        $forum_update_sql .= ", forum_last_post_id = $post_id" . (($mode == 'newtopic') ? ", forum_topics = forum_topics $sign" : "");
+        $forum_update_sql .= ", forum_last_post_id = $post_id" . (($mode == 'newtopic') ? ", forum_topics = forum_topics $sign" : '');
         $topic_update_sql = "topic_last_post_id = $post_id, topic_last_post_time = " . TIMENOW . (($mode == 'reply') ? ", topic_replies = topic_replies $sign" : ", topic_first_post_id = $post_id");
     }
 
-    $sql = "UPDATE " . BB_FORUMS . " SET $forum_update_sql WHERE forum_id = $forum_id";
+    $sql = 'UPDATE ' . BB_FORUMS . " SET $forum_update_sql WHERE forum_id = $forum_id";
     if (!OLD_DB()->sql_query($sql)) {
         bb_die('Error in posting #4');
     }
 
     if ($topic_update_sql != '') {
-        $sql = "UPDATE " . BB_TOPICS . " SET $topic_update_sql WHERE topic_id = $topic_id";
+        $sql = 'UPDATE ' . BB_TOPICS . " SET $topic_update_sql WHERE topic_id = $topic_id";
         if (!OLD_DB()->sql_query($sql)) {
             bb_die('Error in posting #5');
         }
     }
 
-    $sql = "UPDATE " . BB_USERS . " SET user_posts = user_posts $sign WHERE user_id = $user_id";
+    $sql = 'UPDATE ' . BB_USERS . " SET user_posts = user_posts $sign WHERE user_id = $user_id";
     if (!OLD_DB()->sql_query($sql)) {
         bb_die('Error in posting #6');
     }
@@ -295,22 +295,22 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
         if ($mode == 'reply') {
             $update_watched_sql = $user_id_sql = array();
 
-            $sql = OLD_DB()->fetch_rowset("SELECT ban_userid FROM " . BB_BANLIST . " WHERE ban_userid != 0");
+            $sql = OLD_DB()->fetch_rowset('SELECT ban_userid FROM ' . BB_BANLIST . ' WHERE ban_userid != 0');
 
             foreach ($sql as $row) {
                 $user_id_sql[] = ',' . $row['ban_userid'];
             }
             $user_id_sql = implode('', $user_id_sql);
 
-            $watch_list = OLD_DB()->fetch_rowset("SELECT u.username, u.user_id, u.user_email, u.user_lang
-				FROM " . BB_TOPICS_WATCH . " tw, " . BB_USERS . " u
+            $watch_list = OLD_DB()->fetch_rowset('SELECT u.username, u.user_id, u.user_email, u.user_lang
+				FROM ' . BB_TOPICS_WATCH . ' tw, ' . BB_USERS . " u
 				WHERE tw.topic_id = $topic_id
-					AND tw.user_id NOT IN (" . $userdata['user_id'] . ", " . EXCLUDED_USERS . $user_id_sql . ")
-					AND tw.notify_status = " . TOPIC_WATCH_NOTIFIED . "
+					AND tw.user_id NOT IN (" . $userdata['user_id'] . ', ' . EXCLUDED_USERS . $user_id_sql . ')
+					AND tw.notify_status = ' . TOPIC_WATCH_NOTIFIED . '
 					AND u.user_id = tw.user_id
 					AND u.user_active = 1
 				ORDER BY u.user_id
-			");
+			');
 
             if ($watch_list) {
                 $orig_word = $replacement_word = array();
@@ -348,23 +348,23 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
             }
 
             if ($update_watched_sql) {
-                OLD_DB()->query("UPDATE " . BB_TOPICS_WATCH . "
-					SET notify_status = " . TOPIC_WATCH_UNNOTIFIED . "
+                OLD_DB()->query('UPDATE ' . BB_TOPICS_WATCH . '
+					SET notify_status = ' . TOPIC_WATCH_UNNOTIFIED . "
 					WHERE topic_id = $topic_id
 						AND user_id IN ($update_watched_sql)
 				");
             }
         }
 
-        $topic_watch = OLD_DB()->fetch_row("SELECT topic_id FROM " . BB_TOPICS_WATCH . " WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']}", 'topic_id');
+        $topic_watch = OLD_DB()->fetch_row('SELECT topic_id FROM ' . BB_TOPICS_WATCH . " WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']}", 'topic_id');
 
         if (!$notify_user && !empty($topic_watch)) {
-            OLD_DB()->query("DELETE FROM " . BB_TOPICS_WATCH . " WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']}");
+            OLD_DB()->query('DELETE FROM ' . BB_TOPICS_WATCH . " WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']}");
         } elseif ($notify_user && empty($topic_watch)) {
-            OLD_DB()->query("
-				INSERT INTO " . BB_TOPICS_WATCH . " (user_id, topic_id, notify_status)
-				VALUES (" . $userdata['user_id'] . ", $topic_id, " . TOPIC_WATCH_NOTIFIED . ")
-			");
+            OLD_DB()->query('
+				INSERT INTO ' . BB_TOPICS_WATCH . ' (user_id, topic_id, notify_status)
+				VALUES (' . $userdata['user_id'] . ", $topic_id, " . TOPIC_WATCH_NOTIFIED . ')
+			');
         }
     }
 }
@@ -386,8 +386,8 @@ function insert_post($mode, $topic_id, $forum_id = '', $old_forum_id = '', $new_
             return;
         }
 
-        $sql = "SELECT forum_id, forum_name
-			FROM " . BB_FORUMS . "
+        $sql = 'SELECT forum_id, forum_name
+			FROM ' . BB_FORUMS . "
 			WHERE forum_id IN($forum_id, $old_forum_id)";
 
         $forum_names = array();
@@ -408,8 +408,8 @@ function insert_post($mode, $topic_id, $forum_id = '', $old_forum_id = '', $new_
         $poster_id = BOT_UID;
         $poster_ip = '7f000001';
     } elseif ($mode == 'after_split_to_new') {
-        $sql = "SELECT t.topic_title, p.post_time
-			FROM " . BB_TOPICS . " t, " . BB_POSTS . " p
+        $sql = 'SELECT t.topic_title, p.post_time
+			FROM ' . BB_TOPICS . ' t, ' . BB_POSTS . " p
 			WHERE t.topic_id = $old_topic_id
 				AND p.post_id = t.topic_first_post_id";
 
@@ -430,7 +430,7 @@ function insert_post($mode, $topic_id, $forum_id = '', $old_forum_id = '', $new_
     $post_columns = 'topic_id,  forum_id,  poster_id,   post_username,   post_time,   poster_ip';
     $post_values = "$topic_id, $forum_id, $poster_id, '$post_username', $post_time, '$poster_ip'";
 
-    OLD_DB()->query("INSERT INTO " . BB_POSTS . " ($post_columns) VALUES ($post_values)");
+    OLD_DB()->query('INSERT INTO ' . BB_POSTS . " ($post_columns) VALUES ($post_values)");
 
     $post_id = OLD_DB()->sql_nextid();
     $post_text = OLD_DB()->escape($post_text);
@@ -438,7 +438,7 @@ function insert_post($mode, $topic_id, $forum_id = '', $old_forum_id = '', $new_
     $post_text_columns = 'post_id,    post_text';
     $post_text_values = "$post_id, '$post_text'";
 
-    OLD_DB()->query("INSERT INTO " . BB_POSTS_TEXT . " ($post_text_columns) VALUES ($post_text_values)");
+    OLD_DB()->query('INSERT INTO ' . BB_POSTS_TEXT . " ($post_text_columns) VALUES ($post_text_values)");
 }
 
 function topic_review($topic_id)
@@ -446,18 +446,18 @@ function topic_review($topic_id)
     global $template;
 
     // Fetch posts data
-    $review_posts = OLD_DB()->fetch_rowset("
+    $review_posts = OLD_DB()->fetch_rowset('
 		SELECT
 			p.*, h.post_html, IF(h.post_html IS NULL, pt.post_text, NULL) AS post_text,
-			IF(p.poster_id = " . GUEST_UID . ", p.post_username, u.username) AS username, u.user_rank
-		FROM      " . BB_POSTS . " p
-		LEFT JOIN " . BB_USERS . " u  ON(u.user_id = p.poster_id)
-		LEFT JOIN " . BB_POSTS_TEXT . " pt ON(pt.post_id = p.post_id)
-		LEFT JOIN " . BB_POSTS_HTML . " h  ON(h.post_id = p.post_id)
-		WHERE p.topic_id = " . (int)$topic_id . "
+			IF(p.poster_id = ' . GUEST_UID . ', p.post_username, u.username) AS username, u.user_rank
+		FROM      ' . BB_POSTS . ' p
+		LEFT JOIN ' . BB_USERS . ' u  ON(u.user_id = p.poster_id)
+		LEFT JOIN ' . BB_POSTS_TEXT . ' pt ON(pt.post_id = p.post_id)
+		LEFT JOIN ' . BB_POSTS_HTML . ' h  ON(h.post_id = p.post_id)
+		WHERE p.topic_id = ' . (int)$topic_id . '
 		ORDER BY p.post_time DESC
-		LIMIT " . config('tp.posts_per_page') . "
-	");
+		LIMIT ' . config('tp.posts_per_page') . '
+	');
 
     // Topic posts block
     foreach ($review_posts as $i => $post) {
diff --git a/library/includes/functions_torrent.php b/library/includes/functions_torrent.php
index b91ddba02..10c5723b2 100644
--- a/library/includes/functions_torrent.php
+++ b/library/includes/functions_torrent.php
@@ -15,18 +15,18 @@ function get_torrent_info($attach_id)
 {
     $attach_id = (int)$attach_id;
 
-    $sql = "
+    $sql = '
 		SELECT
 			a.post_id, d.physical_filename, d.extension, d.tracker_status,
 			t.topic_first_post_id,
 			p.poster_id, p.topic_id, p.forum_id,
 			f.allow_reg_tracker
 		FROM
-			" . BB_ATTACHMENTS . " a,
-			" . BB_ATTACHMENTS_DESC . " d,
-			" . BB_POSTS . " p,
-			" . BB_TOPICS . " t,
-			" . BB_FORUMS . " f
+			' . BB_ATTACHMENTS . ' a,
+			' . BB_ATTACHMENTS_DESC . ' d,
+			' . BB_POSTS . ' p,
+			' . BB_TOPICS . ' t,
+			' . BB_FORUMS . " f
 		WHERE
 			    a.attach_id = $attach_id
 			AND d.attach_id = $attach_id
@@ -84,7 +84,7 @@ function tracker_unregister($attach_id, $mode = '')
     }
 
     if (!$topic_id) {
-        $sql = "SELECT topic_id FROM " . BB_BT_TORRENTS . " WHERE attach_id = $attach_id";
+        $sql = 'SELECT topic_id FROM ' . BB_BT_TORRENTS . " WHERE attach_id = $attach_id";
 
         if (!$result = OLD_DB()->sql_query($sql)) {
             bb_die('Could not query torrent information');
@@ -96,7 +96,7 @@ function tracker_unregister($attach_id, $mode = '')
 
     // Unset DL-Type for topic
     if (config('tp.bt_unset_dltype_on_tor_unreg') && $topic_id) {
-        $sql = "UPDATE " . BB_TOPICS . " SET topic_dl_type = " . TOPIC_DL_TYPE_NORMAL . " WHERE topic_id = $topic_id";
+        $sql = 'UPDATE ' . BB_TOPICS . ' SET topic_dl_type = ' . TOPIC_DL_TYPE_NORMAL . " WHERE topic_id = $topic_id";
 
         if (!$result = OLD_DB()->sql_query($sql)) {
             bb_die('Could not update topics table #1');
@@ -104,7 +104,7 @@ function tracker_unregister($attach_id, $mode = '')
     }
 
     // Remove peers from tracker
-    $sql = "DELETE FROM " . BB_BT_TRACKER . " WHERE topic_id = $topic_id";
+    $sql = 'DELETE FROM ' . BB_BT_TRACKER . " WHERE topic_id = $topic_id";
 
     if (!OLD_DB()->sql_query($sql)) {
         bb_die('Could not delete peers');
@@ -112,21 +112,21 @@ function tracker_unregister($attach_id, $mode = '')
 
     // Ocelot
     if (config('tp.ocelot.enabled')) {
-        if ($row = OLD_DB()->fetch_row("SELECT info_hash FROM " . BB_BT_TORRENTS . " WHERE attach_id = $attach_id LIMIT 1")) {
+        if ($row = OLD_DB()->fetch_row('SELECT info_hash FROM ' . BB_BT_TORRENTS . " WHERE attach_id = $attach_id LIMIT 1")) {
             $info_hash = $row['info_hash'];
         }
         ocelot_update_tracker('delete_torrent', array('info_hash' => rawurlencode($info_hash), 'id' => $topic_id));
     }
 
     // Delete torrent
-    $sql = "DELETE FROM " . BB_BT_TORRENTS . " WHERE attach_id = $attach_id";
+    $sql = 'DELETE FROM ' . BB_BT_TORRENTS . " WHERE attach_id = $attach_id";
 
     if (!OLD_DB()->sql_query($sql)) {
         bb_die('Could not delete torrent from torrents table');
     }
 
     // Update tracker_status
-    $sql = "UPDATE " . BB_ATTACHMENTS_DESC . " SET tracker_status = 0 WHERE attach_id = $attach_id";
+    $sql = 'UPDATE ' . BB_ATTACHMENTS_DESC . " SET tracker_status = 0 WHERE attach_id = $attach_id";
 
     if (!OLD_DB()->sql_query($sql)) {
         bb_die('Could not update torrent status #1');
@@ -179,8 +179,8 @@ function change_tor_status($attach_id, $new_tor_status)
 
     torrent_auth_check($torrent['forum_id'], $torrent['poster_id']);
 
-    OLD_DB()->query("
-		UPDATE " . BB_BT_TORRENTS . " SET
+    OLD_DB()->query('
+		UPDATE ' . BB_BT_TORRENTS . " SET
 			tor_status = $new_tor_status,
 			checked_user_id = {$userdata['user_id']},
 			checked_time = '" . TIMENOW . "'
@@ -206,11 +206,11 @@ function change_tor_type($attach_id, $tor_status_gold)
     $tor_status_gold = (int)$tor_status_gold;
     $info_hash = null;
 
-    OLD_DB()->query("UPDATE " . BB_BT_TORRENTS . " SET tor_type = $tor_status_gold WHERE topic_id = $topic_id");
+    OLD_DB()->query('UPDATE ' . BB_BT_TORRENTS . " SET tor_type = $tor_status_gold WHERE topic_id = $topic_id");
 
     // Ocelot
     if (config('tp.ocelot.enabled')) {
-        if ($row = OLD_DB()->fetch_row("SELECT info_hash FROM " . BB_BT_TORRENTS . " WHERE topic_id = $topic_id LIMIT 1")) {
+        if ($row = OLD_DB()->fetch_row('SELECT info_hash FROM ' . BB_BT_TORRENTS . " WHERE topic_id = $topic_id LIMIT 1")) {
             $info_hash = $row['info_hash'];
         }
         ocelot_update_tracker('update_torrent', array('info_hash' => rawurlencode($info_hash), 'freetorrent' => $tor_status_gold));
@@ -299,7 +299,7 @@ function tracker_register($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVED
         ocelot_update_tracker('add_torrent', array('info_hash' => rawurlencode($info_hash), 'id' => $topic_id, 'freetorrent' => 0));
     }
 
-    if ($row = OLD_DB()->fetch_row("SELECT topic_id FROM " . BB_BT_TORRENTS . " WHERE info_hash = '$info_hash_sql' LIMIT 1")) {
+    if ($row = OLD_DB()->fetch_row('SELECT topic_id FROM ' . BB_BT_TORRENTS . " WHERE info_hash = '$info_hash_sql' LIMIT 1")) {
         $msg = sprintf(trans('messages.BT_REG_FAIL_SAME_HASH'), TOPIC_URL . $row['topic_id']);
         bb_die($msg);
         set_die_append_msg($forum_id, $topic_id);
@@ -322,7 +322,7 @@ function tracker_register($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVED
     $columns = ' info_hash,       post_id,  poster_id,  topic_id,  forum_id,  attach_id,    size,  reg_time,  tor_status';
     $values = "'$info_hash_sql', $post_id, $poster_id, $topic_id, $forum_id, $attach_id, '$size', $reg_time, $tor_status";
 
-    $sql = "INSERT INTO " . BB_BT_TORRENTS . " ($columns) VALUES ($values)";
+    $sql = 'INSERT INTO ' . BB_BT_TORRENTS . " ($columns) VALUES ($values)";
 
     if (!OLD_DB()->sql_query($sql)) {
         $sql_error = OLD_DB()->sql_error();
@@ -352,7 +352,7 @@ function tracker_register($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVED
     }
 
     if (config('tracker.tor_topic_up')) {
-        OLD_DB()->query("UPDATE " . BB_TOPICS . " SET topic_last_post_time = GREATEST(topic_last_post_time, " . (TIMENOW - 3 * 86400) . ") WHERE topic_id = $topic_id");
+        OLD_DB()->query('UPDATE ' . BB_TOPICS . ' SET topic_last_post_time = GREATEST(topic_last_post_time, ' . (TIMENOW - 3 * 86400) . ") WHERE topic_id = $topic_id");
     }
 
     if ($reg_mode == 'request' || $reg_mode == 'newtopic') {
@@ -422,10 +422,10 @@ function send_torrent_with_passkey($filename)
 
     if ($min_ratio && $user_id != $poster_id && ($user_ratio = get_bt_ratio($bt_userdata)) !== null) {
         if ($user_ratio < $min_ratio && $post_id) {
-            $dl = OLD_DB()->fetch_row("
+            $dl = OLD_DB()->fetch_row('
 				SELECT dl.user_status
-				FROM " . BB_POSTS . " p
-				LEFT JOIN " . BB_BT_DLSTATUS . " dl ON dl.topic_id = p.topic_id AND dl.user_id = $user_id
+				FROM ' . BB_POSTS . ' p
+				LEFT JOIN ' . BB_BT_DLSTATUS . " dl ON dl.topic_id = p.topic_id AND dl.user_id = $user_id
 				WHERE p.post_id = $post_id
 				LIMIT 1
 			");
@@ -444,7 +444,7 @@ function send_torrent_with_passkey($filename)
         bb_die('This is not a bencoded file');
     }
 
-    $announce = config('tp.ocelot.enabled') ? (string)(config('tp.ocelot.url') . $passkey_val . "/announce") : (string)($ann_url . "?$passkey_key=$passkey_val");
+    $announce = config('tp.ocelot.enabled') ? (string)(config('tp.ocelot.url') . $passkey_val . '/announce') : (string)($ann_url . "?$passkey_key=$passkey_val");
 
     // Replace original announce url with tracker default
     if (config('tp.bt_replace_ann_url') || !isset($tor['announce'])) {
@@ -513,7 +513,7 @@ function generate_passkey($user_id, $force_generate = false)
 
     // Check if user can change passkey
     if (!$force_generate) {
-        $sql = "SELECT user_opt FROM " . BB_USERS . " WHERE user_id = $user_id LIMIT 1";
+        $sql = 'SELECT user_opt FROM ' . BB_USERS . " WHERE user_id = $user_id LIMIT 1";
 
         if (!$result = OLD_DB()->sql_query($sql)) {
             bb_die('Could not query userdata for passkey');
@@ -529,18 +529,18 @@ function generate_passkey($user_id, $force_generate = false)
         $passkey_val = make_rand_str(BT_AUTH_KEY_LENGTH);
         $old_passkey = null;
 
-        if ($row = OLD_DB()->fetch_row("SELECT auth_key FROM " . BB_BT_USERS . " WHERE user_id = $user_id LIMIT 1")) {
+        if ($row = OLD_DB()->fetch_row('SELECT auth_key FROM ' . BB_BT_USERS . " WHERE user_id = $user_id LIMIT 1")) {
             $old_passkey = $row['auth_key'];
         }
 
         // Insert new row
-        OLD_DB()->query("INSERT IGNORE INTO " . BB_BT_USERS . " (user_id, auth_key) VALUES ($user_id, '$passkey_val')");
+        OLD_DB()->query('INSERT IGNORE INTO ' . BB_BT_USERS . " (user_id, auth_key) VALUES ($user_id, '$passkey_val')");
 
         if (OLD_DB()->affected_rows() == 1) {
             return $passkey_val;
         }
         // Update
-        OLD_DB()->query("UPDATE IGNORE " . BB_BT_USERS . " SET auth_key = '$passkey_val' WHERE user_id = $user_id");
+        OLD_DB()->query('UPDATE IGNORE ' . BB_BT_USERS . " SET auth_key = '$passkey_val' WHERE user_id = $user_id");
 
         if (OLD_DB()->affected_rows() == 1) {
             // Ocelot
@@ -555,19 +555,19 @@ function generate_passkey($user_id, $force_generate = false)
 
 function tracker_rm_torrent($topic_id)
 {
-    return OLD_DB()->sql_query("DELETE FROM " . BB_BT_TRACKER . " WHERE topic_id = " . (int)$topic_id);
+    return OLD_DB()->sql_query('DELETE FROM ' . BB_BT_TRACKER . ' WHERE topic_id = ' . (int)$topic_id);
 }
 
 function tracker_rm_user($user_id)
 {
-    return OLD_DB()->sql_query("DELETE FROM " . BB_BT_TRACKER . " WHERE user_id = " . (int)$user_id);
+    return OLD_DB()->sql_query('DELETE FROM ' . BB_BT_TRACKER . ' WHERE user_id = ' . (int)$user_id);
 }
 
 function get_registered_torrents($id, $mode)
 {
     $field = ($mode == 'topic') ? 'topic_id' : 'post_id';
 
-    $sql = "SELECT topic_id FROM " . BB_BT_TORRENTS . " WHERE $field = $id LIMIT 1";
+    $sql = 'SELECT topic_id FROM ' . BB_BT_TORRENTS . " WHERE $field = $id LIMIT 1";
 
     if (!$result = OLD_DB()->sql_query($sql)) {
         bb_die('Could not query torrent id');
@@ -622,7 +622,7 @@ function ocelot_send_request($get, $max_attempts = 1, &$err = false)
         $file = fsockopen(config('tp.ocelot.host'), config('tp.ocelot.port'), $error_num, $error_string);
         if ($file) {
             if (fwrite($file, $header) === false) {
-                $err = "Failed to fwrite()";
+                $err = 'Failed to fwrite()';
                 continue;
             }
         } else {
@@ -639,10 +639,10 @@ function ocelot_send_request($get, $max_attempts = 1, &$err = false)
         if ($data_end > $data_start) {
             $data = substr($response, $data_start, $data_end - $data_start);
         } else {
-            $data = "";
+            $data = '';
         }
         $status = substr($response, $data_end + 1);
-        if ($status == "success") {
+        if ($status == 'success') {
             $success = true;
         }
     }
diff --git a/library/includes/functions_validate.php b/library/includes/functions_validate.php
index 914123b3d..3dfaaedb3 100644
--- a/library/includes/functions_validate.php
+++ b/library/includes/functions_validate.php
@@ -32,7 +32,7 @@ function validate_username($username, $check_ban_and_taken = true)
     // Allowed symbols
     if (!preg_match('#^[' . $name_chars . ']+$#iu', $username, $m)) {
         $invalid_chars = preg_replace('#[' . $name_chars . ']#iu', '', $username);
-        return "{trans('messages.USERNAME_INVALID')}: <b>" . htmlCHR($invalid_chars) . "</b>";
+        return "{trans('messages.USERNAME_INVALID')}: <b>" . htmlCHR($invalid_chars) . '</b>';
     }
     // HTML Entities
     if (preg_match_all('/&(#[0-9]+|[a-z]+);/iu', $username, $m)) {
@@ -46,7 +46,7 @@ function validate_username($username, $check_ban_and_taken = true)
         // Занято
         $username_sql = OLD_DB()->escape($username);
 
-        if ($row = OLD_DB()->fetch_row("SELECT username FROM " . BB_USERS . " WHERE username = '$username_sql' LIMIT 1")) {
+        if ($row = OLD_DB()->fetch_row('SELECT username FROM ' . BB_USERS . " WHERE username = '$username_sql' LIMIT 1")) {
             if ((!IS_GUEST && $row['username'] != $user->name) || IS_GUEST) {
                 return trans('messages.USERNAME_TAKEN');
             }
@@ -54,7 +54,7 @@ function validate_username($username, $check_ban_and_taken = true)
         // Запрещено
         $banned_names = array();
 
-        foreach (OLD_DB()->fetch_rowset("SELECT disallow_username FROM " . BB_DISALLOW . " ORDER BY NULL") as $row) {
+        foreach (OLD_DB()->fetch_rowset('SELECT disallow_username FROM ' . BB_DISALLOW . ' ORDER BY NULL') as $row) {
             $banned_names[] = str_replace('\*', '.*?', preg_quote($row['disallow_username'], '#u'));
         }
         if ($banned_names_exp = implode('|', $banned_names)) {
@@ -82,7 +82,7 @@ function validate_email($email, $check_ban_and_taken = true)
     if ($check_ban_and_taken) {
         $banned_emails = array();
 
-        foreach (OLD_DB()->fetch_rowset("SELECT ban_email FROM " . BB_BANLIST . " ORDER BY NULL") as $row) {
+        foreach (OLD_DB()->fetch_rowset('SELECT ban_email FROM ' . BB_BANLIST . ' ORDER BY NULL') as $row) {
             $banned_emails[] = str_replace('\*', '.*?', preg_quote($row['ban_email'], '#'));
         }
         if ($banned_emails_exp = implode('|', $banned_emails)) {
@@ -93,7 +93,7 @@ function validate_email($email, $check_ban_and_taken = true)
 
         $email_sql = OLD_DB()->escape($email);
 
-        if ($row = OLD_DB()->fetch_row("SELECT `user_email` FROM " . BB_USERS . " WHERE user_email = '$email_sql' LIMIT 1")) {
+        if ($row = OLD_DB()->fetch_row('SELECT `user_email` FROM ' . BB_USERS . " WHERE user_email = '$email_sql' LIMIT 1")) {
             if ($row['user_email'] == $userdata['user_email']) {
                 return false;
             }
diff --git a/library/includes/online_userlist.php b/library/includes/online_userlist.php
index bfc91b5a2..331d933f0 100644
--- a/library/includes/online_userlist.php
+++ b/library/includes/online_userlist.php
@@ -31,11 +31,11 @@ $users_cnt = [
 ];
 $online = $online_short = array('userlist' => '');
 
-$sql = "
+$sql = '
 	SELECT
 		u.username, u.user_id, u.user_opt, u.user_rank, u.user_level,
 		s.session_logged_in, s.session_ip, (s.session_time - s.session_start) AS ses_len, COUNT(s.session_id) AS sessions, COUNT(DISTINCT s.session_ip) AS ips
-	FROM " . BB_SESSIONS . " s, " . BB_USERS . " u
+	FROM ' . BB_SESSIONS . ' s, ' . BB_USERS . " u
 	WHERE s.session_time > $time_online
 		AND u.user_id = s.session_user_id
 	GROUP BY u.username, u.user_id, u.user_opt, u.user_rank, u.user_level, s.session_user_id, s.session_logged_in, s.session_ip, s.session_time, s.session_start
diff --git a/library/includes/page_footer.php b/library/includes/page_footer.php
index bbfb16cd5..d97274078 100644
--- a/library/includes/page_footer.php
+++ b/library/includes/page_footer.php
@@ -18,7 +18,7 @@ if (!empty($template)) {
         'SIMPLE_FOOTER' => !empty($gen_simple_header),
         'POWERED' => 'Tracker software by <a target="_blank" href="https://torrentpier.com">TorrentPier</a> &copy; 2005-' . date('Y'),
         'SHOW_ADMIN_LINK' => IS_ADMIN && !defined('IN_ADMIN'),
-        'ADMIN_LINK_HREF' => "admin/index.php",
+        'ADMIN_LINK_HREF' => 'admin/index.php',
     ));
 
     $template->set_filenames(array('page_footer' => 'page_footer.tpl'));
@@ -58,7 +58,7 @@ if ($show_dbg_info) {
         for ($i = 0; $i < 3; $i++) {
             $l[$i] = round($l[$i], 1);
         }
-        $stat .= " &nbsp;|&nbsp; " . trans('messages.LIMIT') . " $l[0] $l[1] $l[2]";
+        $stat .= ' &nbsp;|&nbsp; ' . trans('messages.LIMIT') . " $l[0] $l[1] $l[2]";
     }
 
     $stat .= ' &nbsp;]';
diff --git a/library/includes/page_header.php b/library/includes/page_header.php
index bdaaf687c..2beb2143f 100644
--- a/library/includes/page_header.php
+++ b/library/includes/page_header.php
@@ -22,7 +22,7 @@ $logged_in = (int)!empty($userdata['session_logged_in']);
 
 // Generate logged in/logged out status
 if ($logged_in) {
-    $u_login_logout = BB_ROOT . LOGIN_URL . "?logout=1";
+    $u_login_logout = BB_ROOT . LOGIN_URL . '?logout=1';
 } else {
     $u_login_logout = BB_ROOT . LOGIN_URL;
 }
@@ -78,13 +78,13 @@ if ($logged_in && empty($gen_simple_header) && !defined('IN_ADMIN')) {
     if (!$have_new_pm && $userdata['user_unread_privmsg']) {
         // synch unread pm count
         if (defined('IN_PM')) {
-            $row = OLD_DB()->fetch_row("
+            $row = OLD_DB()->fetch_row('
 				SELECT COUNT(*) AS pm_count
-				FROM " . BB_PRIVMSGS . "
-				WHERE privmsgs_to_userid = " . $userdata['user_id'] . "
-					AND privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . "
+				FROM ' . BB_PRIVMSGS . '
+				WHERE privmsgs_to_userid = ' . $userdata['user_id'] . '
+					AND privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . '
 				GROUP BY privmsgs_to_userid
-			");
+			');
 
             $real_unread_pm_count = (int)$row['pm_count'];
 
@@ -122,7 +122,7 @@ $template->assign_vars(array(
     'USE_TABLESORTER' => !empty($page_cfg['use_tablesorter']),
 
     'SITENAME' => config('tp.sitename'),
-    'U_INDEX' => BB_ROOT . "index.php",
+    'U_INDEX' => BB_ROOT . 'index.php',
     'T_INDEX' => sprintf(trans('messages.FORUM_INDEX'), config('tp.sitename')),
 
     'IS_GUEST' => IS_GUEST,
@@ -151,20 +151,20 @@ $template->assign_vars(array(
     'S_LOGIN_ACTION' => LOGIN_URL,
 
     'U_CUR_DOWNLOADS' => PROFILE_URL . $userdata['user_id'],
-    'U_FORUM' => "viewforum.php",
-    'U_GROUPS' => "group.php",
+    'U_FORUM' => 'viewforum.php',
+    'U_GROUPS' => 'group.php',
     'U_LOGIN_LOGOUT' => $u_login_logout,
-    'U_MEMBERLIST' => "memberlist.php",
-    'U_MODCP' => "modcp.php",
-    'U_OPTIONS' => "profile.php?mode=editprofile",
-    'U_PRIVATEMSGS' => PM_URL . "?folder=inbox",
+    'U_MEMBERLIST' => 'memberlist.php',
+    'U_MODCP' => 'modcp.php',
+    'U_OPTIONS' => 'profile.php?mode=editprofile',
+    'U_PRIVATEMSGS' => PM_URL . '?folder=inbox',
     'U_PROFILE' => PROFILE_URL . $userdata['user_id'],
-    'U_READ_PM' => PM_URL . "?folder=inbox" . (($userdata['user_newest_pm_id'] && $userdata['user_new_privmsg'] == 1) ? "&mode=read&p={$userdata['user_newest_pm_id']}" : ''),
-    'U_REGISTER' => "profile.php?mode=register",
-    'U_SEARCH' => "search.php",
-    'U_SEND_PASSWORD' => "profile.php?mode=sendpassword",
+    'U_READ_PM' => PM_URL . '?folder=inbox' . (($userdata['user_newest_pm_id'] && $userdata['user_new_privmsg'] == 1) ? "&mode=read&p={$userdata['user_newest_pm_id']}" : ''),
+    'U_REGISTER' => 'profile.php?mode=register',
+    'U_SEARCH' => 'search.php',
+    'U_SEND_PASSWORD' => 'profile.php?mode=sendpassword',
     'U_TERMS' => config('tp.terms_and_conditions_url'),
-    'U_TRACKER' => "tracker.php",
+    'U_TRACKER' => 'tracker.php',
 
     'SHOW_SIDEBAR1' => !empty(config('page.show_sidebar1.' . BB_SCRIPT)) || config('tp.show_sidebar1_on_every_page'),
     'SHOW_SIDEBAR2' => !empty(config('page.show_sidebar2.' . BB_SCRIPT)) || config('tp.show_sidebar2_on_every_page'),
@@ -260,12 +260,12 @@ if (!empty(config('page.show_torhelp.' . BB_SCRIPT)) && !empty($userdata['torhel
             bb_setcookie('torhelp', '', COOKIE_EXPIRED);
         }
 
-        $sql = "
+        $sql = '
 			SELECT topic_id, topic_title
-			FROM " . BB_TOPICS . "
-			WHERE topic_id IN(" . $userdata['torhelp'] . ")
+			FROM ' . BB_TOPICS . '
+			WHERE topic_id IN(' . $userdata['torhelp'] . ')
 			LIMIT 8
-		";
+		';
         $torhelp_topics = array();
 
         foreach (OLD_DB()->fetch_rowset($sql) as $row) {
diff --git a/library/includes/posting_tpl.php b/library/includes/posting_tpl.php
index af096f93e..719dff462 100644
--- a/library/includes/posting_tpl.php
+++ b/library/includes/posting_tpl.php
@@ -15,14 +15,14 @@ $can_edit_tpl = IS_SUPER_ADMIN;
 $edit_tpl_mode = ($can_edit_tpl && !empty($_REQUEST['edit_tpl']));
 
 // forum_data
-$sql = "SELECT forum_name, allow_reg_tracker, forum_tpl_id FROM " . BB_FORUMS . " WHERE forum_id = $forum_id LIMIT 1";
+$sql = 'SELECT forum_name, allow_reg_tracker, forum_tpl_id FROM ' . BB_FORUMS . " WHERE forum_id = $forum_id LIMIT 1";
 
 if (!$forum_id || !$f_data = OLD_DB()->fetch_row($sql)) {
     bb_die(trans('messages.FORUM_NOT_EXIST'));
 }
 // tpl_data
 $tpl_data = array();
-$sql = "SELECT * FROM " . BB_TOPIC_TPL . " WHERE tpl_id = {$f_data['forum_tpl_id']} LIMIT 1";
+$sql = 'SELECT * FROM ' . BB_TOPIC_TPL . " WHERE tpl_id = {$f_data['forum_tpl_id']} LIMIT 1";
 
 if (!$f_data['forum_tpl_id'] || !$tpl_data = OLD_DB()->fetch_row($sql)) {
     if (!$edit_tpl_mode) {
@@ -47,9 +47,9 @@ if ($tpl_data) {
     $tpl_rules_html = '';
 
     if ($tpl_data['tpl_rules_post_id']) {
-        if (!$tpl_rules_html = bbcode2html(OLD_DB()->fetch_row("SELECT post_text FROM " . BB_POSTS_TEXT . " WHERE post_id = " . $tpl_data['tpl_rules_post_id'], 'post_text'))) {
+        if (!$tpl_rules_html = bbcode2html(OLD_DB()->fetch_row('SELECT post_text FROM ' . BB_POSTS_TEXT . ' WHERE post_id = ' . $tpl_data['tpl_rules_post_id'], 'post_text'))) {
             $tpl_data['tpl_rules_post_id'] = 0;
-            OLD_DB()->query("UPDATE " . BB_TOPIC_TPL . " SET tpl_rules_post_id = 0 WHERE tpl_id = {$f_data['forum_tpl_id']}");
+            OLD_DB()->query('UPDATE ' . BB_TOPIC_TPL . " SET tpl_rules_post_id = 0 WHERE tpl_id = {$f_data['forum_tpl_id']}");
         }
     }
 
diff --git a/library/includes/sessions.php b/library/includes/sessions.php
index bf625b997..2ad8507b2 100644
--- a/library/includes/sessions.php
+++ b/library/includes/sessions.php
@@ -62,8 +62,8 @@ function cache_rm_user_sessions($user_id)
 {
     $user_id = get_id_csv($user_id);
 
-    $rowset = OLD_DB()->fetch_rowset("
-		SELECT session_id FROM " . BB_SESSIONS . " WHERE session_user_id IN($user_id)
+    $rowset = OLD_DB()->fetch_rowset('
+		SELECT session_id FROM ' . BB_SESSIONS . " WHERE session_user_id IN($user_id)
 	");
 
     foreach ($rowset as $row) {
@@ -83,7 +83,7 @@ function db_update_userdata($userdata, $sql_ary, $data_already_escaped = true)
     }
 
     $sql_args = OLD_DB()->build_array('UPDATE', $sql_ary, $data_already_escaped);
-    OLD_DB()->query("UPDATE " . BB_USERS . " SET $sql_args WHERE user_id = {$userdata['user_id']}");
+    OLD_DB()->query('UPDATE ' . BB_USERS . " SET $sql_args WHERE user_id = {$userdata['user_id']}");
 
     if (OLD_DB()->affected_rows()) {
         cache_rm_userdata($userdata);
@@ -96,7 +96,7 @@ function delete_user_sessions($user_id)
     cache_rm_user_sessions($user_id);
 
     $user_id = get_id_csv($user_id);
-    OLD_DB()->query("DELETE FROM " . BB_SESSIONS . " WHERE session_user_id IN($user_id)");
+    OLD_DB()->query('DELETE FROM ' . BB_SESSIONS . " WHERE session_user_id IN($user_id)");
 }
 
 // deprecated
diff --git a/library/includes/torrent_show_dl_list.php b/library/includes/torrent_show_dl_list.php
index 447c7bc76..844b870e8 100644
--- a/library/includes/torrent_show_dl_list.php
+++ b/library/includes/torrent_show_dl_list.php
@@ -30,7 +30,7 @@ $show_dl_buttons = ($dl_topic && config('tp.bt_show_dl_list_buttons'));
 // link to clear DL-List
 $template->assign_vars(array('S_DL_DELETE' => false));
 if ($is_auth['auth_mod'] && ($t_data['topic_dl_type'] == TOPIC_DL_TYPE_DL)) {
-    $s_dl_delete = "<br /><a href=\"dl_list.php?mode=dl_delete&amp;" . POST_TOPIC_URL . "=$topic_id&amp;sid=" . $userdata['session_id'] . '">' . trans('messages.DL_LIST_DEL') . '</a>';
+    $s_dl_delete = '<br /><a href="dl_list.php?mode=dl_delete&amp;' . POST_TOPIC_URL . "=$topic_id&amp;sid=" . $userdata['session_id'] . '">' . trans('messages.DL_LIST_DEL') . '</a>';
     $template->assign_vars(array('S_DL_DELETE' => $s_dl_delete));
 }
 
@@ -43,12 +43,12 @@ if ($show_dl_list) {
     }
 
     if ($count_mode) {
-        $sql = "SELECT dl_status AS user_status, users_count AS username
-			FROM " . BB_BT_DLSTATUS_SNAP . "
+        $sql = 'SELECT dl_status AS user_status, users_count AS username
+			FROM ' . BB_BT_DLSTATUS_SNAP . "
 			WHERE topic_id = $topic_id";
     } else {
         $sql = "SELECT d.user_status, d.user_id, DATE_FORMAT(d.last_modified_dlstatus, '%Y-%m-%d') AS last_modified_dlstatus, u.username, u.user_rank
-			FROM " . BB_BT_DLSTATUS . " d, " . BB_USERS . " u
+			FROM " . BB_BT_DLSTATUS . ' d, ' . BB_USERS . " u
 			WHERE d.topic_id = $topic_id
 				AND d.user_id = u.user_id
 				AND d.user_status != " . DL_STATUS_RELEASER . "
@@ -70,7 +70,7 @@ if ($show_dl_list) {
                 $dl_cat[$u['user_status']] = $u['username'];
                 $dl_count[$u['user_status']] = $u['username'];
             } else {
-                $u_prof_href = ($u['user_id'] == GUEST_UID) ? '#' : "profile.php?mode=viewprofile&amp;u=" . $u['user_id'] . "#torrent";
+                $u_prof_href = ($u['user_id'] == GUEST_UID) ? '#' : 'profile.php?mode=viewprofile&amp;u=' . $u['user_id'] . '#torrent';
                 $dl_cat[$u['user_status']] .= '<nobr><a class="' . $u_link_class . '" href="' . $u_prof_href . '" title="' . $u['last_modified_dlstatus'] . '">' . profile_url(array('username' => $u['username'], 'user_rank' => $u['user_rank'])) . '</a></nobr>, ';
                 $dl_count[$u['user_status']]++;
             }
@@ -121,7 +121,7 @@ if ($show_dl_buttons) {
 
     $template->assign_vars(array(
         'DL_HIDDEN_FIELDS' => $dl_hidden_fields,
-        'S_DL_ACTION' => "dl_list.php?" . POST_TOPIC_URL . "=$topic_id",
+        'S_DL_ACTION' => 'dl_list.php?' . POST_TOPIC_URL . "=$topic_id",
     ));
 }
 
diff --git a/library/includes/ucp/activate.php b/library/includes/ucp/activate.php
index 3716b7484..760f5a3f1 100644
--- a/library/includes/ucp/activate.php
+++ b/library/includes/ucp/activate.php
@@ -15,9 +15,9 @@ if (empty($_GET['u']) || empty($_GET['act_key'])) {
     bb_die('Bad request');
 }
 
-$sql = "SELECT user_active, user_id, username, user_email, user_newpasswd, user_lang, user_actkey
-	FROM " . BB_USERS . "
-	WHERE user_id = " . (int)$_GET[POST_USERS_URL];
+$sql = 'SELECT user_active, user_id, username, user_email, user_newpasswd, user_lang, user_actkey
+	FROM ' . BB_USERS . '
+	WHERE user_id = ' . (int)$_GET[POST_USERS_URL];
 if (!($result = OLD_DB()->sql_query($sql))) {
     bb_die('Could not obtain user information');
 }
@@ -28,9 +28,9 @@ if ($row = OLD_DB()->sql_fetchrow($result)) {
     } elseif ((trim($row['user_actkey']) == trim($_GET['act_key'])) && (trim($row['user_actkey']) != '')) {
         $sql_update_pass = ($row['user_newpasswd'] != '') ? ", user_password = '" . md5(md5($row['user_newpasswd'])) . "', user_newpasswd = ''" : '';
 
-        $sql = "UPDATE " . BB_USERS . "
-			SET user_active = 1, user_actkey = ''" . $sql_update_pass . "
-			WHERE user_id = " . $row['user_id'];
+        $sql = 'UPDATE ' . BB_USERS . "
+			SET user_active = 1, user_actkey = ''" . $sql_update_pass . '
+			WHERE user_id = ' . $row['user_id'];
         if (!($result = OLD_DB()->sql_query($sql))) {
             bb_die('Could not update users table');
         }
diff --git a/library/includes/ucp/bonus.php b/library/includes/ucp/bonus.php
index 35622492b..3acbad092 100644
--- a/library/includes/ucp/bonus.php
+++ b/library/includes/ucp/bonus.php
@@ -43,7 +43,7 @@ if (isset($_POST['bonus_id'])) {
         bb_die($message);
     }
 
-    OLD_DB()->query("UPDATE " . BB_BT_USERS . " bu, " . BB_USERS . " u
+    OLD_DB()->query('UPDATE ' . BB_BT_USERS . ' bu, ' . BB_USERS . " u
 		SET
 			bu.u_up_total   = u_up_total    + $upload,
 			u.user_points   = u.user_points - $points
diff --git a/library/includes/ucp/email.php b/library/includes/ucp/email.php
index 6231972b6..3df045740 100644
--- a/library/includes/ucp/email.php
+++ b/library/includes/ucp/email.php
@@ -25,13 +25,13 @@ if (!empty($_GET[POST_USERS_URL]) || !empty($_POST[POST_USERS_URL])) {
 }
 
 if (!$userdata['session_logged_in']) {
-    redirectToUrl(LOGIN_URL . "?redirect=profile.php&mode=email&" . POST_USERS_URL . "=$user_id");
+    redirectToUrl(LOGIN_URL . '?redirect=profile.php&mode=email&' . POST_USERS_URL . "=$user_id");
 }
 
 $errors = array();
 
-$sql = "SELECT username, user_id, user_rank, user_email, user_lang
-	FROM " . BB_USERS . "
+$sql = 'SELECT username, user_id, user_rank, user_email, user_lang
+	FROM ' . BB_USERS . "
 	WHERE user_id = $user_id
 ";
 
@@ -77,7 +77,7 @@ if ($row = OLD_DB()->fetch_row($sql)) {
     $template->assign_vars(array(
         'USERNAME' => profile_url($row),
         'S_HIDDEN_FIELDS' => '',
-        'S_POST_ACTION' => "profile.php?mode=email&amp;" . POST_USERS_URL . "=$user_id",
+        'S_POST_ACTION' => 'profile.php?mode=email&amp;' . POST_USERS_URL . "=$user_id",
         'ERROR_MESSAGE' => $errors ? implode('<br />', array_unique($errors)) : '',
     ));
 
diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php
index 5fc370f2d..10c9dc8c1 100644
--- a/library/includes/ucp/register.php
+++ b/library/includes/ucp/register.php
@@ -55,7 +55,7 @@ switch ($mode) {
         if (!IS_ADMIN) {
             // Ограничение по ip
             if (config('tp.unique_ip')) {
-                if ($users = OLD_DB()->fetch_row("SELECT user_id, username FROM " . BB_USERS . " WHERE user_reg_ip = '" . USER_IP . "' LIMIT 1")) {
+                if ($users = OLD_DB()->fetch_row('SELECT user_id, username FROM ' . BB_USERS . " WHERE user_reg_ip = '" . USER_IP . "' LIMIT 1")) {
                     bb_die(sprintf(trans('messages.ALREADY_REG_IP'), '<a href="' . PROFILE_URL . $users['user_id'] . '"><b>' . $users['username'] . '</b></a>', config('tp.tech_admin_email')));
                 }
             }
@@ -496,7 +496,7 @@ foreach ($profile_fields as $field => $can_edit) {
         case 'user_twitter':
             $twitter = isset($_POST['user_twitter']) ? (string)$_POST['user_twitter'] : $pr_data['user_twitter'];
             if ($submit && $twitter != $pr_data['user_twitter']) {
-                if ($twitter != '' && !preg_match("#^[a-zA-Z0-9_]{1,15}$#", $twitter)) {
+                if ($twitter != '' && !preg_match('#^[a-zA-Z0-9_]{1,15}$#', $twitter)) {
                     $errors[] = trans('messages.TWITTER_ERROR');
                 }
                 $pr_data['user_twitter'] = $twitter;
@@ -558,7 +558,7 @@ if ($submit && !$errors) {
 
         $sql_args = OLD_DB()->build_array('INSERT', $db_data);
 
-        OLD_DB()->query("INSERT INTO " . BB_USERS . $sql_args);
+        OLD_DB()->query('INSERT INTO ' . BB_USERS . $sql_args);
         $new_user_id = OLD_DB()->sql_nextid();
 
         if (IS_ADMIN) {
@@ -634,7 +634,7 @@ if ($submit && !$errors) {
 
             $sql_args = OLD_DB()->build_array('UPDATE', $db_data);
 
-            OLD_DB()->query("UPDATE " . BB_USERS . " SET $sql_args WHERE user_id = {$pr_data['user_id']}");
+            OLD_DB()->query('UPDATE ' . BB_USERS . " SET $sql_args WHERE user_id = {$pr_data['user_id']}");
 
             if ($pr_data['user_id'] != $userdata['user_id']) {
                 if ($pr_data['user_level'] == MOD && !empty($db_data['username'])) {
diff --git a/library/includes/ucp/sendpasswd.php b/library/includes/ucp/sendpasswd.php
index dbabe9342..f373316fa 100644
--- a/library/includes/ucp/sendpasswd.php
+++ b/library/includes/ucp/sendpasswd.php
@@ -24,7 +24,7 @@ if (isset($_POST['submit'])) {
         bb_die(trans('messages.CAPTCHA_WRONG'));
     }
     $email = (!empty($_POST['email'])) ? trim(strip_tags(htmlspecialchars($_POST['email']))) : '';
-    $sql = "SELECT * FROM " . BB_USERS . " WHERE user_email = '" . OLD_DB()->escape($email) . "'";
+    $sql = 'SELECT * FROM ' . BB_USERS . " WHERE user_email = '" . OLD_DB()->escape($email) . "'";
     if ($result = OLD_DB()->sql_query($sql)) {
         if ($row = OLD_DB()->sql_fetchrow($result)) {
             if (!$row['user_active']) {
@@ -40,7 +40,7 @@ if (isset($_POST['submit'])) {
             $user_actkey = make_rand_str(12);
             $user_password = make_rand_str(8);
 
-            $sql = "UPDATE " . BB_USERS . "
+            $sql = 'UPDATE ' . BB_USERS . "
 				SET user_newpasswd = '$user_password', user_actkey = '$user_actkey'
 				WHERE user_id = " . $row['user_id'];
             if (!OLD_DB()->sql_query($sql)) {
@@ -80,7 +80,7 @@ $template->assign_vars(array(
     'EMAIL' => $email,
     'CAPTCHA_HTML' => $need_captcha ? bb_captcha('get') : '',
     'S_HIDDEN_FIELDS' => '',
-    'S_PROFILE_ACTION' => "profile.php?mode=sendpassword",
+    'S_PROFILE_ACTION' => 'profile.php?mode=sendpassword',
 ));
 
 print_page('usercp_sendpasswd.tpl');
diff --git a/library/includes/ucp/topic_watch.php b/library/includes/ucp/topic_watch.php
index 04c345534..b6d226859 100644
--- a/library/includes/ucp/topic_watch.php
+++ b/library/includes/ucp/topic_watch.php
@@ -20,8 +20,8 @@ $start = isset($_GET['start']) ? abs((int)$_GET['start']) : 0;
 $per_page = config('tp.topics_per_page');
 
 if (isset($_POST['topic_id_list'])) {
-    $topic_ids = implode(",", $_POST['topic_id_list']);
-    $sql = "DELETE FROM " . BB_TOPICS_WATCH . "  WHERE topic_id IN(" . $topic_ids . ") AND user_id = $user_id";
+    $topic_ids = implode(',', $_POST['topic_id_list']);
+    $sql = 'DELETE FROM ' . BB_TOPICS_WATCH . '  WHERE topic_id IN(' . $topic_ids . ") AND user_id = $user_id";
     if (!($result = OLD_DB()->sql_query($sql))) {
         bb_die('Could not delete topic watch information #1');
     }
@@ -32,7 +32,7 @@ $template->assign_vars(array(
     'S_FORM_ACTION' => BB_ROOT . 'profile.php?mode=watch',
 ));
 
-$sql = "SELECT COUNT(topic_id) as watch_count FROM " . BB_TOPICS_WATCH . " WHERE user_id = $user_id";
+$sql = 'SELECT COUNT(topic_id) as watch_count FROM ' . BB_TOPICS_WATCH . " WHERE user_id = $user_id";
 if (!($result = OLD_DB()->sql_query($sql))) {
     bb_die('Could not obtain watch topic information #2');
 }
@@ -41,9 +41,9 @@ $watch_count = $row['watch_count'] ?: 0;
 OLD_DB()->sql_freeresult($result);
 
 if ($watch_count > 0) {
-    $sql = "SELECT w.*, t.*, f.*, u.*, u2.username as last_username, u2.user_id as last_user_id,
+    $sql = 'SELECT w.*, t.*, f.*, u.*, u2.username as last_username, u2.user_id as last_user_id,
 		u2.user_level as last_user_level, u2.user_rank as last_user_rank
-	FROM " . BB_TOPICS_WATCH . " w, " . BB_TOPICS . " t, " . BB_USERS . " u, " . BB_FORUMS . " f, " . BB_POSTS . " p, " . BB_USERS . " u2
+	FROM ' . BB_TOPICS_WATCH . ' w, ' . BB_TOPICS . ' t, ' . BB_USERS . ' u, ' . BB_FORUMS . ' f, ' . BB_POSTS . ' p, ' . BB_USERS . " u2
 	WHERE w.topic_id = t.topic_id
 		AND t.forum_id = f.forum_id
 		AND p.post_id = t.topic_last_post_id
diff --git a/library/includes/ucp/viewprofile.php b/library/includes/ucp/viewprofile.php
index a3e532305..ce93ee957 100644
--- a/library/includes/ucp/viewprofile.php
+++ b/library/includes/ucp/viewprofile.php
@@ -79,7 +79,7 @@ $template->assign_vars(array(
     'PROFILE_USER_ID' => $profiledata['user_id'],
     'PROFILE_USER' => $profile_user_id,
     'USER_REGDATE' => bb_date($profiledata['user_regdate'], 'Y-m-d H:i', false),
-    'POSTER_RANK' => $poster_rank ? "<span class=\"$rank_style\">" . $poster_rank . "</span>" : trans('messages.USER'),
+    'POSTER_RANK' => $poster_rank ? "<span class=\"$rank_style\">" . $poster_rank . '</span>' : trans('messages.USER'),
     'RANK_IMAGE' => $rank_image,
     'RANK_SELECT' => $rank_select,
     'POSTS' => $profiledata['user_posts'],
@@ -119,10 +119,10 @@ $template->assign_vars(array(
 
 if (IS_ADMIN) {
     $group_membership = array();
-    $sql = "
+    $sql = '
 		SELECT COUNT(g.group_id) AS groups_cnt, g.group_single_user, ug.user_pending
-		FROM " . BB_USER_GROUP . " ug
-		LEFT JOIN " . BB_GROUPS . " g USING(group_id)
+		FROM ' . BB_USER_GROUP . ' ug
+		LEFT JOIN ' . BB_GROUPS . " g USING(group_id)
 		WHERE ug.user_id = {$profiledata['user_id']}
 		GROUP BY ug.user_id, g.group_single_user, ug.user_pending
 		ORDER BY NULL
diff --git a/library/includes/ucp/viewtorrent.php b/library/includes/ucp/viewtorrent.php
index 6caea586f..c2e2f3d7d 100644
--- a/library/includes/ucp/viewtorrent.php
+++ b/library/includes/ucp/viewtorrent.php
@@ -21,12 +21,12 @@ $not_auth_forums_sql = $excluded_forums_csv ? "
 	AND f.forum_parent NOT IN($excluded_forums_csv)
 " : '';
 
-$sql = OLD_DB()->fetch_rowset("
+$sql = OLD_DB()->fetch_rowset('
 	SELECT
 		f.forum_id, f.forum_name, t.topic_title,
 		tor.tor_type, tor.size,
 		sn.seeders, sn.leechers, tr.*
-	FROM " . BB_FORUMS . " f, " . BB_TOPICS . " t, " . BB_BT_TRACKER . " tr, " . BB_BT_TORRENTS . " tor, " . BB_BT_TRACKER_SNAP . " sn
+	FROM ' . BB_FORUMS . ' f, ' . BB_TOPICS . ' t, ' . BB_BT_TRACKER . ' tr, ' . BB_BT_TORRENTS . ' tor, ' . BB_BT_TRACKER_SNAP . " sn
 	WHERE tr.user_id = {$profiledata['user_id']}
 		AND tr.topic_id = tor.topic_id
 		AND sn.topic_id = tor.topic_id
diff --git a/login.php b/login.php
index 6866810fc..41c81e83a 100644
--- a/login.php
+++ b/login.php
@@ -21,10 +21,10 @@ if (!empty($_GET['logout'])) {
     if (!IS_GUEST) {
         $user->session_end();
     }
-    redirectToUrl("index.php");
+    redirectToUrl('index.php');
 }
 
-$redirect_url = "index.php";
+$redirect_url = 'index.php';
 $login_errors = array();
 
 // Requested redirect
@@ -37,14 +37,14 @@ if (preg_match('/^redirect=([a-z0-9\.#\/\?&=\+\-_]+)/si', $_SERVER['QUERY_STRING
 } elseif (!empty($_POST['redirect'])) {
     $redirect_url = str_replace('&amp;', '&', htmlspecialchars($_POST['redirect']));
 } elseif (!empty($_SERVER['HTTP_REFERER']) && ($parts = @parse_url($_SERVER['HTTP_REFERER']))) {
-    $redirect_url = ($parts['path'] ?? "index.php") . (isset($parts['query']) ? '?' . $parts['query'] : '');
+    $redirect_url = ($parts['path'] ?? 'index.php') . (isset($parts['query']) ? '?' . $parts['query'] : '');
 }
 
 $redirect_url = str_replace('&admin=1', '', $redirect_url);
 $redirect_url = str_replace('?admin=1', '', $redirect_url);
 
 if (!$redirect_url || false !== strpos(urldecode($redirect_url), "\n") || false !== strpos(urldecode($redirect_url), "\r") || false !== strpos(urldecode($redirect_url), ';url')) {
-    $redirect_url = "index.php";
+    $redirect_url = 'index.php';
 }
 
 $redirect_url = str_replace("&sid={$user->data['session_id']}", '', $redirect_url);
diff --git a/memberlist.php b/memberlist.php
index 055828cad..16a21aea2 100644
--- a/memberlist.php
+++ b/memberlist.php
@@ -69,7 +69,7 @@ $select_sort_order .= '</select>';
 $template->assign_vars(array(
     'S_MODE_SELECT' => $select_sort_mode,
     'S_ORDER_SELECT' => $select_sort_order,
-    'S_MODE_ACTION' => "memberlist.php",
+    'S_MODE_ACTION' => 'memberlist.php',
     'S_USERNAME' => $paginationusername,
 ));
 
@@ -126,12 +126,12 @@ if ($by_letter_req) {
 
 // ENG
 for ($i = ord('A'), $cnt = ord('Z'); $i <= $cnt; $i++) {
-    $select_letter .= ($by_letter == chr($i)) ? '<b>' . chr($i) . '</b>&nbsp;' : '<a class="genmed" href="' . ("memberlist.php?letter=" . chr($i) . "&amp;mode=$mode&amp;order=$sort_order") . '">' . chr($i) . '</a>&nbsp;';
+    $select_letter .= ($by_letter == chr($i)) ? '<b>' . chr($i) . '</b>&nbsp;' : '<a class="genmed" href="' . ('memberlist.php?letter=' . chr($i) . "&amp;mode=$mode&amp;order=$sort_order") . '">' . chr($i) . '</a>&nbsp;';
 }
 // RUS
 $select_letter .= ': ';
 for ($i = 224, $cnt = 255; $i <= $cnt; $i++) {
-    $select_letter .= ($by_letter == iconv('windows-1251', 'UTF-8', chr($i))) ? '<b>' . iconv('windows-1251', 'UTF-8', chr($i - 32)) . '</b>&nbsp;' : '<a class="genmed" href="' . ("memberlist.php?letter=%" . strtoupper(base_convert($i, 10, 16)) . "&amp;mode=$mode&amp;order=$sort_order") . '">' . iconv('windows-1251', 'UTF-8', chr($i - 32)) . '</a>&nbsp;';
+    $select_letter .= ($by_letter == iconv('windows-1251', 'UTF-8', chr($i))) ? '<b>' . iconv('windows-1251', 'UTF-8', chr($i - 32)) . '</b>&nbsp;' : '<a class="genmed" href="' . ('memberlist.php?letter=%' . strtoupper(base_convert($i, 10, 16)) . "&amp;mode=$mode&amp;order=$sort_order") . '">' . iconv('windows-1251', 'UTF-8', chr($i - 32)) . '</a>&nbsp;';
 }
 
 $select_letter .= ':&nbsp;';
@@ -145,7 +145,7 @@ $template->assign_vars(array(
 ));
 
 // per-letter selection end
-$sql = "SELECT username, user_id, user_rank, user_opt, user_posts, user_regdate, user_from, user_website, user_email FROM " . BB_USERS . " WHERE user_id NOT IN(" . EXCLUDED_USERS . ")";
+$sql = 'SELECT username, user_id, user_rank, user_opt, user_posts, user_regdate, user_from, user_website, user_email FROM ' . BB_USERS . ' WHERE user_id NOT IN(' . EXCLUDED_USERS . ')';
 if ($username) {
     $username = preg_replace('/\*/', '%', clean_username($username));
     $letter_sql = "username LIKE '" . OLD_DB()->escape($username) . "'";
@@ -159,7 +159,7 @@ if ($result = OLD_DB()->fetch_rowset($sql)) {
         $from = $row['user_from'];
         $joined = bb_date($row['user_regdate'], config('tp.date_format'));
         $posts = $row['user_posts'];
-        $pm = '<a class="txtb" href="' . (PM_URL . "?mode=post&amp;" . POST_USERS_URL . "=$user_id") . '">' . trans('messages.SEND_PM_TXTB') . '</a>';
+        $pm = '<a class="txtb" href="' . (PM_URL . '?mode=post&amp;' . POST_USERS_URL . "=$user_id") . '">' . trans('messages.SEND_PM_TXTB') . '</a>';
 
         if (bf($row['user_opt'], 'user_opt', 'user_viewemail') || IS_ADMIN) {
             $email_uri = config('tp.board_email_form') ? ('profile.php?mode=email&amp;' . POST_USERS_URL . "=$user_id") : 'mailto:' . $row['user_email'];
@@ -200,8 +200,8 @@ if ($paginationusername) {
     $paginationurl .= "&amp;username=$paginationusername";
 }
 if ($mode != 'topten' || config('tp.topics_per_page') < 10) {
-    $sql = "SELECT COUNT(*) AS total FROM " . BB_USERS;
-    $sql .= $letter_sql ? " WHERE $letter_sql" : " WHERE user_id NOT IN(". EXCLUDED_USERS .")";
+    $sql = 'SELECT COUNT(*) AS total FROM ' . BB_USERS;
+    $sql .= $letter_sql ? " WHERE $letter_sql" : ' WHERE user_id NOT IN(' . EXCLUDED_USERS . ')';
     if (!$result = OLD_DB()->sql_query($sql)) {
         bb_die('Error getting total users');
     }
diff --git a/modcp.php b/modcp.php
index afb6194cf..5608df0ae 100644
--- a/modcp.php
+++ b/modcp.php
@@ -46,7 +46,7 @@ function validate_topics($forum_id, &$req_topics, &$topic_titles)
     $valid_topics = $valid_titles = array();
 
     if ($topic_csv = get_id_csv($req_topics)) {
-        $sql = "SELECT topic_id, topic_title FROM " . BB_TOPICS . " WHERE topic_id IN($topic_csv) AND forum_id = $forum_id";
+        $sql = 'SELECT topic_id, topic_title FROM ' . BB_TOPICS . " WHERE topic_id IN($topic_csv) AND forum_id = $forum_id";
 
         foreach (OLD_DB()->fetch_rowset($sql) as $row) {
             $valid_topics[] = $row['topic_id'];
@@ -101,11 +101,11 @@ if (isset($_REQUEST['mode'])) {
 
 // Obtain relevant data
 if ($topic_id) {
-    $sql = "
+    $sql = '
 		SELECT
 			f.forum_id, f.forum_name, f.forum_topics, f.self_moderated,
 			t.topic_first_post_id, t.topic_poster
-		FROM " . BB_TOPICS . " t, " . BB_FORUMS . " f
+		FROM ' . BB_TOPICS . ' t, ' . BB_FORUMS . " f
 		WHERE t.topic_id = $topic_id
 			AND f.forum_id = t.forum_id
 		LIMIT 1
@@ -119,7 +119,7 @@ if ($topic_id) {
     $forum_name = $topic_row['forum_name'];
     $forum_topics = (!$topic_row['forum_topics']) ? 1 : $topic_row['forum_topics'];
 } elseif ($forum_id) {
-    $sql = "SELECT forum_name, forum_topics FROM " . BB_FORUMS . " WHERE forum_id = $forum_id LIMIT 1";
+    $sql = 'SELECT forum_name, forum_topics FROM ' . BB_FORUMS . " WHERE forum_id = $forum_id LIMIT 1";
 
     if (!$topic_row = OLD_DB()->fetch_row($sql)) {
         bb_die('Forum not exist');
@@ -243,7 +243,7 @@ switch ($mode) {
             print_confirmation(array(
                 'QUESTION' => trans('messages.CONFIRM_DELETE_TOPIC'),
                 'ITEMS_LIST' => implode("\n</li>\n<li>\n", $topic_titles),
-                'FORM_ACTION' => "modcp.php",
+                'FORM_ACTION' => 'modcp.php',
                 'HIDDEN_FIELDS' => build_hidden_fields($hidden_fields),
             ));
         }
@@ -290,7 +290,7 @@ switch ($mode) {
                 'TOPIC_TITLES' => implode("\n</li>\n<li>\n", $topic_titles),
 
                 'S_FORUM_SELECT' => $forum_select,
-                'S_MODCP_ACTION' => "modcp.php",
+                'S_MODCP_ACTION' => 'modcp.php',
                 'S_HIDDEN_FIELDS' => build_hidden_fields($hidden_fields),
             ));
 
@@ -303,9 +303,9 @@ switch ($mode) {
         $lock = ($mode == 'lock');
         $new_topic_status = $lock ? TOPIC_LOCKED : TOPIC_UNLOCKED;
 
-        $sql = "
+        $sql = '
 			SELECT topic_id, topic_title
-			FROM " . BB_TOPICS . "
+			FROM ' . BB_TOPICS . "
 			WHERE topic_id IN($topic_csv)
 				AND forum_id = $forum_id
 				AND topic_status != " . TOPIC_MOVED . "
@@ -323,8 +323,8 @@ switch ($mode) {
             bb_die(trans('messages.NONE_SELECTED'));
         }
 
-        OLD_DB()->query("
-			UPDATE " . BB_TOPICS . " SET
+        OLD_DB()->query('
+			UPDATE ' . BB_TOPICS . " SET
 				topic_status = $new_topic_status
 			WHERE topic_id IN($topic_csv)
 		");
@@ -351,8 +351,8 @@ switch ($mode) {
         $set_download = ($mode == 'set_download');
         $new_dl_type = $set_download ? TOPIC_DL_TYPE_DL : TOPIC_DL_TYPE_NORMAL;
 
-        OLD_DB()->query("
-			UPDATE " . BB_TOPICS . " SET
+        OLD_DB()->query('
+			UPDATE ' . BB_TOPICS . " SET
 				topic_dl_type = $new_dl_type
 			WHERE topic_id IN($topic_csv)
 				AND forum_id = $forum_id
@@ -386,8 +386,8 @@ switch ($mode) {
                 }
             }
             if ($req_post_id_sql = implode(',', $req_post_id_sql)) {
-                $sql = "SELECT post_id
-					FROM " . BB_POSTS . "
+                $sql = 'SELECT post_id
+					FROM ' . BB_POSTS . "
 					WHERE post_id IN($req_post_id_sql)
 						AND post_id != $topic_first_post_id
 						AND topic_id = $topic_id
@@ -408,8 +408,8 @@ switch ($mode) {
         if ($post_id_sql && $split) {
             //mpd end
 
-            $sql = "SELECT post_id, poster_id, topic_id, post_time
-				FROM " . BB_POSTS . "
+            $sql = 'SELECT post_id, poster_id, topic_id, post_time
+				FROM ' . BB_POSTS . "
 				WHERE post_id IN ($post_id_sql)
 				ORDER BY post_time ASC";
             if (!($result = OLD_DB()->sql_query($sql))) {
@@ -449,8 +449,8 @@ switch ($mode) {
 
                 $first_post_id = min(explode(',', $post_id_sql));
 
-                $sql = "INSERT INTO " . BB_TOPICS . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_first_post_id)
-					VALUES ('" . OLD_DB()->escape($post_subject) . "', $first_poster, " . $topic_time . ", $new_forum_id, " . TOPIC_UNLOCKED . ", " . POST_NORMAL . ", $first_post_id)";
+                $sql = 'INSERT INTO ' . BB_TOPICS . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_first_post_id)
+					VALUES ('" . OLD_DB()->escape($post_subject) . "', $first_poster, " . $topic_time . ", $new_forum_id, " . TOPIC_UNLOCKED . ', ' . POST_NORMAL . ", $first_post_id)";
                 if (!OLD_DB()->sql_query($sql)) {
                     bb_die('Could not insert new topic');
                 }
@@ -459,7 +459,7 @@ switch ($mode) {
 
                 // Update topic watch table, switch users whose posts
                 // have moved, over to watching the new topic
-                $sql = "UPDATE " . BB_TOPICS_WATCH . "
+                $sql = 'UPDATE ' . BB_TOPICS_WATCH . "
 					SET topic_id = $new_topic_id
 					WHERE topic_id = $topic_id
 						AND user_id IN ($user_id_sql)";
@@ -469,7 +469,7 @@ switch ($mode) {
 
                 $sql_where = (!empty($_POST['split_type_beyond'])) ? " post_time >= $post_time AND topic_id = $topic_id" : "post_id IN ($post_id_sql)";
 
-                $sql = "UPDATE " . BB_POSTS . " SET topic_id = $new_topic_id, forum_id = $new_forum_id WHERE $sql_where";
+                $sql = 'UPDATE ' . BB_POSTS . " SET topic_id = $new_topic_id, forum_id = $new_forum_id WHERE $sql_where";
                 if (!OLD_DB()->sql_query($sql)) {
                     bb_die('Could not update posts table');
                 }
@@ -486,8 +486,8 @@ switch ($mode) {
                 sync('forum', array($forum_id, $new_forum_id));
 
                 //bot
-                $message = trans('messages.TOPIC_SPLIT') . '<br /><br /><a href="' . "viewtopic.php?" . POST_TOPIC_URL . "=$topic_id&amp;sid=" . $userdata['session_id'] . '">' . trans('messages.TOPIC_SPLIT_OLD') . '</a>';
-                $message .= ' &nbsp;::&nbsp; <a href="' . "viewtopic.php?" . POST_TOPIC_URL . "=$new_topic_id&amp;sid=" . $userdata['session_id'] . '">' . trans('messages.TOPIC_SPLIT_NEW') . '</a>';
+                $message = trans('messages.TOPIC_SPLIT') . '<br /><br /><a href="' . 'viewtopic.php?' . POST_TOPIC_URL . "=$topic_id&amp;sid=" . $userdata['session_id'] . '">' . trans('messages.TOPIC_SPLIT_OLD') . '</a>';
+                $message .= ' &nbsp;::&nbsp; <a href="' . 'viewtopic.php?' . POST_TOPIC_URL . "=$new_topic_id&amp;sid=" . $userdata['session_id'] . '">' . trans('messages.TOPIC_SPLIT_NEW') . '</a>';
 
                 // Log action
                 $log_action->mod('mod_topic_split', array(
@@ -512,8 +512,8 @@ switch ($mode) {
             $msg = $result ? trans('messages.DELETE_POSTS_SUCCESFULLY') : 'No posts were removed';
             bb_die(return_msg_mcp($msg));
         } else {
-            $sql = "SELECT u.username, p.*, pt.post_text, p.post_username
-				FROM " . BB_POSTS . " p, " . BB_USERS . " u, " . BB_POSTS_TEXT . " pt
+            $sql = 'SELECT u.username, p.*, pt.post_text, p.post_username
+				FROM ' . BB_POSTS . ' p, ' . BB_USERS . ' u, ' . BB_POSTS_TEXT . " pt
 				WHERE p.topic_id = $topic_id
 					AND p.poster_id = u.user_id
 					AND p.post_id = pt.post_id
@@ -580,7 +580,7 @@ switch ($mode) {
         }
 
         // Look up relevant data for this post
-        $sql = "SELECT * FROM " . BB_POSTS . " WHERE post_id = $post_id AND forum_id = $forum_id";
+        $sql = 'SELECT * FROM ' . BB_POSTS . " WHERE post_id = $post_id AND forum_id = $forum_id";
         if (!($result = OLD_DB()->sql_query($sql))) {
             bb_die('Could not get poster IP information');
         }
@@ -598,7 +598,7 @@ switch ($mode) {
         $template->assign_vars(array(
             'TPL_MODCP_IP' => true,
             'IP' => $ip_this_post,
-            'U_LOOKUP_IP' => "modcp.php?mode=ip&amp;" . POST_POST_URL . "=$post_id&amp;" . POST_TOPIC_URL . "=$topic_id&amp;rdns=$ip_this_post&amp;sid=" . $userdata['session_id'],
+            'U_LOOKUP_IP' => 'modcp.php?mode=ip&amp;' . POST_POST_URL . "=$post_id&amp;" . POST_TOPIC_URL . "=$topic_id&amp;rdns=$ip_this_post&amp;sid=" . $userdata['session_id'],
         ));
 
         //
@@ -606,7 +606,7 @@ switch ($mode) {
         //
         $where_sql = ($poster_id == $anon) ? "post_username = '{$post_row['post_username']}'" : "poster_id = $poster_id";
 
-        $sql = "SELECT poster_ip, COUNT(*) AS postings FROM " . BB_POSTS . " WHERE $where_sql GROUP BY poster_ip ORDER BY postings DESC LIMIT 100";
+        $sql = 'SELECT poster_ip, COUNT(*) AS postings FROM ' . BB_POSTS . " WHERE $where_sql GROUP BY poster_ip ORDER BY postings DESC LIMIT 100";
         if (!($result = OLD_DB()->sql_query($sql))) {
             bb_die('Could not get IP information for this user');
         }
@@ -629,7 +629,7 @@ switch ($mode) {
                     'ROW_CLASS' => !($i % 2) ? 'row4' : 'row5',
                     'IP' => $ip,
                     'POSTS' => $row['postings'],
-                    'U_LOOKUP_IP' => "modcp.php?mode=ip&amp;" . POST_POST_URL . "=$post_id&amp;" . POST_TOPIC_URL . "=$topic_id&amp;rdns=" . $row['poster_ip'] . "&amp;sid=" . $userdata['session_id'],
+                    'U_LOOKUP_IP' => 'modcp.php?mode=ip&amp;' . POST_POST_URL . "=$post_id&amp;" . POST_TOPIC_URL . "=$topic_id&amp;rdns=" . $row['poster_ip'] . '&amp;sid=' . $userdata['session_id'],
                 ));
 
                 $i++;
@@ -643,7 +643,7 @@ switch ($mode) {
 				u.user_id,
 				IF(u.user_id = $anon, p.post_username, u.username) AS username,
 				COUNT(*) as postings
-			FROM " . BB_USERS . " u, " . BB_POSTS . " p
+			FROM " . BB_USERS . ' u, ' . BB_POSTS . " p
 			WHERE p.poster_id = u.user_id
 				AND p.poster_ip = '" . $post_row['poster_ip'] . "'
 			GROUP BY u.user_id, p.post_username
@@ -680,9 +680,9 @@ switch ($mode) {
         $new_topic_status = $pin ? 1 : 0;
 
         if (count($topic_csv)) {
-            $sql = "
+            $sql = '
 				SELECT topic_id, topic_title
-				FROM " . BB_TOPICS . "
+				FROM ' . BB_TOPICS . "
 				WHERE topic_id IN($topic_csv)
 					AND forum_id = $forum_id
 					AND topic_show_first_post != " . TOPIC_MOVED . "
@@ -700,8 +700,8 @@ switch ($mode) {
                 bb_die(trans('messages.NONE_SELECTED'));
             }
 
-            OLD_DB()->query("
-				UPDATE " . BB_TOPICS . " SET
+            OLD_DB()->query('
+				UPDATE ' . BB_TOPICS . " SET
 					topic_show_first_post = $new_topic_status
 				WHERE topic_id IN($topic_csv)
 			");
@@ -709,9 +709,9 @@ switch ($mode) {
             $msg = $pin ? trans('messages.POST_PINNED') : trans('messages.POST_UNPINNED');
             bb_die(return_msg_mcp($msg));
         } elseif ($topic_id) {
-            $sql = "
+            $sql = '
 				SELECT topic_id, topic_title
-				FROM " . BB_TOPICS . "
+				FROM ' . BB_TOPICS . "
 				WHERE topic_id = $topic_id
 					AND forum_id = $forum_id
 					AND topic_show_first_post != " . TOPIC_MOVED . "
@@ -730,8 +730,8 @@ switch ($mode) {
                 bb_die(trans('messages.NONE_SELECTED'));
             }
 
-            OLD_DB()->query("
-				UPDATE " . BB_TOPICS . " SET
+            OLD_DB()->query('
+				UPDATE ' . BB_TOPICS . " SET
 					topic_show_first_post = $new_topic_status
 				WHERE topic_id IN($topic_csv)
 			");
diff --git a/poll.php b/poll.php
index 770c110cc..7469fdccb 100644
--- a/poll.php
+++ b/poll.php
@@ -18,7 +18,7 @@ $forum_id = (int)@$_POST['forum_id'];
 $vote_id = (int)@$_POST['vote_id'];
 
 $return_topic_url = TOPIC_URL . $topic_id;
-$return_topic_url .= !empty($_POST['start']) ? "&amp;start=" . (int)$_POST['start'] : '';
+$return_topic_url .= !empty($_POST['start']) ? '&amp;start=' . (int)$_POST['start'] : '';
 
 set_die_append_msg($forum_id, $topic_id);
 
@@ -28,7 +28,7 @@ $poll = new TorrentPier\Legacy\Poll();
 if (!$topic_id) {
     bb_die('Invalid topic_id');
 }
-if (!$t_data = OLD_DB()->fetch_row("SELECT * FROM " . BB_TOPICS . " WHERE topic_id = $topic_id LIMIT 1")) {
+if (!$t_data = OLD_DB()->fetch_row('SELECT * FROM ' . BB_TOPICS . " WHERE topic_id = $topic_id LIMIT 1")) {
     bb_die('Topic not found');
 }
 
@@ -66,12 +66,12 @@ switch ($mode) {
         if (!$vote_id) {
             bb_die(trans('messages.NO_VOTE_OPTION'));
         }
-        if (OLD_DB()->fetch_row("SELECT 1 FROM " . BB_POLL_USERS . " WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']} LIMIT 1")) {
+        if (OLD_DB()->fetch_row('SELECT 1 FROM ' . BB_POLL_USERS . " WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']} LIMIT 1")) {
             bb_die(trans('messages.ALREADY_VOTED'));
         }
 
-        OLD_DB()->query("
-			UPDATE " . BB_POLL_VOTES . " SET
+        OLD_DB()->query('
+			UPDATE ' . BB_POLL_VOTES . " SET
 				vote_result = vote_result + 1
 			WHERE topic_id = $topic_id
 				AND vote_id = $vote_id
@@ -81,7 +81,7 @@ switch ($mode) {
             bb_die(trans('messages.NO_VOTE_OPTION'));
         }
 
-        OLD_DB()->query("INSERT IGNORE INTO " . BB_POLL_USERS . " (topic_id, user_id, vote_ip, vote_dt) VALUES ($topic_id, {$userdata['user_id']}, '" . USER_IP . "', " . TIMENOW . ")");
+        OLD_DB()->query('INSERT IGNORE INTO ' . BB_POLL_USERS . " (topic_id, user_id, vote_ip, vote_dt) VALUES ($topic_id, {$userdata['user_id']}, '" . USER_IP . "', " . TIMENOW . ')');
 
         OLD_CACHE('bb_poll_data')->rm("poll_$topic_id");
 
@@ -93,7 +93,7 @@ switch ($mode) {
         if (!$t_data['topic_vote']) {
             bb_die(trans('messages.POST_HAS_NO_POLL'));
         }
-        OLD_DB()->query("UPDATE " . BB_TOPICS . " SET topic_vote = 1 WHERE topic_id = $topic_id");
+        OLD_DB()->query('UPDATE ' . BB_TOPICS . " SET topic_vote = 1 WHERE topic_id = $topic_id");
         bb_die(trans('messages.NEW_POLL_START'));
         break;
 
@@ -102,7 +102,7 @@ switch ($mode) {
         if (!$t_data['topic_vote']) {
             bb_die(trans('messages.POST_HAS_NO_POLL'));
         }
-        OLD_DB()->query("UPDATE " . BB_TOPICS . " SET topic_vote = " . POLL_FINISHED . " WHERE topic_id = $topic_id");
+        OLD_DB()->query('UPDATE ' . BB_TOPICS . ' SET topic_vote = ' . POLL_FINISHED . " WHERE topic_id = $topic_id");
         bb_die(trans('messages.NEW_POLL_END'));
         break;
 
diff --git a/posting.php b/posting.php
index 4f40da1c7..c5ad80bab 100644
--- a/posting.php
+++ b/posting.php
@@ -102,15 +102,15 @@ switch ($mode) {
         if (!$forum_id) {
             bb_simple_die(trans('messages.FORUM_NOT_EXIST'));
         }
-        $sql = "SELECT * FROM " . BB_FORUMS . " WHERE forum_id = $forum_id LIMIT 1";
+        $sql = 'SELECT * FROM ' . BB_FORUMS . " WHERE forum_id = $forum_id LIMIT 1";
         break;
 
     case 'reply':
         if (!$topic_id) {
             bb_die(trans('messages.NO_TOPIC_ID'));
         }
-        $sql = "SELECT f.*, t.*
-			FROM " . BB_FORUMS . " f, " . BB_TOPICS . " t
+        $sql = 'SELECT f.*, t.*
+			FROM ' . BB_FORUMS . ' f, ' . BB_TOPICS . " t
 			WHERE t.topic_id = $topic_id
 				AND f.forum_id = t.forum_id
 			LIMIT 1";
@@ -126,18 +126,18 @@ switch ($mode) {
         $select_sql = 'SELECT f.*, t.*, p.*';
         $select_sql .= (!$submit) ? ', pt.*, u.username, u.user_id' : '';
 
-        $from_sql = "FROM " . BB_POSTS . " p, " . BB_TOPICS . " t, " . BB_FORUMS . " f";
-        $from_sql .= (!$submit) ? ", " . BB_POSTS_TEXT . " pt, " . BB_USERS . " u" : '';
+        $from_sql = 'FROM ' . BB_POSTS . ' p, ' . BB_TOPICS . ' t, ' . BB_FORUMS . ' f';
+        $from_sql .= (!$submit) ? ', ' . BB_POSTS_TEXT . ' pt, ' . BB_USERS . ' u' : '';
 
         $where_sql = "
 			WHERE p.post_id = $post_id
 			AND t.topic_id = p.topic_id
 			AND f.forum_id = p.forum_id
 		";
-        $where_sql .= (!$submit) ? "
+        $where_sql .= (!$submit) ? '
 			AND pt.post_id = p.post_id
 			AND u.user_id = p.poster_id
-		" : '';
+		' : '';
 
         $sql = "$select_sql $from_sql $where_sql LIMIT 1";
         break;
@@ -221,13 +221,13 @@ if (!$is_auth[$is_auth_type]) {
         default:
             $redirect = '';
     }
-    redirectToUrl(LOGIN_URL . "?redirect=/" . POSTING_URL . "?$redirect");
+    redirectToUrl(LOGIN_URL . '?redirect=/' . POSTING_URL . "?$redirect");
 }
 
 if ($mode == 'new_rel') {
     if ($tor_status = implode(',', config('tp.tor_cannot_new'))) {
-        $sql = OLD_DB()->fetch_rowset("SELECT t.topic_title, t.topic_id, tor.tor_status
-			FROM " . BB_BT_TORRENTS . " tor, " . BB_TOPICS . " t
+        $sql = OLD_DB()->fetch_rowset('SELECT t.topic_title, t.topic_id, tor.tor_status
+			FROM ' . BB_BT_TORRENTS . ' tor, ' . BB_TOPICS . " t
 			WHERE poster_id = {$userdata['user_id']}
 				AND tor.topic_id = t.topic_id
 				AND tor.tor_status IN ($tor_status)
@@ -253,7 +253,7 @@ if ($submit || $refresh) {
     $notify_user = bf($userdata['user_opt'], 'user_opt', 'user_notify');
 
     if (!IS_GUEST && $mode != 'newtopic' && !$notify_user) {
-        $notify_user = (int)OLD_DB()->fetch_row("SELECT topic_id FROM " . BB_TOPICS_WATCH . " WHERE topic_id = $topic_id AND user_id = " . $userdata['user_id']);
+        $notify_user = (int)OLD_DB()->fetch_row('SELECT topic_id FROM ' . BB_TOPICS_WATCH . " WHERE topic_id = $topic_id AND user_id = " . $userdata['user_id']);
     }
 }
 
@@ -266,9 +266,9 @@ $topic_has_new_posts = false;
 
 if (!IS_GUEST && $mode != 'newtopic' && ($submit || $preview || $mode == 'quote' || $mode == 'reply') && isset($_COOKIE[COOKIE_TOPIC])) {
     if ($topic_last_read = max((int)(@$tracking_topics[$topic_id]), (int)(@$tracking_forums[$forum_id]))) {
-        $sql = "SELECT p.*, pt.post_text, u.username, u.user_rank
-			FROM " . BB_POSTS . " p, " . BB_POSTS_TEXT . " pt, " . BB_USERS . " u
-			WHERE p.topic_id = " . (int)$topic_id . "
+        $sql = 'SELECT p.*, pt.post_text, u.username, u.user_rank
+			FROM ' . BB_POSTS . ' p, ' . BB_POSTS_TEXT . ' pt, ' . BB_USERS . ' u
+			WHERE p.topic_id = ' . (int)$topic_id . "
 				AND u.user_id = p.poster_id
 				AND pt.post_id = p.post_id
 				AND p.post_time > $topic_last_read
@@ -367,14 +367,14 @@ if (($delete || $mode == 'delete') && !$confirm) {
 
         if (defined('TORRENT_ATTACH_ID') && config('tp.bt_newtopic_auto_reg') && !$error_msg) {
             include INC_DIR . '/functions_torrent.php';
-            if (!OLD_DB()->fetch_row("SELECT attach_id FROM " . BB_BT_TORRENTS . " WHERE attach_id = " . TORRENT_ATTACH_ID)) {
+            if (!OLD_DB()->fetch_row('SELECT attach_id FROM ' . BB_BT_TORRENTS . ' WHERE attach_id = ' . TORRENT_ATTACH_ID)) {
                 if (config('tp.premod')) {
                     // Получение списка id форумов начиная с parent
                     $forum_parent = $forum_id;
                     if ($post_info['forum_parent']) {
                         $forum_parent = $post_info['forum_parent'];
                     }
-                    $count_rowset = OLD_DB()->fetch_rowset("SELECT forum_id FROM " . BB_FORUMS . " WHERE forum_parent = $forum_parent");
+                    $count_rowset = OLD_DB()->fetch_rowset('SELECT forum_id FROM ' . BB_FORUMS . " WHERE forum_parent = $forum_parent");
                     $sub_forums = array();
                     foreach ($count_rowset as $count_row) {
                         if ($count_row['forum_id'] != $forum_id) {
@@ -384,14 +384,14 @@ if (($delete || $mode == 'delete') && !$confirm) {
                     $sub_forums[] = $forum_id;
                     $sub_forums = implode(',', $sub_forums);
                     // Подсчет проверенных релизов в форумах раздела
-                    $count_checked_releases = OLD_DB()->fetch_row("
+                    $count_checked_releases = OLD_DB()->fetch_row('
 						SELECT COUNT(*) AS checked_releases
-						FROM " . BB_BT_TORRENTS . "
-						WHERE poster_id  = " . $userdata['user_id'] . "
+						FROM ' . BB_BT_TORRENTS . '
+						WHERE poster_id  = ' . $userdata['user_id'] . "
 						  AND forum_id   IN($sub_forums)
-						  AND tor_status IN(" . TOR_APPROVED . "," . TOR_DOUBTFUL . "," . TOR_TMP . ")
+						  AND tor_status IN(" . TOR_APPROVED . ',' . TOR_DOUBTFUL . ',' . TOR_TMP . ')
 						LIMIT 1
-					", 'checked_releases');
+					', 'checked_releases');
                     if ($count_checked_releases || IS_AM) {
                         tracker_register(TORRENT_ATTACH_ID, 'newtopic', TOR_NOT_APPROVED);
                     } else {
@@ -533,10 +533,10 @@ if ($mode == 'newtopic' || ($mode == 'editpost' && $post_data['first_post'])) {
 $topic_dl_type = $post_info['topic_dl_type'] ?? 0;
 
 if ($post_info['allow_reg_tracker'] && $post_data['first_post'] && ($topic_dl_type || $is_auth['auth_mod'])) {
-    $sql = "
+    $sql = '
 		SELECT tor.attach_id
-		FROM " . BB_POSTS . " p
-		LEFT JOIN " . BB_BT_TORRENTS . " tor ON (p.post_id = tor.post_id)
+		FROM ' . BB_POSTS . ' p
+		LEFT JOIN ' . BB_BT_TORRENTS . " tor ON (p.post_id = tor.post_id)
 		WHERE p.post_id = $post_id
 	";
     $result = OLD_DB()->fetch_row($sql);
@@ -567,9 +567,9 @@ if ($post_info['allow_reg_tracker'] && $post_data['first_post'] && ($topic_dl_ty
 if ($userdata['user_level'] == GROUP_MEMBER || IS_AM) {
     $poster_rgroups = '';
 
-    $sql = "SELECT ug.group_id, g.group_name, g.release_group
-		FROM " . BB_USER_GROUP . " ug
-		INNER JOIN " . BB_GROUPS . " g ON(g.group_id = ug.group_id)
+    $sql = 'SELECT ug.group_id, g.group_name, g.release_group
+		FROM ' . BB_USER_GROUP . ' ug
+		INNER JOIN ' . BB_GROUPS . " g ON(g.group_id = ug.group_id)
 		WHERE ug.user_id = {$userdata['user_id']}
 			AND g.release_group = 1
 		ORDER BY g.group_name";
@@ -613,7 +613,7 @@ $template->assign_vars(array(
     'POSTING_TYPE_TITLE' => $page_title,
     'POSTING_TOPIC_ID' => ($mode != 'newtopic') ? $topic_id : '',
     'POSTING_TOPIC_TITLE' => ($mode != 'newtopic') ? wbr($post_info['topic_title']) : '',
-    'U_VIEW_FORUM' => "viewforum.php?" . POST_FORUM_URL . "=$forum_id",
+    'U_VIEW_FORUM' => 'viewforum.php?' . POST_FORUM_URL . "=$forum_id",
 
     'USERNAME' => @$username,
     'CAPTCHA_HTML' => IS_GUEST ? bb_captcha('get') : '',
@@ -623,7 +623,7 @@ $template->assign_vars(array(
     'POSTER_RGROUPS' => isset($poster_rgroups) && !empty($poster_rgroups) ? $poster_rgroups : '',
     'ATTACH_RG_SIG' => $switch_rg_sig ?: false,
 
-    'U_VIEWTOPIC' => ($mode == 'reply') ? "viewtopic.php?" . POST_TOPIC_URL . "=$topic_id&amp;postorder=desc" : '',
+    'U_VIEWTOPIC' => ($mode == 'reply') ? 'viewtopic.php?' . POST_TOPIC_URL . "=$topic_id&amp;postorder=desc" : '',
 
     'S_NOTIFY_CHECKED' => $notify_user ? 'checked="checked"' : '',
     'S_TYPE_TOGGLE' => $topic_type_toggle,
diff --git a/privmsg.php b/privmsg.php
index 99c0590b2..96747f6c6 100644
--- a/privmsg.php
+++ b/privmsg.php
@@ -85,10 +85,10 @@ $error = false;
 //
 // Define the box image links
 //
-$inbox_url = ($folder != 'inbox' || $mode != '') ? '<a href="' . PM_URL . "?folder=inbox" . '">' . trans('messages.INBOX') . '</a>' : trans('messages.INBOX');
-$outbox_url = ($folder != 'outbox' || $mode != '') ? '<a href="' . PM_URL . "?folder=outbox" . '">' . trans('messages.OUTBOX') . '</a>' : trans('messages.OUTBOX');
-$sentbox_url = ($folder != 'sentbox' || $mode != '') ? '<a href="' . PM_URL . "?folder=sentbox" . '">' . trans('messages.SENTBOX') . '</a>' : trans('messages.SENTBOX');
-$savebox_url = ($folder != 'savebox' || $mode != '') ? '<a href="' . PM_URL . "?folder=savebox" . '">' . trans('messages.SAVEBOX') . '</a>' : trans('messages.SAVEBOX');
+$inbox_url = ($folder != 'inbox' || $mode != '') ? '<a href="' . PM_URL . '?folder=inbox' . '">' . trans('messages.INBOX') . '</a>' : trans('messages.INBOX');
+$outbox_url = ($folder != 'outbox' || $mode != '') ? '<a href="' . PM_URL . '?folder=outbox' . '">' . trans('messages.OUTBOX') . '</a>' : trans('messages.OUTBOX');
+$sentbox_url = ($folder != 'sentbox' || $mode != '') ? '<a href="' . PM_URL . '?folder=sentbox' . '">' . trans('messages.SENTBOX') . '</a>' : trans('messages.SENTBOX');
+$savebox_url = ($folder != 'savebox' || $mode != '') ? '<a href="' . PM_URL . '?folder=savebox' . '">' . trans('messages.SAVEBOX') . '</a>' : trans('messages.SAVEBOX');
 
 // ----------
 // Start main
@@ -106,29 +106,29 @@ if ($mode == 'read') {
     switch ($folder) {
         case 'inbox':
             $l_box_name = trans('messages.INBOX');
-            $pm_sql_user = "AND pm.privmsgs_to_userid = " . $userdata['user_id'] . "
-				AND ( pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . "
-					OR pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
-					OR pm.privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
+            $pm_sql_user = 'AND pm.privmsgs_to_userid = ' . $userdata['user_id'] . '
+				AND ( pm.privmsgs_type = ' . PRIVMSGS_READ_MAIL . '
+					OR pm.privmsgs_type = ' . PRIVMSGS_NEW_MAIL . '
+					OR pm.privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ' )';
             break;
         case 'outbox':
             $l_box_name = trans('messages.OUTBOX');
-            $pm_sql_user = "AND pm.privmsgs_from_userid =  " . $userdata['user_id'] . "
-				AND ( pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
-					OR pm.privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) ";
+            $pm_sql_user = 'AND pm.privmsgs_from_userid =  ' . $userdata['user_id'] . '
+				AND ( pm.privmsgs_type = ' . PRIVMSGS_NEW_MAIL . '
+					OR pm.privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ' ) ';
             break;
         case 'sentbox':
             $l_box_name = trans('messages.SENTBOX');
-            $pm_sql_user = "AND pm.privmsgs_from_userid =  " . $userdata['user_id'] . "
-				AND pm.privmsgs_type = " . PRIVMSGS_SENT_MAIL;
+            $pm_sql_user = 'AND pm.privmsgs_from_userid =  ' . $userdata['user_id'] . '
+				AND pm.privmsgs_type = ' . PRIVMSGS_SENT_MAIL;
             break;
         case 'savebox':
             $l_box_name = trans('messages.SAVEBOX');
-            $pm_sql_user = "AND ( ( pm.privmsgs_to_userid = " . $userdata['user_id'] . "
-					AND pm.privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " )
-				OR ( pm.privmsgs_from_userid = " . $userdata['user_id'] . "
-					AND pm.privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " )
-				)";
+            $pm_sql_user = 'AND ( ( pm.privmsgs_to_userid = ' . $userdata['user_id'] . '
+					AND pm.privmsgs_type = ' . PRIVMSGS_SAVED_IN_MAIL . ' )
+				OR ( pm.privmsgs_from_userid = ' . $userdata['user_id'] . '
+					AND pm.privmsgs_type = ' . PRIVMSGS_SAVED_OUT_MAIL . ' )
+				)';
             break;
         default:
             bb_die(trans('messages.NO_SUCH_FOLDER'));
@@ -138,10 +138,10 @@ if ($mode == 'read') {
     //
     // Major query obtains the message ...
     //
-    $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_email, u.user_regdate, u.user_rank,
+    $sql = 'SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_email, u.user_regdate, u.user_rank,
 			u2.username AS to_username, u2.user_id AS to_user_id, u2.user_rank as to_user_rank,
 			pm.*, pmt.privmsgs_text
-		FROM " . BB_PRIVMSGS . " pm, " . BB_PRIVMSGS_TEXT . " pmt, " . BB_USERS . " u, " . BB_USERS . " u2
+		FROM ' . BB_PRIVMSGS . ' pm, ' . BB_PRIVMSGS_TEXT . ' pmt, ' . BB_USERS . ' u, ' . BB_USERS . " u2
 		WHERE pm.privmsgs_id = $privmsgs_id
 			AND pmt.privmsgs_text_id = pm.privmsgs_id
 			$pm_sql_user
@@ -168,14 +168,14 @@ if ($mode == 'read') {
         // Update appropriate counter
         switch ($privmsg['privmsgs_type']) {
             case PRIVMSGS_NEW_MAIL:
-                $sql = "user_new_privmsg = IF(user_new_privmsg, user_new_privmsg - 1, 0)";
+                $sql = 'user_new_privmsg = IF(user_new_privmsg, user_new_privmsg - 1, 0)';
                 break;
             case PRIVMSGS_UNREAD_MAIL:
-                $sql = "user_unread_privmsg = IF(user_unread_privmsg, user_unread_privmsg - 1, 0)";
+                $sql = 'user_unread_privmsg = IF(user_unread_privmsg, user_unread_privmsg - 1, 0)';
                 break;
         }
 
-        $sql = "UPDATE " . BB_USERS . " SET $sql WHERE user_id = " . $userdata['user_id'];
+        $sql = 'UPDATE ' . BB_USERS . " SET $sql WHERE user_id = " . $userdata['user_id'];
         if (!OLD_DB()->sql_query($sql)) {
             bb_die('Could not update private message read status for user');
         }
@@ -183,40 +183,40 @@ if ($mode == 'read') {
             cache_rm_userdata($userdata);
         }
 
-        $sql = "UPDATE " . BB_PRIVMSGS . "
-			SET privmsgs_type = " . PRIVMSGS_READ_MAIL . "
-			WHERE privmsgs_id = " . $privmsg['privmsgs_id'];
+        $sql = 'UPDATE ' . BB_PRIVMSGS . '
+			SET privmsgs_type = ' . PRIVMSGS_READ_MAIL . '
+			WHERE privmsgs_id = ' . $privmsg['privmsgs_id'];
         if (!OLD_DB()->sql_query($sql)) {
             bb_die('Could not update private message read status');
         }
 
         // Check to see if the poster has a 'full' sent box
-        $sql = "SELECT COUNT(privmsgs_id) AS sent_items, MIN(privmsgs_date) AS oldest_post_time
-			FROM " . BB_PRIVMSGS . "
-			WHERE privmsgs_type = " . PRIVMSGS_SENT_MAIL . "
-				AND privmsgs_from_userid = " . $privmsg['privmsgs_from_userid'];
+        $sql = 'SELECT COUNT(privmsgs_id) AS sent_items, MIN(privmsgs_date) AS oldest_post_time
+			FROM ' . BB_PRIVMSGS . '
+			WHERE privmsgs_type = ' . PRIVMSGS_SENT_MAIL . '
+				AND privmsgs_from_userid = ' . $privmsg['privmsgs_from_userid'];
         if (!($result = OLD_DB()->sql_query($sql))) {
             bb_die('Could not obtain sent message info for sender');
         }
 
         if ($sent_info = OLD_DB()->sql_fetchrow($result)) {
             if (config('tp.max_sentbox_privmsgs') && $sent_info['sent_items'] >= config('tp.max_sentbox_privmsgs')) {
-                $sql = "SELECT privmsgs_id FROM " . BB_PRIVMSGS . "
-					WHERE privmsgs_type = " . PRIVMSGS_SENT_MAIL . "
-						AND privmsgs_date = " . $sent_info['oldest_post_time'] . "
-						AND privmsgs_from_userid = " . $privmsg['privmsgs_from_userid'];
+                $sql = 'SELECT privmsgs_id FROM ' . BB_PRIVMSGS . '
+					WHERE privmsgs_type = ' . PRIVMSGS_SENT_MAIL . '
+						AND privmsgs_date = ' . $sent_info['oldest_post_time'] . '
+						AND privmsgs_from_userid = ' . $privmsg['privmsgs_from_userid'];
                 if (!$result = OLD_DB()->sql_query($sql)) {
                     bb_die('Could not find oldest privmsgs');
                 }
                 $old_privmsgs_id = OLD_DB()->sql_fetchrow($result);
                 $old_privmsgs_id = (int)$old_privmsgs_id['privmsgs_id'];
 
-                $sql = "DELETE FROM " . BB_PRIVMSGS . " WHERE privmsgs_id = $old_privmsgs_id";
+                $sql = 'DELETE FROM ' . BB_PRIVMSGS . " WHERE privmsgs_id = $old_privmsgs_id";
                 if (!OLD_DB()->sql_query($sql)) {
                     bb_die('Could not delete oldest privmsgs (sent)');
                 }
 
-                $sql = "DELETE FROM " . BB_PRIVMSGS_TEXT . " WHERE privmsgs_text_id = $old_privmsgs_id";
+                $sql = 'DELETE FROM ' . BB_PRIVMSGS_TEXT . " WHERE privmsgs_text_id = $old_privmsgs_id";
                 if (!OLD_DB()->sql_query($sql)) {
                     bb_die('Could not delete oldest privmsgs text (sent)');
                 }
@@ -228,15 +228,15 @@ if ($mode == 'read') {
         // not the most DB friendly way but a lot easier to manage, besides the admin will be able to
         // set limits on numbers of storable posts for users ... hopefully!
         //
-        $sql = "INSERT INTO " . BB_PRIVMSGS . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip)
-			VALUES (" . PRIVMSGS_SENT_MAIL . ", '" . OLD_DB()->escape($privmsg['privmsgs_subject']) . "', " . $privmsg['privmsgs_from_userid'] . ", " . $privmsg['privmsgs_to_userid'] . ", " . $privmsg['privmsgs_date'] . ", '" . $privmsg['privmsgs_ip'] . "')";
+        $sql = 'INSERT INTO ' . BB_PRIVMSGS . ' (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip)
+			VALUES (' . PRIVMSGS_SENT_MAIL . ", '" . OLD_DB()->escape($privmsg['privmsgs_subject']) . "', " . $privmsg['privmsgs_from_userid'] . ', ' . $privmsg['privmsgs_to_userid'] . ', ' . $privmsg['privmsgs_date'] . ", '" . $privmsg['privmsgs_ip'] . "')";
         if (!OLD_DB()->sql_query($sql)) {
             bb_die('Could not insert private message sent info');
         }
 
         $privmsg_sent_id = OLD_DB()->sql_nextid();
 
-        $sql = "INSERT INTO " . BB_PRIVMSGS_TEXT . " (privmsgs_text_id, privmsgs_text)
+        $sql = 'INSERT INTO ' . BB_PRIVMSGS_TEXT . " (privmsgs_text_id, privmsgs_text)
 			VALUES ($privmsg_sent_id, '" . OLD_DB()->escape($privmsg['privmsgs_text']) . "')";
         if (!OLD_DB()->sql_query($sql)) {
             bb_die('Could not insert private message sent text');
@@ -247,10 +247,10 @@ if ($mode == 'read') {
     // Pick a folder, any folder, so long as it's one below ...
     //
     $post_urls = array(
-        'post' => PM_URL . "?mode=post",
-        'reply' => PM_URL . "?mode=reply&amp;" . POST_POST_URL . "=$privmsg_id",
-        'quote' => PM_URL . "?mode=quote&amp;" . POST_POST_URL . "=$privmsg_id",
-        'edit' => PM_URL . "?mode=edit&amp;" . POST_POST_URL . "=$privmsg_id"
+        'post' => PM_URL . '?mode=post',
+        'reply' => PM_URL . '?mode=reply&amp;' . POST_POST_URL . "=$privmsg_id",
+        'quote' => PM_URL . '?mode=quote&amp;' . POST_POST_URL . "=$privmsg_id",
+        'edit' => PM_URL . '?mode=edit&amp;' . POST_POST_URL . "=$privmsg_id"
     );
     $post_icons = array(
         'post_img' => '<a href="' . $post_urls['post'] . '"><img src="' . $images['pm_postmsg'] . '" alt="' . trans('messages.POST_NEW_PM') . '" border="0" /></a>',
@@ -355,11 +355,11 @@ if ($mode == 'read') {
 
     $post_date = bb_date($privmsg['privmsgs_date']);
 
-    $temp_url = "profile.php?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $user_id_from;
+    $temp_url = 'profile.php?mode=viewprofile&amp;' . POST_USERS_URL . '=' . $user_id_from;
     $profile_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_profile'] . '" alt="' . trans('messages.READ_PROFILE') . '" title="' . trans('messages.READ_PROFILE') . '" border="0" /></a>';
     $profile = '<a href="' . $temp_url . '">' . trans('messages.READ_PROFILE') . '</a>';
 
-    $temp_url = PM_URL . "?mode=post&amp;" . POST_USERS_URL . "=$user_id_from";
+    $temp_url = PM_URL . '?mode=post&amp;' . POST_USERS_URL . "=$user_id_from";
     $pm_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_pm'] . '" alt="' . trans('messages.SEND_PRIVATE_MESSAGE') . '" title="' . trans('messages.SEND_PRIVATE_MESSAGE') . '" border="0" /></a>';
     $pm = '<a href="' . $temp_url . '">' . trans('messages.SEND_PRIVATE_MESSAGE') . '</a>';
 
@@ -442,27 +442,27 @@ if ($mode == 'read') {
 
         switch ($folder) {
             case 'inbox':
-                $delete_type = "privmsgs_to_userid = " . $userdata['user_id'] . " AND (
-				privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
+                $delete_type = 'privmsgs_to_userid = ' . $userdata['user_id'] . ' AND (
+				privmsgs_type = ' . PRIVMSGS_READ_MAIL . ' OR privmsgs_type = ' . PRIVMSGS_NEW_MAIL . ' OR privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ' )';
                 break;
 
             case 'outbox':
-                $delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
+                $delete_type = 'privmsgs_from_userid = ' . $userdata['user_id'] . ' AND ( privmsgs_type = ' . PRIVMSGS_NEW_MAIL . ' OR privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ' )';
                 break;
 
             case 'sentbox':
-                $delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_SENT_MAIL;
+                $delete_type = 'privmsgs_from_userid = ' . $userdata['user_id'] . ' AND privmsgs_type = ' . PRIVMSGS_SENT_MAIL;
                 break;
 
             case 'savebox':
-                $delete_type = "( ( privmsgs_from_userid = " . $userdata['user_id'] . "
-					AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " )
-				OR ( privmsgs_to_userid = " . $userdata['user_id'] . "
-					AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) )";
+                $delete_type = '( ( privmsgs_from_userid = ' . $userdata['user_id'] . '
+					AND privmsgs_type = ' . PRIVMSGS_SAVED_OUT_MAIL . ' )
+				OR ( privmsgs_to_userid = ' . $userdata['user_id'] . '
+					AND privmsgs_type = ' . PRIVMSGS_SAVED_IN_MAIL . ' ) )';
                 break;
         }
 
-        $sql = "SELECT privmsgs_id FROM " . BB_PRIVMSGS . " WHERE $delete_type $delete_sql_id";
+        $sql = 'SELECT privmsgs_id FROM ' . BB_PRIVMSGS . " WHERE $delete_type $delete_sql_id";
         if (!($result = OLD_DB()->sql_query($sql))) {
             bb_die('Could not obtain id list to delete messages');
         }
@@ -483,20 +483,20 @@ if ($mode == 'read') {
             if ($folder == 'inbox' || $folder == 'outbox') {
                 switch ($folder) {
                     case 'inbox':
-                        $sql = "privmsgs_to_userid = " . $userdata['user_id'];
+                        $sql = 'privmsgs_to_userid = ' . $userdata['user_id'];
                         break;
                     case 'outbox':
-                        $sql = "privmsgs_from_userid = " . $userdata['user_id'];
+                        $sql = 'privmsgs_from_userid = ' . $userdata['user_id'];
                         break;
                 }
 
                 // Get information relevant to new or unread mail
                 // so we can adjust users counters appropriately
-                $sql = "SELECT privmsgs_to_userid, privmsgs_type
-					FROM " . BB_PRIVMSGS . "
+                $sql = 'SELECT privmsgs_to_userid, privmsgs_type
+					FROM ' . BB_PRIVMSGS . "
 					WHERE privmsgs_id IN ($delete_sql_id)
 						AND $sql
-						AND privmsgs_type IN (" . PRIVMSGS_NEW_MAIL . ", " . PRIVMSGS_UNREAD_MAIL . ")";
+						AND privmsgs_type IN (" . PRIVMSGS_NEW_MAIL . ', ' . PRIVMSGS_UNREAD_MAIL . ')';
                 if (!($result = OLD_DB()->sql_query($sql))) {
                     bb_die('Could not obtain user id list for outbox messages');
                 }
@@ -527,18 +527,18 @@ if ($mode == 'read') {
                         foreach ($update_list as $type => $dec_ary) {
                             switch ($type) {
                                 case 'new':
-                                    $type = "user_new_privmsg";
+                                    $type = 'user_new_privmsg';
                                     break;
 
                                 case 'unread':
-                                    $type = "user_unread_privmsg";
+                                    $type = 'user_unread_privmsg';
                                     break;
                             }
 
                             foreach ($dec_ary as $dec => $user_ary) {
                                 $user_ids = implode(', ', $user_ary);
 
-                                $sql = "UPDATE " . BB_USERS . "
+                                $sql = 'UPDATE ' . BB_USERS . "
 									SET $type = $type - $dec
 									WHERE user_id IN ($user_ids)";
                                 if (!OLD_DB()->sql_query($sql)) {
@@ -553,32 +553,32 @@ if ($mode == 'read') {
             }
 
             // Delete the messages
-            $delete_text_sql = "DELETE FROM " . BB_PRIVMSGS_TEXT . "
+            $delete_text_sql = 'DELETE FROM ' . BB_PRIVMSGS_TEXT . "
 				WHERE privmsgs_text_id IN ($delete_sql_id)";
-            $delete_sql = "DELETE FROM " . BB_PRIVMSGS . "
+            $delete_sql = 'DELETE FROM ' . BB_PRIVMSGS . "
 				WHERE privmsgs_id IN ($delete_sql_id)
 					AND ";
 
             switch ($folder) {
                 case 'inbox':
-                    $delete_sql .= "privmsgs_to_userid = " . $userdata['user_id'] . " AND (
-						privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
+                    $delete_sql .= 'privmsgs_to_userid = ' . $userdata['user_id'] . ' AND (
+						privmsgs_type = ' . PRIVMSGS_READ_MAIL . ' OR privmsgs_type = ' . PRIVMSGS_NEW_MAIL . ' OR privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ' )';
                     break;
 
                 case 'outbox':
-                    $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND (
-						privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
+                    $delete_sql .= 'privmsgs_from_userid = ' . $userdata['user_id'] . ' AND (
+						privmsgs_type = ' . PRIVMSGS_NEW_MAIL . ' OR privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ' )';
                     break;
 
                 case 'sentbox':
-                    $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_SENT_MAIL;
+                    $delete_sql .= 'privmsgs_from_userid = ' . $userdata['user_id'] . ' AND privmsgs_type = ' . PRIVMSGS_SENT_MAIL;
                     break;
 
                 case 'savebox':
-                    $delete_sql .= "( ( privmsgs_from_userid = " . $userdata['user_id'] . "
-						AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " )
-					OR ( privmsgs_to_userid = " . $userdata['user_id'] . "
-						AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) )";
+                    $delete_sql .= '( ( privmsgs_from_userid = ' . $userdata['user_id'] . '
+						AND privmsgs_type = ' . PRIVMSGS_SAVED_OUT_MAIL . ' )
+					OR ( privmsgs_to_userid = ' . $userdata['user_id'] . '
+						AND privmsgs_type = ' . PRIVMSGS_SAVED_IN_MAIL . ' ) )';
                     break;
             }
 
@@ -598,36 +598,36 @@ if ($mode == 'read') {
 } elseif ($save && $mark_list && $folder != 'savebox' && $folder != 'outbox') {
     if (count($mark_list)) {
         // See if recipient is at their savebox limit
-        $sql = "SELECT COUNT(privmsgs_id) AS savebox_items, MIN(privmsgs_date) AS oldest_post_time
-			FROM " . BB_PRIVMSGS . "
-			WHERE ( ( privmsgs_to_userid = " . $userdata['user_id'] . "
-					AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " )
-				OR ( privmsgs_from_userid = " . $userdata['user_id'] . "
-					AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . ") )";
+        $sql = 'SELECT COUNT(privmsgs_id) AS savebox_items, MIN(privmsgs_date) AS oldest_post_time
+			FROM ' . BB_PRIVMSGS . '
+			WHERE ( ( privmsgs_to_userid = ' . $userdata['user_id'] . '
+					AND privmsgs_type = ' . PRIVMSGS_SAVED_IN_MAIL . ' )
+				OR ( privmsgs_from_userid = ' . $userdata['user_id'] . '
+					AND privmsgs_type = ' . PRIVMSGS_SAVED_OUT_MAIL . ') )';
         if (!($result = OLD_DB()->sql_query($sql))) {
             bb_die('Could not obtain sent message info for sender');
         }
 
         if ($saved_info = OLD_DB()->sql_fetchrow($result)) {
             if (config('tp.max_savebox_privmsgs') && $saved_info['savebox_items'] >= config('tp.max_savebox_privmsgs')) {
-                $sql = "SELECT privmsgs_id FROM " . BB_PRIVMSGS . "
-					WHERE ( ( privmsgs_to_userid = " . $userdata['user_id'] . "
-								AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " )
-							OR ( privmsgs_from_userid = " . $userdata['user_id'] . "
-								AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . ") )
-						AND privmsgs_date = " . $saved_info['oldest_post_time'];
+                $sql = 'SELECT privmsgs_id FROM ' . BB_PRIVMSGS . '
+					WHERE ( ( privmsgs_to_userid = ' . $userdata['user_id'] . '
+								AND privmsgs_type = ' . PRIVMSGS_SAVED_IN_MAIL . ' )
+							OR ( privmsgs_from_userid = ' . $userdata['user_id'] . '
+								AND privmsgs_type = ' . PRIVMSGS_SAVED_OUT_MAIL . ') )
+						AND privmsgs_date = ' . $saved_info['oldest_post_time'];
                 if (!$result = OLD_DB()->sql_query($sql)) {
                     bb_die('Could not find oldest privmsgs (save)');
                 }
                 $old_privmsgs_id = OLD_DB()->sql_fetchrow($result);
                 $old_privmsgs_id = (int)$old_privmsgs_id['privmsgs_id'];
 
-                $sql = "DELETE FROM " . BB_PRIVMSGS . " WHERE privmsgs_id = $old_privmsgs_id";
+                $sql = 'DELETE FROM ' . BB_PRIVMSGS . " WHERE privmsgs_id = $old_privmsgs_id";
                 if (!OLD_DB()->sql_query($sql)) {
                     bb_die('Could not delete oldest privmsgs (save)');
                 }
 
-                $sql = "DELETE FROM " . BB_PRIVMSGS_TEXT . " WHERE privmsgs_text_id = $old_privmsgs_id";
+                $sql = 'DELETE FROM ' . BB_PRIVMSGS_TEXT . " WHERE privmsgs_text_id = $old_privmsgs_id";
                 if (!OLD_DB()->sql_query($sql)) {
                     bb_die('Could not delete oldest privmsgs text (save)');
                 }
@@ -640,26 +640,26 @@ if ($mode == 'read') {
         }
 
         // Process request
-        $saved_sql = "UPDATE " . BB_PRIVMSGS;
+        $saved_sql = 'UPDATE ' . BB_PRIVMSGS;
 
         // Decrement read/new counters if appropriate
         if ($folder == 'inbox' || $folder == 'outbox') {
             switch ($folder) {
                 case 'inbox':
-                    $sql = "privmsgs_to_userid = " . $userdata['user_id'];
+                    $sql = 'privmsgs_to_userid = ' . $userdata['user_id'];
                     break;
                 case 'outbox':
-                    $sql = "privmsgs_from_userid = " . $userdata['user_id'];
+                    $sql = 'privmsgs_from_userid = ' . $userdata['user_id'];
                     break;
             }
 
             // Get information relevant to new or unread mail
             // so we can adjust users counters appropriately
-            $sql = "SELECT privmsgs_to_userid, privmsgs_type
-				FROM " . BB_PRIVMSGS . "
+            $sql = 'SELECT privmsgs_to_userid, privmsgs_type
+				FROM ' . BB_PRIVMSGS . "
 				WHERE privmsgs_id IN ($saved_sql_id)
 					AND $sql
-					AND privmsgs_type IN (" . PRIVMSGS_NEW_MAIL . ", " . PRIVMSGS_UNREAD_MAIL . ")";
+					AND privmsgs_type IN (" . PRIVMSGS_NEW_MAIL . ', ' . PRIVMSGS_UNREAD_MAIL . ')';
             if (!($result = OLD_DB()->sql_query($sql))) {
                 bb_die('Could not obtain user id list for outbox messages');
             }
@@ -690,18 +690,18 @@ if ($mode == 'read') {
                     foreach ($update_list as $type => $dec_ary) {
                         switch ($type) {
                             case 'new':
-                                $type = "user_new_privmsg";
+                                $type = 'user_new_privmsg';
                                 break;
 
                             case 'unread':
-                                $type = "user_unread_privmsg";
+                                $type = 'user_unread_privmsg';
                                 break;
                         }
 
                         foreach ($dec_ary as $dec => $user_ary) {
                             $user_ids = implode(', ', $user_ary);
 
-                            $sql = "UPDATE " . BB_USERS . " SET $type = $type - $dec WHERE user_id IN ($user_ids)";
+                            $sql = 'UPDATE ' . BB_USERS . " SET $type = $type - $dec WHERE user_id IN ($user_ids)";
                             if (!OLD_DB()->sql_query($sql)) {
                                 bb_die('Could not update user pm counters');
                             }
@@ -715,24 +715,24 @@ if ($mode == 'read') {
 
         switch ($folder) {
             case 'inbox':
-                $saved_sql .= " SET privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . "
-					WHERE privmsgs_to_userid = " . $userdata['user_id'] . "
-						AND ( privmsgs_type = " . PRIVMSGS_READ_MAIL . "
-							OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
-							OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . ")";
+                $saved_sql .= ' SET privmsgs_type = ' . PRIVMSGS_SAVED_IN_MAIL . '
+					WHERE privmsgs_to_userid = ' . $userdata['user_id'] . '
+						AND ( privmsgs_type = ' . PRIVMSGS_READ_MAIL . '
+							OR privmsgs_type = ' . PRIVMSGS_NEW_MAIL . '
+							OR privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ')';
                 break;
 
             case 'outbox':
-                $saved_sql .= " SET privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . "
-					WHERE privmsgs_from_userid = " . $userdata['user_id'] . "
-						AND ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
-							OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) ";
+                $saved_sql .= ' SET privmsgs_type = ' . PRIVMSGS_SAVED_OUT_MAIL . '
+					WHERE privmsgs_from_userid = ' . $userdata['user_id'] . '
+						AND ( privmsgs_type = ' . PRIVMSGS_NEW_MAIL . '
+							OR privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ' ) ';
                 break;
 
             case 'sentbox':
-                $saved_sql .= " SET privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . "
-					WHERE privmsgs_from_userid = " . $userdata['user_id'] . "
-						AND privmsgs_type = " . PRIVMSGS_SENT_MAIL;
+                $saved_sql .= ' SET privmsgs_type = ' . PRIVMSGS_SAVED_OUT_MAIL . '
+					WHERE privmsgs_from_userid = ' . $userdata['user_id'] . '
+						AND privmsgs_type = ' . PRIVMSGS_SENT_MAIL;
                 break;
         }
 
@@ -742,12 +742,12 @@ if ($mode == 'read') {
             bb_die('Could not save private messages');
         }
 
-        redirectToUrl(PM_URL . "?folder=savebox");
+        redirectToUrl(PM_URL . '?folder=savebox');
     }
 } elseif ($submit || $refresh || $mode != '') {
     if (IS_USER && $submit && $mode != 'edit') {
         // Flood control
-        $sql = "SELECT MAX(privmsgs_date) AS last_post_time FROM " . BB_PRIVMSGS . " WHERE privmsgs_from_userid = " . $userdata['user_id'];
+        $sql = 'SELECT MAX(privmsgs_date) AS last_post_time FROM ' . BB_PRIVMSGS . ' WHERE privmsgs_from_userid = ' . $userdata['user_id'];
         if ($result = OLD_DB()->sql_query($sql)) {
             $db_row = OLD_DB()->sql_fetchrow($result);
 
@@ -821,47 +821,47 @@ if ($mode == 'read') {
 
         if ($mode != 'edit') {
             // See if recipient is at their inbox limit
-            $sql = "SELECT COUNT(privmsgs_id) AS inbox_items, MIN(privmsgs_date) AS oldest_post_time
-				FROM " . BB_PRIVMSGS . "
-				WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
-						OR privmsgs_type = " . PRIVMSGS_READ_MAIL . "
-						OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )
-					AND privmsgs_to_userid = " . $to_userdata['user_id'];
+            $sql = 'SELECT COUNT(privmsgs_id) AS inbox_items, MIN(privmsgs_date) AS oldest_post_time
+				FROM ' . BB_PRIVMSGS . '
+				WHERE ( privmsgs_type = ' . PRIVMSGS_NEW_MAIL . '
+						OR privmsgs_type = ' . PRIVMSGS_READ_MAIL . '
+						OR privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ' )
+					AND privmsgs_to_userid = ' . $to_userdata['user_id'];
             if (!($result = OLD_DB()->sql_query($sql))) {
                 bb_die(trans('messages.NO_SUCH_USER'));
             }
 
             if ($inbox_info = OLD_DB()->sql_fetchrow($result)) {
                 if (config('tp.max_inbox_privmsgs') && $inbox_info['inbox_items'] >= config('tp.max_inbox_privmsgs')) {
-                    $sql = "SELECT privmsgs_id FROM " . BB_PRIVMSGS . "
-						WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
-								OR privmsgs_type = " . PRIVMSGS_READ_MAIL . "
-								OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . "  )
-							AND privmsgs_date = " . $inbox_info['oldest_post_time'] . "
-							AND privmsgs_to_userid = " . $to_userdata['user_id'];
+                    $sql = 'SELECT privmsgs_id FROM ' . BB_PRIVMSGS . '
+						WHERE ( privmsgs_type = ' . PRIVMSGS_NEW_MAIL . '
+								OR privmsgs_type = ' . PRIVMSGS_READ_MAIL . '
+								OR privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . '  )
+							AND privmsgs_date = ' . $inbox_info['oldest_post_time'] . '
+							AND privmsgs_to_userid = ' . $to_userdata['user_id'];
                     if (!$result = OLD_DB()->sql_query($sql)) {
                         bb_die('Could not find oldest privmsgs (inbox)');
                     }
                     $old_privmsgs_id = OLD_DB()->sql_fetchrow($result);
                     $old_privmsgs_id = (int)$old_privmsgs_id['privmsgs_id'];
 
-                    $sql = "DELETE FROM " . BB_PRIVMSGS . " WHERE privmsgs_id = $old_privmsgs_id";
+                    $sql = 'DELETE FROM ' . BB_PRIVMSGS . " WHERE privmsgs_id = $old_privmsgs_id";
                     if (!OLD_DB()->sql_query($sql)) {
                         bb_die('Could not delete oldest privmsgs (inbox)');
                     }
 
-                    $sql = "DELETE FROM " . BB_PRIVMSGS_TEXT . " WHERE privmsgs_text_id = $old_privmsgs_id";
+                    $sql = 'DELETE FROM ' . BB_PRIVMSGS_TEXT . " WHERE privmsgs_text_id = $old_privmsgs_id";
                     if (!OLD_DB()->sql_query($sql)) {
                         bb_die('Could not delete oldest privmsgs text (inbox)');
                     }
                 }
             }
 
-            $sql_info = "INSERT INTO " . BB_PRIVMSGS . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip)
-				VALUES (" . PRIVMSGS_NEW_MAIL . ", '" . OLD_DB()->escape($privmsg_subject) . "', " . $userdata['user_id'] . ", " . $to_userdata['user_id'] . ", $msg_time, '" . USER_IP . "')";
+            $sql_info = 'INSERT INTO ' . BB_PRIVMSGS . ' (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip)
+				VALUES (' . PRIVMSGS_NEW_MAIL . ", '" . OLD_DB()->escape($privmsg_subject) . "', " . $userdata['user_id'] . ', ' . $to_userdata['user_id'] . ", $msg_time, '" . USER_IP . "')";
         } else {
-            $sql_info = "UPDATE " . BB_PRIVMSGS . "
-				SET privmsgs_type = " . PRIVMSGS_NEW_MAIL . ", privmsgs_subject = '" . OLD_DB()->escape($privmsg_subject) . "', privmsgs_from_userid = " . $userdata['user_id'] . ", privmsgs_to_userid = " . $to_userdata['user_id'] . ", privmsgs_date = $msg_time, privmsgs_ip = '" . USER_IP . "'
+            $sql_info = 'UPDATE ' . BB_PRIVMSGS . '
+				SET privmsgs_type = ' . PRIVMSGS_NEW_MAIL . ", privmsgs_subject = '" . OLD_DB()->escape($privmsg_subject) . "', privmsgs_from_userid = " . $userdata['user_id'] . ', privmsgs_to_userid = ' . $to_userdata['user_id'] . ", privmsgs_date = $msg_time, privmsgs_ip = '" . USER_IP . "'
 				WHERE privmsgs_id = $privmsg_id";
         }
 
@@ -872,10 +872,10 @@ if ($mode == 'read') {
         if ($mode != 'edit') {
             $privmsg_sent_id = OLD_DB()->sql_nextid();
 
-            $sql = "INSERT INTO " . BB_PRIVMSGS_TEXT . " (privmsgs_text_id, privmsgs_text)
+            $sql = 'INSERT INTO ' . BB_PRIVMSGS_TEXT . " (privmsgs_text_id, privmsgs_text)
 				VALUES ($privmsg_sent_id, '" . OLD_DB()->escape($privmsg_message) . "')";
         } else {
-            $sql = "UPDATE " . BB_PRIVMSGS_TEXT . "
+            $sql = 'UPDATE ' . BB_PRIVMSGS_TEXT . "
 				SET privmsgs_text = '" . OLD_DB()->escape($privmsg_message) . "'
 				WHERE privmsgs_text_id = $privmsg_id";
         }
@@ -887,7 +887,7 @@ if ($mode == 'read') {
         if ($mode != 'edit') {
             $timenow = TIMENOW;
             // Add to the users new pm counter
-            $sql = "UPDATE " . BB_USERS . " SET
+            $sql = 'UPDATE ' . BB_USERS . " SET
 					user_new_privmsg = user_new_privmsg + 1,
 					user_last_privmsg = $timenow,
 					user_newest_pm_id = $privmsg_sent_id
@@ -943,8 +943,8 @@ if ($mode == 'read') {
         } elseif ($mode == 'edit') {
             $page_title = trans('messages.EDIT_PM');
 
-            $sql = "SELECT u.user_id
-				FROM " . BB_PRIVMSGS . " pm, " . BB_USERS . " u
+            $sql = 'SELECT u.user_id
+				FROM ' . BB_PRIVMSGS . ' pm, ' . BB_USERS . " u
 				WHERE pm.privmsgs_id = $privmsg_id
 					AND u.user_id = pm.privmsgs_from_userid";
             if (!($result = OLD_DB()->sql_query($sql))) {
@@ -965,7 +965,7 @@ if ($mode == 'read') {
         if (!empty($_GET[POST_USERS_URL])) {
             $user_id = (int)$_GET[POST_USERS_URL];
 
-            $sql = "SELECT username FROM " . BB_USERS . " WHERE user_id = $user_id AND user_id <> " . GUEST_UID;
+            $sql = 'SELECT username FROM ' . BB_USERS . " WHERE user_id = $user_id AND user_id <> " . GUEST_UID;
             if (!($result = OLD_DB()->sql_query($sql))) {
                 $error = true;
                 $error_msg = trans('messages.NO_SUCH_USER');
@@ -975,14 +975,14 @@ if ($mode == 'read') {
                 $to_username = $row['username'];
             }
         } elseif ($mode == 'edit') {
-            $sql = "SELECT pm.*, pmt.privmsgs_text, u.username, u.user_id
-				FROM " . BB_PRIVMSGS . " pm, " . BB_PRIVMSGS_TEXT . " pmt, " . BB_USERS . " u
+            $sql = 'SELECT pm.*, pmt.privmsgs_text, u.username, u.user_id
+				FROM ' . BB_PRIVMSGS . ' pm, ' . BB_PRIVMSGS_TEXT . ' pmt, ' . BB_USERS . " u
 				WHERE pm.privmsgs_id = $privmsg_id
 					AND pmt.privmsgs_text_id = pm.privmsgs_id
-					AND pm.privmsgs_from_userid = " . $userdata['user_id'] . "
-					AND ( pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
-						OR pm.privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )
-					AND u.user_id = pm.privmsgs_to_userid";
+					AND pm.privmsgs_from_userid = " . $userdata['user_id'] . '
+					AND ( pm.privmsgs_type = ' . PRIVMSGS_NEW_MAIL . '
+						OR pm.privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ' )
+					AND u.user_id = pm.privmsgs_to_userid';
             if (!($result = OLD_DB()->sql_query($sql))) {
                 bb_die('Could not obtain private message for editing #1');
             }
@@ -997,12 +997,12 @@ if ($mode == 'read') {
             $to_username = $privmsg['username'];
             $to_userid = $privmsg['user_id'];
         } elseif ($mode == 'reply' || $mode == 'quote') {
-            $sql = "SELECT pm.privmsgs_subject, pm.privmsgs_date, pmt.privmsgs_text, u.username, u.user_id
-				FROM " . BB_PRIVMSGS . " pm, " . BB_PRIVMSGS_TEXT . " pmt, " . BB_USERS . " u
+            $sql = 'SELECT pm.privmsgs_subject, pm.privmsgs_date, pmt.privmsgs_text, u.username, u.user_id
+				FROM ' . BB_PRIVMSGS . ' pm, ' . BB_PRIVMSGS_TEXT . ' pmt, ' . BB_USERS . " u
 				WHERE pm.privmsgs_id = $privmsg_id
 					AND pmt.privmsgs_text_id = pm.privmsgs_id
-					AND pm.privmsgs_to_userid = " . $userdata['user_id'] . "
-					AND u.user_id = pm.privmsgs_from_userid";
+					AND pm.privmsgs_to_userid = " . $userdata['user_id'] . '
+					AND u.user_id = pm.privmsgs_from_userid';
             if (!($result = OLD_DB()->sql_query($sql))) {
                 bb_die('Could not obtain private message for editing #2');
             }
@@ -1137,7 +1137,7 @@ if ($mode == 'read') {
         'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields,
         'S_POST_ACTION' => PM_URL,
 
-        'U_SEARCH_USER' => "search.php?mode=searchuser",
+        'U_SEARCH_USER' => 'search.php?mode=searchuser',
         'U_VIEW_FORUM' => PM_URL,
     ));
 } else {
@@ -1157,10 +1157,10 @@ if ($mode == 'read') {
         'user_last_privmsg' => $userdata['session_start'],
     ));
 
-    $sql = "UPDATE " . BB_PRIVMSGS . "
-		SET privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . "
-		WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
-			AND privmsgs_to_userid = " . $userdata['user_id'];
+    $sql = 'UPDATE ' . BB_PRIVMSGS . '
+		SET privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . '
+		WHERE privmsgs_type = ' . PRIVMSGS_NEW_MAIL . '
+			AND privmsgs_to_userid = ' . $userdata['user_id'];
     if (!OLD_DB()->sql_query($sql)) {
         bb_die('Could not update private message new / read status (2) for user');
     }
@@ -1188,55 +1188,55 @@ if ($mode == 'read') {
     //
     // General SQL to obtain messages
     //
-    $sql_tot = "SELECT COUNT(privmsgs_id) AS total
-		FROM " . BB_PRIVMSGS . " ";
-    $sql = "SELECT pm.privmsgs_type, pm.privmsgs_id, pm.privmsgs_date, pm.privmsgs_subject, u.user_id, u.username, u.user_rank
-		FROM " . BB_PRIVMSGS . " pm, " . BB_USERS . " u ";
+    $sql_tot = 'SELECT COUNT(privmsgs_id) AS total
+		FROM ' . BB_PRIVMSGS . ' ';
+    $sql = 'SELECT pm.privmsgs_type, pm.privmsgs_id, pm.privmsgs_date, pm.privmsgs_subject, u.user_id, u.username, u.user_rank
+		FROM ' . BB_PRIVMSGS . ' pm, ' . BB_USERS . ' u ';
     switch ($folder) {
         case 'inbox':
-            $sql_tot .= "WHERE privmsgs_to_userid = " . $userdata['user_id'] . "
-				AND ( privmsgs_type =  " . PRIVMSGS_NEW_MAIL . "
-					OR privmsgs_type = " . PRIVMSGS_READ_MAIL . "
-					OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
+            $sql_tot .= 'WHERE privmsgs_to_userid = ' . $userdata['user_id'] . '
+				AND ( privmsgs_type =  ' . PRIVMSGS_NEW_MAIL . '
+					OR privmsgs_type = ' . PRIVMSGS_READ_MAIL . '
+					OR privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ' )';
 
-            $sql .= "WHERE pm.privmsgs_to_userid = " . $userdata['user_id'] . "
+            $sql .= 'WHERE pm.privmsgs_to_userid = ' . $userdata['user_id'] . '
 				AND u.user_id = pm.privmsgs_from_userid
-				AND ( pm.privmsgs_type =  " . PRIVMSGS_NEW_MAIL . "
-					OR pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . "
-					OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
+				AND ( pm.privmsgs_type =  ' . PRIVMSGS_NEW_MAIL . '
+					OR pm.privmsgs_type = ' . PRIVMSGS_READ_MAIL . '
+					OR privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ' )';
             break;
 
         case 'outbox':
-            $sql_tot .= "WHERE privmsgs_from_userid = " . $userdata['user_id'] . "
-				AND ( privmsgs_type =  " . PRIVMSGS_NEW_MAIL . "
-					OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
+            $sql_tot .= 'WHERE privmsgs_from_userid = ' . $userdata['user_id'] . '
+				AND ( privmsgs_type =  ' . PRIVMSGS_NEW_MAIL . '
+					OR privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ' )';
 
-            $sql .= "WHERE pm.privmsgs_from_userid = " . $userdata['user_id'] . "
+            $sql .= 'WHERE pm.privmsgs_from_userid = ' . $userdata['user_id'] . '
 				AND u.user_id = pm.privmsgs_to_userid
-				AND ( pm.privmsgs_type =  " . PRIVMSGS_NEW_MAIL . "
-					OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
+				AND ( pm.privmsgs_type =  ' . PRIVMSGS_NEW_MAIL . '
+					OR privmsgs_type = ' . PRIVMSGS_UNREAD_MAIL . ' )';
             break;
 
         case 'sentbox':
-            $sql_tot .= "WHERE privmsgs_from_userid = " . $userdata['user_id'] . "
-				AND privmsgs_type =  " . PRIVMSGS_SENT_MAIL;
+            $sql_tot .= 'WHERE privmsgs_from_userid = ' . $userdata['user_id'] . '
+				AND privmsgs_type =  ' . PRIVMSGS_SENT_MAIL;
 
-            $sql .= "WHERE pm.privmsgs_from_userid = " . $userdata['user_id'] . "
+            $sql .= 'WHERE pm.privmsgs_from_userid = ' . $userdata['user_id'] . '
 				AND u.user_id = pm.privmsgs_to_userid
-				AND pm.privmsgs_type =  " . PRIVMSGS_SENT_MAIL;
+				AND pm.privmsgs_type =  ' . PRIVMSGS_SENT_MAIL;
             break;
 
         case 'savebox':
-            $sql_tot .= "WHERE ( ( privmsgs_to_userid = " . $userdata['user_id'] . "
-					AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " )
-				OR ( privmsgs_from_userid = " . $userdata['user_id'] . "
-					AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . ") )";
+            $sql_tot .= 'WHERE ( ( privmsgs_to_userid = ' . $userdata['user_id'] . '
+					AND privmsgs_type = ' . PRIVMSGS_SAVED_IN_MAIL . ' )
+				OR ( privmsgs_from_userid = ' . $userdata['user_id'] . '
+					AND privmsgs_type = ' . PRIVMSGS_SAVED_OUT_MAIL . ') )';
 
-            $sql .= "WHERE u.user_id = pm.privmsgs_from_userid
-				AND ( ( pm.privmsgs_to_userid = " . $userdata['user_id'] . "
-					AND pm.privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " )
-				OR ( pm.privmsgs_from_userid = " . $userdata['user_id'] . "
-					AND pm.privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " ) )";
+            $sql .= 'WHERE u.user_id = pm.privmsgs_from_userid
+				AND ( ( pm.privmsgs_to_userid = ' . $userdata['user_id'] . '
+					AND pm.privmsgs_type = ' . PRIVMSGS_SAVED_IN_MAIL . ' )
+				OR ( pm.privmsgs_from_userid = ' . $userdata['user_id'] . '
+					AND pm.privmsgs_type = ' . PRIVMSGS_SAVED_OUT_MAIL . ' ) )';
             break;
 
         default:
@@ -1310,7 +1310,7 @@ if ($mode == 'read') {
             $l_box_name = trans('messages.SENTBOX');
             break;
     }
-    $post_pm = PM_URL . "?mode=post";
+    $post_pm = PM_URL . '?mode=post';
     $post_pm_img = '<a href="' . $post_pm . '"><img src="' . $images['pm_postmsg'] . '" alt="' . trans('messages.POST_NEW_PM') . '" border="0" /></a>';
     $post_pm = '<a href="' . $post_pm . '">' . trans('messages.POST_NEW_PM') . '</a>';
 
@@ -1369,7 +1369,7 @@ if ($mode == 'read') {
         'S_POST_NEW_MSG' => $post_new_mesg_url,
         'S_SELECT_MSG_DAYS' => $select_msg_days,
 
-        'U_POST_NEW_TOPIC' => PM_URL . "?mode=post",
+        'U_POST_NEW_TOPIC' => PM_URL . '?mode=post',
     ));
 
     //
@@ -1429,7 +1429,7 @@ if ($mode == 'read') {
 
         generate_pagination(PM_URL . "?folder=$folder", $pm_total, config('tp.topics_per_page'), $start);
     } else {
-        $template->assign_block_vars("switch_no_messages", array());
+        $template->assign_block_vars('switch_no_messages', array());
     }
 }
 
@@ -1447,12 +1447,12 @@ require PAGE_FOOTER;
 function pm_die($msg)
 {
     $msg .= '<br /><br />';
-    $msg .= sprintf(trans('messages.CLICK_RETURN_INBOX'), '<a href="' . PM_URL . "?folder=inbox" . '">', '</a> ');
-    $msg .= sprintf(trans('messages.CLICK_RETURN_SENTBOX'), '<a href="' . PM_URL . "?folder=sentbox" . '">', '</a> ');
-    $msg .= sprintf(trans('messages.CLICK_RETURN_OUTBOX'), '<a href="' . PM_URL . "?folder=outbox" . '">', '</a> ');
-    $msg .= sprintf(trans('messages.CLICK_RETURN_SAVEBOX'), '<a href="' . PM_URL . "?folder=savebox" . '">', '</a> ');
+    $msg .= sprintf(trans('messages.CLICK_RETURN_INBOX'), '<a href="' . PM_URL . '?folder=inbox' . '">', '</a> ');
+    $msg .= sprintf(trans('messages.CLICK_RETURN_SENTBOX'), '<a href="' . PM_URL . '?folder=sentbox' . '">', '</a> ');
+    $msg .= sprintf(trans('messages.CLICK_RETURN_OUTBOX'), '<a href="' . PM_URL . '?folder=outbox' . '">', '</a> ');
+    $msg .= sprintf(trans('messages.CLICK_RETURN_SAVEBOX'), '<a href="' . PM_URL . '?folder=savebox' . '">', '</a> ');
     $msg .= '<br /><br />';
-    $msg .= sprintf(trans('messages.CLICK_RETURN_INDEX'), '<a href="' . "index.php" . '">', '</a>');
+    $msg .= sprintf(trans('messages.CLICK_RETURN_INDEX'), '<a href="' . 'index.php' . '">', '</a>');
 
     bb_die($msg);
 }
diff --git a/search.php b/search.php
index 5da006950..88aa57989 100644
--- a/search.php
+++ b/search.php
@@ -34,7 +34,7 @@ if (isset($_POST['del_my_post'])) {
         bb_die(trans('messages.NONE_SELECTED'));
     }
 
-    OLD_DB()->query("UPDATE " . BB_POSTS . " SET user_post = 0 WHERE poster_id = {$user->id} AND topic_id IN($topic_csv)");
+    OLD_DB()->query('UPDATE ' . BB_POSTS . " SET user_post = 0 WHERE poster_id = {$user->id} AND topic_id IN($topic_csv)");
 
     if (OLD_DB()->affected_rows()) {
         //bb_die('Выбранные темы ['. count($_POST['topic_id_list']) .' шт.] удалены из списка "Мои сообщения"');
@@ -53,7 +53,7 @@ if (isset($_POST['del_my_post'])) {
         redirectToUrl('index.php');
     }
 
-    OLD_DB()->query("UPDATE " . BB_POSTS . " SET user_post = 1 WHERE poster_id = {$user->id}");
+    OLD_DB()->query('UPDATE ' . BB_POSTS . " SET user_post = 1 WHERE poster_id = {$user->id}");
 
     redirectToUrl("search.php?u={$user->id}");
 }
@@ -288,7 +288,7 @@ if (empty($_GET) && empty($_POST)) {
 
         'THIS_USER_ID' => $userdata['user_id'],
         'THIS_USER_NAME' => addslashes($userdata['username']),
-        'SEARCH_ACTION' => "search.php",
+        'SEARCH_ACTION' => 'search.php',
         'U_SEARCH_USER' => "search.php?mode=searchuser&amp;input_name=$poster_name_key",
         'ONLOAD_FOCUS_ID' => 'text_match_input',
 
@@ -319,9 +319,9 @@ $datastore->rm('cat_forums');
 
 // Restore previously found items list and search settings if we have valid $search_id
 if ($search_id) {
-    $row = OLD_DB()->fetch_row("
+    $row = OLD_DB()->fetch_row('
 		SELECT search_array, search_settings
-		FROM " . BB_SEARCH . "
+		FROM ' . BB_SEARCH . "
 		WHERE session_id = '$session_id'
 			AND search_type = " . SEARCH_TYPE_POST . "
 			AND search_id = '$search_id'
@@ -468,7 +468,7 @@ if ($post_mode) {
 
         // WHERE
         if ($join_p && $join_t) {
-            $SQL['WHERE'][] = "t.topic_id = p.topic_id";
+            $SQL['WHERE'][] = 't.topic_id = p.topic_id';
         }
 
         if ($excluded_forums_csv) {
@@ -515,8 +515,8 @@ if ($post_mode) {
             redirectToUrl(basename(__FILE__));
         }
 
-        $SQL['GROUP BY'][] = "item_id";
-        $SQL['ORDER BY'][] = ($new_posts && $join_p) ? "p.topic_id ASC, p.post_time ASC" : "$order $sort";
+        $SQL['GROUP BY'][] = 'item_id';
+        $SQL['ORDER BY'][] = ($new_posts && $join_p) ? 'p.topic_id ASC, p.post_time ASC' : "$order $sort";
         $SQL['LIMIT'][] = "$search_limit";
 
         $items_display = fetch_search_ids($SQL);
@@ -655,7 +655,7 @@ else {
 
         // WHERE
         if ($join_p && $join_t) {
-            $SQL['WHERE'][] = "t.topic_id = p.topic_id";
+            $SQL['WHERE'][] = 't.topic_id = p.topic_id';
         }
 
         if ($excluded_forums_csv) {
@@ -663,7 +663,7 @@ else {
         }
 
         if ($join_t) {
-            $SQL['WHERE'][] = "t.topic_status != " . TOPIC_MOVED;
+            $SQL['WHERE'][] = 't.topic_status != ' . TOPIC_MOVED;
         }
         if ($forum_val) {
             $SQL['WHERE'][] = "$tbl.forum_id IN($forum_val)";
@@ -684,7 +684,7 @@ else {
             $SQL['WHERE'][] = "p.poster_id = $poster_id_val";
         }
         if ($my_posts && $user->id == $poster_id_val) {
-            $SQL['WHERE'][] = "p.user_post = 1";
+            $SQL['WHERE'][] = 'p.user_post = 1';
 
             if ($userdata['user_posts']) {
                 $template->assign_var('BB_DIE_APPEND_MSG', '
@@ -725,7 +725,7 @@ else {
             redirectToUrl(basename(__FILE__));
         }
 
-        $SQL['GROUP BY'][] = "item_id";
+        $SQL['GROUP BY'][] = 'item_id';
         $SQL['LIMIT'][] = "$search_limit";
 
         if ($egosearch) {
@@ -750,19 +750,19 @@ else {
 		IF(p2.poster_id = $anon_id, p2.post_username, u2.username) AS last_username
 	";
     if ($join_dl) {
-        $SQL['SELECT'][] = "dl.user_status AS dl_status";
+        $SQL['SELECT'][] = 'dl.user_status AS dl_status';
     }
 
-    $SQL['FROM'][] = BB_TOPICS . " t";
-    $SQL['LEFT JOIN'][] = BB_POSTS . " p1 ON(t.topic_first_post_id = p1.post_id)";
-    $SQL['LEFT JOIN'][] = BB_USERS . " u1 ON(t.topic_poster = u1.user_id)";
-    $SQL['LEFT JOIN'][] = BB_POSTS . " p2 ON(t.topic_last_post_id = p2.post_id)";
-    $SQL['LEFT JOIN'][] = BB_USERS . " u2 ON(p2.poster_id = u2.user_id)";
+    $SQL['FROM'][] = BB_TOPICS . ' t';
+    $SQL['LEFT JOIN'][] = BB_POSTS . ' p1 ON(t.topic_first_post_id = p1.post_id)';
+    $SQL['LEFT JOIN'][] = BB_USERS . ' u1 ON(t.topic_poster = u1.user_id)';
+    $SQL['LEFT JOIN'][] = BB_POSTS . ' p2 ON(t.topic_last_post_id = p2.post_id)';
+    $SQL['LEFT JOIN'][] = BB_USERS . ' u2 ON(p2.poster_id = u2.user_id)';
     if ($join_dl) {
         $SQL['LEFT JOIN'][] = BB_BT_DLSTATUS . " dl ON(dl.user_id = $user_id AND dl.topic_id = t.topic_id)";
     }
 
-    $SQL['WHERE'][] = "t.topic_id IN(" . implode(',', $items_display) . ")";
+    $SQL['WHERE'][] = 't.topic_id IN(' . implode(',', $items_display) . ')';
     if ($excluded_forums_csv) {
         $SQL['WHERE'][] = "t.forum_id NOT IN($excluded_forums_csv)";
     }
@@ -887,7 +887,7 @@ function fetch_search_ids($sql, $search_type = SEARCH_TYPE_POST)
         $columns = 'session_id,   search_type,   search_id,   search_time,    search_settings,    search_array';
         $values = "'$session_id', $search_type, '$search_id', " . TIMENOW . ", '$search_settings', '$search_array'";
 
-        OLD_DB()->query("REPLACE INTO " . BB_SEARCH . " ($columns) VALUES ($values)");
+        OLD_DB()->query('REPLACE INTO ' . BB_SEARCH . " ($columns) VALUES ($values)");
     }
 
     return array_slice($items_found, 0, $per_page);
@@ -900,7 +900,7 @@ function prevent_huge_searches($SQL)
         $SQL['ORDER BY'] = array();
         $SQL['LIMIT'] = array('0');
 
-        if (OLD_DB()->query($SQL) and $row = OLD_DB()->fetch_row("SELECT FOUND_ROWS() AS rows_count")) {
+        if (OLD_DB()->query($SQL) and $row = OLD_DB()->fetch_row('SELECT FOUND_ROWS() AS rows_count')) {
             if ($row['rows_count'] > config('tp.limit_max_search_results')) {
                 bb_die('Too_many_search_results');
             }
@@ -917,14 +917,14 @@ function username_search($search_match)
     if (!empty($search_match)) {
         $username_search = preg_replace('/\*/', '%', clean_username($search_match));
 
-        $sql = "
+        $sql = '
 			SELECT username
-			FROM " . BB_USERS . "
+			FROM ' . BB_USERS . "
 			WHERE username LIKE '" . OLD_DB()->escape($username_search) . "'
-				AND user_id <> " . GUEST_UID . "
+				AND user_id <> " . GUEST_UID . '
 			ORDER BY username
 			LIMIT 200
-		";
+		';
 
         foreach (OLD_DB()->fetch_rowset($sql) as $row) {
             $username = htmlCHR(stripslashes(html_entity_decode($row['username'])));
diff --git a/styles/templates/default/tpl_config.php b/styles/templates/default/tpl_config.php
index 3b8b179cc..626dceeb8 100644
--- a/styles/templates/default/tpl_config.php
+++ b/styles/templates/default/tpl_config.php
@@ -163,7 +163,7 @@ if (!empty($page_cfg['load_tpl_vars']) and $vars = array_flip($page_cfg['load_tp
             'WWW_IMG' => trans('messages.VISIT_WEBSITE_TXTB'),
             'ICQ_IMG' => trans('messages.ICQ_TXTB'),
 
-            'EMAIL_URL' => BB_ROOT . "profile.php?mode=email&amp;u=",
+            'EMAIL_URL' => BB_ROOT . 'profile.php?mode=email&amp;u=',
             'FORUM_URL' => BB_ROOT . FORUM_URL,
             'ICQ_URL' => 'http://www.icq.com/people/',
             'PM_URL' => BB_ROOT . PM_URL,
diff --git a/tracker.php b/tracker.php
index 50f5b75dd..92746f434 100644
--- a/tracker.php
+++ b/tracker.php
@@ -302,9 +302,9 @@ $tor_list_ary = array();
 $tor_list_sql = '';
 
 if ($search_id) {
-    $row = OLD_DB()->fetch_row("
+    $row = OLD_DB()->fetch_row('
 		SELECT search_array, search_settings
-		FROM " . BB_SEARCH . "
+		FROM ' . BB_SEARCH . "
 		WHERE session_id = '$session_id'
 			AND search_type = " . SEARCH_TYPE_TRACKER . "
 			AND search_id = '$search_id'
@@ -523,7 +523,7 @@ if ($allowed_forums) {
         $rg_id_sql = (int)$s_rg_val;
         $s_seen_time = $s_not_seen_opt[$s_not_seen_val]['sql'];
         $s_seen_sign = ($s_not_seen_val == $never) ? '=' : '<';
-        $s_seen_exclude = ($s_not_seen_val == $never) ? '' : "AND tor.seeder_last_seen != 0";
+        $s_seen_exclude = ($s_not_seen_val == $never) ? '' : 'AND tor.seeder_last_seen != 0';
         $order_by_peers = ($order_val == $ord_seeders || $order_val == $ord_leechers);
         $order_by_speed = ($order_val == $ord_sp_up || $order_val == $ord_sp_down);
 
@@ -535,7 +535,7 @@ if ($allowed_forums) {
         $SQL = OLD_DB()->get_empty_sql_array();
 
         // SELECT
-        $SQL['SELECT'][] = "tor.topic_id";
+        $SQL['SELECT'][] = 'tor.topic_id';
 
         // FROM
         $SQL['FROM'][] = $torrents_tbl;
@@ -587,13 +587,13 @@ if ($allowed_forums) {
             $SQL['WHERE'][] = "tor.poster_id = $user_id";
         }
         if ($only_active) {
-            $SQL['WHERE'][] = "sn.topic_id IS NOT NULL";
+            $SQL['WHERE'][] = 'sn.topic_id IS NOT NULL';
         }
         if ($seed_exist) {
-            $SQL['WHERE'][] = "sn.seeders >= 1";
+            $SQL['WHERE'][] = 'sn.seeders >= 1';
         }
         if ($tor_type) {
-            $SQL['WHERE'][] = "tor.tor_type IN(1,2)";
+            $SQL['WHERE'][] = 'tor.tor_type IN(1,2)';
         }
 
         // ORDER
@@ -628,7 +628,7 @@ if ($allowed_forums) {
             $columns = 'session_id,   search_type,   search_id,   search_time,   search_settings,  search_array';
             $values = "'$session_id', $search_type, '$search_id', " . TIMENOW . ", '$curr_set_sql', '$tor_list_sql'";
 
-            OLD_DB()->query("REPLACE INTO " . BB_SEARCH . " ($columns) VALUES ($values)");
+            OLD_DB()->query('REPLACE INTO ' . BB_SEARCH . " ($columns) VALUES ($values)");
         }
         unset($columns, $values, $curr_set_sql, $tor_list_sql);
 
@@ -639,16 +639,16 @@ if ($allowed_forums) {
         }
 
         // SELECT
-        $select = "
+        $select = '
 			SELECT
 				tor.topic_id, tor.post_id, tor.attach_id, tor.size, tor.reg_time, tor.complete_count, tor.seeder_last_seen, tor.tor_status, tor.tor_type,
 				t.topic_title, t.topic_time, t.topic_replies, t.topic_views, sn.seeders, sn.leechers, tor.info_hash
-		";
-        $select .= (!$hide_speed) ? ", sn.speed_up, sn.speed_down" : '';
-        $select .= (!$hide_forum) ? ", tor.forum_id" : '';
-        $select .= (!$hide_cat) ? ", f.cat_id" : '';
-        $select .= (!$hide_author) ? ", tor.poster_id, u.username, u.user_rank" : '';
-        $select .= (!IS_GUEST) ? ", dl.user_status AS dl_status" : '';
+		';
+        $select .= (!$hide_speed) ? ', sn.speed_up, sn.speed_down' : '';
+        $select .= (!$hide_forum) ? ', tor.forum_id' : '';
+        $select .= (!$hide_cat) ? ', f.cat_id' : '';
+        $select .= (!$hide_author) ? ', tor.poster_id, u.username, u.user_rank' : '';
+        $select .= (!IS_GUEST) ? ', dl.user_status AS dl_status' : '';
 
         // FROM
         $from = "
@@ -672,7 +672,7 @@ if ($allowed_forums) {
 		";
 
         // ORDER
-        $order = "ORDER BY " . $order_opt[$order_val]['sql'];
+        $order = 'ORDER BY ' . $order_opt[$order_val]['sql'];
 
         // SORT
         $sort = $sort_opt[$sort_val]['sql'];
@@ -689,7 +689,7 @@ if ($allowed_forums) {
 			$limit
 		";
 
-        $passkey = OLD_DB()->fetch_row("SELECT auth_key FROM " . BB_BT_USERS . " WHERE user_id = " . (int)$user_id . " LIMIT 1");
+        $passkey = OLD_DB()->fetch_row('SELECT auth_key FROM ' . BB_BT_USERS . ' WHERE user_id = ' . (int)$user_id . ' LIMIT 1');
         // Build torrents table
         foreach (OLD_DB()->fetch_rowset($sql) as $tor) {
             $dl = $tor['speed_down'] ?? 0;
diff --git a/viewforum.php b/viewforum.php
index 8ee834f5d..402ea709a 100644
--- a/viewforum.php
+++ b/viewforum.php
@@ -68,7 +68,7 @@ $moderation = (!empty($_REQUEST['mod']) && $is_auth['auth_mod']);
 if (!$is_auth['auth_view']) {
     if (IS_GUEST) {
         $redirect = $start ? "&start=$start" : '';
-        redirectToUrl(LOGIN_URL . "?redirect=" . FORUM_URL . $forum_id . $redirect);
+        redirectToUrl(LOGIN_URL . '?redirect=' . FORUM_URL . $forum_id . $redirect);
     }
     // The user is not authed to read this forum ...
     $message = sprintf(trans('messages.SORRY_AUTH_VIEW'), $is_auth['auth_view_type']);
@@ -137,10 +137,10 @@ if (!$forum_data['forum_parent'] && isset($forums['f'][$forum_id]['subforums'])
 			f.forum_id, f.forum_status, f.forum_last_post_id, f.forum_posts, f.forum_topics,
 			t.topic_last_post_time, t.topic_id AS last_topic_id, t.topic_title AS last_topic_title,
 			p.poster_id AS sf_last_user_id, IF(p.poster_id = $anon, p.post_username, u.username) AS sf_last_username, u.user_rank
-		FROM      " . BB_FORUMS . " f
-		LEFT JOIN " . BB_TOPICS . " t ON(f.forum_last_post_id = t.topic_last_post_id)
-		LEFT JOIN " . BB_POSTS . " p ON(f.forum_last_post_id = p.post_id)
-		LEFT JOIN " . BB_USERS . " u ON(p.poster_id = u.user_id)
+		FROM      " . BB_FORUMS . ' f
+		LEFT JOIN ' . BB_TOPICS . ' t ON(f.forum_last_post_id = t.topic_last_post_id)
+		LEFT JOIN ' . BB_POSTS . ' p ON(f.forum_last_post_id = p.post_id)
+		LEFT JOIN ' . BB_USERS . " u ON(p.poster_id = u.user_id)
 		WHERE f.forum_parent = $forum_id
 			$only_new_sql
 			$ignore_forum_sql
@@ -242,12 +242,12 @@ $sel_previous_days = array(
 
 if (!empty($_REQUEST['topicdays'])) {
     if ($req_topic_days = abs((int)$_REQUEST['topicdays']) and isset($sel_previous_days[$req_topic_days])) {
-        $sql = "
+        $sql = '
 			SELECT COUNT(*) AS forum_topics
-			FROM " . BB_TOPICS . "
+			FROM ' . BB_TOPICS . "
 			WHERE forum_id = $forum_id
-				AND topic_last_post_time > " . (TIMENOW - 86400 * $req_topic_days) . "
-		";
+				AND topic_last_post_time > " . (TIMENOW - 86400 * $req_topic_days) . '
+		';
 
         if ($row = OLD_DB()->fetch_row($sql)) {
             $topic_days = $req_topic_days;
@@ -273,7 +273,7 @@ $order_method = get_forum_display_sort_option($order_value, 'field', 'order');
 
 $order_sql = "ORDER BY t.topic_type DESC, $sort_method $order_method";
 
-$limit_topics_time_sql = $topic_days ? "AND t.topic_last_post_time > " . (TIMENOW - 86400 * $topic_days) : '';
+$limit_topics_time_sql = $topic_days ? 'AND t.topic_last_post_time > ' . (TIMENOW - 86400 * $topic_days) : '';
 
 $select_tor_sql = $join_tor_sql = '';
 $join_dl = (config('tp.show_dl_status_in_forum') && !IS_GUEST);
@@ -290,12 +290,12 @@ if ($forum_data['allow_reg_tracker']) {
 	';
     $select_tor_sql .= $join_dl ? ', dl.user_status AS dl_status' : '';
 
-    $join_tor_sql = "
-		LEFT JOIN " . BB_BT_TORRENTS . " tor ON(t.topic_id = tor.topic_id)
-		LEFT JOIN " . BB_BT_USERS . " bt  ON(bt.user_id = {$userdata['user_id']})
-		LEFT JOIN " . BB_BT_TRACKER_SNAP . " sn  ON(tor.topic_id = sn.topic_id)
-	";
-    $join_tor_sql .= $join_dl ? " LEFT JOIN " . BB_BT_DLSTATUS . " dl ON(dl.user_id = {$userdata['user_id']} AND dl.topic_id = t.topic_id)" : '';
+    $join_tor_sql = '
+		LEFT JOIN ' . BB_BT_TORRENTS . ' tor ON(t.topic_id = tor.topic_id)
+		LEFT JOIN ' . BB_BT_USERS . " bt  ON(bt.user_id = {$userdata['user_id']})
+		LEFT JOIN " . BB_BT_TRACKER_SNAP . ' sn  ON(tor.topic_id = sn.topic_id)
+	';
+    $join_tor_sql .= $join_dl ? ' LEFT JOIN ' . BB_BT_DLSTATUS . " dl ON(dl.user_id = {$userdata['user_id']} AND dl.topic_id = t.topic_id)" : '';
 }
 
 // Title match
@@ -316,9 +316,9 @@ if ($title_match =& $_REQUEST[$title_match_key]) {
 $topic_ids = $topic_rowset = array();
 
 // IDs
-$sql = "
+$sql = '
 	SELECT t.topic_id
-	FROM " . BB_TOPICS . " t
+	FROM ' . BB_TOPICS . " t
 	WHERE t.forum_id = $forum_id
 		$only_new_sql
 		$title_match_sql
@@ -339,11 +339,11 @@ if ($topics_csv = implode(',', $topic_ids)) {
 			p2.poster_id AS last_user_id, u2.user_rank as last_user_rank,
 			IF(p2.poster_id = $anon, p2.post_username, u2.username) AS last_username
 				$select_tor_sql
-		FROM      " . BB_TOPICS . " t
-		LEFT JOIN " . BB_POSTS . " p1 ON(t.topic_first_post_id = p1.post_id)
-		LEFT JOIN " . BB_USERS . " u1 ON(t.topic_poster = u1.user_id)
-		LEFT JOIN " . BB_POSTS . " p2 ON(t.topic_last_post_id = p2.post_id)
-		LEFT JOIN " . BB_USERS . " u2 ON(p2.poster_id = u2.user_id)
+		FROM      " . BB_TOPICS . ' t
+		LEFT JOIN ' . BB_POSTS . ' p1 ON(t.topic_first_post_id = p1.post_id)
+		LEFT JOIN ' . BB_USERS . ' u1 ON(t.topic_poster = u1.user_id)
+		LEFT JOIN ' . BB_POSTS . ' p2 ON(t.topic_last_post_id = p2.post_id)
+		LEFT JOIN ' . BB_USERS . " u2 ON(p2.poster_id = u2.user_id)
 			$join_tor_sql
 		WHERE t.topic_id IN($topics_csv)
 		    $where_tor_sql
@@ -410,7 +410,7 @@ $template->assign_vars(array(
     'T_POST_NEW_TOPIC' => ($forum_data['forum_status'] == FORUM_LOCKED) ? trans('messages.FORUM_LOCKED') : $post_new_topic,
     'S_AUTH_LIST' => $u_auth,
     'U_VIEW_FORUM' => FORUM_URL . $forum_id,
-    'U_MARK_READ' => FORUM_URL . $forum_id . "&amp;mark=topics",
+    'U_MARK_READ' => FORUM_URL . $forum_id . '&amp;mark=topics',
     'U_SEARCH_SELF' => "search.php?uid={$userdata['user_id']}&f=$forum_id",
 ));
 
@@ -493,7 +493,7 @@ $pg_url = FORUM_URL . $forum_id;
 $pg_url .= $topic_days ? "&amp;topicdays=$topic_days" : '';
 $pg_url .= $sort_value ? "&amp;sort=$sort_value" : '';
 $pg_url .= $order_value ? "&amp;order=$order_value" : '';
-$pg_url .= $moderation ? "&amp;mod=1" : '';
+$pg_url .= $moderation ? '&amp;mod=1' : '';
 $pg_url .= ($topics_per_page != config('tp.topics_per_page')) ? "&amp;tpp=$topics_per_page" : '';
 
 if ($found_topics) {
diff --git a/viewtopic.php b/viewtopic.php
index 45cfe4a81..ae69656bc 100644
--- a/viewtopic.php
+++ b/viewtopic.php
@@ -66,8 +66,8 @@ if ($topic_id && isset($_GET['view']) && ($_GET['view'] == 'next' || $_GET['view
     $sql_condition = ($_GET['view'] == 'next') ? '>' : '<';
     $sql_ordering = ($_GET['view'] == 'next') ? 'ASC' : 'DESC';
 
-    $sql = "SELECT t.topic_id
-		FROM " . BB_TOPICS . " t, " . BB_TOPICS . " t2
+    $sql = 'SELECT t.topic_id
+		FROM ' . BB_TOPICS . ' t, ' . BB_TOPICS . " t2
 		WHERE t2.topic_id = $topic_id
 			AND t.forum_id = t2.forum_id
 			AND t.topic_moved_id = 0
@@ -85,18 +85,18 @@ if ($topic_id && isset($_GET['view']) && ($_GET['view'] == 'next' || $_GET['view
 
 // Get forum/topic data
 if ($topic_id) {
-    $sql = "SELECT t.*, f.*, tw.notify_status
-		FROM " . BB_TOPICS . " t
-		LEFT JOIN " . BB_FORUMS . " f USING(forum_id)
-		LEFT JOIN " . BB_TOPICS_WATCH . " tw ON(tw.topic_id = t.topic_id AND tw.user_id = {$userdata['user_id']})
+    $sql = 'SELECT t.*, f.*, tw.notify_status
+		FROM ' . BB_TOPICS . ' t
+		LEFT JOIN ' . BB_FORUMS . ' f USING(forum_id)
+		LEFT JOIN ' . BB_TOPICS_WATCH . " tw ON(tw.topic_id = t.topic_id AND tw.user_id = {$userdata['user_id']})
 		WHERE t.topic_id = $topic_id
 	";
 } elseif ($post_id) {
-    $sql = "SELECT t.*, f.*, p.post_time, tw.notify_status
-		FROM " . BB_TOPICS . " t
-		LEFT JOIN " . BB_FORUMS . " f  USING(forum_id)
-		LEFT JOIN " . BB_POSTS . " p  USING(topic_id)
-		LEFT JOIN " . BB_TOPICS_WATCH . " tw ON(tw.topic_id = t.topic_id AND tw.user_id = {$userdata['user_id']})
+    $sql = 'SELECT t.*, f.*, p.post_time, tw.notify_status
+		FROM ' . BB_TOPICS . ' t
+		LEFT JOIN ' . BB_FORUMS . ' f  USING(forum_id)
+		LEFT JOIN ' . BB_POSTS . ' p  USING(topic_id)
+		LEFT JOIN ' . BB_TOPICS_WATCH . " tw ON(tw.topic_id = t.topic_id AND tw.user_id = {$userdata['user_id']})
 		WHERE p.post_id = $post_id
 	";
 } else {
@@ -135,8 +135,8 @@ if (($next_topic_id || @$_GET['view'] === 'newest') && !IS_GUEST && $topic_id) {
     $post_time = 'post_time >= ' . get_last_read($topic_id, $forum_id);
     $post_id_altern = $next_topic_id ? '' : ' OR post_id = ' . $t_data['topic_last_post_id'];
 
-    $sql = "SELECT post_id, post_time
-		FROM " . BB_POSTS . "
+    $sql = 'SELECT post_id, post_time
+		FROM ' . BB_POSTS . "
 		WHERE topic_id = $topic_id
 			AND ($post_time $post_id_altern)
 		ORDER BY post_time ASC
@@ -149,8 +149,8 @@ if (($next_topic_id || @$_GET['view'] === 'newest') && !IS_GUEST && $topic_id) {
 }
 
 if ($post_id && !empty($t_data['post_time']) && ($t_data['topic_replies'] + 1) > $posts_per_page) {
-    $sql = "SELECT COUNT(post_id) AS prev_posts
-		FROM " . BB_POSTS . "
+    $sql = 'SELECT COUNT(post_id) AS prev_posts
+		FROM ' . BB_POSTS . "
 		WHERE topic_id = $topic_id
 			AND post_time <= {$t_data['post_time']}";
 
@@ -237,7 +237,7 @@ if (config('tp.topic_notify_enabled')) {
                 if ($_GET['unwatch'] == 'topic') {
                     $is_watching_topic = 0;
 
-                    OLD_DB()->query("DELETE FROM " . BB_TOPICS_WATCH . " WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']}");
+                    OLD_DB()->query('DELETE FROM ' . BB_TOPICS_WATCH . " WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']}");
                 }
 
                 set_die_append_msg($forum_id, $topic_id);
@@ -246,7 +246,7 @@ if (config('tp.topic_notify_enabled')) {
                 $is_watching_topic = true;
 
                 if (!$t_data['notify_status']) {
-                    OLD_DB()->query("UPDATE " . BB_TOPICS_WATCH . " SET notify_status = " . TOPIC_WATCH_NOTIFIED . " WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']}");
+                    OLD_DB()->query('UPDATE ' . BB_TOPICS_WATCH . ' SET notify_status = ' . TOPIC_WATCH_NOTIFIED . " WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']}");
                 }
             }
         } else {
@@ -254,10 +254,10 @@ if (config('tp.topic_notify_enabled')) {
                 if ($_GET['watch'] == 'topic') {
                     $is_watching_topic = true;
 
-                    OLD_DB()->query("
-						INSERT INTO " . BB_TOPICS_WATCH . " (user_id, topic_id, notify_status)
-						VALUES (" . $userdata['user_id'] . ", $topic_id, " . TOPIC_WATCH_NOTIFIED . ")
-					");
+                    OLD_DB()->query('
+						INSERT INTO ' . BB_TOPICS_WATCH . ' (user_id, topic_id, notify_status)
+						VALUES (' . $userdata['user_id'] . ", $topic_id, " . TOPIC_WATCH_NOTIFIED . ')
+					');
                 }
 
                 set_die_append_msg($forum_id, $topic_id);
@@ -269,7 +269,7 @@ if (config('tp.topic_notify_enabled')) {
     } else {
         if (isset($_GET['unwatch'])) {
             if ($_GET['unwatch'] == 'topic') {
-                redirectToUrl(LOGIN_URL . "?redirect=" . TOPIC_URL . "$topic_id&unwatch=topic");
+                redirectToUrl(LOGIN_URL . '?redirect=' . TOPIC_URL . "$topic_id&unwatch=topic");
             }
         }
     }
@@ -289,8 +289,8 @@ if (!empty($_REQUEST['postdays'])) {
         }
         $min_post_time = TIMENOW - ($post_days * 86400);
 
-        $sql = "SELECT COUNT(p.post_id) AS num_posts
-			FROM " . BB_TOPICS . " t, " . BB_POSTS . " p
+        $sql = 'SELECT COUNT(p.post_id) AS num_posts
+			FROM ' . BB_TOPICS . ' t, ' . BB_POSTS . " p
 			WHERE t.topic_id = $topic_id
 				AND p.topic_id = t.topic_id
 				AND p.post_time > $min_post_time";
@@ -309,7 +309,7 @@ $post_order = (isset($_POST['postorder']) && $_POST['postorder'] !== 'asc') ? 'd
 // 1. Add first post of topic if it pinned and page of topic not first
 $first_post = false;
 if ($t_data['topic_show_first_post'] && $start) {
-    $first_post = OLD_DB()->fetch_rowset("
+    $first_post = OLD_DB()->fetch_rowset('
 		SELECT
 			u.username, u.user_id, u.user_rank, u.user_posts, u.user_from,
 			u.user_regdate, u.user_sig,
@@ -318,19 +318,19 @@ if ($t_data['topic_show_first_post'] && $start) {
 			p.*, g.group_name, g.group_id, g.group_signature, g.avatar_ext_id as rg_avatar_id,
 			u2.username as mc_username, u2.user_rank as mc_user_rank,
 			h.post_html, IF(h.post_html IS NULL, pt.post_text, NULL) AS post_text
-		FROM      " . BB_POSTS . " p
-		LEFT JOIN " . BB_USERS . " u  ON(u.user_id = p.poster_id)
-		LEFT JOIN " . BB_POSTS_TEXT . " pt ON(pt.post_id = p.post_id)
-		LEFT JOIN " . BB_POSTS_HTML . " h  ON(h.post_id = p.post_id)
-		LEFT JOIN " . BB_USERS . " u2 ON(u2.user_id = p.mc_user_id)
-		LEFT JOIN " . BB_GROUPS . " g ON(g.group_id = p.poster_rg_id)
+		FROM      ' . BB_POSTS . ' p
+		LEFT JOIN ' . BB_USERS . ' u  ON(u.user_id = p.poster_id)
+		LEFT JOIN ' . BB_POSTS_TEXT . ' pt ON(pt.post_id = p.post_id)
+		LEFT JOIN ' . BB_POSTS_HTML . ' h  ON(h.post_id = p.post_id)
+		LEFT JOIN ' . BB_USERS . ' u2 ON(u2.user_id = p.mc_user_id)
+		LEFT JOIN ' . BB_GROUPS . " g ON(g.group_id = p.poster_rg_id)
 		WHERE
 			p.post_id = {$t_data['topic_first_post_id']}
 		LIMIT 1
 	");
 }
 // 2. All others posts
-$sql = "
+$sql = '
 	SELECT
 		u.username, u.user_id, u.user_rank, u.user_posts, u.user_from,
 		u.user_regdate, u.user_sig,
@@ -339,12 +339,12 @@ $sql = "
 		p.*, g.group_name, g.group_id, g.group_signature, g.avatar_ext_id as rg_avatar_id,
 		u2.username as mc_username, u2.user_rank as mc_user_rank,
 		h.post_html, IF(h.post_html IS NULL, pt.post_text, NULL) AS post_text
-	FROM      " . BB_POSTS . " p
-	LEFT JOIN " . BB_USERS . " u  ON(u.user_id = p.poster_id)
-	LEFT JOIN " . BB_POSTS_TEXT . " pt ON(pt.post_id = p.post_id)
-	LEFT JOIN " . BB_POSTS_HTML . " h  ON(h.post_id = p.post_id)
-	LEFT JOIN " . BB_USERS . " u2 ON(u2.user_id = p.mc_user_id)
-	LEFT JOIN " . BB_GROUPS . " g ON(g.group_id = p.poster_rg_id)
+	FROM      ' . BB_POSTS . ' p
+	LEFT JOIN ' . BB_USERS . ' u  ON(u.user_id = p.poster_id)
+	LEFT JOIN ' . BB_POSTS_TEXT . ' pt ON(pt.post_id = p.post_id)
+	LEFT JOIN ' . BB_POSTS_HTML . ' h  ON(h.post_id = p.post_id)
+	LEFT JOIN ' . BB_USERS . ' u2 ON(u2.user_id = p.mc_user_id)
+	LEFT JOIN ' . BB_GROUPS . " g ON(g.group_id = p.poster_rg_id)
 	WHERE p.topic_id = $topic_id
 		$limit_posts_time
 	GROUP BY p.post_id
@@ -376,11 +376,11 @@ if (count($orig_word)) {
 }
 
 // Post, reply and other URL generation for templating vars
-$new_topic_url = POSTING_URL . "?mode=newtopic&amp;f=" . $forum_id;
-$reply_topic_url = POSTING_URL . "?mode=reply&amp;t=" . $topic_id;
+$new_topic_url = POSTING_URL . '?mode=newtopic&amp;f=' . $forum_id;
+$reply_topic_url = POSTING_URL . '?mode=reply&amp;t=' . $topic_id;
 $view_forum_url = FORUM_URL . $forum_id;
-$view_prev_topic_url = TOPIC_URL . $topic_id . "&amp;view=previous#newest";
-$view_next_topic_url = TOPIC_URL . $topic_id . "&amp;view=next#newest";
+$view_prev_topic_url = TOPIC_URL . $topic_id . '&amp;view=previous#newest';
+$view_next_topic_url = TOPIC_URL . $topic_id . '&amp;view=next#newest';
 
 $reply_img = ($t_data['forum_status'] == FORUM_LOCKED || $t_data['topic_status'] == TOPIC_LOCKED) ? $images['reply_locked'] : $images['reply_new'];
 $reply_alt = ($t_data['forum_status'] == FORUM_LOCKED || $t_data['topic_status'] == TOPIC_LOCKED) ? trans('messages.TOPIC_LOCKED_SHORT') : trans('messages.REPLY_TO_TOPIC');
@@ -403,31 +403,31 @@ $s_auth_can .= ($is_auth['auth_download'] ? trans('messages.RULES_DOWNLOAD_CAN')
 $topic_mod = '';
 if ($is_auth['auth_mod']) {
     $s_auth_can .= trans('messages.RULES_MODERATE');
-    $topic_mod .= "<a href=\"modcp.php?" . POST_TOPIC_URL . "=$topic_id&amp;mode=delete&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_mod_delete'] . '" alt="' . trans('messages.DELETE_TOPIC') . '" title="' . trans('messages.DELETE_TOPIC') . '" border="0" /></a>&nbsp;';
-    $topic_mod .= "<a href=\"modcp.php?" . POST_TOPIC_URL . "=$topic_id&amp;mode=move&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_mod_move'] . '" alt="' . trans('messages.MOVE_TOPIC') . '" title="' . trans('messages.MOVE_TOPIC') . '" border="0" /></a>&nbsp;';
-    $topic_mod .= ($t_data['topic_status'] == TOPIC_UNLOCKED) ? "<a href=\"modcp.php?" . POST_TOPIC_URL . "=$topic_id&amp;mode=lock&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_mod_lock'] . '" alt="' . trans('messages.LOCK_TOPIC') . '" title="' . trans('messages.LOCK_TOPIC') . '" border="0" /></a>&nbsp;' : "<a href=\"modcp.php?" . POST_TOPIC_URL . "=$topic_id&amp;mode=unlock&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_mod_unlock'] . '" alt="' . trans('messages.UNLOCK_TOPIC') . '" title="' . trans('messages.UNLOCK_TOPIC') . '" border="0" /></a>&nbsp;';
-    $topic_mod .= "<a href=\"modcp.php?" . POST_TOPIC_URL . "=$topic_id&amp;mode=split&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_mod_split'] . '" alt="' . trans('messages.SPLIT_TOPIC') . '" title="' . trans('messages.SPLIT_TOPIC') . '" border="0" /></a>&nbsp;';
+    $topic_mod .= '<a href="modcp.php?' . POST_TOPIC_URL . "=$topic_id&amp;mode=delete&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_mod_delete'] . '" alt="' . trans('messages.DELETE_TOPIC') . '" title="' . trans('messages.DELETE_TOPIC') . '" border="0" /></a>&nbsp;';
+    $topic_mod .= '<a href="modcp.php?' . POST_TOPIC_URL . "=$topic_id&amp;mode=move&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_mod_move'] . '" alt="' . trans('messages.MOVE_TOPIC') . '" title="' . trans('messages.MOVE_TOPIC') . '" border="0" /></a>&nbsp;';
+    $topic_mod .= ($t_data['topic_status'] == TOPIC_UNLOCKED) ? '<a href="modcp.php?' . POST_TOPIC_URL . "=$topic_id&amp;mode=lock&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_mod_lock'] . '" alt="' . trans('messages.LOCK_TOPIC') . '" title="' . trans('messages.LOCK_TOPIC') . '" border="0" /></a>&nbsp;' : '<a href="modcp.php?' . POST_TOPIC_URL . "=$topic_id&amp;mode=unlock&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_mod_unlock'] . '" alt="' . trans('messages.UNLOCK_TOPIC') . '" title="' . trans('messages.UNLOCK_TOPIC') . '" border="0" /></a>&nbsp;';
+    $topic_mod .= '<a href="modcp.php?' . POST_TOPIC_URL . "=$topic_id&amp;mode=split&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_mod_split'] . '" alt="' . trans('messages.SPLIT_TOPIC') . '" title="' . trans('messages.SPLIT_TOPIC') . '" border="0" /></a>&nbsp;';
 
     if ($t_data['allow_reg_tracker'] || $t_data['topic_dl_type'] == TOPIC_DL_TYPE_DL || IS_ADMIN) {
         if ($t_data['topic_dl_type'] == TOPIC_DL_TYPE_DL) {
-            $topic_mod .= "<a href=\"modcp.php?" . POST_TOPIC_URL . "=$topic_id&amp;mode=unset_download&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_normal'] . '" alt="' . trans('messages.UNSET_DL_STATUS') . '" title="' . trans('messages.UNSET_DL_STATUS') . '" border="0" /></a>';
+            $topic_mod .= '<a href="modcp.php?' . POST_TOPIC_URL . "=$topic_id&amp;mode=unset_download&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_normal'] . '" alt="' . trans('messages.UNSET_DL_STATUS') . '" title="' . trans('messages.UNSET_DL_STATUS') . '" border="0" /></a>';
         } else {
-            $topic_mod .= "<a href=\"modcp.php?" . POST_TOPIC_URL . "=$topic_id&amp;mode=set_download&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_dl'] . '" alt="' . trans('messages.SET_DL_STATUS') . '" title="' . trans('messages.SET_DL_STATUS') . '" border="0" /></a>';
+            $topic_mod .= '<a href="modcp.php?' . POST_TOPIC_URL . "=$topic_id&amp;mode=set_download&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_dl'] . '" alt="' . trans('messages.SET_DL_STATUS') . '" title="' . trans('messages.SET_DL_STATUS') . '" border="0" /></a>';
         }
     }
 } elseif (($t_data['topic_poster'] == $userdata['user_id']) && $userdata['session_logged_in'] && $t_data['self_moderated']) {
-    $topic_mod .= "<a href=\"modcp.php?" . POST_TOPIC_URL . "=$topic_id&amp;mode=move&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_mod_move'] . '" alt="' . trans('messages.MOVE_TOPIC') . '" title="' . trans('messages.MOVE_TOPIC') . '" border="0" /></a>&nbsp;';
+    $topic_mod .= '<a href="modcp.php?' . POST_TOPIC_URL . "=$topic_id&amp;mode=move&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_mod_move'] . '" alt="' . trans('messages.MOVE_TOPIC') . '" title="' . trans('messages.MOVE_TOPIC') . '" border="0" /></a>&nbsp;';
 }
 
 // Topic watch information
 $s_watching_topic = $s_watching_topic_img = '';
 if ($can_watch_topic) {
     if ($is_watching_topic) {
-        $s_watching_topic = "<a href=\"" . TOPIC_URL . $topic_id . "&amp;unwatch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '">' . trans('messages.STOP_WATCHING_TOPIC') . '</a>';
-        $s_watching_topic_img = isset($images['topic_un_watch']) ? "<a href=\"" . TOPIC_URL . "$topic_id&amp;unwatch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_un_watch'] . '" alt="' . trans('messages.STOP_WATCHING_TOPIC') . '" title="' . trans('messages.STOP_WATCHING_TOPIC') . '" border="0"></a>' : '';
+        $s_watching_topic = '<a href="' . TOPIC_URL . $topic_id . "&amp;unwatch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '">' . trans('messages.STOP_WATCHING_TOPIC') . '</a>';
+        $s_watching_topic_img = isset($images['topic_un_watch']) ? '<a href="' . TOPIC_URL . "$topic_id&amp;unwatch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_un_watch'] . '" alt="' . trans('messages.STOP_WATCHING_TOPIC') . '" title="' . trans('messages.STOP_WATCHING_TOPIC') . '" border="0"></a>' : '';
     } else {
-        $s_watching_topic = "<a href=\"" . TOPIC_URL . $topic_id . "&amp;watch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '">' . trans('messages.START_WATCHING_TOPIC') . '</a>';
-        $s_watching_topic_img = isset($images['Topic_watch']) ? "<a href=\"" . TOPIC_URL . "$topic_id&amp;watch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['Topic_watch'] . '" alt="' . trans('messages.START_WATCHING_TOPIC') . '" title="' . trans('messages.START_WATCHING_TOPIC') . '" border="0"></a>' : '';
+        $s_watching_topic = '<a href="' . TOPIC_URL . $topic_id . "&amp;watch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '">' . trans('messages.START_WATCHING_TOPIC') . '</a>';
+        $s_watching_topic_img = isset($images['Topic_watch']) ? '<a href="' . TOPIC_URL . "$topic_id&amp;watch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['Topic_watch'] . '" alt="' . trans('messages.START_WATCHING_TOPIC') . '" title="' . trans('messages.START_WATCHING_TOPIC') . '" border="0"></a>' : '';
     }
 }
 
@@ -435,8 +435,8 @@ if ($can_watch_topic) {
 $pg_url = TOPIC_URL . $topic_id;
 $pg_url .= $post_days ? "&amp;postdays=$post_days" : '';
 $pg_url .= ($post_order != 'asc') ? "&amp;postorder=$post_order" : '';
-$pg_url .= isset($_REQUEST['single']) ? "&amp;single=1" : '';
-$pg_url .= $moderation ? "&amp;mod=1" : '';
+$pg_url .= isset($_REQUEST['single']) ? '&amp;single=1' : '';
+$pg_url .= $moderation ? '&amp;mod=1' : '';
 $pg_url .= ($posts_per_page != config('tp.posts_per_page')) ? "&amp;ppp=$posts_per_page" : '';
 
 generate_pagination($pg_url, $total_replies, $posts_per_page, $start);
@@ -538,7 +538,7 @@ if ($topic_attachment) {
 //
 // Update the topic view counter
 //
-$sql = "INSERT INTO " . BUF_TOPIC_VIEW . " (topic_id,  topic_views) VALUES ($topic_id, 1) ON DUPLICATE KEY UPDATE topic_views = topic_views + 1";
+$sql = 'INSERT INTO ' . BUF_TOPIC_VIEW . " (topic_id,  topic_views) VALUES ($topic_id, 1) ON DUPLICATE KEY UPDATE topic_views = topic_views + 1";
 if (!OLD_DB()->sql_query($sql)) {
     bb_die('Could not update topic views');
 }
@@ -763,7 +763,7 @@ if (defined('SPLIT_FORM_START')) {
     $template->assign_vars(array(
         'SPLIT_FORM' => true,
         'START' => $start,
-        'S_SPLIT_ACTION' => "modcp.php",
+        'S_SPLIT_ACTION' => 'modcp.php',
         'POST_FORUM_URL' => POST_FORUM_URL,
         'POST_TOPIC_URL' => POST_TOPIC_URL,
     ));

From a79dd8d3d971db837128eb630821a9cbd79c618c Mon Sep 17 00:00:00 2001
From: Yuriy Pikhtarev <iglix@me.com>
Date: Fri, 30 Jun 2017 21:53:09 +0300
Subject: [PATCH 4/8] Missing or empty conditionals group statement.

---
 library/includes/functions_admin.php | 4 +---
 library/includes/functions_post.php  | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/library/includes/functions_admin.php b/library/includes/functions_admin.php
index 6cf8dea6a..cb53f9ed9 100644
--- a/library/includes/functions_admin.php
+++ b/library/includes/functions_admin.php
@@ -360,9 +360,7 @@ function topic_delete($mode_or_topic_id, $forum_id = null, $prune_time = 0, $pru
 	');
 
     // Log action
-    if ($prune) {
-        // TODO
-    } else {
+    if (!$prune) {
         foreach ($log_topics as $row) {
             if ($row['topic_status'] == TOPIC_MOVED) {
                 $row['topic_title'] = '<i>' . trans('messages.TOPIC_MOVED') . '</i> ' . $row['topic_title'];
diff --git a/library/includes/functions_post.php b/library/includes/functions_post.php
index b50fb88eb..63e505066 100644
--- a/library/includes/functions_post.php
+++ b/library/includes/functions_post.php
@@ -41,8 +41,7 @@ function prepare_post(&$mode, &$post_data, &$error_msg, &$username, &$subject, &
     }
 
     // Check message
-    if (!empty($message)) {
-    } elseif ($mode != 'delete') {
+    if (empty($message) && $mode != 'delete') {
         $error_msg .= (!empty($error_msg)) ? '<br />' . trans('messages.EMPTY_MESSAGE') : trans('messages.EMPTY_MESSAGE');
     }
 

From 8f01a41f9224926c774c05418f4ab0c473823d58 Mon Sep 17 00:00:00 2001
From: Yuriy Pikhtarev <iglix@me.com>
Date: Fri, 30 Jun 2017 21:56:58 +0300
Subject: [PATCH 5/8] Usage of the silence operator.

---
 resources/lang/ru/messages.php     | 4 ++--
 resources/lang/source/messages.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/ru/messages.php b/resources/lang/ru/messages.php
index 8153f8fc5..706a6b5e0 100644
--- a/resources/lang/ru/messages.php
+++ b/resources/lang/ru/messages.php
@@ -1675,7 +1675,7 @@ return [
     ],
     'SCREENSHOTS_RULES' => 'Прочтите правила размещения скриншотов!',
     'SCREENSHOTS_RULES_TOPIC' => 'Прочтите правила размещения скриншотов в этом разделе!',
-    'SCRIPT_DUPLICATE' => 'Скрипт <b>' . @$_POST['cron_script'] . '</b> уже существует!',
+    'SCRIPT_DUPLICATE' => 'Скрипт уже существует!',
     'SEARCH' => 'Поиск',
     'SEARCH_ALL_WORDS' => 'искать все слова',
     'SEARCH_AUTHOR' => 'Поиск по автору',
@@ -2021,7 +2021,7 @@ return [
     'TIME_LIMIT_EXPLAIN_WEBSERVER' => '<i>Ваш веб-сервер настроен на таймаут %s сек, так что не превышайте этого значения</i>',
     'TIMER_EXPIRED' => 'Таймер истек в %s секунд.',
     'TIMEZONE' => 'Часовой пояс',
-    'TITLE_DUPLICATE' => 'Название задачи <b>' . @$_POST['cron_title'] . '</b> уже существует!',
+    'TITLE_DUPLICATE' => 'Название задачи уже существует!',
     'TITLE_MATCH' => 'Название содержит',
     'TITLE_SEARCH_HINT' => 'поиск по названию…',
     'TO' => 'Кому',
diff --git a/resources/lang/source/messages.php b/resources/lang/source/messages.php
index aa9c7fe82..44158c793 100644
--- a/resources/lang/source/messages.php
+++ b/resources/lang/source/messages.php
@@ -1675,7 +1675,7 @@ return [
     ],
     'SCREENSHOTS_RULES' => 'Read the rules laid out screenshots!',
     'SCREENSHOTS_RULES_TOPIC' => 'Read the rules laid out the screenshots in this section!',
-    'SCRIPT_DUPLICATE' => 'Script <b>' . @$_POST['cron_script'] . '</b> already exists!',
+    'SCRIPT_DUPLICATE' => 'Script already exists!',
     'SEARCH' => 'Search',
     'SEARCH_ALL_WORDS' => 'all words',
     'SEARCH_AUTHOR' => 'Search for Author',
@@ -2021,7 +2021,7 @@ return [
     'TIME_LIMIT_EXPLAIN_WEBSERVER' => '<i>Your webserver has a timeout of %s secs configured, so stay below this value</i>',
     'TIMER_EXPIRED' => 'Timer expired at %s secs.',
     'TIMEZONE' => 'Timezone',
-    'TITLE_DUPLICATE' => 'Task Name <b>' . @$_POST['cron_title'] . '</b> already exists!',
+    'TITLE_DUPLICATE' => 'Task name already exists!',
     'TITLE_MATCH' => 'Title match',
     'TITLE_SEARCH_HINT' => 'search title...',
     'TO' => 'To',

From 38e25d70fa73396d44b29601a1cf0e81c02f27f3 Mon Sep 17 00:00:00 2001
From: Yuriy Pikhtarev <iglix@me.com>
Date: Fri, 30 Jun 2017 22:09:21 +0300
Subject: [PATCH 6/8] Unterminated statement.

---
 styles/templates/admin/admin_sitemap.tpl         |   2 +-
 styles/templates/default/group_edit.tpl          |   4 ++--
 .../default/images/lang/en/icon_edit.gif         | Bin 2026 -> 0 bytes
 .../default/images/lang/en/icon_email.gif        | Bin 2661 -> 0 bytes
 .../default/images/lang/en/icon_icq_add.gif      | Bin 2523 -> 0 bytes
 .../templates/default/images/lang/en/icon_ip.gif | Bin 1288 -> 0 bytes
 .../templates/default/images/lang/en/icon_mc.gif | Bin 1315 -> 0 bytes
 .../templates/default/images/lang/en/icon_pm.gif | Bin 2569 -> 0 bytes
 .../default/images/lang/en/icon_poll.gif         | Bin 2113 -> 0 bytes
 .../default/images/lang/en/icon_profile.gif      | Bin 2504 -> 0 bytes
 .../default/images/lang/en/icon_quote.gif        | Bin 2527 -> 0 bytes
 .../default/images/lang/en/icon_search.gif       | Bin 2771 -> 0 bytes
 .../default/images/lang/en/icon_www.gif          | Bin 2739 -> 0 bytes
 .../default/images/lang/en/msg_newpost.gif       | Bin 3294 -> 0 bytes
 styles/templates/default/images/lang/en/post.gif | Bin 3318 -> 0 bytes
 .../templates/default/images/lang/en/release.gif | Bin 3662 -> 0 bytes
 .../default/images/lang/en/reply-locked.gif      | Bin 3208 -> 0 bytes
 .../templates/default/images/lang/en/reply.gif   | Bin 3311 -> 0 bytes
 18 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 styles/templates/default/images/lang/en/icon_edit.gif
 delete mode 100644 styles/templates/default/images/lang/en/icon_email.gif
 delete mode 100644 styles/templates/default/images/lang/en/icon_icq_add.gif
 delete mode 100644 styles/templates/default/images/lang/en/icon_ip.gif
 delete mode 100644 styles/templates/default/images/lang/en/icon_mc.gif
 delete mode 100644 styles/templates/default/images/lang/en/icon_pm.gif
 delete mode 100644 styles/templates/default/images/lang/en/icon_poll.gif
 delete mode 100644 styles/templates/default/images/lang/en/icon_profile.gif
 delete mode 100644 styles/templates/default/images/lang/en/icon_quote.gif
 delete mode 100644 styles/templates/default/images/lang/en/icon_search.gif
 delete mode 100644 styles/templates/default/images/lang/en/icon_www.gif
 delete mode 100644 styles/templates/default/images/lang/en/msg_newpost.gif
 delete mode 100644 styles/templates/default/images/lang/en/post.gif
 delete mode 100644 styles/templates/default/images/lang/en/release.gif
 delete mode 100644 styles/templates/default/images/lang/en/reply-locked.gif
 delete mode 100644 styles/templates/default/images/lang/en/reply.gif

diff --git a/styles/templates/admin/admin_sitemap.tpl b/styles/templates/admin/admin_sitemap.tpl
index fb73c4373..cd04f3b93 100644
--- a/styles/templates/admin/admin_sitemap.tpl
+++ b/styles/templates/admin/admin_sitemap.tpl
@@ -66,7 +66,7 @@ ajax.sitemap = function(mode) {
 		action : 'sitemap',
 		mode : mode
 	});
-}
+};
 ajax.callback.sitemap = function(data) {
 	if(data.mode == 'create') $('#mess_time').html(data.html);
 	else $('#sitemap').html(data.html);
diff --git a/styles/templates/default/group_edit.tpl b/styles/templates/default/group_edit.tpl
index 5e9bf6040..86060d964 100644
--- a/styles/templates/default/group_edit.tpl
+++ b/styles/templates/default/group_edit.tpl
@@ -32,7 +32,7 @@ function manage_group(mode, value) {
 				<textarea cols="80" id="group_description" rows="6">{GROUP_DESCRIPTION}</textarea>
 			</p>
 			<p>
-				<input type="button" value="{L_AJAX_PREVIEW}" onclick="ajax.exec({ action: 'posts', type: 'view_message', message: $('textarea#group_description').val()});ajax.callback.posts=function(data){$('div#preview_description').html(data.message_html);initPostBBCode('div#preview_description')}">
+				<input type="button" value="{L_AJAX_PREVIEW}" onclick="ajax.exec({ action: 'posts', type: 'view_message', message: $('textarea#group_description').val()});ajax.callback.posts=function(data);{$('div#preview_description').html(data.message_html);initPostBBCode('div#preview_description')}">
 				<input type="button" value="{L_SAVE}" onclick="manage_group('group_description',$('textarea#group_description').val())">
 			</p>
 		</td>
@@ -44,7 +44,7 @@ function manage_group(mode, value) {
 				<textarea cols="80" id="group_signature" rows="3">{GROUP_SIGNATURE}</textarea>
 			</p>
 			<p>
-				<input type="button" value="{L_AJAX_PREVIEW}" onclick="ajax.exec({ action: 'posts', type: 'view_message', message: $('textarea#group_signature').val()});ajax.callback.posts=function(data){$('div#preview_signature').html(data.message_html);initPostBBCode('div#preview_signature')}">
+				<input type="button" value="{L_AJAX_PREVIEW}" onclick="ajax.exec({ action: 'posts', type: 'view_message', message: $('textarea#group_signature').val()});ajax.callback.posts=function(data);{$('div#preview_signature').html(data.message_html);initPostBBCode('div#preview_signature')}">
 				<input type="button" value="{L_SAVE}" onclick="manage_group('group_signature',$('textarea#group_signature').val())">
 			</p>
 		</td>
diff --git a/styles/templates/default/images/lang/en/icon_edit.gif b/styles/templates/default/images/lang/en/icon_edit.gif
deleted file mode 100644
index 65937c5fc3ddf643aad109f7ff6f4d418621518f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2026
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
L7l>-2mah39Wdt8K

diff --git a/styles/templates/default/images/lang/en/icon_email.gif b/styles/templates/default/images/lang/en/icon_email.gif
deleted file mode 100644
index 67137b80270acc87413b1d1e5f4eecc78c0c4fdc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2661
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

diff --git a/styles/templates/default/images/lang/en/icon_icq_add.gif b/styles/templates/default/images/lang/en/icon_icq_add.gif
deleted file mode 100644
index c0c5cd55229a672d646bc96cd05c260dc3986793..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2523
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
ZU>|$+eC&prlox)td_4Rp7u<KH{S7guA6EbX

diff --git a/styles/templates/default/images/lang/en/icon_ip.gif b/styles/templates/default/images/lang/en/icon_ip.gif
deleted file mode 100644
index 5822a929ad89fbdc1b2fdf6c90e4b27578eec239..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1288
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m=!WZB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV
z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPA<wUD9OyvQvjKmn3P{y
zVygsnDZ~r81#n~YilM;-3^4tQ!~%UoJp+)JU<!SG@hi>Eg{v+u2}(t{7puX=A(aKG
z`a!A1`K3k4z=%sz23b{L<y@4SSdw29lAoUg3&ntp{F40QjQj!x=U`KX@XWlF{PJS3
zYF}R~&%EN2#JuEGPZwJypnko~%oHmFM@us|3v(l5XESp{LswuRxtKefn;2Lcx*1s*
zS(?N2y5uL9=BDPA!1Sgd^cv&T3rYyN1wfl!Qj0RnQd8WD@^cly9=6KF?G^)^=0WwQ
z;C724PQCg-$LNEi6)BowLcp{GV!{(GkONQlsd>P(UIa|k(_foAF)%RJdAc};RNR^q
zZ0*hLC@_z=UC1-hrN+#2O|1x<$fb_f-rgS!tZR>Gt&MW|!<)H9aHEHE#BXN4Nm^6O
zlr)qCuN+c)#9VfK=H0zJFYBGVckgWS{<-;O&qE~I9GWidT+z^YG-+dU%I2F#4lFx*
zzjI>SBEgRv<&W}P9rf;tKPIuGvZAf^lcCQ0xlB@9?3(kG{I{)@cbt4q$mPMti*-BJ
zymLs|&GSNT>KXBF*3W)#`}J?ExS}xmUEAbl(+KssOHF3B|GK*O>i6x>7Me_*UL=#d
zHdAV4L^q#-^~C18XDwID$6nD~)>?Kd)vxKGUPp?;ZRW?Vj;oD#-##ARX>GvRTfX4R
zn<E+J9v_dnJ({;oP-~)YcW3D1U*|TTaL8K`Zp0pVc8><z@v5(T81?gWPxOB|`0bHN
z>eWkqMYmqAW5{Y>eeLJJpSlk|o#GK`+x%^p#L>v9`z>~+KmE=1@5-686LmB%7R&j_
zKFMhko)<YMblMXAi_H_8PMP`gg!!+%w*TKMc}6yd%s+QU4{)E%0F_Oiu6{1-oD!M<
D{5;f;

diff --git a/styles/templates/default/images/lang/en/icon_mc.gif b/styles/templates/default/images/lang/en/icon_mc.gif
deleted file mode 100644
index 1db8e37f573c2d8e931cb5733af02f49e7d45344..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1315
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{T%CB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87
z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$
zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`<jAm(=3qqRfJl%=|nBkco*&`K2Yc
zN<f!FypUVq>kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0
zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij{$pv5BFj
zg^8Jgv9qh8p`nwrqotd<o1>$lsiT3Vi3!XMY<f+MT`e75O<mnAEL;o?U5zbGERCFj
zObasu3r9mEbC_PwyyB9?yyR4vy_rCJp?Y2L>a}t%N=+=uFAB-e&w-_YfQ<Z-{NjxK
z0tM$_Q-$!%yp;U%Vo>Bj{OXcglv$RV;#QQOs{jsNt4u7m6ZSPkZwfgfrVn(CJ}7A*
zB^8(uF#Um;@PrTKz_U(j9x%TY0W(JTNw2pI42+?kE{-7;x8?-z^<ps;m^aZ?K#<ix
z=A7_(R#*9i*_$_Q6ta##aL%oU>7aN(G<W=iEbEOC0fO7YTxM^Lc=*IYKyY@7kJ@kJ
z$eeR0+jM6B{8W3tg~fAH1837kW@hf5#}z3lvzCb%=>9yC!Zs`L)kD^|?(dd!uw}1Z
zI*aLEfz#IQM(PJ%MDE{J-LU!J+ID-}JB?TKUKnd1%;~pyuU=63pGlql_J&O&VVtk~
zIz3K>tx7t_F3;0*D6>QC`H_PvR~Dv(H9RrfRCD6BQ#RL>OAQ)l7Ohr1dB)ZC?Dg;b
z>T2r8<|>uUy30Fdk4EbCdDfqe_t@>_<36df>*4W;mp8qxr<L8-eX(}CV)g%)=Q#&>
zH=TOpxb57v8@KFt=O)*eGf&Hxd-&qft=snZZnvy3zC9uLz*cSX=)I=%&R&?MrOoH_
z^sb=!lqYKq`nA<2KRK4fdu+SS|Ld!Ni6$^)xUVVv+IGqURBU;=`njxgN@xNA{o~N;

diff --git a/styles/templates/default/images/lang/en/icon_pm.gif b/styles/templates/default/images/lang/en/icon_pm.gif
deleted file mode 100644
index 432075c5990ae0d057eded797ea7698994e3f375..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2569
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

diff --git a/styles/templates/default/images/lang/en/icon_poll.gif b/styles/templates/default/images/lang/en/icon_poll.gif
deleted file mode 100644
index 73a29852d50a8d59208f72e5dd5211f57f14dd40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2113
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
Z0d+aJezCRdYt7P6-H#u@tL7X?{Vz+FXw?7!

diff --git a/styles/templates/default/images/lang/en/icon_profile.gif b/styles/templates/default/images/lang/en/icon_profile.gif
deleted file mode 100644
index abac5dd873e9eb8df0ca2ba7c58a2d894a41fb5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2504
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
Ar2qf`

diff --git a/styles/templates/default/images/lang/en/icon_quote.gif b/styles/templates/default/images/lang/en/icon_quote.gif
deleted file mode 100644
index 9497b2c57075870b5ec618178942c899a8d63cf6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2527
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
AL;wH)

diff --git a/styles/templates/default/images/lang/en/icon_search.gif b/styles/templates/default/images/lang/en/icon_search.gif
deleted file mode 100644
index 5d9c0171389f81b9546066b3e0c50944bdb6084d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2771
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

diff --git a/styles/templates/default/images/lang/en/icon_www.gif b/styles/templates/default/images/lang/en/icon_www.gif
deleted file mode 100644
index 3da9e0e8c8a5b0147277afccb8e99a2a3ecdfb52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2739
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
KlyZ-q34Z}$%bN87

diff --git a/styles/templates/default/images/lang/en/msg_newpost.gif b/styles/templates/default/images/lang/en/msg_newpost.gif
deleted file mode 100644
index 33a1e1c7250ddf953f8b00074abfa7dbc1af3a6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3294
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

diff --git a/styles/templates/default/images/lang/en/post.gif b/styles/templates/default/images/lang/en/post.gif
deleted file mode 100644
index 9d53572cdc1051ff85e912ea19ce1d31f6257aa1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3318
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
YHfz`<#U<ojTmBQVBH9s3ag^i#1_;i+egFUf

diff --git a/styles/templates/default/images/lang/en/release.gif b/styles/templates/default/images/lang/en/release.gif
deleted file mode 100644
index 25440636ea69881a14d883d68e9caf56ea0d2846..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3662
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
Q-2TJEqV27!j-8GC59<4S<NyEw

diff --git a/styles/templates/default/images/lang/en/reply-locked.gif b/styles/templates/default/images/lang/en/reply-locked.gif
deleted file mode 100644
index edfd75a8770be408ac336c9e135bd1c29e9428ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3208
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
NU~X!I<6%xk{Tq(8l8gWV

diff --git a/styles/templates/default/images/lang/en/reply.gif b/styles/templates/default/images/lang/en/reply.gif
deleted file mode 100644
index f18c08923d4fb0ef61a0ba0eb239c3e9f63834e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3311
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
RKivKWF~wS93eg^s{{o4ix)T5Z


From 74c84c7759ec3553042374aa6793ba8535b1f3ca Mon Sep 17 00:00:00 2001
From: Yuriy Pikhtarev <iglix@me.com>
Date: Fri, 30 Jun 2017 22:10:43 +0300
Subject: [PATCH 7/8] Useless return.

---
 group.php                                               | 2 --
 library/TorrentPier/TorrentPier/Legacy/Cache/Xcache.php | 1 -
 library/includes/functions_admin_cron.php               | 4 ----
 library/includes/functions_admin_torrent.php            | 1 -
 library/includes/functions_torrent.php                  | 4 ----
 5 files changed, 12 deletions(-)

diff --git a/group.php b/group.php
index e2c272d8a..50f89aecb 100644
--- a/group.php
+++ b/group.php
@@ -41,8 +41,6 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$
     } else {
         $www = '';
     }
-
-    return;
 }
 
 $user->session_start(array('req_login' => true));
diff --git a/library/TorrentPier/TorrentPier/Legacy/Cache/Xcache.php b/library/TorrentPier/TorrentPier/Legacy/Cache/Xcache.php
index bf864c599..0f01c88a3 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Cache/Xcache.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Cache/Xcache.php
@@ -64,7 +64,6 @@ class Xcache extends Common
 
         xcache_clear_cache(XC_TYPE_PHP, 0);
         xcache_clear_cache(XC_TYPE_VAR, 0);
-        return;
     }
 
     public function is_installed()
diff --git a/library/includes/functions_admin_cron.php b/library/includes/functions_admin_cron.php
index 0f6b26433..9356c305e 100644
--- a/library/includes/functions_admin_cron.php
+++ b/library/includes/functions_admin_cron.php
@@ -46,21 +46,17 @@ function run_jobs($jobs)
 			END
 			WHERE cron_id IN ($jobs)
 		");
-
-    return;
 }
 
 function delete_jobs($jobs)
 {
     OLD_DB()->query('DELETE FROM ' . BB_CRON . " WHERE cron_id IN ($jobs)");
-    return;
 }
 
 function toggle_active($jobs, $cron_action)
 {
     $active = ($cron_action == 'disable') ? 0 : 1;
     OLD_DB()->query('UPDATE ' . BB_CRON . " SET cron_active = $active WHERE cron_id IN ($jobs)");
-    return;
 }
 
 function validate_cron_post($cron_arr)
diff --git a/library/includes/functions_admin_torrent.php b/library/includes/functions_admin_torrent.php
index c95884f0d..6b57a4060 100644
--- a/library/includes/functions_admin_torrent.php
+++ b/library/includes/functions_admin_torrent.php
@@ -41,7 +41,6 @@ function update_table_bool($table_name, $key, $field_name, $field_def_val)
             }
         }
     }
-    return;
 }
 
 function set_tpl_vars($default_cfg, $cfg)
diff --git a/library/includes/functions_torrent.php b/library/includes/functions_torrent.php
index 10c5723b2..a1b7ce8a3 100644
--- a/library/includes/functions_torrent.php
+++ b/library/includes/functions_torrent.php
@@ -160,8 +160,6 @@ function delete_torrent($attach_id, $mode = '')
     torrent_auth_check($forum_id, $poster_id);
     tracker_unregister($attach_id);
     delete_attachment(0, $attach_id);
-
-    return;
 }
 
 function change_tor_status($attach_id, $new_tor_status)
@@ -360,8 +358,6 @@ function tracker_register($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVED
         $mess = sprintf(trans('messages.BT_REGISTERED'), DOWNLOAD_URL . $attach_id);
         bb_die($mess);
     }
-
-    return;
 }
 
 function send_torrent_with_passkey($filename)

From 38513a84611221ca83d8b28369c7ecee8cdd7c88 Mon Sep 17 00:00:00 2001
From: Yuriy Pikhtarev <iglix@me.com>
Date: Fri, 30 Jun 2017 22:11:09 +0300
Subject: [PATCH 8/8] Redundant 'else' keyword.

---
 library/TorrentPier/TorrentPier/Legacy/Common/User.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/TorrentPier/TorrentPier/Legacy/Common/User.php b/library/TorrentPier/TorrentPier/Legacy/Common/User.php
index 5b67a8d2e..2c6c54906 100644
--- a/library/TorrentPier/TorrentPier/Legacy/Common/User.php
+++ b/library/TorrentPier/TorrentPier/Legacy/Common/User.php
@@ -414,9 +414,9 @@ class User
 					');
 
                     return $new_session_userdata;
-                } else {
-                    trigger_error('Could not start session : login', E_USER_ERROR);
                 }
+
+                trigger_error('Could not start session : login', E_USER_ERROR);
             }
         }