- ';
+ $options .= $data['rg'] ? '
- ' . trans('messages.RELEASE_GROUP') . ' ' : '
- ' . $members . ' '; if (IS_AM) { $options .= '
- ' . $candidates . ' '; @@ -173,14 +171,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 +264,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 +273,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 +285,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 +317,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) { @@ -348,9 +346,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 = ''; } elseif (IS_GUEST) { $group_details = trans('messages.LOGIN_TO_JOIN'); @@ -405,12 +403,12 @@ 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&" . POST_GROUPS_URL . "=$group_id", - 'U_GROUP_MEMBERS' => "group.php?view=members&" . POST_GROUPS_URL . "=$group_id", + 'U_GROUP_RELEASES' => 'group.php?view=releases&' . POST_GROUPS_URL . "=$group_id", + 'U_GROUP_MEMBERS' => 'group.php?view=members&' . 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, @@ -423,7 +421,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 +434,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 . "&view=releases", $count_releases, $per_page, $start); + generate_pagination(GROUP_URL . $group_id . '&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 +488,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 +559,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 b5e259e94..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']), @@ -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..ef589ef37 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')); @@ -74,28 +74,28 @@ $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 $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) " : ''; // 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,11 +191,11 @@ 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( - '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,13 +294,13 @@ $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_NEW' => 'search.php?new=1', 'U_SEARCH_SELF_BY_MY' => "search.php?uid={$userdata['user_id']}&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, )); @@ -365,7 +365,7 @@ if (config('tp.birthday_check_day') && config('tp.birthday_enabled')) { } $week_list[] = profile_url($week) . ' (' . birthday_age($week['user_birthday'] - 1) . ')'; } - $week_all = ($week_all) ? ' ...' : ''; + $week_all = $week_all ? ' ...' : ''; $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) . ' (' . birthday_age($today['user_birthday']) . ')'; } - $today_all = ($today_all) ? ' ...' : ''; + $today_all = $today_all ? ' ...' : ''; $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
- \n", $topic_titles), - 'FORM_ACTION' => "modcp.php", + 'FORM_ACTION' => 'modcp.php', 'HIDDEN_FIELDS' => build_hidden_fields($hidden_fields), )); } @@ -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) { @@ -290,7 +290,7 @@ switch ($mode) { 'TOPIC_TITLES' => implode("\n \n
- \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),
));
@@ -301,11 +301,11 @@ 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 = "
+ $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,14 +323,14 @@ 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)
");
// 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,10 +349,10 @@ 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
+ OLD_DB()->query('
+ UPDATE ' . BB_TOPICS . " SET
topic_dl_type = $new_dl_type
WHERE topic_id IN($topic_csv)
AND forum_id = $forum_id
@@ -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;
@@ -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,9 +449,9 @@ 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)";
- if (!(OLD_DB()->sql_query($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)";
+ 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') . '
' . trans('messages.TOPIC_SPLIT_OLD') . ''; - $message .= ' :: ' . trans('messages.TOPIC_SPLIT_NEW') . ''; + $message = trans('messages.TOPIC_SPLIT') . '
' . trans('messages.TOPIC_SPLIT_OLD') . ''; + $message .= ' :: ' . trans('messages.TOPIC_SPLIT_NEW') . ''; // Log action $log_action->mod('mod_topic_split', array( @@ -509,11 +509,11 @@ 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 - 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 @@ -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, @@ -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&" . POST_POST_URL . "=$post_id&" . POST_TOPIC_URL . "=$topic_id&rdns=$ip_this_post&sid=" . $userdata['session_id'], + 'U_LOOKUP_IP' => 'modcp.php?mode=ip&' . POST_POST_URL . "=$post_id&" . POST_TOPIC_URL . "=$topic_id&rdns=$ip_this_post&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&" . POST_POST_URL . "=$post_id&" . POST_TOPIC_URL . "=$topic_id&rdns=" . $row['poster_ip'] . "&sid=" . $userdata['session_id'], + 'U_LOOKUP_IP' => 'modcp.php?mode=ip&' . POST_POST_URL . "=$post_id&" . POST_TOPIC_URL . "=$topic_id&rdns=" . $row['poster_ip'] . '&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 @@ -677,12 +677,12 @@ 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 = " + $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,18 +700,18 @@ 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) "); - $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 = " + $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,13 +730,13 @@ 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) "); - $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/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']) ? "&start=" . (int)$_POST['start'] : ''; +$return_topic_url .= !empty($_POST['start']) ? '&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 8def75596..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; @@ -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']) { @@ -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 { @@ -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') { @@ -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); @@ -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" '; @@ -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,19 +613,19 @@ $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') : '', + '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&postorder=desc" : '', + 'U_VIEWTOPIC' => ($mode == 'reply') ? 'viewtopic.php?' . POST_TOPIC_URL . "=$topic_id&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..96747f6c6 100644 --- a/privmsg.php +++ b/privmsg.php @@ -85,10 +85,10 @@ $error = false; // // Define the box image links // -$inbox_url = ($folder != 'inbox' || $mode != '') ? '' . trans('messages.INBOX') . '' : trans('messages.INBOX'); -$outbox_url = ($folder != 'outbox' || $mode != '') ? '' . trans('messages.OUTBOX') . '' : trans('messages.OUTBOX'); -$sentbox_url = ($folder != 'sentbox' || $mode != '') ? '' . trans('messages.SENTBOX') . '' : trans('messages.SENTBOX'); -$savebox_url = ($folder != 'savebox' || $mode != '') ? '' . trans('messages.SAVEBOX') . '' : trans('messages.SAVEBOX'); +$inbox_url = ($folder != 'inbox' || $mode != '') ? '' . trans('messages.INBOX') . '' : trans('messages.INBOX'); +$outbox_url = ($folder != 'outbox' || $mode != '') ? '' . trans('messages.OUTBOX') . '' : trans('messages.OUTBOX'); +$sentbox_url = ($folder != 'sentbox' || $mode != '') ? '' . trans('messages.SENTBOX') . '' : trans('messages.SENTBOX'); +$savebox_url = ($folder != 'savebox' || $mode != '') ? '' . trans('messages.SAVEBOX') . '' : 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&" . POST_POST_URL . "=$privmsg_id", - 'quote' => PM_URL . "?mode=quote&" . POST_POST_URL . "=$privmsg_id", - 'edit' => PM_URL . "?mode=edit&" . POST_POST_URL . "=$privmsg_id" + 'post' => PM_URL . '?mode=post', + 'reply' => PM_URL . '?mode=reply&' . POST_POST_URL . "=$privmsg_id", + 'quote' => PM_URL . '?mode=quote&' . POST_POST_URL . "=$privmsg_id", + 'edit' => PM_URL . '?mode=edit&' . POST_POST_URL . "=$privmsg_id" ); $post_icons = array( 'post_img' => '', @@ -355,11 +355,11 @@ if ($mode == 'read') { $post_date = bb_date($privmsg['privmsgs_date']); - $temp_url = "profile.php?mode=viewprofile&" . POST_USERS_URL . '=' . $user_id_from; + $temp_url = 'profile.php?mode=viewprofile&' . POST_USERS_URL . '=' . $user_id_from; $profile_img = '
'; $profile = '' . trans('messages.READ_PROFILE') . ''; - $temp_url = PM_URL . "?mode=post&" . POST_USERS_URL . "=$user_id_from"; + $temp_url = PM_URL . '?mode=post&' . POST_USERS_URL . "=$user_id_from"; $pm_img = '
'; $pm = '' . trans('messages.SEND_PRIVATE_MESSAGE') . ''; @@ -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 @@ -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 @@ -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'); } @@ -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'); } // @@ -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 = '
'; - $msg .= sprintf(trans('messages.CLICK_RETURN_INBOX'), '', ' '); - $msg .= sprintf(trans('messages.CLICK_RETURN_SENTBOX'), '', ' '); - $msg .= sprintf(trans('messages.CLICK_RETURN_OUTBOX'), '', ' '); - $msg .= sprintf(trans('messages.CLICK_RETURN_SAVEBOX'), '', ' '); + $msg .= sprintf(trans('messages.CLICK_RETURN_INBOX'), '', ' '); + $msg .= sprintf(trans('messages.CLICK_RETURN_SENTBOX'), '', ' '); + $msg .= sprintf(trans('messages.CLICK_RETURN_OUTBOX'), '', ' '); + $msg .= sprintf(trans('messages.CLICK_RETURN_SAVEBOX'), '', ' '); $msg .= '
'; - $msg .= sprintf(trans('messages.CLICK_RETURN_INDEX'), '', ''); + $msg .= sprintf(trans('messages.CLICK_RETURN_INDEX'), '', ''); bb_die($msg); } 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' => 'Скрипт ' . @$_POST['cron_script'] . ' уже существует!', + 'SCRIPT_DUPLICATE' => 'Скрипт уже существует!', 'SEARCH' => 'Поиск', 'SEARCH_ALL_WORDS' => 'искать все слова', 'SEARCH_AUTHOR' => 'Поиск по автору', @@ -2021,7 +2021,7 @@ return [ 'TIME_LIMIT_EXPLAIN_WEBSERVER' => 'Ваш веб-сервер настроен на таймаут %s сек, так что не превышайте этого значения', 'TIMER_EXPIRED' => 'Таймер истек в %s секунд.', 'TIMEZONE' => 'Часовой пояс', - 'TITLE_DUPLICATE' => 'Название задачи ' . @$_POST['cron_title'] . ' уже существует!', + '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 ' . @$_POST['cron_script'] . ' 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' => 'Your webserver has a timeout of %s secs configured, so stay below this value', 'TIMER_EXPIRED' => 'Timer expired at %s secs.', 'TIMEZONE' => 'Timezone', - 'TITLE_DUPLICATE' => 'Task Name ' . @$_POST['cron_title'] . ' already exists!', + 'TITLE_DUPLICATE' => 'Task name already exists!', 'TITLE_MATCH' => 'Title match', 'TITLE_SEARCH_HINT' => 'search title...', 'TO' => 'To', diff --git a/search.php b/search.php index 9c70282d4..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}"); } @@ -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']; @@ -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&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) { @@ -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); @@ -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); @@ -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'; @@ -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', ' @@ -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); @@ -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)"; } @@ -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'); @@ -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/sitemap/.keep b/sitemap/.gitkeep similarity index 100% rename from sitemap/.keep rename to sitemap/.gitkeep 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) {
- ';
$options .= '
[ ]
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/library/TorrentPier/TorrentPier/Legacy/Attach.php b/library/TorrentPier/TorrentPier/Legacy/Attach.php
index 32a42e6f4..66eb10c55 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.
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.
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.
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.
Your ' . $message_type . ' has been stored');
}
}
@@ -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(['&', '&', ' '], '_', $this->attach_filename);
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..053f7570b 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');
@@ -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,10 +112,10 @@ 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);
+ 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/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/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/TorrentPier/TorrentPier/Legacy/Common/User.php b/library/TorrentPier/TorrentPier/Legacy/Common/User.php
index c5341f216..2c6c54906 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,16 +407,16 @@ 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);
}
}
@@ -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,14 +517,14 @@ 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
+ 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 40bb15460..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);
@@ -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/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 cab427698..3c16d2039 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;
}
}
@@ -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 b72f4f060..a4421104b 100644
--- a/library/ajax/change_user_rank.php
+++ b/library/ajax/change_user_rank.php
@@ -24,11 +24,11 @@ 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);
-$user_rank = ($rank_id) ? '' . $ranks[$rank_id]['rank_title'] . '' : '';
+$user_rank = $rank_id ? '' . $ranks[$rank_id]['rank_title'] . '' : '';
-$this->response['html'] = ($rank_id) ? trans('messages.AWARDED_RANK') . " $user_rank " : trans('messages.SHOT_RANK');
-$this->response['rank_name'] = ($rank_id) ? $user_rank : trans('messages.USER');
+$this->response['html'] = $rank_id ? trans('messages.AWARDED_RANK') . " $user_rank " : 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..6e0b69d0e 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'));
@@ -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 32b09fccd..81bc4b4a8 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':
@@ -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 4e16ebd23..4a968f5f4 100644
--- a/library/ajax/group_membership.php
+++ b/library/ajax/group_membership.php
@@ -23,17 +23,17 @@ 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
";
$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..e43bdc281 100644
--- a/library/ajax/index_data.php
+++ b/library/ajax/index_data.php
@@ -68,12 +68,12 @@ switch ($mode) {
if (isset($mod['mod_groups'][$forum_id])) {
foreach ($mod['mod_groups'][$forum_id] as $group_id) {
- $moderators[] = '' . $mod['name_groups'][$group_id] . '';
+ $moderators[] = '' . $mod['name_groups'][$group_id] . '';
}
}
$html = ': ';
- $html .= ($moderators) ? implode(', ', $moderators) : trans('messages.NONE');
+ $html .= $moderators ? implode(', ', $moderators) : trans('messages.NONE');
unset($moderators, $mod);
$datastore->rm('moderators');
break;
@@ -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']);
}
@@ -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) ? '' . get_bt_ratio($btu) . '' : trans('messages.IT_WILL_BE_DOWN') . ' ' . humn_size(MIN_DL_FOR_RATIO) . '';
$html = '
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 2a6aa64e4..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) {
@@ -31,12 +31,12 @@ 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");
+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 50d4a02a9..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']);
@@ -229,9 +229,9 @@ 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";
+ $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/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 = '
' . sprintf(trans('messages.CHOOSE_PASS_ERR_MIN'), 5) . '';
} 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 = '
' . $text . '';
}
}
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.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..bf5d602a9 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 = '' . trans('messages.BT_REG_ON_TRACKER') . '';
$unreg_tor_url = '' . trans('messages.BT_UNREG_FROM_TRACKER') . '';
- $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';
@@ -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');
}
@@ -137,12 +137,12 @@ 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'];
// 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";
@@ -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'])),
@@ -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";
@@ -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,13 +356,13 @@ 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',
));
}
foreach ($peers as $pid => $peer) {
- $u_prof_href = ($s_mode == 'count') ? '#' : "profile.php?mode=viewprofile&u=" . $peer['user_id'] . "#torrent";
+ $u_prof_href = ($s_mode == 'count') ? '#' : 'profile.php?mode=viewprofile&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&spmode=full#seeders";
+ $seed_order_action = 'viewtopic.php?' . POST_TOPIC_URL . "=$bt_topic_id&spmode=full#seeders";
$template->assign_block_vars("$x_full", array(
'SEED_ORD_ACT' => $seed_order_action,
@@ -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';
@@ -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&spmode=full#leechers";
+ $leech_order_action = 'viewtopic.php?' . POST_TOPIC_URL . "=$bt_topic_id&spmode=full#leechers";
$template->assign_block_vars("$x_full", array(
'LEECH_ORD_ACT' => $leech_order_action,
@@ -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']) ? ' ®' : '';
$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 : "$name",
+ 'NAME' => $peer['update_time'] ? $name : "$name",
'COMPL_PRC' => $compl_perc,
'UP_TOTAL' => ($max_up_id[$x] == $pid) ? "$up_tot" : $up_tot,
'DOWN_TOTAL' => ($max_down_id[$x] == $pid) ? "$down_tot" : $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') . ' · ' . 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') . ' · ' . 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 .= '
';
- $s_auth_can .= (($is_auth['auth_download']) ? trans('messages.RULES_DOWNLOAD_CAN') : trans('messages.RULES_DOWNLOAD_CANNOT')) . '
';
+ $s_auth_can .= ($is_auth['auth_attachments'] ? trans('messages.RULES_ATTACH_CAN') : trans('messages.RULES_ATTACH_CANNOT')) . '
';
+ $s_auth_can .= ($is_auth['auth_download'] ? trans('messages.RULES_DOWNLOAD_CAN') : trans('messages.RULES_DOWNLOAD_CANNOT')) . '
';
}
/**
@@ -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';
}
@@ -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..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',
));
}
@@ -371,16 +371,16 @@ 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);
}
- 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 8d0290c37..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) {
@@ -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..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) {
@@ -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,13 +86,13 @@ 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));
}
}
- 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 02026f3a1..31c36f01e 100644
--- a/library/includes/cron/jobs/prune_forums.php
+++ b/library/includes/cron/jobs/prune_forums.php
@@ -14,9 +14,9 @@ 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']));
+ 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 7e9c95ac3..6fd30d78d 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);
}
/*
@@ -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'];
@@ -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 = ' ')
$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];
@@ -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
" . sprintf(trans('messages.CLICK_RETURN_JOBS_ADDED'), "", "") . "
" . sprintf(trans('messages.CLICK_RETURN_JOBS'), "", "") . "
" . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), "", "");
+ $message = $errMess . '
' . sprintf(trans('messages.CLICK_RETURN_JOBS_ADDED'), '', '') . '
' . sprintf(trans('messages.CLICK_RETURN_JOBS'), '', '') . '
' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '');
bb_die($message);
}
@@ -115,7 +111,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 +134,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_admin_torrent.php b/library/includes/functions_admin_torrent.php
index 278189382..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)
@@ -60,12 +59,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]) ? '' . trans('messages.YES') . '' : trans('messages.YES'),
+ 'L_' . strtoupper($config_name) . '_YES' => $cfg[$config_name] ? '' . trans('messages.YES') . '' : trans('messages.YES'),
'L_' . strtoupper($config_name) . '_NO' => (!$cfg[$config_name]) ? '' . trans('messages.NO') . '' : trans('messages.NO'),
));
}
@@ -91,7 +90,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..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 .= "\n";
- $atom .= "
' . trans('messages.EMPTY_MESSAGE') : trans('messages.EMPTY_MESSAGE');
}
@@ -71,10 +70,10 @@ 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";
+ $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 +86,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 +108,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 +126,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 +137,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 +154,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 +209,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,19 +222,19 @@ 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');
}
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']) {
- $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 +246,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 +294,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 +347,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 +385,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 +407,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 +429,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 +437,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 +445,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..a1b7ce8a3 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');
@@ -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)
@@ -179,8 +177,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 +204,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 +297,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 +320,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 +350,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') {
@@ -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)
@@ -422,10 +418,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 +440,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 +509,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 +525,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 +551,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 +618,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 +635,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')}: " . htmlCHR($invalid_chars) . "";
+ return "{trans('messages.USERNAME_INVALID')}: " . htmlCHR($invalid_chars) . '';
}
// 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/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..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
@@ -75,7 +75,7 @@ foreach (OLD_DB()->fetch_rowset($sql) as $u) {
$stat[] = "t:$t";
}
- $ulist[$level][] = ($stat) ? "$name [" . implode(', ', $stat) . ']' : $name;
+ $ulist[$level][] = $stat ? "$name [" . implode(', ', $stat) . ']' : $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..d97274078 100644
--- a/library/includes/page_footer.php
+++ b/library/includes/page_footer.php
@@ -17,8 +17,8 @@ if (!empty($template)) {
$template->assign_vars(array(
'SIMPLE_FOOTER' => !empty($gen_simple_header),
'POWERED' => 'Tracker software by TorrentPier © 2005-' . date('Y'),
- 'SHOW_ADMIN_LINK' => (IS_ADMIN && !defined('IN_ADMIN')),
- 'ADMIN_LINK_HREF' => "admin/index.php",
+ 'SHOW_ADMIN_LINK' => IS_ADMIN && !defined('IN_ADMIN'),
+ 'ADMIN_LINK_HREF' => 'admin/index.php',
));
$template->set_filenames(array('page_footer' => 'page_footer.tpl'));
@@ -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%%) · ', $sql_t, round($sql_t * 100 / $gen_time)) : '';
+ $sql_time_txt = $sql_t ? sprintf('%.3f ' . trans('messages.SEC') . ' (%d%%) · ', $sql_t, round($sql_t * 100 / $gen_time)) : '';
$num_q = $DBS->num_queries;
$stat .= " | MySQL: {$sql_time_txt}{$num_q} " . trans('messages.QUERIES');
}
@@ -58,7 +58,7 @@ if ($show_dbg_info) {
for ($i = 0; $i < 3; $i++) {
$l[$i] = round($l[$i], 1);
}
- $stat .= " | " . trans('messages.LIMIT') . " $l[0] $l[1] $l[2]";
+ $stat .= ' | ' . trans('messages.LIMIT') . " $l[0] $l[1] $l[2]";
}
$stat .= ' ]';
diff --git a/library/includes/page_header.php b/library/includes/page_header.php
index 2cc7333cd..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'];
@@ -112,17 +112,17 @@ $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']),
'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) {
@@ -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..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']}");
}
}
@@ -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/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 48cd53c25..844b870e8 100644
--- a/library/includes/torrent_show_dl_list.php
+++ b/library/includes/torrent_show_dl_list.php
@@ -29,8 +29,8 @@ $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 = "
' . trans('messages.DL_LIST_DEL') . '';
+if ($is_auth['auth_mod'] && ($t_data['topic_dl_type'] == TOPIC_DL_TYPE_DL)) {
+ $s_dl_delete = '
' . trans('messages.DL_LIST_DEL') . '';
$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&u=" . $u['user_id'] . "#torrent";
+ $u_prof_href = ($u['user_id'] == GUEST_UID) ? '#' : 'profile.php?mode=viewprofile&u=' . $u['user_id'] . '#torrent';
$dl_cat[$u['user_status']] .= '
', array_unique($errors)) : '',
+ 'S_POST_ACTION' => 'profile.php?mode=email&' . POST_USERS_URL . "=$user_id",
+ 'ERROR_MESSAGE' => $errors ? implode('
', array_unique($errors)) : '',
));
print_page('usercp_email.tpl');
diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php
index 9146b70b7..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'), '' . $users['username'] . '', config('tp.tech_admin_email')));
}
}
@@ -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);
@@ -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'])) {
@@ -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('
', array_unique($errors)) : '',
+ 'SHOW_REG_AGREEMENT' => $mode == 'register' && !IS_ADMIN,
+ 'ERROR_MESSAGE' => $errors ? implode('
', 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..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)) {
@@ -78,9 +78,9 @@ 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",
+ '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 b748ca4b9..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,18 +32,18 @@ $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');
}
$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) {
- $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
@@ -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..ce93ee957 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']) ? '' : '';
+ $rank_image = $ranks[$user_rank]['rank_image'] ? '
' : '';
$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) ? "" . $poster_rank . "" : trans('messages.USER'),
+ 'POSTER_RANK' => $poster_rank ? "" . $poster_rank . '' : 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,18 +111,18 @@ $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),
));
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
@@ -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..c2e2f3d7d 100644
--- a/library/includes/ucp/viewtorrent.php
+++ b/library/includes/ucp/viewtorrent.php
@@ -16,17 +16,17 @@ $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)
" : '';
-$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
@@ -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 : "
$topic_title",
+ 'TOPIC_TITLE' => $row['update_time'] ? $topic_title : "$topic_title",
'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 : "$topic_title",
+ 'TOPIC_TITLE' => $row['update_time'] ? $topic_title : "$topic_title",
'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 : "$topic_title",
+ 'TOPIC_TITLE' => $row['update_time'] ? $topic_title : "$topic_title",
'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..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('&', '&', 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);
@@ -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..16a21aea2 100644
--- a/memberlist.php
+++ b/memberlist.php
@@ -69,7 +69,7 @@ $select_sort_order .= '';
$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,18 +126,18 @@ if ($by_letter_req) {
// ENG
for ($i = ord('A'), $cnt = ord('Z'); $i <= $cnt; $i++) {
- $select_letter .= ($by_letter == chr($i)) ? '' . chr($i) . ' ' : '' . chr($i) . ' ';
+ $select_letter .= ($by_letter == chr($i)) ? '' . chr($i) . ' ' : '' . chr($i) . ' ';
}
// RUS
$select_letter .= ': ';
for ($i = 224, $cnt = 255; $i <= $cnt; $i++) {
- $select_letter .= ($by_letter == iconv('windows-1251', 'UTF-8', chr($i))) ? '' . iconv('windows-1251', 'UTF-8', chr($i - 32)) . ' ' : '' . iconv('windows-1251', 'UTF-8', chr($i - 32)) . ' ';
+ $select_letter .= ($by_letter == iconv('windows-1251', 'UTF-8', chr($i))) ? '' . iconv('windows-1251', 'UTF-8', chr($i - 32)) . ' ' : '' . iconv('windows-1251', 'UTF-8', chr($i - 32)) . ' ';
}
$select_letter .= ': ';
-$select_letter .= ($by_letter == 'others') ? '' . trans('messages.OTHERS') . ' ' : '' . trans('messages.OTHERS') . ' ';
+$select_letter .= ($by_letter == 'others') ? '' . trans('messages.OTHERS') . ' ' : '' . trans('messages.OTHERS') . ' ';
$select_letter .= ': ';
-$select_letter .= ($by_letter == 'all') ? '' . trans('messages.ALL') . '' : '' . trans('messages.ALL') . '';
+$select_letter .= ($by_letter == 'all') ? '' . trans('messages.ALL') . '' : '' . trans('messages.ALL') . '';
$template->assign_vars(array(
'S_LETTER_SELECT' => $select_letter,
@@ -145,12 +145,12 @@ $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) . "'";
}
-$sql .= ($letter_sql) ? " AND $letter_sql" : '';
+$sql .= $letter_sql ? " AND $letter_sql" : '';
$sql .= " ORDER BY $order_by";
if ($result = OLD_DB()->fetch_rowset($sql)) {
@@ -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 = '' . trans('messages.SEND_PM_TXTB') . '';
+ $pm = '' . trans('messages.SEND_PM_TXTB') . '';
if (bf($row['user_opt'], 'user_opt', 'user_viewemail') || IS_ADMIN) {
$email_uri = config('tp.board_email_form') ? ('profile.php?mode=email&' . POST_USERS_URL . "=$user_id") : 'mailto:' . $row['user_email'];
@@ -200,8 +200,8 @@ if ($paginationusername) {
$paginationurl .= "&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 0aa349986..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');
@@ -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,13 +237,13 @@ 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(
'QUESTION' => trans('messages.CONFIRM_DELETE_TOPIC'),
'ITEMS_LIST' => implode("\n\n
- +
@@ -44,7 +44,7 @@ function manage_group(mode, value) {- +
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 65937c5fc..000000000 Binary files a/styles/templates/default/images/lang/en/icon_edit.gif and /dev/null differ 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 67137b802..000000000 Binary files a/styles/templates/default/images/lang/en/icon_email.gif and /dev/null differ 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 c0c5cd552..000000000 Binary files a/styles/templates/default/images/lang/en/icon_icq_add.gif and /dev/null differ 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 5822a929a..000000000 Binary files a/styles/templates/default/images/lang/en/icon_ip.gif and /dev/null differ 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 1db8e37f5..000000000 Binary files a/styles/templates/default/images/lang/en/icon_mc.gif and /dev/null differ 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 432075c59..000000000 Binary files a/styles/templates/default/images/lang/en/icon_pm.gif and /dev/null differ 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 73a29852d..000000000 Binary files a/styles/templates/default/images/lang/en/icon_poll.gif and /dev/null differ 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 abac5dd87..000000000 Binary files a/styles/templates/default/images/lang/en/icon_profile.gif and /dev/null differ 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 9497b2c57..000000000 Binary files a/styles/templates/default/images/lang/en/icon_quote.gif and /dev/null differ 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 5d9c01713..000000000 Binary files a/styles/templates/default/images/lang/en/icon_search.gif and /dev/null differ 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 3da9e0e8c..000000000 Binary files a/styles/templates/default/images/lang/en/icon_www.gif and /dev/null differ 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 33a1e1c72..000000000 Binary files a/styles/templates/default/images/lang/en/msg_newpost.gif and /dev/null differ 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 9d53572cd..000000000 Binary files a/styles/templates/default/images/lang/en/post.gif and /dev/null differ 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 25440636e..000000000 Binary files a/styles/templates/default/images/lang/en/release.gif and /dev/null differ 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 edfd75a87..000000000 Binary files a/styles/templates/default/images/lang/en/reply-locked.gif and /dev/null differ 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 f18c08923..000000000 Binary files a/styles/templates/default/images/lang/en/reply.gif and /dev/null differ 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&u=", + 'EMAIL_URL' => BB_ROOT . 'profile.php?mode=email&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 ba148e1bd..92746f434 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; @@ -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; @@ -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') . ' · ' . 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 .= '\n"; } diff --git a/viewforum.php b/viewforum.php index 7c942aa2d..402ea709a 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,8 +67,8 @@ $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); + $redirect = $start ? "&start=$start" : ''; + 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']); @@ -130,17 +130,17 @@ 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 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); @@ -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 = ' + 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 @@ -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("\n", $u_auth); $template->assign_vars(array( @@ -402,15 +402,15 @@ $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, - 'U_MARK_READ' => FORUM_URL . $forum_id . "&mark=topics", + 'U_MARK_READ' => FORUM_URL . $forum_id . '&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 ? "&topicdays=$topic_days" : ''; $pg_url .= $sort_value ? "&sort=$sort_value" : ''; $pg_url .= $order_value ? "&order=$order_value" : ''; -$pg_url .= $moderation ? "&mod=1" : ''; +$pg_url .= $moderation ? '&mod=1' : ''; $pg_url .= ($topics_per_page != config('tp.topics_per_page')) ? "&tpp=$topics_per_page" : ''; if ($found_topics) { diff --git a/viewtopic.php b/viewtopic.php index 4f48f03fb..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 { @@ -133,10 +133,10 @@ 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 . " + $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']}"; @@ -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"); } @@ -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&f=" . $forum_id; -$reply_topic_url = POSTING_URL . "?mode=reply&t=" . $topic_id; +$new_topic_url = POSTING_URL . '?mode=newtopic&f=' . $forum_id; +$reply_topic_url = POSTING_URL . '?mode=reply&t=' . $topic_id; $view_forum_url = FORUM_URL . $forum_id; -$view_prev_topic_url = TOPIC_URL . $topic_id . "&view=previous#newest"; -$view_next_topic_url = TOPIC_URL . $topic_id . "&view=next#newest"; +$view_prev_topic_url = TOPIC_URL . $topic_id . '&view=previous#newest'; +$view_next_topic_url = TOPIC_URL . $topic_id . '&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'); @@ -391,43 +391,43 @@ $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')) . '
'; -$s_auth_can .= (($is_auth['auth_reply']) ? trans('messages.RULES_REPLY_CAN') : trans('messages.RULES_REPLY_CANNOT')) . '
'; -$s_auth_can .= (($is_auth['auth_edit']) ? trans('messages.RULES_EDIT_CAN') : trans('messages.RULES_EDIT_CANNOT')) . '
'; -$s_auth_can .= (($is_auth['auth_delete']) ? trans('messages.RULES_DELETE_CAN') : trans('messages.RULES_DELETE_CANNOT')) . '
'; -$s_auth_can .= (($is_auth['auth_vote']) ? trans('messages.RULES_VOTE_CAN') : trans('messages.RULES_VOTE_CANNOT')) . '
'; -$s_auth_can .= (($is_auth['auth_attachments']) ? trans('messages.RULES_ATTACH_CAN') : trans('messages.RULES_ATTACH_CANNOT')) . '
'; -$s_auth_can .= (($is_auth['auth_download']) ? trans('messages.RULES_DOWNLOAD_CAN') : trans('messages.RULES_DOWNLOAD_CANNOT')) . '
'; +$s_auth_can = ($is_auth['auth_post'] ? trans('messages.RULES_POST_CAN') : trans('messages.RULES_POST_CANNOT')) . '
'; +$s_auth_can .= ($is_auth['auth_reply'] ? trans('messages.RULES_REPLY_CAN') : trans('messages.RULES_REPLY_CANNOT')) . '
'; +$s_auth_can .= ($is_auth['auth_edit'] ? trans('messages.RULES_EDIT_CAN') : trans('messages.RULES_EDIT_CANNOT')) . '
'; +$s_auth_can .= ($is_auth['auth_delete'] ? trans('messages.RULES_DELETE_CAN') : trans('messages.RULES_DELETE_CANNOT')) . '
'; +$s_auth_can .= ($is_auth['auth_vote'] ? trans('messages.RULES_VOTE_CAN') : trans('messages.RULES_VOTE_CANNOT')) . '
'; +$s_auth_can .= ($is_auth['auth_attachments'] ? trans('messages.RULES_ATTACH_CAN') : trans('messages.RULES_ATTACH_CANNOT')) . '
'; +$s_auth_can .= ($is_auth['auth_download'] ? trans('messages.RULES_DOWNLOAD_CAN') : trans('messages.RULES_DOWNLOAD_CANNOT')) . '
'; // Moderator output $topic_mod = ''; if ($is_auth['auth_mod']) { $s_auth_can .= trans('messages.RULES_MODERATE'); - $topic_mod .= "