';
if ($l = sys('la')) {
diff --git a/admin/stats/tracker.php b/admin/stats/tracker.php
index b9bea4081..98d2d9e30 100644
--- a/admin/stats/tracker.php
+++ b/admin/stats/tracker.php
@@ -9,7 +9,9 @@ $di = \TorrentPier\Di::getInstance();
$user->session_start();
-if (!IS_ADMIN) bb_die($lang['NOT_AUTHORISED']);
+if (!IS_ADMIN) {
+ bb_die($lang['NOT_AUTHORISED']);
+}
$peers_in_last_minutes = array(30, 15, 5, 1);
$peers_in_last_sec_limit = 300;
@@ -38,14 +40,12 @@ DB()->query("
$stat += DB()->fetch_row("SELECT COUNT(*) AS p_within_ann FROM " . TMP_TRACKER_TABLE . " WHERE update_time >= " . (TIMENOW - $announce_interval));
// All peers, "max_peer_time"
$stat += DB()->fetch_row("SELECT COUNT(*) AS p_all, SUM(speed_up) as speed_up, SUM(speed_down) as speed_down, UNIX_TIMESTAMP() - MIN(update_time) AS max_peer_time, UNIX_TIMESTAMP() - MAX(update_time) AS last_peer_time FROM " . TMP_TRACKER_TABLE);
-
// Active users
$stat += DB()->fetch_row("SELECT COUNT(DISTINCT user_id) AS u_bt_active FROM " . TMP_TRACKER_TABLE);
// All bt-users
$stat += DB()->fetch_row("SELECT COUNT(*) AS u_bt_all FROM " . BB_BT_USERS);
// All bb-users
$stat += DB()->fetch_row("SELECT COUNT(*) AS u_bb_all FROM " . BB_USERS);
-
// Active torrents
$stat += DB()->fetch_row("SELECT COUNT(DISTINCT topic_id) AS tor_active FROM " . TMP_TRACKER_TABLE);
// With seeder
@@ -81,13 +81,7 @@ function commify_ob($contents)
ob_start('commify_ob');
echo '';
-echo '
-
-
-
-
-';
-
+echo '
';
echo "\n| users: bb-all / bt-all / bt-active | $stat[u_bb_all] / $stat[u_bt_all] / $stat[u_bt_active] |
\n";
echo "\n
@@ -111,12 +105,9 @@ echo "\n
echo "\n| peers: in last " . join(' / ', $peers_in_last_minutes) . " min | \n";
echo "\n" . join(' / ', $peers_in_last_min) . " |
\n";
-
echo "\n peers in last $peers_in_last_sec_limit sec
[ per second, DESC order --> ]
last peer: $stat[last_peer_time] seconds ago
" . date("j M H:i:s [T O]") . " | \n";
echo ' ' . join(' ', $peers_in_last_sec) . " |
\n";
-
echo '
';
-
echo '';
if ($l = sys('la')) {
@@ -128,7 +119,6 @@ if ($l = sys('la')) {
}
echo 'gen time: ' . sprintf('%.3f', (array_sum(explode(' ', microtime())) - TIMESTART)) . " sec\n";
-
echo '![' . $lang['VISIT_WEBSITE'] . '](' . $images['icon_www'] . ' "' . $lang['VISIT_WEBSITE'] . '")
';
- } else $www = '';
+ } else {
+ $www = '';
+ }
return;
}
@@ -100,15 +104,15 @@ if (!$group_id) {
foreach (DB()->fetch_rowset($sql) as $row) {
if ($row['is_group_mod']) {
$type = 'MOD';
- } else if ($row['membership'] == $member) {
+ } elseif ($row['membership'] == $member) {
$type = 'MEMBER';
- } else if ($row['membership'] == $pending) {
+ } elseif ($row['membership'] == $pending) {
$type = 'PENDING';
- } else if ($row['group_type'] == GROUP_OPEN) {
+ } elseif ($row['group_type'] == GROUP_OPEN) {
$type = 'OPEN';
- } else if ($row['group_type'] == GROUP_CLOSED) {
+ } elseif ($row['group_type'] == GROUP_CLOSED) {
$type = 'CLOSED';
- } else if ($row['group_type'] == GROUP_HIDDEN && IS_ADMIN) {
+ } elseif ($row['group_type'] == GROUP_HIDDEN && IS_ADMIN) {
$type = 'HIDDEN';
} else {
continue;
@@ -160,9 +164,11 @@ if (!$group_id) {
} else {
if (IS_ADMIN) {
redirect('admin/admin_groups.php');
- } else bb_die($lang['NO_GROUPS_EXIST']);
+ } else {
+ bb_die($lang['NO_GROUPS_EXIST']);
+ }
}
-} else if (isset($_POST['joingroup']) && $_POST['joingroup']) {
+} elseif (isset($_POST['joingroup']) && $_POST['joingroup']) {
if ($group_info['group_type'] != GROUP_OPEN) {
bb_die($lang['THIS_CLOSED_GROUP']);
}
@@ -210,7 +216,7 @@ if (!$group_id) {
set_die_append_msg(false, false, $group_id);
bb_die($lang['GROUP_JOINED']);
-} else if (!empty($_POST['unsub']) || !empty($_POST['unsubpending'])) {
+} elseif (!empty($_POST['unsub']) || !empty($_POST['unsubpending'])) {
delete_user_group($group_id, $userdata['user_id']);
set_die_append_msg(false, false, $group_id);
@@ -270,7 +276,7 @@ if (!$group_id) {
");
update_user_level($sql_in);
- } else if (!empty($_POST['deny']) || !empty($_POST['remove'])) {
+ } elseif (!empty($_POST['deny']) || !empty($_POST['remove'])) {
DB()->query("
DELETE FROM " . BB_USER_GROUP . "
WHERE user_id IN($sql_in)
@@ -342,14 +348,14 @@ if (!$group_id) {
if ($userdata['user_id'] == $group_moderator['user_id']) {
$group_details = $lang['ARE_GROUP_MODERATOR'];
$s_hidden_fields = '';
- } else if ($is_group_member || $is_group_pending_member) {
+ } elseif ($is_group_member || $is_group_pending_member) {
$template->assign_vars(array(
'SHOW_UNSUBSCRIBE_CONTROLS' => true,
'CONTROL_NAME' => ($is_group_member) ? 'unsub' : 'unsubpending',
));
$group_details = ($is_group_pending_member) ? $lang['PENDING_THIS_GROUP'] : $lang['MEMBER_THIS_GROUP'];
$s_hidden_fields = '';
- } else if (IS_GUEST) {
+ } elseif (IS_GUEST) {
$group_details = $lang['LOGIN_TO_JOIN'];
$s_hidden_fields = '';
} else {
@@ -358,10 +364,10 @@ if (!$group_id) {
$group_details = $lang['THIS_OPEN_GROUP'];
$s_hidden_fields = '';
- } else if ($group_info['group_type'] == GROUP_CLOSED) {
+ } elseif ($group_info['group_type'] == GROUP_CLOSED) {
$group_details = $lang['THIS_CLOSED_GROUP'];
$s_hidden_fields = '';
- } else if ($group_info['group_type'] == GROUP_HIDDEN) {
+ } elseif ($group_info['group_type'] == GROUP_HIDDEN) {
$group_details = $lang['THIS_HIDDEN_GROUP'];
$s_hidden_fields = '';
}
diff --git a/index.php b/index.php
index 03a9811a7..4a7ba2792 100644
--- a/index.php
+++ b/index.php
@@ -353,7 +353,9 @@ if ($di->config->get('birthday_check_day') && $di->config->get('birthday_enabled
}
$week_all = ($week_all) ? ' ...' : '';
$week_list = sprintf($lang['BIRTHDAY_WEEK'], $di->config->get('birthday_check_day'), join(', ', $week_list)) . $week_all;
- } else $week_list = sprintf($lang['NOBIRTHDAY_WEEK'], $di->config->get('birthday_check_day'));
+ } else {
+ $week_list = sprintf($lang['NOBIRTHDAY_WEEK'], $di->config->get('birthday_check_day'));
+ }
if ($stats['birthday_today_list']) {
shuffle($stats['birthday_today_list']);
@@ -366,7 +368,9 @@ if ($di->config->get('birthday_check_day') && $di->config->get('birthday_enabled
}
$today_all = ($today_all) ? ' ...' : '';
$today_list = $lang['BIRTHDAY_TODAY'] . join(', ', $today_list) . $today_all;
- } else $today_list = $lang['NOBIRTHDAY_TODAY'];
+ } else {
+ $today_list = $lang['NOBIRTHDAY_TODAY'];
+ }
$template->assign_vars(array(
'WHOSBIRTHDAY_WEEK' => $week_list,
@@ -387,6 +391,8 @@ if (IS_AM) {
// Display page
define('SHOW_ONLINE', $show_online_users);
-if (isset($_GET['map'])) $template->assign_vars(array('PAGE_TITLE' => $lang['FORUM_MAP']));
+if (isset($_GET['map'])) {
+ $template->assign_vars(array('PAGE_TITLE' => $lang['FORUM_MAP']));
+}
print_page('index.tpl');
diff --git a/library/ajax/avatar.php b/library/ajax/avatar.php
index 2caa7e537..1dc6ee763 100644
--- a/library/ajax/avatar.php
+++ b/library/ajax/avatar.php
@@ -1,6 +1,8 @@
request['topic_id'])) $this->ajax_die('Invalid topic_id');
+if (!isset($this->request['topic_id'])) {
+ $this->ajax_die('Invalid topic_id');
+}
$topic_id = (int)$this->request['topic_id'];
$mode = (string)$this->request['mode'];
@@ -26,16 +30,24 @@ $tor = DB()->fetch_row("
LIMIT 1
");
-if (!$tor) $this->ajax_die($lang['TORRENT_FAILED']);
+if (!$tor) {
+ $this->ajax_die($lang['TORRENT_FAILED']);
+}
switch ($mode) {
case 'status':
$new_status = (int)$this->request['status'];
// Валидность статуса
- if (!isset($lang['TOR_STATUS_NAME'][$new_status])) $this->ajax_die($lang['TOR_STATUS_FAILED']);
- if (!isset($this->request['status'])) $this->ajax_die($lang['TOR_DONT_CHANGE']);
- if (!IS_AM) $this->ajax_die($lang['NOT_MODERATOR']);
+ if (!isset($lang['TOR_STATUS_NAME'][$new_status])) {
+ $this->ajax_die($lang['TOR_STATUS_FAILED']);
+ }
+ if (!isset($this->request['status'])) {
+ $this->ajax_die($lang['TOR_DONT_CHANGE']);
+ }
+ if (!IS_AM) {
+ $this->ajax_die($lang['NOT_MODERATOR']);
+ }
// Тот же статус
if ($tor['tor_status'] == $new_status) {
@@ -49,7 +61,9 @@ switch ($mode) {
// Права на изменение статуса
if ($tor['tor_status'] == TOR_CLOSED_CPHOLD) {
- if (!IS_ADMIN) $this->verify_mod_rights($tor['forum_id']);
+ if (!IS_ADMIN) {
+ $this->verify_mod_rights($tor['forum_id']);
+ }
DB()->query("UPDATE " . BB_TOPICS . " SET topic_status = " . TOPIC_UNLOCKED . " WHERE topic_id = {$topic_id} LIMIT 1");
} else {
$this->verify_mod_rights($tor['forum_id']);
@@ -74,7 +88,9 @@ switch ($mode) {
$subject = sprintf($lang['TOR_MOD_TITLE'], $tor['topic_title']);
$message = sprintf($lang['TOR_MOD_MSG'], get_username($tor['poster_id']), make_url(TOPIC_URL . $topic_id), $di->config->get('tor_icons.' . $new_status) . ' ' . $lang['TOR_STATUS_NAME'][$new_status]);
- if ($comment && $comment != $lang['COMMENT']) $message .= "\n\n[b]" . $lang['COMMENT'] . '[/b]: ' . $comment;
+ if ($comment && $comment != $lang['COMMENT']) {
+ $message .= "\n\n[b]" . $lang['COMMENT'] . '[/b]: ' . $comment;
+ }
send_pm($tor['poster_id'], $subject, $message, $userdata['user_id']);
cache_rm_user_sessions($tor['poster_id']);
@@ -83,12 +99,16 @@ switch ($mode) {
break;
case 'status_reply':
- if (!$di->config->get('tor_comment')) $this->ajax_die($lang['MODULE_OFF']);
+ if (!$di->config->get('tor_comment')) {
+ $this->ajax_die($lang['MODULE_OFF']);
+ }
$subject = sprintf($lang['TOR_AUTH_TITLE'], $tor['topic_title']);
$message = sprintf($lang['TOR_AUTH_MSG'], get_username($tor['checked_user_id']), make_url(TOPIC_URL . $topic_id), $tor['topic_title']);
- if ($comment && $comment != $lang['COMMENT']) $message .= "\n\n[b]" . $lang['COMMENT'] . '[/b]: ' . $comment;
+ if ($comment && $comment != $lang['COMMENT']) {
+ $message .= "\n\n[b]" . $lang['COMMENT'] . '[/b]: ' . $comment;
+ }
send_pm($tor['checked_user_id'], $subject, $message, $userdata['user_id']);
cache_rm_user_sessions($tor['checked_user_id']);
diff --git a/library/ajax/change_torrent.php b/library/ajax/change_torrent.php
index 25bf10164..2533ed85a 100644
--- a/library/ajax/change_torrent.php
+++ b/library/ajax/change_torrent.php
@@ -1,6 +1,8 @@
request['confirmed'])) $this->prompt_for_confirm($lang['DEL_TORRENT']);
+ if (empty($this->request['confirmed'])) {
+ $this->prompt_for_confirm($lang['DEL_TORRENT']);
+ }
delete_torrent($topic_id);
$url = make_url(TOPIC_URL . $topic_id);
break;
case 'del_torrent_move_topic';
- if (empty($this->request['confirmed'])) $this->prompt_for_confirm($lang['DEL_MOVE_TORRENT']);
+ if (empty($this->request['confirmed'])) {
+ $this->prompt_for_confirm($lang['DEL_MOVE_TORRENT']);
+ }
delete_torrent($topic_id);
$url = make_url("modcp.php?t=$topic_id&mode=move");
break;
diff --git a/library/ajax/change_user_opt.php b/library/ajax/change_user_opt.php
index e691f1c6a..e31328693 100644
--- a/library/ajax/change_user_opt.php
+++ b/library/ajax/change_user_opt.php
@@ -1,6 +1,8 @@
response['new_value'] = htmlCHR($value);
- } else $this->ajax_die($lang['WEBSITE_ERROR']);
+ } else {
+ $this->ajax_die($lang['WEBSITE_ERROR']);
+ }
break;
case 'user_gender':
- if (!$di->config->get('gender')) $this->ajax_die($lang['MODULE_OFF']);
+ if (!$di->config->get('gender')) {
+ $this->ajax_die($lang['MODULE_OFF']);
+ }
if (!isset($lang['GENDER_SELECT'][$value])) {
$this->ajax_die($lang['ERROR']);
- } else $this->response['new_value'] = $lang['GENDER_SELECT'][$value];
+ } else {
+ $this->response['new_value'] = $lang['GENDER_SELECT'][$value];
+ }
break;
case 'user_birthday':
- if (!$di->config->get('birthday_enabled')) $this->ajax_die($lang['MODULE_OFF']);
+ if (!$di->config->get('birthday_enabled')) {
+ $this->ajax_die($lang['MODULE_OFF']);
+ }
$birthday_date = date_parse($value);
if (!empty($birthday_date['year'])) {
@@ -107,7 +117,9 @@ switch ($field) {
case 'u_down_total':
case 'u_up_release':
case 'u_up_bonus':
- if (!IS_ADMIN) $this->ajax_die($lang['NOT_ADMIN']);
+ if (!IS_ADMIN) {
+ $this->ajax_die($lang['NOT_ADMIN']);
+ }
$table = BB_BT_USERS;
$value = (float)str_replace(',', '.', $this->request['value']);
diff --git a/library/ajax/gen_passkey.php b/library/ajax/gen_passkey.php
index 6bc2edfa6..bf840d8e1 100644
--- a/library/ajax/gen_passkey.php
+++ b/library/ajax/gen_passkey.php
@@ -1,6 +1,8 @@
response['passkey'] = $passkey;
-} else $this->ajax_die($lang['NOT_AUTHORISED']);
+} else {
+ $this->ajax_die($lang['NOT_AUTHORISED']);
+}
diff --git a/library/ajax/group_membership.php b/library/ajax/group_membership.php
index 2f30eb213..bc25b4e14 100644
--- a/library/ajax/group_membership.php
+++ b/library/ajax/group_membership.php
@@ -1,6 +1,8 @@
(' . birthday_age($week['user_birthday']) . ')';
}
$html = sprintf($lang['BIRTHDAY_WEEK'], $di->config->get('birthday_check_day'), join(', ', $html));
- } else $html = sprintf($lang['NOBIRTHDAY_WEEK'], $di->config->get('birthday_check_day'));
+ } else {
+ $html = sprintf($lang['NOBIRTHDAY_WEEK'], $di->config->get('birthday_check_day'));
+ }
break;
case 'birthday_today':
@@ -36,7 +40,9 @@ switch ($mode) {
$html[] = profile_url($today) . ' (' . birthday_age($today['user_birthday']) . ')';
}
$html = $lang['BIRTHDAY_TODAY'] . join(', ', $html);
- } else $html = $lang['NOBIRTHDAY_TODAY'];
+ } else {
+ $html = $lang['NOBIRTHDAY_TODAY'];
+ }
break;
case 'get_forum_mods':
@@ -69,8 +75,12 @@ switch ($mode) {
case 'change_tz':
$tz = (int)$this->request['tz'];
- if ($tz < -12) $tz = -12;
- if ($tz > 13) $tz = 13;
+ if ($tz < -12) {
+ $tz = -12;
+ }
+ if ($tz > 13) {
+ $tz = 13;
+ }
DB()->query("UPDATE " . BB_USERS . " SET user_timezone = $tz WHERE user_id = " . $userdata['user_id'] . " LIMIT 1");
cache_rm_user_sessions($userdata['user_id']);
break;
diff --git a/library/ajax/manage_admin.php b/library/ajax/manage_admin.php
index d8e987557..be6c204ef 100644
--- a/library/ajax/manage_admin.php
+++ b/library/ajax/manage_admin.php
@@ -1,6 +1,8 @@
request['user_id'];
switch ($mode) {
case 'delete_profile':
- if ($userdata['user_id'] == $user_id) $this->ajax_die($lang['USER_DELETE_ME']);
- if (empty($this->request['confirmed'])) $this->prompt_for_confirm($lang['USER_DELETE_CONFIRM']);
+ if ($userdata['user_id'] == $user_id) {
+ $this->ajax_die($lang['USER_DELETE_ME']);
+ }
+ if (empty($this->request['confirmed'])) {
+ $this->prompt_for_confirm($lang['USER_DELETE_CONFIRM']);
+ }
if ($user_id != BOT_UID) {
delete_user_sessions($user_id);
user_delete($user_id);
$this->response['info'] = $lang['USER_DELETED'];
- } else $this->ajax_die($lang['USER_DELETE_CSV']);
+ } else {
+ $this->ajax_die($lang['USER_DELETE_CSV']);
+ }
break;
case 'delete_topics':
- if (empty($this->request['confirmed']) && $userdata['user_id'] == $user_id) $this->prompt_for_confirm($lang['DELETE_USER_POSTS_ME']);
- if (empty($this->request['confirmed'])) $this->prompt_for_confirm($lang['DELETE_USER_ALL_POSTS_CONFIRM']);
+ if (empty($this->request['confirmed']) && $userdata['user_id'] == $user_id) {
+ $this->prompt_for_confirm($lang['DELETE_USER_POSTS_ME']);
+ }
+ if (empty($this->request['confirmed'])) {
+ $this->prompt_for_confirm($lang['DELETE_USER_ALL_POSTS_CONFIRM']);
+ }
if (IS_ADMIN) {
$user_topics = DB()->fetch_rowset("SELECT topic_id FROM " . BB_TOPICS . " WHERE topic_poster = $user_id", 'topic_id');
@@ -36,26 +48,36 @@ switch ($mode) {
$deleted_posts = post_delete('user', $user_id);
$this->response['info'] = $lang['USER_DELETED_POSTS'];
- } else $this->ajax_die($lang['NOT_ADMIN']);
+ } else {
+ $this->ajax_die($lang['NOT_ADMIN']);
+ }
break;
case 'delete_message':
- if (empty($this->request['confirmed']) && $userdata['user_id'] == $user_id) $this->prompt_for_confirm($lang['DELETE_USER_POSTS_ME']);
- if (empty($this->request['confirmed'])) $this->prompt_for_confirm($lang['DELETE_USER_POSTS_CONFIRM']);
+ if (empty($this->request['confirmed']) && $userdata['user_id'] == $user_id) {
+ $this->prompt_for_confirm($lang['DELETE_USER_POSTS_ME']);
+ }
+ if (empty($this->request['confirmed'])) {
+ $this->prompt_for_confirm($lang['DELETE_USER_POSTS_CONFIRM']);
+ }
if (IS_ADMIN) {
post_delete('user', $user_id);
$this->response['info'] = $lang['USER_DELETED_POSTS'];
- } else $this->ajax_die($lang['NOT_ADMIN']);
+ } else {
+ $this->ajax_die($lang['NOT_ADMIN']);
+ }
break;
case 'user_activate':
- if (empty($this->request['confirmed'])) $this->prompt_for_confirm($lang['DEACTIVATE_CONFIRM']);
+ if (empty($this->request['confirmed'])) {
+ $this->prompt_for_confirm($lang['DEACTIVATE_CONFIRM']);
+ }
DB()->query("UPDATE " . BB_USERS . " SET user_active = '1' WHERE user_id = " . $user_id);
@@ -65,8 +87,12 @@ switch ($mode) {
case 'user_deactivate':
- if ($userdata['user_id'] == $user_id) $this->ajax_die($lang['USER_DEACTIVATE_ME']);
- if (empty($this->request['confirmed'])) $this->prompt_for_confirm($lang['ACTIVATE_CONFIRM']);
+ if ($userdata['user_id'] == $user_id) {
+ $this->ajax_die($lang['USER_DEACTIVATE_ME']);
+ }
+ if (empty($this->request['confirmed'])) {
+ $this->prompt_for_confirm($lang['ACTIVATE_CONFIRM']);
+ }
DB()->query("UPDATE " . BB_USERS . " SET user_active = '0' WHERE user_id = " . $user_id);
delete_user_sessions($user_id);
diff --git a/library/ajax/mod_action.php b/library/ajax/mod_action.php
index 06526a496..c4b6083b0 100644
--- a/library/ajax/mod_action.php
+++ b/library/ajax/mod_action.php
@@ -1,6 +1,8 @@
request['topic_title'];
$new_title = clean_title($topic_title);
- if (!$topic_id) $this->ajax_die($lang['INVALID_TOPIC_ID']);
- if ($new_title == '') $this->ajax_die($lang['DONT_MESSAGE_TITLE']);
+ if (!$topic_id) {
+ $this->ajax_die($lang['INVALID_TOPIC_ID']);
+ }
+ if ($new_title == '') {
+ $this->ajax_die($lang['DONT_MESSAGE_TITLE']);
+ }
if (!$t_data = DB()->fetch_row("SELECT forum_id FROM " . BB_TOPICS . " WHERE topic_id = $topic_id LIMIT 1")) {
$this->ajax_die($lang['INVALID_TOPIC_ID_DB']);
@@ -67,7 +73,9 @@ switch ($mode) {
$user_id = (int)$this->request['user_id'];
$profiledata = get_userdata($user_id);
- if (!$user_id) $this->ajax_die($lang['NO_USER_ID_SPECIFIED']);
+ if (!$user_id) {
+ $this->ajax_die($lang['NO_USER_ID_SPECIFIED']);
+ }
$reg_ip = DB()->fetch_rowset("SELECT username, user_id, user_rank FROM " . BB_USERS . "
WHERE user_reg_ip = '{$profiledata['user_reg_ip']}'
@@ -96,9 +104,11 @@ switch ($mode) {
}
}
- if ($profiledata['user_level'] == ADMIN && !IS_ADMIN) $reg_ip = $last_ip = $lang['HIDDEN'];
- elseif ($profiledata['user_level'] == MOD && IS_MOD) $reg_ip = $last_ip = $lang['HIDDEN'];
- else {
+ if ($profiledata['user_level'] == ADMIN && !IS_ADMIN) {
+ $reg_ip = $last_ip = $lang['HIDDEN'];
+ } elseif ($profiledata['user_level'] == MOD && IS_MOD) {
+ $reg_ip = $last_ip = $lang['HIDDEN'];
+ } else {
$user_reg_ip = decode_ip($profiledata['user_reg_ip']);
$user_last_ip = decode_ip($profiledata['user_last_ip']);
$reg_ip = '' . $user_reg_ip . '';
diff --git a/library/ajax/post_mod_comment.php b/library/ajax/post_mod_comment.php
index e62619c98..6220c78bb 100644
--- a/library/ajax/post_mod_comment.php
+++ b/library/ajax/post_mod_comment.php
@@ -1,13 +1,17 @@
request['post_id'];
$mc_type = (int)$this->request['mc_type'];
$mc_text = (string)$this->request['mc_text'];
-if (!$mc_text = prepare_message($mc_text)) $this->ajax_die($lang['EMPTY_MESSAGE']);
+if (!$mc_text = prepare_message($mc_text)) {
+ $this->ajax_die($lang['EMPTY_MESSAGE']);
+}
$post = DB()->fetch_row("
SELECT
@@ -15,7 +19,9 @@ $post = DB()->fetch_row("
FROM " . BB_POSTS . " p
WHERE p.post_id = $post_id
");
-if (!$post) $this->ajax_die('not post');
+if (!$post) {
+ $this->ajax_die('not post');
+}
$data = array(
'mc_comment' => ($mc_type) ? $mc_text : '',
diff --git a/library/ajax/posts.php b/library/ajax/posts.php
index 31ba4b009..a2d05ed5b 100644
--- a/library/ajax/posts.php
+++ b/library/ajax/posts.php
@@ -1,6 +1,8 @@
request['post_id'])) {
AND f.forum_id = t.forum_id
AND p.post_id = pt.post_id
LIMIT 1");
- if (!$post) $this->ajax_die('not post');
+ if (!$post) {
+ $this->ajax_die('not post');
+ }
$is_auth = auth(AUTH_ALL, $post['forum_id'], $userdata, $post);
if ($post['topic_status'] == TOPIC_LOCKED && !$is_auth['auth_mod']) {
@@ -32,7 +36,9 @@ if (isset($this->request['post_id'])) {
WHERE t.topic_id = $topic_id
AND f.forum_id = t.forum_id
LIMIT 1");
- if (!$post) $this->ajax_die('not post');
+ if (!$post) {
+ $this->ajax_die('not post');
+ }
$is_auth = auth(AUTH_ALL, $post['forum_id'], $userdata, $post);
}
@@ -94,7 +100,9 @@ switch ($this->request['type']) {
case 'view_message':
$message = (string)$this->request['message'];
- if (!trim($message)) $this->ajax_die($lang['EMPTY_MESSAGE']);
+ if (!trim($message)) {
+ $this->ajax_die($lang['EMPTY_MESSAGE']);
+ }
$message = htmlCHR($message, false, ENT_NOQUOTES);
$this->response['message_html'] = bbcode2html($message);
@@ -135,7 +143,9 @@ switch ($this->request['type']) {
'post_text' => $text,
));
}
- } else $this->ajax_die($lang['EMPTY_MESSAGE']);
+ } else {
+ $this->ajax_die($lang['EMPTY_MESSAGE']);
+ }
// Update atom feed
update_atom('topic', (int)$this->request['topic_id']);
diff --git a/library/ajax/sitemap.php b/library/ajax/sitemap.php
index 84269ef9d..c14b077df 100644
--- a/library/ajax/sitemap.php
+++ b/library/ajax/sitemap.php
@@ -1,6 +1,8 @@
create();
+ if (!file_exists(SITEMAP_DIR . 'sitemap.xml')) {
+ $map->create();
+ }
$map_link = make_url(SITEMAP_DIR . 'sitemap.xml');
diff --git a/library/ajax/topic_tpl.php b/library/ajax/topic_tpl.php
index 27cefc75d..aacb8c5a2 100644
--- a/library/ajax/topic_tpl.php
+++ b/library/ajax/topic_tpl.php
@@ -1,10 +1,14 @@
ajax_die('not auth');
+if (!IS_SUPER_ADMIN) {
+ $this->ajax_die('not auth');
+}
array_deep($this->request, 'trim');
@@ -140,8 +144,9 @@ switch ($mode) {
// возможный дубль названия шаблона
if ($sql_error) {
- if ($sql_error['code'] == 1062) // Duplicate entry
- {
+ if ($sql_error['code'] == 1062) {
+ // Duplicate entry
+
$this->ajax_die('Шаблон с таким названием уже существует, выберите другое название');
}
$this->ajax_die("db error {$sql_error['code']}: {$sql_error['message']}");
diff --git a/library/ajax/user_register.php b/library/ajax/user_register.php
index 7b1f382ad..dd37edb5f 100644
--- a/library/ajax/user_register.php
+++ b/library/ajax/user_register.php
@@ -1,6 +1,8 @@
'');
- var $multiple = null;
- var $root_dir = '';
- var $files_html = '';
+ public $tor_decoded = array();
+ public $files_ary = array('/' => '');
+ public $multiple = null;
+ public $root_dir = '';
+ public $files_html = '';
- function torrent($decoded_file_contents)
+ public function torrent($decoded_file_contents)
{
$this->tor_decoded = $decoded_file_contents;
}
- function get_filelist()
+ public function get_filelist()
{
$this->build_filelist_array();
@@ -68,7 +70,7 @@ class torrent
}
}
- function build_filelist_array()
+ public function build_filelist_array()
{
$info = $this->tor_decoded['info'];
@@ -129,7 +131,7 @@ class torrent
}
}
- function build_file_item($name, $length)
+ public function build_file_item($name, $length)
{
global $images, $lang;
@@ -146,7 +148,7 @@ class torrent
return "$name $length $magnet_name $magnet_ext";
}
- function build_filelist_html()
+ public function build_filelist_html()
{
global $html;
return $html->array2html($this->files_ary);
@@ -158,6 +160,8 @@ function clean_tor_dirname($dirname)
return str_replace(array('[', ']', '<', '>', "'"), array('[', ']', '<', '>', '''), $dirname);
}
-if ($bnc_error) $tor_filelist = '' . $lang['ERROR_BUILD'] . '
' . $tor_filelist;
+if ($bnc_error) {
+ $tor_filelist = '' . $lang['ERROR_BUILD'] . '
' . $tor_filelist;
+}
$this->response['html'] = $tor_filelist;
diff --git a/library/config.php b/library/config.php
index 1384439e5..a5d28370f 100644
--- a/library/config.php
+++ b/library/config.php
@@ -1,6 +1,8 @@
= 0);
// x64, int
- if (is_int($v))
+ if (is_int($v)) {
return pack("NN", $v >> 32, $v & 0xFFFFFFFF);
+ }
// x64, bcmath
if (function_exists("bcmul")) {
@@ -194,8 +199,9 @@ function sphPackU64($v)
}
// x32, int
- if (is_int($v))
+ if (is_int($v)) {
return pack("NN", 0, $v);
+ }
// x32, bcmath
if (function_exists("bcmul")) {
@@ -220,19 +226,25 @@ function sphPackU64($v)
// unpack 64-bit unsigned
function sphUnpackU64($v)
{
- list ($hi, $lo) = array_values(unpack("N*N*", $v));
+ list($hi, $lo) = array_values(unpack("N*N*", $v));
if (PHP_INT_SIZE >= 8) {
- if ($hi < 0) $hi += (1 << 32); // because php 5.2.2 to 5.2.5 is totally fucked up again
- if ($lo < 0) $lo += (1 << 32);
+ if ($hi < 0) {
+ $hi += (1 << 32);
+ } // because php 5.2.2 to 5.2.5 is totally fucked up again
+ if ($lo < 0) {
+ $lo += (1 << 32);
+ }
// x64, int
- if ($hi <= 2147483647)
+ if ($hi <= 2147483647) {
return ($hi << 32) + $lo;
+ }
// x64, bcmath
- if (function_exists("bcmul"))
+ if (function_exists("bcmul")) {
return bcadd($lo, bcmul($hi, "4294967296"));
+ }
// x64, no-bcmath
$C = 100000;
@@ -243,15 +255,17 @@ function sphUnpackU64($v)
$l = $l % $C;
}
- if ($h == 0)
+ if ($h == 0) {
return $l;
+ }
return sprintf("%d%05d", $h, $l);
}
// x32, int
if ($hi == 0) {
- if ($lo > 0)
+ if ($lo > 0) {
return $lo;
+ }
return sprintf("%u", $lo);
}
@@ -259,8 +273,9 @@ function sphUnpackU64($v)
$lo = sprintf("%u", $lo);
// x32, bcmath
- if (function_exists("bcmul"))
+ if (function_exists("bcmul")) {
return bcadd($lo, bcmul($hi, "4294967296"));
+ }
// x32, no-bcmath
$hi = (float)$hi;
@@ -275,33 +290,40 @@ function sphUnpackU64($v)
$h = sprintf("%.0f", $h);
$l = sprintf("%07.0f", $l);
- if ($h == "0")
+ if ($h == "0") {
return sprintf("%.0f", (float)$l);
+ }
return $h . $l;
}
// unpack 64-bit signed
function sphUnpackI64($v)
{
- list ($hi, $lo) = array_values(unpack("N*N*", $v));
+ list($hi, $lo) = array_values(unpack("N*N*", $v));
// x64
if (PHP_INT_SIZE >= 8) {
- if ($hi < 0) $hi += (1 << 32); // because php 5.2.2 to 5.2.5 is totally fucked up again
- if ($lo < 0) $lo += (1 << 32);
+ if ($hi < 0) {
+ $hi += (1 << 32);
+ } // because php 5.2.2 to 5.2.5 is totally fucked up again
+ if ($lo < 0) {
+ $lo += (1 << 32);
+ }
return ($hi << 32) + $lo;
}
// x32, int
if ($hi == 0) {
- if ($lo > 0)
+ if ($lo > 0) {
return $lo;
+ }
return sprintf("%u", $lo);
} // x32, int
elseif ($hi == -1) {
- if ($lo < 0)
+ if ($lo < 0) {
return $lo;
+ }
return sprintf("%.0f", $lo - 4294967296.0);
}
@@ -318,8 +340,9 @@ function sphUnpackI64($v)
$lo = sprintf("%u", $lo);
// x32, bcmath
- if (function_exists("bcmul"))
+ if (function_exists("bcmul")) {
return $neg . bcadd(bcadd($lo, bcmul($hi, "4294967296")), $c);
+ }
// x32, no-bcmath
$hi = (float)$hi;
@@ -338,8 +361,9 @@ function sphUnpackI64($v)
$h = sprintf("%.0f", $h);
$l = sprintf("%07.0f", $l);
- if ($h == "0")
+ if ($h == "0") {
return $neg . sprintf("%.0f", (float)$l);
+ }
return $neg . $h . $l;
}
@@ -348,7 +372,9 @@ function sphFixUint($value)
{
if (PHP_INT_SIZE >= 8) {
// x64 route, workaround broken unpack() in 5.2.2+
- if ($value < 0) $value += (1 << 32);
+ if ($value < 0) {
+ $value += (1 << 32);
+ }
return $value;
} else {
// x32 route, workaround php signed/unsigned braindamage
@@ -360,51 +386,51 @@ function sphFixUint($value)
/// sphinx searchd client class
class SphinxClient extends cache_common
{
- var $_host; ///< searchd host (default is "localhost")
- var $_port; ///< searchd port (default is 9312)
- var $_offset; ///< how many records to seek from result-set start (default is 0)
- var $_limit; ///< how many records to return from result-set starting at offset (default is 20)
- var $_mode; ///< query matching mode (default is SPH_MATCH_ALL)
- var $_weights; ///< per-field weights (default is 1 for all fields)
- var $_sort; ///< match sorting mode (default is SPH_SORT_RELEVANCE)
- var $_sortby; ///< attribute to sort by (defualt is "")
- var $_min_id; ///< min ID to match (default is 0, which means no limit)
- var $_max_id; ///< max ID to match (default is 0, which means no limit)
- var $_filters; ///< search filters
- var $_groupby; ///< group-by attribute name
- var $_groupfunc; ///< group-by function (to pre-process group-by attribute value with)
- var $_groupsort; ///< group-by sorting clause (to sort groups in result set with)
- var $_groupdistinct;///< group-by count-distinct attribute
- var $_maxmatches; ///< max matches to retrieve
- var $_cutoff; ///< cutoff to stop searching at (default is 0)
- var $_retrycount; ///< distributed retries count
- var $_retrydelay; ///< distributed retries delay
- var $_anchor; ///< geographical anchor point
- var $_indexweights; ///< per-index weights
- var $_ranker; ///< ranking mode (default is SPH_RANK_PROXIMITY_BM25)
- var $_maxquerytime; ///< max query time, milliseconds (default is 0, do not limit)
- var $_fieldweights; ///< per-field-name weights
- var $_overrides; ///< per-query attribute values overrides
- var $_select; ///< select-list (attributes or expressions, with optional aliases)
+ public $_host; ///< searchd host (default is "localhost")
+ public $_port; ///< searchd port (default is 9312)
+ public $_offset; ///< how many records to seek from result-set start (default is 0)
+ public $_limit; ///< how many records to return from result-set starting at offset (default is 20)
+ public $_mode; ///< query matching mode (default is SPH_MATCH_ALL)
+ public $_weights; ///< per-field weights (default is 1 for all fields)
+ public $_sort; ///< match sorting mode (default is SPH_SORT_RELEVANCE)
+ public $_sortby; ///< attribute to sort by (defualt is "")
+ public $_min_id; ///< min ID to match (default is 0, which means no limit)
+ public $_max_id; ///< max ID to match (default is 0, which means no limit)
+ public $_filters; ///< search filters
+ public $_groupby; ///< group-by attribute name
+ public $_groupfunc; ///< group-by function (to pre-process group-by attribute value with)
+ public $_groupsort; ///< group-by sorting clause (to sort groups in result set with)
+ public $_groupdistinct;///< group-by count-distinct attribute
+ public $_maxmatches; ///< max matches to retrieve
+ public $_cutoff; ///< cutoff to stop searching at (default is 0)
+ public $_retrycount; ///< distributed retries count
+ public $_retrydelay; ///< distributed retries delay
+ public $_anchor; ///< geographical anchor point
+ public $_indexweights; ///< per-index weights
+ public $_ranker; ///< ranking mode (default is SPH_RANK_PROXIMITY_BM25)
+ public $_maxquerytime; ///< max query time, milliseconds (default is 0, do not limit)
+ public $_fieldweights; ///< per-field-name weights
+ public $_overrides; ///< per-query attribute values overrides
+ public $_select; ///< select-list (attributes or expressions, with optional aliases)
- var $_error; ///< last error message
- var $_warning; ///< last warning message
- var $_connerror; ///< connection error vs remote error flag
+ public $_error; ///< last error message
+ public $_warning; ///< last warning message
+ public $_connerror; ///< connection error vs remote error flag
- var $_reqs; ///< requests array for multi-query
- var $_mbenc; ///< stored mbstring encoding
- var $_arrayresult; ///< whether $result["matches"] should be a hash or an array
- var $_timeout; ///< connect timeout
+ public $_reqs; ///< requests array for multi-query
+ public $_mbenc; ///< stored mbstring encoding
+ public $_arrayresult; ///< whether $result["matches"] should be a hash or an array
+ public $_timeout; ///< connect timeout
- var $bb_queries = array();
- var $bb_indexes = array();
+ public $bb_queries = array();
+ public $bb_indexes = array();
/////////////////////////////////////////////////////////////////////////////
// common stuff
/////////////////////////////////////////////////////////////////////////////
/// create a new client object and fill defaults
- function SphinxClient()
+ public function SphinxClient()
{
$this->dbg_enabled = sql_dbg_enabled();
@@ -450,32 +476,33 @@ class SphinxClient extends cache_common
$this->_timeout = 0;
}
- function __destruct()
+ public function __destruct()
{
- if ($this->_socket !== false)
+ if ($this->_socket !== false) {
fclose($this->_socket);
+ }
}
/// get last error message (string)
- function GetLastError()
+ public function GetLastError()
{
return $this->_error;
}
/// get last warning message (string)
- function GetLastWarning()
+ public function GetLastWarning()
{
return $this->_warning;
}
/// get last error flag (to tell network connection errors from searchd errors or broken responses)
- function IsConnectError()
+ public function IsConnectError()
{
return $this->_connerror;
}
/// set searchd host name (string) and port (integer)
- function SetServer($host, $port = 0)
+ public function SetServer($host, $port = 0)
{
assert(is_string($host));
if ($host[0] == '/') {
@@ -491,18 +518,17 @@ class SphinxClient extends cache_common
$this->_host = $host;
$this->_port = $port;
$this->_path = '';
-
}
/// set server connection timeout (0 to remove)
- function SetConnectTimeout($timeout)
+ public function SetConnectTimeout($timeout)
{
assert(is_numeric($timeout));
$this->_timeout = $timeout;
}
- function _Send($handle, $data, $length)
+ public function _Send($handle, $data, $length)
{
if (feof($handle) || fwrite($handle, $data, $length) !== $length) {
$this->_error = 'connection unexpectedly closed (timed out?)';
@@ -515,7 +541,7 @@ class SphinxClient extends cache_common
/////////////////////////////////////////////////////////////////////////////
/// enter mbstring workaround mode
- function _MBPush()
+ public function _MBPush()
{
$this->_mbenc = "";
if (ini_get("mbstring.func_overload") & 2) {
@@ -525,14 +551,15 @@ class SphinxClient extends cache_common
}
/// leave mbstring workaround mode
- function _MBPop()
+ public function _MBPop()
{
- if ($this->_mbenc)
+ if ($this->_mbenc) {
mb_internal_encoding($this->_mbenc);
+ }
}
/// connect to searchd server
- function _Connect()
+ public function _Connect()
{
$this->cur_query = "connect to: {$this->_host}";
$this->debug('start');
@@ -540,8 +567,9 @@ class SphinxClient extends cache_common
if ($this->_socket !== false) {
// we are in persistent connection mode, so we have a socket
// however, need to check whether it's still alive
- if (!feof($this->_socket))
+ if (!feof($this->_socket)) {
return $this->_socket;
+ }
// force reopen
$this->_socket = false;
@@ -559,16 +587,18 @@ class SphinxClient extends cache_common
$port = $this->_port;
}
- if ($this->_timeout <= 0)
+ if ($this->_timeout <= 0) {
$fp = fsockopen($host, $port, $errno, $errstr);
- else
+ } else {
$fp = fsockopen($host, $port, $errno, $errstr, $this->_timeout);
+ }
if (!$fp) {
- if ($this->_path)
+ if ($this->_path) {
$location = $this->_path;
- else
+ } else {
$location = "{$this->_host}:{$this->_port}";
+ }
$errstr = trim($errstr);
$this->_error = "connection to $location failed (errno=$errno, msg=$errstr)";
@@ -600,14 +630,14 @@ class SphinxClient extends cache_common
}
/// get and check response packet from searchd server
- function _GetResponse($fp, $client_ver)
+ public function _GetResponse($fp, $client_ver)
{
$response = "";
$len = 0;
$header = fread($fp, 8);
if (strlen($header) == 8) {
- list ($status, $ver, $len) = array_values(unpack("n2a/Nb", $header));
+ list($status, $ver, $len) = array_values(unpack("n2a/Nb", $header));
$left = $len;
while ($left > 0 && !feof($fp)) {
$chunk = fread($fp, $left);
@@ -617,8 +647,9 @@ class SphinxClient extends cache_common
}
}
}
- if ($this->_socket === false)
+ if ($this->_socket === false) {
fclose($fp);
+ }
// check response
$read = strlen($response);
@@ -663,7 +694,7 @@ class SphinxClient extends cache_common
/// set offset and count into result set,
/// and optionally set max-matches and cutoff limits
- function SetLimits($offset, $limit, $max = 0, $cutoff = 0)
+ public function SetLimits($offset, $limit, $max = 0, $cutoff = 0)
{
assert(is_int($offset));
assert(is_int($limit));
@@ -672,15 +703,17 @@ class SphinxClient extends cache_common
assert($max >= 0);
$this->_offset = $offset;
$this->_limit = $limit;
- if ($max > 0)
+ if ($max > 0) {
$this->_maxmatches = $max;
- if ($cutoff > 0)
+ }
+ if ($cutoff > 0) {
$this->_cutoff = $cutoff;
+ }
}
/// set maximum query time, in milliseconds, per-index
/// integer, 0 means "do not limit"
- function SetMaxQueryTime($max)
+ public function SetMaxQueryTime($max)
{
assert(is_int($max));
assert($max >= 0);
@@ -688,7 +721,7 @@ class SphinxClient extends cache_common
}
/// set matching mode
- function SetMatchMode($mode)
+ public function SetMatchMode($mode)
{
assert($mode == SPH_MATCH_ALL
|| $mode == SPH_MATCH_ANY
@@ -701,7 +734,7 @@ class SphinxClient extends cache_common
}
/// set ranking mode
- function SetRankingMode($ranker)
+ public function SetRankingMode($ranker)
{
assert($ranker == SPH_RANK_PROXIMITY_BM25
|| $ranker == SPH_RANK_BM25
@@ -712,7 +745,7 @@ class SphinxClient extends cache_common
}
/// set matches sorting mode
- function SetSortMode($mode, $sortby = "")
+ public function SetSortMode($mode, $sortby = "")
{
assert(
$mode == SPH_SORT_RELEVANCE ||
@@ -730,17 +763,18 @@ class SphinxClient extends cache_common
/// bind per-field weights by order
/// DEPRECATED; use SetFieldWeights() instead
- function SetWeights($weights)
+ public function SetWeights($weights)
{
assert(is_array($weights));
- foreach ($weights as $weight)
+ foreach ($weights as $weight) {
assert(is_int($weight));
+ }
$this->_weights = $weights;
}
/// bind per-field weights by name
- function SetFieldWeights($weights)
+ public function SetFieldWeights($weights)
{
assert(is_array($weights));
foreach ($weights as $name => $weight) {
@@ -751,7 +785,7 @@ class SphinxClient extends cache_common
}
/// bind per-index weights by name
- function SetIndexWeights($weights)
+ public function SetIndexWeights($weights)
{
assert(is_array($weights));
foreach ($weights as $index => $weight) {
@@ -763,7 +797,7 @@ class SphinxClient extends cache_common
/// set IDs range to match
/// only match records if document ID is beetwen $min and $max (inclusive)
- function SetIDRange($min, $max)
+ public function SetIDRange($min, $max)
{
assert(is_numeric($min));
assert(is_numeric($max));
@@ -774,15 +808,16 @@ class SphinxClient extends cache_common
/// set values set filter
/// only match records where $attribute value is in given set
- function SetFilter($attribute, $values, $exclude = false)
+ public function SetFilter($attribute, $values, $exclude = false)
{
assert(is_string($attribute));
assert(is_array($values));
assert(count($values));
if (is_array($values) && count($values)) {
- foreach ($values as $value)
+ foreach ($values as $value) {
assert(is_numeric($value));
+ }
$this->_filters[] = array("type" => SPH_FILTER_VALUES, "attr" => $attribute, "exclude" => $exclude, "values" => $values);
}
@@ -790,7 +825,7 @@ class SphinxClient extends cache_common
/// set range filter
/// only match records if $attribute value is beetwen $min and $max (inclusive)
- function SetFilterRange($attribute, $min, $max, $exclude = false)
+ public function SetFilterRange($attribute, $min, $max, $exclude = false)
{
assert(is_string($attribute));
assert(is_numeric($min));
@@ -802,7 +837,7 @@ class SphinxClient extends cache_common
/// set float range filter
/// only match records if $attribute value is beetwen $min and $max (inclusive)
- function SetFilterFloatRange($attribute, $min, $max, $exclude = false)
+ public function SetFilterFloatRange($attribute, $min, $max, $exclude = false)
{
assert(is_string($attribute));
assert(is_float($min));
@@ -815,7 +850,7 @@ class SphinxClient extends cache_common
/// setup anchor point for geosphere distance calculations
/// required to use @geodist in filters and sorting
/// latitude and longitude must be in radians
- function SetGeoAnchor($attrlat, $attrlong, $lat, $long)
+ public function SetGeoAnchor($attrlat, $attrlong, $lat, $long)
{
assert(is_string($attrlat));
assert(is_string($attrlong));
@@ -826,7 +861,7 @@ class SphinxClient extends cache_common
}
/// set grouping attribute and function
- function SetGroupBy($attribute, $func, $groupsort = "@group desc")
+ public function SetGroupBy($attribute, $func, $groupsort = "@group desc")
{
assert(is_string($attribute));
assert(is_string($groupsort));
@@ -843,14 +878,14 @@ class SphinxClient extends cache_common
}
/// set count-distinct attribute for group-by queries
- function SetGroupDistinct($attribute)
+ public function SetGroupDistinct($attribute)
{
assert(is_string($attribute));
$this->_groupdistinct = $attribute;
}
/// set distributed retries count and delay
- function SetRetries($count, $delay = 0)
+ public function SetRetries($count, $delay = 0)
{
assert(is_int($count) && $count >= 0);
assert(is_int($delay) && $delay >= 0);
@@ -860,7 +895,7 @@ class SphinxClient extends cache_common
/// set result set format (hash or array; hash by default)
/// PHP specific; needed for group-by-MVA result sets that may contain duplicate IDs
- function SetArrayResult($arrayresult)
+ public function SetArrayResult($arrayresult)
{
assert(is_bool($arrayresult));
$this->_arrayresult = $arrayresult;
@@ -869,7 +904,7 @@ class SphinxClient extends cache_common
/// set attribute values override
/// there can be only one override per attribute
/// $values must be a hash that maps document IDs to attribute values
- function SetOverride($attrname, $attrtype, $values)
+ public function SetOverride($attrname, $attrtype, $values)
{
assert(is_string($attrname));
assert(in_array($attrtype, array(SPH_ATTR_INTEGER, SPH_ATTR_TIMESTAMP, SPH_ATTR_BOOL, SPH_ATTR_FLOAT, SPH_ATTR_BIGINT)));
@@ -879,7 +914,7 @@ class SphinxClient extends cache_common
}
/// set select-list (attributes or expressions), SQL-like syntax
- function SetSelect($select)
+ public function SetSelect($select)
{
assert(is_string($select));
$this->_select = $select;
@@ -888,14 +923,14 @@ class SphinxClient extends cache_common
//////////////////////////////////////////////////////////////////////////////
/// clear all filters (for multi-queries)
- function ResetFilters()
+ public function ResetFilters()
{
$this->_filters = array();
$this->_anchor = array();
}
/// clear groupby settings (for multi-queries)
- function ResetGroupBy()
+ public function ResetGroupBy()
{
$this->_groupby = "";
$this->_groupfunc = SPH_GROUPBY_DAY;
@@ -904,7 +939,7 @@ class SphinxClient extends cache_common
}
/// clear all attribute value overrides (for multi-queries)
- function ResetOverrides()
+ public function ResetOverrides()
{
$this->_overrides = array();
}
@@ -913,7 +948,7 @@ class SphinxClient extends cache_common
/// connect to searchd server, run given search query through given indexes,
/// and return the search results
- function Query($query, $index = "*", $comment = "")
+ public function Query($query, $index = "*", $comment = "")
{
assert(empty($this->_reqs));
@@ -923,19 +958,21 @@ class SphinxClient extends cache_common
$this->bb_queries = array();
$this->bb_indexes = array();
- if (!is_array($results))
- return false; // probably network error; error message should be already filled
+ if (!is_array($results)) {
+ return false;
+ } // probably network error; error message should be already filled
$this->_error = $results[0]["error"];
$this->_warning = $results[0]["warning"];
- if ($results[0]["status"] == SEARCHD_ERROR)
+ if ($results[0]["status"] == SEARCHD_ERROR) {
return false;
- else
+ } else {
return $results[0];
+ }
}
/// helper to pack floats in network byte order
- function _PackFloat($f)
+ public function _PackFloat($f)
{
$t1 = pack("f", $f); // machine order
list(, $t2) = unpack("L*", $t1); // int in machine order
@@ -944,7 +981,7 @@ class SphinxClient extends cache_common
/// add query to multi-query batch
/// returns index into results array from RunQueries() call
- function AddQuery($query, $index = "*", $comment = "")
+ public function AddQuery($query, $index = "*", $comment = "")
{
// mbstring workaround
$this->_MBPush();
@@ -954,8 +991,9 @@ class SphinxClient extends cache_common
$req .= pack("N", strlen($this->_sortby)) . $this->_sortby;
$req .= pack("N", strlen($query)) . $query; // query itself
$req .= pack("N", count($this->_weights)); // weights
- foreach ($this->_weights as $weight)
+ foreach ($this->_weights as $weight) {
$req .= pack("N", (int)$weight);
+ }
$req .= pack("N", strlen($index)) . $index; // indexes
$req .= pack("N", 1); // id64 range marker
$req .= sphPackU64($this->_min_id) . sphPackU64($this->_max_id); // id64 range
@@ -968,8 +1006,9 @@ class SphinxClient extends cache_common
switch ($filter["type"]) {
case SPH_FILTER_VALUES:
$req .= pack("N", count($filter["values"]));
- foreach ($filter["values"] as $value)
+ foreach ($filter["values"] as $value) {
$req .= sphPackI64($value);
+ }
break;
case SPH_FILTER_RANGE:
@@ -1006,16 +1045,18 @@ class SphinxClient extends cache_common
// per-index weights
$req .= pack("N", count($this->_indexweights));
- foreach ($this->_indexweights as $idx => $weight)
+ foreach ($this->_indexweights as $idx => $weight) {
$req .= pack("N", strlen($idx)) . $idx . pack("N", $weight);
+ }
// max query time
$req .= pack("N", $this->_maxquerytime);
// per-field weights
$req .= pack("N", count($this->_fieldweights));
- foreach ($this->_fieldweights as $field => $weight)
+ foreach ($this->_fieldweights as $field => $weight) {
$req .= pack("N", strlen($field)) . $field . pack("N", $weight);
+ }
// comment
$req .= pack("N", strlen($comment)) . $comment;
@@ -1058,7 +1099,7 @@ class SphinxClient extends cache_common
}
/// connect to searchd, run queries batch, and return an array of result sets
- function RunQueries()
+ public function RunQueries()
{
if (empty($this->_reqs)) {
$this->_error = "no queries defined, issue AddQuery() first";
@@ -1101,7 +1142,7 @@ class SphinxClient extends cache_common
}
/// parse and return search query (or queries) response
- function _ParseSearchResponse($response, $nreqs)
+ public function _ParseSearchResponse($response, $nreqs)
{
$p = 0; // current position
$max = strlen($response); // max position for checks, to protect against broken responses
@@ -1181,7 +1222,7 @@ class SphinxClient extends cache_common
list(, $weight) = unpack("N*", substr($response, $p, 4));
$p += 4;
} else {
- list ($doc, $weight) = array_values(unpack("N*N*",
+ list($doc, $weight) = array_values(unpack("N*N*",
substr($response, $p, 8)));
$p += 8;
$doc = sphFixUint($doc);
@@ -1189,10 +1230,11 @@ class SphinxClient extends cache_common
$weight = sprintf("%u", $weight);
// create match entry
- if ($this->_arrayresult)
+ if ($this->_arrayresult) {
$result["matches"][$idx] = array("id" => $doc, "weight" => $weight);
- else
+ } else {
$result["matches"][$doc]["weight"] = $weight;
+ }
// parse and create attributes
$attrvals = array();
@@ -1229,13 +1271,14 @@ class SphinxClient extends cache_common
}
}
- if ($this->_arrayresult)
+ if ($this->_arrayresult) {
$result["matches"][$idx]["attrs"] = $attrvals;
- else
+ } else {
$result["matches"][$doc]["attrs"] = $attrvals;
+ }
}
- list ($total, $total_found, $msecs, $words) =
+ list($total, $total_found, $msecs, $words) =
array_values(unpack("N*N*N*N*", substr($response, $p, 16)));
$result["total"] = sprintf("%u", $total);
$result["total_found"] = sprintf("%u", $total_found);
@@ -1247,7 +1290,7 @@ class SphinxClient extends cache_common
$p += 4;
$word = substr($response, $p, $len);
$p += $len;
- list ($docs, $hits) = array_values(unpack("N*N*", substr($response, $p, 8)));
+ list($docs, $hits) = array_values(unpack("N*N*", substr($response, $p, 8)));
$p += 8;
$result["words"][$word] = array(
"docs" => sprintf("%u", $docs),
@@ -1268,7 +1311,7 @@ class SphinxClient extends cache_common
/// connect to searchd server, and generate exceprts (snippets)
/// of given documents for given query. returns false on failure,
/// an array of snippets on success
- function BuildExcerpts($docs, $index, $words, $opts = array())
+ public function BuildExcerpts($docs, $index, $words, $opts = array())
{
assert(is_array($docs));
assert(is_string($index));
@@ -1286,15 +1329,33 @@ class SphinxClient extends cache_common
// fixup options
/////////////////
- if (!isset($opts["before_match"])) $opts["before_match"] = "";
- if (!isset($opts["after_match"])) $opts["after_match"] = "";
- if (!isset($opts["chunk_separator"])) $opts["chunk_separator"] = " ... ";
- if (!isset($opts["limit"])) $opts["limit"] = 256;
- if (!isset($opts["around"])) $opts["around"] = 5;
- if (!isset($opts["exact_phrase"])) $opts["exact_phrase"] = false;
- if (!isset($opts["single_passage"])) $opts["single_passage"] = false;
- if (!isset($opts["use_boundaries"])) $opts["use_boundaries"] = false;
- if (!isset($opts["weight_order"])) $opts["weight_order"] = false;
+ if (!isset($opts["before_match"])) {
+ $opts["before_match"] = "";
+ }
+ if (!isset($opts["after_match"])) {
+ $opts["after_match"] = "";
+ }
+ if (!isset($opts["chunk_separator"])) {
+ $opts["chunk_separator"] = " ... ";
+ }
+ if (!isset($opts["limit"])) {
+ $opts["limit"] = 256;
+ }
+ if (!isset($opts["around"])) {
+ $opts["around"] = 5;
+ }
+ if (!isset($opts["exact_phrase"])) {
+ $opts["exact_phrase"] = false;
+ }
+ if (!isset($opts["single_passage"])) {
+ $opts["single_passage"] = false;
+ }
+ if (!isset($opts["use_boundaries"])) {
+ $opts["use_boundaries"] = false;
+ }
+ if (!isset($opts["weight_order"])) {
+ $opts["weight_order"] = false;
+ }
/////////////////
// build request
@@ -1302,10 +1363,18 @@ class SphinxClient extends cache_common
// v.1.0 req
$flags = 1; // remove spaces
- if ($opts["exact_phrase"]) $flags |= 2;
- if ($opts["single_passage"]) $flags |= 4;
- if ($opts["use_boundaries"]) $flags |= 8;
- if ($opts["weight_order"]) $flags |= 16;
+ if ($opts["exact_phrase"]) {
+ $flags |= 2;
+ }
+ if ($opts["single_passage"]) {
+ $flags |= 4;
+ }
+ if ($opts["use_boundaries"]) {
+ $flags |= 8;
+ }
+ if ($opts["weight_order"]) {
+ $flags |= 16;
+ }
$req = pack("NN", 0, $flags); // mode=0, flags=$flags
$req .= pack("N", strlen($index)) . $index; // req index
$req .= pack("N", strlen($words)) . $words; // req words
@@ -1369,7 +1438,7 @@ class SphinxClient extends cache_common
/// connect to searchd server, and generate keyword list for a given query
/// returns false on failure,
/// an array of words on success
- function BuildKeywords($query, $index, $hits)
+ public function BuildKeywords($query, $index, $hits)
{
assert(is_string($query));
assert(is_string($index));
@@ -1444,7 +1513,7 @@ class SphinxClient extends cache_common
return $res;
}
- function EscapeString($string)
+ public function EscapeString($string)
{
$from = array('\\', '(', ')', '|', '-', '!', '@', '~', '"', '&', '/', '^', '$', '=');
$to = array('\\\\', '\(', '\)', '\|', '\-', '\!', '\@', '\~', '\"', '\&', '\/', '\^', '\$', '\=');
@@ -1458,15 +1527,16 @@ class SphinxClient extends cache_common
/// batch update given attributes in given rows in given indexes
/// returns amount of updated documents (0 or more) on success, or -1 on failure
- function UpdateAttributes($index, $attrs, $values, $mva = false)
+ public function UpdateAttributes($index, $attrs, $values, $mva = false)
{
// verify everything
assert(is_string($index));
assert(is_bool($mva));
assert(is_array($attrs));
- foreach ($attrs as $attr)
+ foreach ($attrs as $attr) {
assert(is_string($attr));
+ }
assert(is_array($values));
foreach ($values as $id => $entry) {
@@ -1476,10 +1546,12 @@ class SphinxClient extends cache_common
foreach ($entry as $v) {
if ($mva) {
assert(is_array($v));
- foreach ($v as $vv)
+ foreach ($v as $vv) {
assert(is_int($vv));
- } else
+ }
+ } else {
assert(is_int($v));
+ }
}
}
@@ -1497,23 +1569,28 @@ class SphinxClient extends cache_common
$req .= sphPackU64($id);
foreach ($entry as $v) {
$req .= pack("N", $mva ? count($v) : $v);
- if ($mva)
- foreach ($v as $vv)
+ if ($mva) {
+ foreach ($v as $vv) {
$req .= pack("N", $vv);
+ }
+ }
}
}
// connect, send query, get response
- if (!($fp = $this->_Connect()))
+ if (!($fp = $this->_Connect())) {
return -1;
+ }
$len = strlen($req);
$req = pack("nnN", SEARCHD_COMMAND_UPDATE, VER_COMMAND_UPDATE, $len) . $req; // add header
- if (!$this->_Send($fp, $req, $len + 8))
+ if (!$this->_Send($fp, $req, $len + 8)) {
return -1;
+ }
- if (!($response = $this->_GetResponse($fp, VER_COMMAND_UPDATE)))
+ if (!($response = $this->_GetResponse($fp, VER_COMMAND_UPDATE))) {
return -1;
+ }
// parse response
list(, $updated) = unpack("N*", substr($response, 0, 4));
@@ -1524,25 +1601,27 @@ class SphinxClient extends cache_common
// persistent connections
/////////////////////////////////////////////////////////////////////////////
- function Open()
+ public function Open()
{
if ($this->_socket !== false) {
$this->_error = 'already connected';
return false;
}
- if (!$fp = $this->_Connect())
+ if (!$fp = $this->_Connect()) {
return false;
+ }
// command, command version = 0, body length = 4, body = 1
$req = pack("nnNN", SEARCHD_COMMAND_PERSIST, 0, 4, 1);
- if (!$this->_Send($fp, $req, 12))
+ if (!$this->_Send($fp, $req, 12)) {
return false;
+ }
$this->_socket = $fp;
return true;
}
- function Close()
+ public function Close()
{
if ($this->_socket === false) {
$this->_error = 'not connected';
@@ -1559,7 +1638,7 @@ class SphinxClient extends cache_common
// status
//////////////////////////////////////////////////////////////////////////
- function Status()
+ public function Status()
{
$this->_MBPush();
if (!($fp = $this->_Connect())) {
@@ -1577,17 +1656,18 @@ class SphinxClient extends cache_common
$res = substr($response, 4); // just ignore length, error handling, etc
$p = 0;
- list ($rows, $cols) = array_values(unpack("N*N*", substr($response, $p, 8)));
+ list($rows, $cols) = array_values(unpack("N*N*", substr($response, $p, 8)));
$p += 8;
$res = array();
- for ($i = 0; $i < $rows; $i++)
+ for ($i = 0; $i < $rows; $i++) {
for ($j = 0; $j < $cols; $j++) {
list(, $len) = unpack("N*", substr($response, $p, 4));
$p += 4;
$res[$i][] = substr($response, $p, $len);
$p += $len;
}
+ }
$this->_MBPop();
return $res;
diff --git a/library/includes/bbcode.php b/library/includes/bbcode.php
index caf2dbb51..731cf9efe 100644
--- a/library/includes/bbcode.php
+++ b/library/includes/bbcode.php
@@ -1,6 +1,8 @@
enqueue(array(
'smile_replacements',
@@ -220,7 +222,7 @@ function strip_quotes($text)
$stack = array();
$newtext = '[...] ';
$substr_pos = 0;
- foreach ($pos_list AS $pos => $type) {
+ foreach ($pos_list as $pos => $type) {
$stacksize = sizeof($stack);
if ($type == 'start') {
// empty stack, so add from the last close tag or the beginning of the string
@@ -244,7 +246,7 @@ function strip_quotes($text)
// as key points, and repeat. Allows emulation of a non-greedy-type
// recursion.
if ($stack) {
- foreach ($stack AS $pos) {
+ foreach ($stack as $pos) {
unset($pos_list["$pos"]);
}
}
@@ -349,12 +351,14 @@ function extract_search_words($text)
// short & long words 2
$text_out = array();
foreach ($text as $word) {
- if (mb_strlen($word) > $min_word_len && mb_strlen($word) <= $max_word_len) $text_out[] = $word;
+ if (mb_strlen($word) > $min_word_len && mb_strlen($word) <= $max_word_len) {
+ $text_out[] = $word;
+ }
}
$text = $text_out;
if (sizeof($text) > $max_words_count) {
-# shuffle($text);
+ # shuffle($text);
$text = array_splice($text, 0, $max_words_count);
}
@@ -399,11 +403,11 @@ function add_search_words($post_id, $post_message, $topic_title = '', $only_retu
class bbcode
{
- var $tpl = array(); // шаблоны для замены тегов
- var $smilies = null; // смайлы
- var $found_spam = null; // найденные спам "слова"
- var $del_words = array(); // см. get_words_rate()
- var $tidy_cfg = array(
+ public $tpl = array(); // шаблоны для замены тегов
+ public $smilies = null; // смайлы
+ public $found_spam = null; // найденные спам "слова"
+ public $del_words = array(); // см. get_words_rate()
+ public $tidy_cfg = array(
'drop-empty-paras' => false,
'fix-uri' => false,
'force-output' => true,
@@ -421,7 +425,7 @@ class bbcode
'show-warnings' => false,
'wrap' => 0,
);
- var $block_tags = array(
+ public $block_tags = array(
'align',
'br',
'clear',
@@ -431,17 +435,17 @@ class bbcode
'quote',
'spoiler',
);
- var $preg = array();
- var $str = array();
- var $preg_search = array();
- var $preg_repl = array();
- var $str_search = array();
- var $str_repl = array();
+ public $preg = array();
+ public $str = array();
+ public $preg_search = array();
+ public $preg_repl = array();
+ public $str_search = array();
+ public $str_repl = array();
/**
* Constructor
*/
- function bbcode()
+ public function bbcode()
{
$this->tpl = get_bbcode_tpl();
@@ -451,7 +455,7 @@ class bbcode
/**
* init_replacements
*/
- function init_replacements()
+ public function init_replacements()
{
$tpl = $this->tpl;
$img_exp = '(https?:)?//[^\s\?&;=\#\"<>]+?\.(jpg|jpeg|gif|png)([a-z0-9/?&%;][^\[\]]*)?';
@@ -517,7 +521,7 @@ class bbcode
*
* @return string
*/
- function bbcode2html($text)
+ public function bbcode2html($text)
{
/** @var \TorrentPier\Di $di */
$di = \TorrentPier\Di::getInstance();
@@ -570,7 +574,7 @@ class bbcode
*
* @return mixed|string
*/
- static function clean_up($text)
+ public static function clean_up($text)
{
$text = trim($text);
$text = str_replace("\r", '', $text);
@@ -646,7 +650,7 @@ class bbcode
*
* @return string
*/
- function code_callback($m)
+ public function code_callback($m)
{
$code = trim($m[2]);
$code = str_replace(' ', ' ', $code);
@@ -663,7 +667,7 @@ class bbcode
*
* @return string
*/
- function url_callback($m)
+ public function url_callback($m)
{
/** @var \TorrentPier\Di $di */
$di = \TorrentPier\Di::getInstance();
@@ -671,7 +675,9 @@ class bbcode
$url = trim($m[1]);
$url_name = (isset($m[2])) ? trim($m[2]) : $url;
- if (!preg_match("#^https?://#isu", $url) && !preg_match("/^#/", $url)) $url = 'http://' . $url;
+ if (!preg_match("#^https?://#isu", $url) && !preg_match("/^#/", $url)) {
+ $url = 'http://' . $url;
+ }
if (in_array(parse_url($url, PHP_URL_HOST), $di->config->get('nofollow.allowed_url')) || $di->config->get('nofollow.disabled')) {
$link = "$url_name";
@@ -689,7 +695,7 @@ class bbcode
*
* @return string
*/
- function escape_tiltes_callback($m)
+ public function escape_tiltes_callback($m)
{
$tilte = substr($m[3], 0, 250);
$tilte = str_replace(array('[', ']', ':', ')', '"'), array('[', ']', ':', ')', '"'), $tilte);
@@ -705,7 +711,7 @@ class bbcode
*
* @return string
*/
- function make_clickable($text)
+ public function make_clickable($text)
{
$url_regexp = "#
(?
', $text);
$text = str_replace("\n", '
', $text);
@@ -800,7 +806,7 @@ class bbcode
*
* @return string
*/
- function tidy($text)
+ public function tidy($text)
{
$text = tidy_repair_string($text, $this->tidy_cfg, 'utf8');
return $text;
@@ -825,14 +831,14 @@ function bbcode2html($text)
class words_rate
{
- var $dbg_mode = false;
- var $words_rate = 0;
- var $deleted_words = array();
- var $del_text_hl = '';
- var $words_del_exp = '';
- var $words_cnt_exp = '#[a-zA-Zа-яА-ЯёЁ]{4,}#';
+ public $dbg_mode = false;
+ public $words_rate = 0;
+ public $deleted_words = array();
+ public $del_text_hl = '';
+ public $words_del_exp = '';
+ public $words_cnt_exp = '#[a-zA-Zа-яА-ЯёЁ]{4,}#';
- function words_rate()
+ public function words_rate()
{
// слова начинающиеся на..
$del_list = file_get_contents(BB_ROOT . '/library/words_rate_del_list.txt');
@@ -850,7 +856,7 @@ class words_rate
*
* @return int
*/
- function get_words_rate($text)
+ public function get_words_rate($text)
{
$this->words_rate = 127; // максимальное значение по умолчанию
$this->deleted_words = array();
diff --git a/library/includes/classes/emailer.php b/library/includes/classes/emailer.php
index 265d6f0dd..0b5707e86 100644
--- a/library/includes/classes/emailer.php
+++ b/library/includes/classes/emailer.php
@@ -1,17 +1,19 @@
use_smtp = $use_smtp;
}
- function set_default_vars()
+ public function set_default_vars()
{
/** @var \TorrentPier\Di $di */
$di = \TorrentPier\Di::getInstance();
@@ -35,7 +37,7 @@ class emailer
}
// Resets all the data (address, template file, etc etc to default
- function reset()
+ public function reset()
{
$this->addresses = array();
$this->msg = $this->extra_headers = '';
@@ -43,44 +45,44 @@ class emailer
}
// Sets an email address to send to
- function email_address($address)
+ public function email_address($address)
{
$this->addresses['to'] = trim($address);
}
- function cc($address)
+ public function cc($address)
{
$this->addresses['cc'][] = trim($address);
}
- function bcc($address)
+ public function bcc($address)
{
$this->addresses['bcc'][] = trim($address);
}
- function replyto($address)
+ public function replyto($address)
{
$this->reply_to = trim($address);
}
- function from($address)
+ public function from($address)
{
$this->from = trim($address);
}
// set up subject for mail
- function set_subject($subject = '')
+ public function set_subject($subject = '')
{
$this->subject = trim(preg_replace('#[\n\r]+#s', '', $subject));
}
// set up extra mail headers
- function extra_headers($headers)
+ public function extra_headers($headers)
{
$this->extra_headers .= trim($headers) . "\n";
}
- function use_template($template_file, $template_lang = '')
+ public function use_template($template_file, $template_lang = '')
{
/** @var \TorrentPier\Di $di */
$di = \TorrentPier\Di::getInstance();
@@ -118,13 +120,13 @@ class emailer
}
// assign variables
- function assign_vars($vars)
+ public function assign_vars($vars)
{
$this->vars = array_merge($this->vars, $vars);
}
// Send the mail out to the recipients set previously in var $this->address
- function send($email_format = 'text')
+ public function send($email_format = 'text')
{
global $userdata;
@@ -206,7 +208,7 @@ class emailer
return true;
}
- function encode($str)
+ public function encode($str)
{
if ($this->encoding == '') {
return $str;
diff --git a/library/includes/classes/sitemap.php b/library/includes/classes/sitemap.php
index 6c8072097..6b1463a8f 100644
--- a/library/includes/classes/sitemap.php
+++ b/library/includes/classes/sitemap.php
@@ -1,22 +1,24 @@
home = make_url();
}
- function build_map()
+ public function build_map()
{
$map = "\n\n";
$map .= $this->get_static();
@@ -27,7 +29,7 @@ class sitemap
return $map;
}
- function build_index($count)
+ public function build_index($count)
{
$lm = date('c');
$map = "\n\n";
@@ -41,7 +43,7 @@ class sitemap
return $map;
}
- function build_stat()
+ public function build_stat()
{
$map = "\n\n";
$map .= $this->get_static();
@@ -51,7 +53,7 @@ class sitemap
return $map;
}
- function build_map_topic($n)
+ public function build_map_topic($n)
{
$map = "\n\n";
$map .= $this->get_topic($n);
@@ -60,7 +62,7 @@ class sitemap
return $map;
}
- function get_forum()
+ public function get_forum()
{
global $datastore;
@@ -79,15 +81,18 @@ class sitemap
$sql = DB()->sql_query("SELECT forum_id, forum_topics, forum_parent, forum_name FROM " . BB_FORUMS . " " . $ignore_forum_sql . " ORDER BY forum_id ASC");
while ($row = DB()->sql_fetchrow($sql)) {
- if (function_exists('seo_url')) $loc = $this->home . seo_url(FORUM_URL . $row['forum_id'], $row['forum_name']);
- else $loc = $this->home . FORUM_URL . $row['forum_id'];
+ if (function_exists('seo_url')) {
+ $loc = $this->home . seo_url(FORUM_URL . $row['forum_id'], $row['forum_name']);
+ } else {
+ $loc = $this->home . FORUM_URL . $row['forum_id'];
+ }
$xml .= $this->get_xml($loc, $lm);
}
return $xml;
}
- function get_topic($page = false)
+ public function get_topic($page = false)
{
global $datastore;
@@ -99,7 +104,9 @@ class sitemap
$page = $page * 40000;
$this->limit = " LIMIT {$page},40000";
} else {
- if ($this->limit < 1) $this->limit = false;
+ if ($this->limit < 1) {
+ $this->limit = false;
+ }
if ($this->limit) {
$this->limit = " LIMIT 0," . $this->limit;
} else {
@@ -118,15 +125,18 @@ class sitemap
$sql = DB()->sql_query("SELECT topic_id, topic_title, topic_time FROM " . BB_TOPICS . " " . $ignore_forum_sql . " ORDER BY topic_time ASC" . $this->limit);
while ($row = DB()->sql_fetchrow($sql)) {
- if (function_exists('seo_url')) $loc = $this->home . seo_url(TOPIC_URL . $row['topic_id'], $row['topic_title']);
- else $loc = $this->home . TOPIC_URL . $row['topic_id'];
+ if (function_exists('seo_url')) {
+ $loc = $this->home . seo_url(TOPIC_URL . $row['topic_id'], $row['topic_title']);
+ } else {
+ $loc = $this->home . TOPIC_URL . $row['topic_id'];
+ }
$xml .= $this->get_xml($loc, date('c', $row['topic_time']));
}
return $xml;
}
- function get_static()
+ public function get_static()
{
/** @var \TorrentPier\Di $di */
$di = \TorrentPier\Di::getInstance();
@@ -151,7 +161,7 @@ class sitemap
return $xml;
}
- function get_xml($loc, $lm)
+ public function get_xml($loc, $lm)
{
$xml = "\t\n";
$xml .= "\t\t$loc\n";
@@ -162,7 +172,7 @@ class sitemap
return $xml;
}
- function send_url($url, $map)
+ public function send_url($url, $map)
{
$data = false;
$file = $url . urlencode($map);
@@ -185,11 +195,13 @@ class sitemap
}
}
- function create()
+ public function create()
{
$row = DB()->fetch_row("SELECT COUNT(*) AS count FROM " . BB_TOPICS);
- if (!$this->limit) $this->limit = $row['count'];
+ if (!$this->limit) {
+ $this->limit = $row['count'];
+ }
if ($this->limit > 40000) {
$pages_count = ceil($row['count'] / 40000);
diff --git a/library/includes/core/dbs.php b/library/includes/core/dbs.php
index 7ec766746..06f4874eb 100644
--- a/library/includes/core/dbs.php
+++ b/library/includes/core/dbs.php
@@ -1,20 +1,22 @@
$srv_cfg
- var $srv = array(); // $srv_name => $db_obj
- var $alias = array(); // $srv_alias => $srv_name
+ public $cfg = array(); // $srv_name => $srv_cfg
+ public $srv = array(); // $srv_name => $db_obj
+ public $alias = array(); // $srv_alias => $srv_name
- var $log_file = 'sql_queries';
- var $log_counter = 0;
- var $num_queries = 0;
- var $sql_inittime = 0;
- var $sql_timetotal = 0;
+ public $log_file = 'sql_queries';
+ public $log_counter = 0;
+ public $num_queries = 0;
+ public $sql_inittime = 0;
+ public $sql_timetotal = 0;
- function DBS($cfg)
+ public function DBS($cfg)
{
$this->cfg = $cfg['db'];
$this->alias = $cfg['db_alias'];
@@ -25,7 +27,7 @@ class DBS
}
// получение/инициализация класса для сервера $srv_name
- function get_db_obj($srv_name_or_alias = 'db1')
+ public function get_db_obj($srv_name_or_alias = 'db1')
{
$srv_name = $this->get_srv_name($srv_name_or_alias);
@@ -37,11 +39,11 @@ class DBS
}
// определение имени сервера
- function get_srv_name($name)
+ public function get_srv_name($name)
{
if (isset($this->alias[$name])) {
$srv_name = $this->alias[$name];
- } else if (isset($this->cfg[$name])) {
+ } elseif (isset($this->cfg[$name])) {
$srv_name = $name;
} else {
$srv_name = 'db1';
diff --git a/library/includes/core/mysql.php b/library/includes/core/mysql.php
index eda719d12..d9fbe1fa0 100644
--- a/library/includes/core/mysql.php
+++ b/library/includes/core/mysql.php
@@ -1,44 +1,46 @@
link = $this->connect();
@@ -82,7 +84,7 @@ class sql_db
/**
* Open connection
*/
- function connect()
+ public function connect()
{
$this->cur_query = ($this->dbg_enabled) ? ($this->cfg['persist'] ? 'p' : '') . "connect to: {$this->cfg['dbhost']}" : 'connect';
$this->debug('start');
@@ -107,7 +109,7 @@ class sql_db
/**
* Select database
*/
- function select_db()
+ public function select_db()
{
$this->cur_query = ($this->dbg_enabled) ? "select db: {$this->cfg['dbname']}" : 'select db';
$this->debug('start');
@@ -126,7 +128,7 @@ class sql_db
/**
* Base query method
*/
- function sql_query($query)
+ public function sql_query($query)
{
if (!is_resource($this->link)) {
$this->init();
@@ -158,7 +160,7 @@ class sql_db
/**
* Execute query WRAPPER (with error handling)
*/
- function query($query)
+ public function query($query)
{
if (!$result = $this->sql_query($query)) {
$this->trigger_error();
@@ -170,11 +172,11 @@ class sql_db
/**
* Return number of rows
*/
- function num_rows($result = false)
+ public function num_rows($result = false)
{
$num_rows = false;
- if ($result OR $result = $this->result) {
+ if ($result or $result = $this->result) {
$num_rows = is_resource($result) ? mysql_num_rows($result) : false;
}
@@ -184,7 +186,7 @@ class sql_db
/**
* Return number of affected rows
*/
- function affected_rows()
+ public function affected_rows()
{
return is_resource($this->link) ? mysql_affected_rows($this->link) : -1;
}
@@ -192,7 +194,7 @@ class sql_db
/**
* Fetch current field
*/
- function sql_fetchfield($field, $rownum = -1, $query_id = 0)
+ public function sql_fetchfield($field, $rownum = -1, $query_id = 0)
{
if (!$query_id) {
$query_id = $this->query_result;
@@ -208,7 +210,7 @@ class sql_db
} else {
if ($this->rowset[$query_id]) {
$result = $this->rowset[$query_id][0][$field];
- } else if ($this->row[$query_id]) {
+ } elseif ($this->row[$query_id]) {
$result = $this->row[$query_id][$field];
}
}
@@ -222,7 +224,7 @@ class sql_db
/**
* Fetch current row
*/
- function sql_fetchrow($result, $field_name = '')
+ public function sql_fetchrow($result, $field_name = '')
{
$row = mysql_fetch_assoc($result);
@@ -236,7 +238,7 @@ class sql_db
/**
* Alias of sql_fetchrow()
*/
- function fetch_next($result)
+ public function fetch_next($result)
{
return $this->sql_fetchrow($result);
}
@@ -244,7 +246,7 @@ class sql_db
/**
* Fetch row WRAPPER (with error handling)
*/
- function fetch_row($query, $field_name = '')
+ public function fetch_row($query, $field_name = '')
{
if (!$result = $this->sql_query($query)) {
$this->trigger_error();
@@ -256,7 +258,7 @@ class sql_db
/**
* Fetch all rows
*/
- function sql_fetchrowset($result, $field_name = '')
+ public function sql_fetchrowset($result, $field_name = '')
{
$rowset = array();
@@ -270,7 +272,7 @@ class sql_db
/**
* Fetch all rows WRAPPER (with error handling)
*/
- function fetch_rowset($query, $field_name = '')
+ public function fetch_rowset($query, $field_name = '')
{
if (!$result = $this->sql_query($query)) {
$this->trigger_error();
@@ -282,7 +284,7 @@ class sql_db
/**
* Fetch all rows WRAPPER (with error handling)
*/
- function fetch_all($query, $field_name = '')
+ public function fetch_all($query, $field_name = '')
{
if (!$result = $this->sql_query($query)) {
$this->trigger_error();
@@ -294,7 +296,7 @@ class sql_db
/**
* Get last inserted id after insert statement
*/
- function sql_nextid()
+ public function sql_nextid()
{
return mysql_insert_id($this->link);
}
@@ -302,9 +304,9 @@ class sql_db
/**
* Free sql result
*/
- function sql_freeresult($result = false)
+ public function sql_freeresult($result = false)
{
- if ($result OR $result = $this->result) {
+ if ($result or $result = $this->result) {
$return_value = is_resource($result) ? mysql_free_result($result) : false;
}
@@ -314,10 +316,14 @@ class sql_db
/**
* Escape data used in sql query
*/
- function escape($v, $check_type = false, $dont_escape = false)
+ public function escape($v, $check_type = false, $dont_escape = false)
{
- if ($dont_escape) return $v;
- if (!$check_type) return $this->escape_string($v);
+ if ($dont_escape) {
+ return $v;
+ }
+ if (!$check_type) {
+ return $this->escape_string($v);
+ }
switch (true) {
case is_string($v):
@@ -338,7 +344,7 @@ class sql_db
/**
* Escape string
*/
- function escape_string($str)
+ public function escape_string($str)
{
if (!is_resource($this->link)) {
$this->init();
@@ -352,7 +358,7 @@ class sql_db
*
* Possible $query_type values: INSERT, INSERT_SELECT, MULTI_INSERT, UPDATE, SELECT
*/
- function build_array($query_type, $input_ary, $data_already_escaped = false, $check_data_type_in_escape = true)
+ public function build_array($query_type, $input_ary, $data_already_escaped = false, $check_data_type_in_escape = true)
{
$fields = $values = $ary = $query = array();
$dont_escape = $data_already_escaped;
@@ -370,7 +376,7 @@ class sql_db
$fields = join(', ', $fields);
$values = join(', ', $values);
$query = "($fields)\nVALUES\n($values)";
- } else if ($query_type == 'INSERT_SELECT') {
+ } elseif ($query_type == 'INSERT_SELECT') {
foreach ($input_ary as $field => $val) {
$fields[] = $field;
$values[] = $this->escape($val, $check_type, $dont_escape);
@@ -378,7 +384,7 @@ class sql_db
$fields = join(', ', $fields);
$values = join(', ', $values);
$query = "($fields)\nSELECT\n$values";
- } else if ($query_type == 'MULTI_INSERT') {
+ } elseif ($query_type == 'MULTI_INSERT') {
foreach ($input_ary as $id => $sql_ary) {
foreach ($sql_ary as $field => $val) {
$values[] = $this->escape($val, $check_type, $dont_escape);
@@ -389,7 +395,7 @@ class sql_db
$fields = join(', ', array_keys($input_ary[0]));
$values = join(",\n", $ary);
$query = "($fields)\nVALUES\n$values";
- } else if ($query_type == 'SELECT' || $query_type == 'UPDATE') {
+ } elseif ($query_type == 'SELECT' || $query_type == 'UPDATE') {
foreach ($input_ary as $field => $val) {
$ary[] = "$field = " . $this->escape($val, $check_type, $dont_escape);
}
@@ -404,7 +410,7 @@ class sql_db
return "\n" . $query . "\n";
}
- function get_empty_sql_array()
+ public function get_empty_sql_array()
{
return array(
'SELECT' => array(),
@@ -420,7 +426,7 @@ class sql_db
);
}
- function build_sql($sql_ary)
+ public function build_sql($sql_ary)
{
$sql = '';
array_deep($sql_ary, 'array_unique', false, true);
@@ -463,7 +469,7 @@ class sql_db
/**
* Return sql error array
*/
- function sql_error()
+ public function sql_error()
{
if (is_resource($this->link)) {
return array('code' => mysql_errno($this->link), 'message' => mysql_error($this->link));
@@ -475,7 +481,7 @@ class sql_db
/**
* Close sql connection
*/
- function close()
+ public function close()
{
if (is_resource($this->link)) {
$this->unlock();
@@ -497,7 +503,7 @@ class sql_db
/**
* Add shutdown query
*/
- function add_shutdown_query($sql)
+ public function add_shutdown_query($sql)
{
$this->shutdown['__sql'][] = $sql;
}
@@ -505,9 +511,11 @@ class sql_db
/**
* Exec shutdown queries
*/
- function exec_shutdown_queries()
+ public function exec_shutdown_queries()
{
- if (empty($this->shutdown)) return;
+ if (empty($this->shutdown)) {
+ return;
+ }
if (!empty($this->shutdown['post_html'])) {
$post_html_sql = $this->build_array('MULTI_INSERT', $this->shutdown['post_html']);
@@ -524,10 +532,10 @@ class sql_db
/**
* Lock tables
*/
- function lock($tables, $lock_type = 'WRITE')
+ public function lock($tables, $lock_type = 'WRITE')
{
if ($this->cfg['persist']) {
-# return true;
+ # return true;
}
$tables_sql = array();
@@ -545,7 +553,7 @@ class sql_db
/**
* Unlock tables
*/
- function unlock()
+ public function unlock()
{
if ($this->locked && $this->sql_query("UNLOCK TABLES")) {
$this->locked = false;
@@ -557,7 +565,7 @@ class sql_db
/**
* Obtain user level lock
*/
- function get_lock($name, $timeout = 0)
+ public function get_lock($name, $timeout = 0)
{
$lock_name = $this->get_lock_name($name);
$timeout = (int)$timeout;
@@ -573,7 +581,7 @@ class sql_db
/**
* Obtain user level lock status
*/
- function release_lock($name)
+ public function release_lock($name)
{
$lock_name = $this->get_lock_name($name);
$row = $this->fetch_row("SELECT RELEASE_LOCK('$lock_name') AS lock_result");
@@ -588,7 +596,7 @@ class sql_db
/**
* Release user level lock
*/
- function is_free_lock($name)
+ public function is_free_lock($name)
{
$lock_name = $this->get_lock_name($name);
$row = $this->fetch_row("SELECT IS_FREE_LOCK('$lock_name') AS lock_result");
@@ -598,7 +606,7 @@ class sql_db
/**
* Make per db unique lock name
*/
- function get_lock_name($name)
+ public function get_lock_name($name)
{
if (!$this->selected_db) {
$this->init();
@@ -610,7 +618,7 @@ class sql_db
/**
* Get info about last query
*/
- function query_info()
+ public function query_info()
{
$info = array();
@@ -618,9 +626,9 @@ class sql_db
$info[] = "$num rows";
}
- if (is_resource($this->link) AND $ext = mysql_info($this->link)) {
+ if (is_resource($this->link) and $ext = mysql_info($this->link)) {
$info[] = "$ext";
- } else if (!$num && ($aff = $this->affected_rows($this->result) AND $aff != -1)) {
+ } elseif (!$num && ($aff = $this->affected_rows($this->result) and $aff != -1)) {
$info[] = "$aff rows";
}
@@ -630,7 +638,7 @@ class sql_db
/**
* Get server version
*/
- function server_version()
+ public function server_version()
{
preg_match('#^(\d+\.\d+\.\d+).*#', mysql_get_server_info(), $m);
return $m[1];
@@ -640,7 +648,7 @@ class sql_db
* Set slow query marker for xx seconds
* This will disable counting other queries as "slow" during this time
*/
- function expect_slow_query($ignoring_time = 60, $new_priority = 10)
+ public function expect_slow_query($ignoring_time = 60, $new_priority = 10)
{
/** @var \TorrentPier\Di $di */
$di = \TorrentPier\Di::getInstance();
@@ -662,9 +670,11 @@ class sql_db
/**
* Store debug info
*/
- function debug($mode)
+ public function debug($mode)
{
- if (!SQL_DEBUG) return;
+ if (!SQL_DEBUG) {
+ return;
+ }
$id =& $this->dbg_id;
$dbg =& $this->dbg[$id];
@@ -685,7 +695,7 @@ class sql_db
if ($this->do_explain) {
$this->explain('start');
}
- } else if ($mode == 'stop') {
+ } elseif ($mode == 'stop') {
if (SQL_CALC_QUERY_TIME || DBG_LOG || SQL_LOG_SLOW_QUERIES) {
$this->cur_query_time = utime() - $this->sql_starttime;
$this->sql_timetotal += $this->cur_query_time;
@@ -715,7 +725,7 @@ class sql_db
/**
* Trigger error
*/
- function trigger_error($msg = 'DB Error')
+ public function trigger_error($msg = 'DB Error')
{
if (error_reporting()) {
if (DBG_LOG === true) {
@@ -732,7 +742,7 @@ class sql_db
/**
* Find caller source
*/
- function debug_find_source($mode = '')
+ public function debug_find_source($mode = '')
{
foreach (debug_backtrace() as $trace) {
if (!empty($trace['file']) && $trace['file'] !== __FILE__) {
@@ -752,7 +762,7 @@ class sql_db
/**
* Prepare for logging
*/
- function log_next_query($queries_count = 1, $log_file = 'sql_queries')
+ public function log_next_query($queries_count = 1, $log_file = 'sql_queries')
{
$this->DBS['log_file'] = $log_file;
$this->DBS['log_counter'] = $queries_count;
@@ -761,7 +771,7 @@ class sql_db
/**
* Log query
*/
- function log_query($log_file = 'sql_queries')
+ public function log_query($log_file = 'sql_queries')
{
$q_time = ($this->cur_query_time >= 10) ? round($this->cur_query_time, 0) : sprintf('%.4f', $this->cur_query_time);
$msg = array();
@@ -782,7 +792,7 @@ class sql_db
/**
* Log slow query
*/
- function log_slow_query($log_file = 'sql_slow_bb')
+ public function log_slow_query($log_file = 'sql_slow_bb')
{
/** @var \TorrentPier\Di $di */
$di = \TorrentPier\Di::getInstance();
@@ -799,9 +809,11 @@ class sql_db
/**
* Log error
*/
- function log_error()
+ public function log_error()
{
- if (!SQL_LOG_ERRORS) return;
+ if (!SQL_LOG_ERRORS) {
+ return;
+ }
$msg = array();
$err = $this->sql_error();
@@ -825,7 +837,7 @@ class sql_db
/**
* Explain queries (based on code from phpBB3)
*/
- function explain($mode, $html_table = '', $row = '')
+ public function explain($mode, $html_table = '', $row = '')
{
$query = str_compact($this->cur_query);
// remove comments
@@ -836,7 +848,7 @@ class sql_db
$this->explain_hold = '';
if (preg_match('#UPDATE ([a-z0-9_]+).*?WHERE(.*)/#', $query, $m)) {
$query = "SELECT * FROM $m[1] WHERE $m[2]";
- } else if (preg_match('#DELETE FROM ([a-z0-9_]+).*?WHERE(.*)#s', $query, $m)) {
+ } elseif (preg_match('#DELETE FROM ([a-z0-9_]+).*?WHERE(.*)#s', $query, $m)) {
$query = "SELECT * FROM $m[1] WHERE $m[2]";
}
@@ -855,7 +867,9 @@ class sql_db
break;
case 'stop':
- if (!$this->explain_hold) break;
+ if (!$this->explain_hold) {
+ break;
+ }
$id = $this->dbg_id - 1;
$htid = 'expl-' . intval($this->link) . '-' . $id;
diff --git a/library/includes/cron/cron_check.php b/library/includes/cron/cron_check.php
index 900b5aacf..b982ec742 100644
--- a/library/includes/cron/cron_check.php
+++ b/library/includes/cron/cron_check.php
@@ -1,6 +1,8 @@
update('cat_forums');
diff --git a/library/includes/cron/jobs/ds_update_stats.php b/library/includes/cron/jobs/ds_update_stats.php
index e3bdfadcb..f8c908647 100644
--- a/library/includes/cron/jobs/ds_update_stats.php
+++ b/library/includes/cron/jobs/ds_update_stats.php
@@ -1,5 +1,7 @@
update('stats');
diff --git a/library/includes/cron/jobs/flash_topic_view.php b/library/includes/cron/jobs/flash_topic_view.php
index 9a0764ba9..a3f305a4e 100644
--- a/library/includes/cron/jobs/flash_topic_view.php
+++ b/library/includes/cron/jobs/flash_topic_view.php
@@ -1,6 +1,8 @@
lock(array(
diff --git a/library/includes/cron/jobs/prune_forums.php b/library/includes/cron/jobs/prune_forums.php
index 4ff9afd68..723c9a85c 100644
--- a/library/includes/cron/jobs/prune_forums.php
+++ b/library/includes/cron/jobs/prune_forums.php
@@ -1,6 +1,8 @@
config->get('seed_bonus_enabled') && $di->config->get('seed_bonus_point
$seed_release = unserialize($di->config->get('seed_bonus_release'));
foreach ($seed_bonus as $i => $points) {
- if (!$points || !$seed_release[$i]) continue;
+ if (!$points || !$seed_release[$i]) {
+ continue;
+ }
$user_points = ((float)$points / 4);
$release = (int)$seed_release[$i];
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 84c394bcd..eb9fdd04a 100644
--- a/library/includes/cron/jobs/tr_update_seeder_last_seen.php
+++ b/library/includes/cron/jobs/tr_update_seeder_last_seen.php
@@ -1,6 +1,8 @@
query("
UPDATE
diff --git a/library/includes/cron/jobs/update_forums_atom.php b/library/includes/cron/jobs/update_forums_atom.php
index 3b1c2bd27..d280146bf 100644
--- a/library/includes/cron/jobs/update_forums_atom.php
+++ b/library/includes/cron/jobs/update_forums_atom.php
@@ -1,6 +1,8 @@
fetch_rowset("SELECT forum_id, allow_reg_tracker, forum_name FROM " . BB_FORUMS);
if (file_exists($di->config->get('atom.path') . '/f/0.atom')) {
- if (filemtime($di->config->get('atom.path') . '/f/0.atom') <= $timecheck) update_forum_feed(0, $forums_data);
+ if (filemtime($di->config->get('atom.path') . '/f/0.atom') <= $timecheck) {
+ update_forum_feed(0, $forums_data);
+ }
} else {
update_forum_feed(0, $forums_data);
}
foreach ($forums_data as $forum_data) {
if (file_exists($di->config->get('atom.path') . '/f/' . $forum_data['forum_id'] . '.atom')) {
- if (filemtime($di->config->get('atom.path') . '/f/' . $forum_data['forum_id'] . '.atom') <= $timecheck) update_forum_feed($forum_data['forum_id'], $forum_data);
+ if (filemtime($di->config->get('atom.path') . '/f/' . $forum_data['forum_id'] . '.atom') <= $timecheck) {
+ update_forum_feed($forum_data['forum_id'], $forum_data);
+ }
} else {
update_forum_feed($forum_data['forum_id'], $forum_data);
}
diff --git a/library/includes/datastore/apc.php b/library/includes/datastore/apc.php
index 25fd9b704..09162562e 100644
--- a/library/includes/datastore/apc.php
+++ b/library/includes/datastore/apc.php
@@ -1,13 +1,15 @@
is_installed()) {
die('Error: APC extension not installed');
@@ -16,7 +18,7 @@ class datastore_apc extends datastore_common
$this->prefix = $prefix;
}
- function store($title, $var)
+ public function store($title, $var)
{
$this->data[$title] = $var;
@@ -29,7 +31,7 @@ class datastore_apc extends datastore_common
return (bool)apc_store($this->prefix . $title, $var);
}
- function clean()
+ public function clean()
{
foreach ($this->known_items as $title => $script_name) {
$this->cur_query = "cache->rm('$title')";
@@ -42,7 +44,7 @@ class datastore_apc extends datastore_common
}
}
- function _fetch_from_store()
+ public function _fetch_from_store()
{
if (!$items = $this->queued_items) {
$src = $this->_debug_find_caller('enqueue');
@@ -60,7 +62,7 @@ class datastore_apc extends datastore_common
}
}
- function is_installed()
+ public function is_installed()
{
return function_exists('apc_fetch');
}
diff --git a/library/includes/datastore/build_cat_forums.php b/library/includes/datastore/build_cat_forums.php
index 81e6a9291..731d86f81 100644
--- a/library/includes/datastore/build_cat_forums.php
+++ b/library/includes/datastore/build_cat_forums.php
@@ -1,6 +1,8 @@
array(), // only by personal permissions
diff --git a/library/includes/datastore/build_ranks.php b/library/includes/datastore/build_ranks.php
index 264fad658..ec571019a 100644
--- a/library/includes/datastore/build_ranks.php
+++ b/library/includes/datastore/build_ranks.php
@@ -1,6 +1,8 @@
data)
*/
- var $data = array();
+ public $data = array();
/**
* Список элементов, которые будут извлечены из хранилища при первом же запросе get()
* до этого момента они ставятся в очередь $queued_items для дальнейшего извлечения _fetch()'ем
* всех элементов одним запросом
* array('title1', 'title2'...)
*/
- var $queued_items = array();
+ public $queued_items = array();
/**
* 'title' => 'builder script name' inside "includes/datastore" dir
*/
- var $known_items = array(
+ public $known_items = array(
'cat_forums' => 'build_cat_forums.php',
'jumpbox' => 'build_cat_forums.php',
'viewtopic_forum_select' => 'build_cat_forums.php',
@@ -39,14 +41,14 @@ class datastore_common
/**
* Constructor
*/
- function datastore_common()
+ public function datastore_common()
{
}
/**
* @param array(item1_title, item2_title...) or single item's title
*/
- function enqueue($items)
+ public function enqueue($items)
{
foreach ((array)$items as $item) {
// игнор уже поставленного в очередь либо уже извлеченного
@@ -56,7 +58,7 @@ class datastore_common
}
}
- function &get($title)
+ public function &get($title)
{
if (!isset($this->data[$title])) {
$this->enqueue($title);
@@ -65,18 +67,18 @@ class datastore_common
return $this->data[$title];
}
- function store($item_name, $item_data)
+ public function store($item_name, $item_data)
{
}
- function rm($items)
+ public function rm($items)
{
foreach ((array)$items as $item) {
unset($this->data[$item]);
}
}
- function update($items)
+ public function update($items)
{
if ($items == 'all') {
$items = array_keys(array_unique($this->known_items));
@@ -86,7 +88,7 @@ class datastore_common
}
}
- function _fetch()
+ public function _fetch()
{
$this->_fetch_from_store();
@@ -99,11 +101,11 @@ class datastore_common
$this->queued_items = array();
}
- function _fetch_from_store()
+ public function _fetch_from_store()
{
}
- function _build_item($title)
+ public function _build_item($title)
{
if (!empty($this->known_items[$title])) {
require(INC_DIR . $this->ds_dir . $this->known_items[$title]);
@@ -112,20 +114,22 @@ class datastore_common
}
}
- var $num_queries = 0;
- var $sql_starttime = 0;
- var $sql_inittime = 0;
- var $sql_timetotal = 0;
- var $cur_query_time = 0;
+ public $num_queries = 0;
+ public $sql_starttime = 0;
+ public $sql_inittime = 0;
+ public $sql_timetotal = 0;
+ public $cur_query_time = 0;
- var $dbg = array();
- var $dbg_id = 0;
- var $dbg_enabled = false;
- var $cur_query = null;
+ public $dbg = array();
+ public $dbg_id = 0;
+ public $dbg_enabled = false;
+ public $cur_query = null;
- function debug($mode, $cur_query = null)
+ public function debug($mode, $cur_query = null)
{
- if (!$this->dbg_enabled) return;
+ if (!$this->dbg_enabled) {
+ return;
+ }
$id =& $this->dbg_id;
$dbg =& $this->dbg[$id];
@@ -138,7 +142,7 @@ class datastore_common
$dbg['file'] = $this->debug_find_source('file');
$dbg['line'] = $this->debug_find_source('line');
$dbg['time'] = '';
- } else if ($mode == 'stop') {
+ } elseif ($mode == 'stop') {
$this->cur_query_time = utime() - $this->sql_starttime;
$this->sql_timetotal += $this->cur_query_time;
$dbg['time'] = $this->cur_query_time;
@@ -146,7 +150,7 @@ class datastore_common
}
}
- function debug_find_source($mode = '')
+ public function debug_find_source($mode = '')
{
foreach (debug_backtrace() as $trace) {
if ($trace['file'] !== __FILE__) {
diff --git a/library/includes/datastore/file.php b/library/includes/datastore/file.php
index 500f6674f..d14fd53a4 100644
--- a/library/includes/datastore/file.php
+++ b/library/includes/datastore/file.php
@@ -1,21 +1,23 @@
prefix = $prefix;
$this->dir = $dir;
$this->dbg_enabled = sql_dbg_enabled();
}
- function store($title, $var)
+ public function store($title, $var)
{
$this->cur_query = "cache->set('$title')";
$this->debug('start');
@@ -36,7 +38,7 @@ class datastore_file extends datastore_common
return (bool)file_write($filecache, $filename, false, true, true);
}
- function clean()
+ public function clean()
{
$dir = $this->dir;
@@ -54,7 +56,7 @@ class datastore_file extends datastore_common
}
}
- function _fetch_from_store()
+ public function _fetch_from_store()
{
if (!$items = $this->queued_items) {
$src = $this->_debug_find_caller('enqueue');
diff --git a/library/includes/datastore/memcache.php b/library/includes/datastore/memcache.php
index c8c36d8d8..b3b2a05cb 100644
--- a/library/includes/datastore/memcache.php
+++ b/library/includes/datastore/memcache.php
@@ -1,16 +1,18 @@
is_installed()) {
die('Error: Memcached extension not installed');
@@ -22,7 +24,7 @@ class datastore_memcache extends datastore_common
$this->dbg_enabled = sql_dbg_enabled();
}
- function connect()
+ public function connect()
{
$connect_type = ($this->cfg['pconnect']) ? 'pconnect' : 'connect';
@@ -33,7 +35,9 @@ class datastore_memcache extends datastore_common
$this->connected = true;
}
- if (DBG_LOG) dbg_log(' ', 'CACHE-connect' . ($this->connected ? '' : '-FAIL'));
+ if (DBG_LOG) {
+ dbg_log(' ', 'CACHE-connect' . ($this->connected ? '' : '-FAIL'));
+ }
if (!$this->connected && $this->cfg['con_required']) {
die('Could not connect to memcached server');
@@ -43,9 +47,11 @@ class datastore_memcache extends datastore_common
$this->cur_query = null;
}
- function store($title, $var)
+ public function store($title, $var)
{
- if (!$this->connected) $this->connect();
+ if (!$this->connected) {
+ $this->connect();
+ }
$this->data[$title] = $var;
$this->cur_query = "cache->set('$title')";
@@ -57,9 +63,11 @@ class datastore_memcache extends datastore_common
return (bool)$this->memcache->set($this->prefix . $title, $var);
}
- function clean()
+ public function clean()
{
- if (!$this->connected) $this->connect();
+ if (!$this->connected) {
+ $this->connect();
+ }
foreach ($this->known_items as $title => $script_name) {
$this->cur_query = "cache->rm('$title')";
$this->debug('start');
@@ -71,14 +79,16 @@ class datastore_memcache extends datastore_common
}
}
- function _fetch_from_store()
+ public function _fetch_from_store()
{
if (!$items = $this->queued_items) {
$src = $this->_debug_find_caller('enqueue');
trigger_error("Datastore: item '$item' already enqueued [$src]", E_USER_ERROR);
}
- if (!$this->connected) $this->connect();
+ if (!$this->connected) {
+ $this->connect();
+ }
foreach ($items as $item) {
$this->cur_query = "cache->get('$item')";
$this->debug('start');
@@ -90,7 +100,7 @@ class datastore_memcache extends datastore_common
}
}
- function is_installed()
+ public function is_installed()
{
return class_exists('Memcache');
}
diff --git a/library/includes/datastore/redis.php b/library/includes/datastore/redis.php
index b660c591b..e90827cc4 100644
--- a/library/includes/datastore/redis.php
+++ b/library/includes/datastore/redis.php
@@ -1,16 +1,18 @@
is_installed()) {
die('Error: Redis extension not installed');
@@ -22,7 +24,7 @@ class datastore_redis extends datastore_common
$this->prefix = $prefix;
}
- function connect()
+ public function connect()
{
$this->cur_query = 'connect ' . $this->cfg['host'] . ':' . $this->cfg['port'];
$this->debug('start');
@@ -39,9 +41,11 @@ class datastore_redis extends datastore_common
$this->cur_query = null;
}
- function store($title, $var)
+ public function store($title, $var)
{
- if (!$this->connected) $this->connect();
+ if (!$this->connected) {
+ $this->connect();
+ }
$this->data[$title] = $var;
$this->cur_query = "cache->set('$title')";
@@ -53,9 +57,11 @@ class datastore_redis extends datastore_common
return (bool)$this->redis->set($this->prefix . $title, serialize($var));
}
- function clean()
+ public function clean()
{
- if (!$this->connected) $this->connect();
+ if (!$this->connected) {
+ $this->connect();
+ }
foreach ($this->known_items as $title => $script_name) {
$this->cur_query = "cache->rm('$title')";
$this->debug('start');
@@ -67,14 +73,16 @@ class datastore_redis extends datastore_common
}
}
- function _fetch_from_store()
+ public function _fetch_from_store()
{
if (!$items = $this->queued_items) {
$src = $this->_debug_find_caller('enqueue');
trigger_error("Datastore: item '$item' already enqueued [$src]", E_USER_ERROR);
}
- if (!$this->connected) $this->connect();
+ if (!$this->connected) {
+ $this->connect();
+ }
foreach ($items as $item) {
$this->cur_query = "cache->get('$item')";
$this->debug('start');
@@ -86,7 +94,7 @@ class datastore_redis extends datastore_common
}
}
- function is_installed()
+ public function is_installed()
{
return class_exists('Redis');
}
diff --git a/library/includes/datastore/sqlite.php b/library/includes/datastore/sqlite.php
index 5c18298c5..9595755be 100644
--- a/library/includes/datastore/sqlite.php
+++ b/library/includes/datastore/sqlite.php
@@ -1,13 +1,15 @@
'/path/to/datastore.db.sqlite',
'table_name' => 'datastore',
'table_schema' => 'CREATE TABLE datastore (
@@ -20,14 +22,14 @@ class datastore_sqlite extends datastore_common
'log_name' => 'DATASTORE',
);
- function datastore_sqlite($cfg, $prefix = null)
+ public function datastore_sqlite($cfg, $prefix = null)
{
$this->cfg = array_merge($this->cfg, $cfg);
$this->db = new sqlite_common($this->cfg);
$this->prefix = $prefix;
}
- function store($item_name, $item_data)
+ public function store($item_name, $item_data)
{
$this->data[$item_name] = $item_data;
@@ -39,14 +41,16 @@ class datastore_sqlite extends datastore_common
return (bool)$result;
}
- function clean()
+ public function clean()
{
$this->db->query("DELETE FROM " . $this->cfg['table_name']);
}
- function _fetch_from_store()
+ public function _fetch_from_store()
{
- if (!$items = $this->queued_items) return;
+ if (!$items = $this->queued_items) {
+ return;
+ }
$prefix_len = strlen($this->prefix);
$prefix_sql = SQLite3::escapeString($this->prefix);
diff --git a/library/includes/datastore/xcache.php b/library/includes/datastore/xcache.php
index 975756df3..b1a0a37e2 100644
--- a/library/includes/datastore/xcache.php
+++ b/library/includes/datastore/xcache.php
@@ -1,13 +1,15 @@
is_installed()) {
die('Error: XCache extension not installed');
@@ -17,7 +19,7 @@ class datastore_xcache extends datastore_common
$this->prefix = $prefix;
}
- function store($title, $var)
+ public function store($title, $var)
{
$this->data[$title] = $var;
@@ -30,7 +32,7 @@ class datastore_xcache extends datastore_common
return (bool)xcache_set($this->prefix . $title, $var);
}
- function clean()
+ public function clean()
{
foreach ($this->known_items as $title => $script_name) {
$this->cur_query = "cache->rm('$title')";
@@ -43,7 +45,7 @@ class datastore_xcache extends datastore_common
}
}
- function _fetch_from_store()
+ public function _fetch_from_store()
{
if (!$items = $this->queued_items) {
$src = $this->_debug_find_caller('enqueue');
@@ -61,7 +63,7 @@ class datastore_xcache extends datastore_common
}
}
- function is_installed()
+ public function is_installed()
{
return function_exists('xcache_get');
}
diff --git a/library/includes/functions.php b/library/includes/functions.php
index b3ce90d11..3dab50e90 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -1,6 +1,8 @@
$f_access);
}
@@ -313,7 +317,7 @@ function auth($type, $forum_id, $ug_data, $f_access = array(), $group_perm = UG_
$u_access[$row['forum_id']] = $row['forum_perm'];
}
} // USER mode
- else if (!empty($ug_data['user_id'])) {
+ elseif (!empty($ug_data['user_id'])) {
$is_guest = empty($ug_data['session_logged_in']);
$is_admin = (!$is_guest && $ug_data['user_level'] == ADMIN);
@@ -406,26 +410,30 @@ function auth($type, $forum_id, $ug_data, $f_access = array(), $group_perm = UG_
function auth_check($bf_ary, $bf_key, $perm_ary, $perm_key, $is_admin = false)
{
- if ($is_admin) return true;
- if (!isset($perm_ary[$perm_key])) return false;
+ if ($is_admin) {
+ return true;
+ }
+ if (!isset($perm_ary[$perm_key])) {
+ return false;
+ }
return bf($perm_ary[$perm_key], $bf_ary, $bf_key);
}
class Date_Delta
{
- var $auto_granularity = array(
+ public $auto_granularity = array(
60 => 'seconds', // set granularity to "seconds" if delta less then 1 minute
10800 => 'minutes', // 3 hours
259200 => 'hours', // 3 days
31363200 => 'mday', // 12 months
311040000 => 'mon', // 10 years
);
- var $intervals = array();
- var $format = '';
+ public $intervals = array();
+ public $format = '';
// Creates new object.
- function Date_Delta()
+ public function Date_Delta()
{
global $lang;
@@ -434,7 +442,7 @@ class Date_Delta
}
// Makes the spellable phrase.
- function spellDelta($first, $last, $from = 'auto')
+ public function spellDelta($first, $last, $from = 'auto')
{
if ($last < $first) {
$old_first = $first;
@@ -455,7 +463,9 @@ class Date_Delta
// Solve data delta.
$delta = $this->getDelta($first, $last);
- if (!$delta) return false;
+ if (!$delta) {
+ return false;
+ }
// Make spellable phrase.
$parts = array();
@@ -472,15 +482,19 @@ class Date_Delta
continue;
}
$parts[] = declension($n, $this->intervals[$k], $this->format);
- if ($k == $from) break;
+ if ($k == $from) {
+ break;
+ }
}
return join(' ', $parts);
}
// returns the associative array with date deltas.
- function getDelta($first, $last)
+ public function getDelta($first, $last)
{
- if ($last < $first) return false;
+ if ($last < $first) {
+ return false;
+ }
// Solve H:M:S part.
$hms = ($last - $first) % (3600 * 24);
@@ -520,10 +534,12 @@ class Date_Delta
}
// Returns the length (in days) of the specified month.
- function monthLength($year, $mon)
+ public function monthLength($year, $mon)
{
$l = 28;
- while (checkdate($mon, $l + 1, $year)) $l++;
+ while (checkdate($mon, $l + 1, $year)) {
+ $l++;
+ }
return $l;
}
}
@@ -561,15 +577,17 @@ function get_select($select, $selected = null, $return_as = 'html', $first_opt =
class html_common
{
- var $options = '';
- var $attr = array();
- var $cur_attr = null;
- var $max_length = HTML_SELECT_MAX_LENGTH;
- var $selected = array();
+ public $options = '';
+ public $attr = array();
+ public $cur_attr = null;
+ public $max_length = HTML_SELECT_MAX_LENGTH;
+ public $selected = array();
- function build_select($name, $params, $selected = null, $max_length = HTML_SELECT_MAX_LENGTH, $multiple_size = null, $js = '')
+ public function build_select($name, $params, $selected = null, $max_length = HTML_SELECT_MAX_LENGTH, $multiple_size = null, $js = '')
{
- if (empty($params)) return '';
+ if (empty($params)) {
+ return '';
+ }
$this->options = '';
$this->selected = array_flip((array)$selected);
@@ -593,7 +611,7 @@ class html_common
return "\n\n";
}
- function _build_select_rec($params)
+ public function _build_select_rec($params)
{
foreach ($params as $opt_name => $opt_val) {
$opt_name = rtrim($opt_name);
@@ -623,14 +641,14 @@ class html_common
}
}
- function array2html($array, $ul = 'ul', $li = 'li')
+ public function array2html($array, $ul = 'ul', $li = 'li')
{
$this->out = '';
$this->_array2html_rec($array, $ul, $li);
return "<$ul class=\"tree-root\">{$this->out}";
}
- function _array2html_rec($array, $ul, $li)
+ public function _array2html_rec($array, $ul, $li)
{
foreach ($array as $k => $v) {
if (is_array($v)) {
@@ -644,7 +662,7 @@ class html_common
}
// all arguments should be already htmlspecialchar()d (if needed)
- function build_checkbox($name, $title, $checked = false, $disabled = false, $class = null, $id = null, $value = 1)
+ public function build_checkbox($name, $title, $checked = false, $disabled = false, $class = null, $id = null, $value = 1)
{
$name = ' name="' . $name . '" ';
$value = ' value="' . $value . '" ';
@@ -671,8 +689,12 @@ function build_checkbox($name, $title, $checked = false, $disabled = false, $cla
function replace_quote($str, $double = true, $single = true)
{
- if ($double) $str = str_replace('"', '"', $str);
- if ($single) $str = str_replace("'", ''', $str);
+ if ($double) {
+ $str = str_replace('"', '"', $str);
+ }
+ if ($single) {
+ $str = str_replace("'", ''', $str);
+ }
return $str;
}
@@ -754,7 +776,7 @@ function url_arg($url, $arg, $value, $amp = '&')
$new = is_null($value) ? '' : $m[1] . urlencode($value);
$url = str_replace($cur, $new, $url);
} // добавляем параметр
- else if (!is_null($value)) {
+ elseif (!is_null($value)) {
$div = (strpos($url, '?') !== false) ? $amp : '?';
$url = $url . $div . $arg . '=' . urlencode($value);
}
@@ -848,9 +870,9 @@ function checkbox_get_val(&$key, &$val, $default = 1, $on = 1, $off = 0)
if (isset($_REQUEST[$key]) && is_string($_REQUEST[$key])) {
$val = (int)$_REQUEST[$key];
- } else if (!isset($_REQUEST[$key]) && isset($_REQUEST['prev_' . $key])) {
+ } elseif (!isset($_REQUEST[$key]) && isset($_REQUEST['prev_' . $key])) {
$val = $off;
- } else if (isset($previous_settings[$key]) && (!IS_GUEST || !empty($search_id))) {
+ } elseif (isset($previous_settings[$key]) && (!IS_GUEST || !empty($search_id))) {
$val = ($previous_settings[$key]) ? $on : $off;
} else {
$val = $default;
@@ -865,7 +887,7 @@ function select_get_val($key, &$val, $options_ary, $default, $num = true)
if (isset($options_ary[$_REQUEST[$key]])) {
$val = ($num) ? intval($_REQUEST[$key]) : $_REQUEST[$key];
}
- } else if (isset($previous_settings[$key])) {
+ } elseif (isset($previous_settings[$key])) {
$val = $previous_settings[$key];
} else {
$val = $default;
@@ -995,7 +1017,9 @@ function get_username($user_id)
function get_user_id($username)
{
- if (empty($username)) return false;
+ if (empty($username)) {
+ return false;
+ }
$row = DB()->fetch_row("SELECT user_id FROM " . BB_USERS . " WHERE username = '" . DB()->escape($username) . "' LIMIT 1");
return $row['user_id'];
}
@@ -1214,7 +1238,9 @@ function get_userdata($u, $force_name = false, $allow_guest = false)
/** @var \TorrentPier\Cache\Adapter $cache */
$cache = $di->cache;
- if (!$u) return false;
+ if (!$u) {
+ return false;
+ }
if (intval($u) == GUEST_UID && $allow_guest) {
if ($u_data = $cache->get('guest_userdata')) {
@@ -1285,15 +1311,21 @@ function get_forum_select($mode = 'guest', $name = POST_FORUM_URL, $selected = n
foreach ($forums['f'] as $fid => $f) {
switch ($mode) {
case 'guest':
- if ($f['auth_view'] != AUTH_ALL) continue 2;
+ if ($f['auth_view'] != AUTH_ALL) {
+ continue 2;
+ }
break;
case 'user':
- if ($f['auth_view'] != AUTH_ALL && $f['auth_view'] != AUTH_REG) continue 2;
+ if ($f['auth_view'] != AUTH_ALL && $f['auth_view'] != AUTH_REG) {
+ continue 2;
+ }
break;
case 'not_auth_forums':
- if (isset($not_auth_forums_fary[$f['forum_id']])) continue 2;
+ if (isset($not_auth_forums_fary[$f['forum_id']])) {
+ continue 2;
+ }
break;
case 'admin':
@@ -1335,7 +1367,9 @@ function setup_style()
if (!IS_GUEST && !empty($userdata['tpl_name'])) {
foreach ($di->config->get('templates') as $folder => $name) {
- if ($userdata['tpl_name'] == $folder) $tpl_dir_name = basename($userdata['tpl_name']);
+ if ($userdata['tpl_name'] == $folder) {
+ $tpl_dir_name = basename($userdata['tpl_name']);
+ }
}
}
@@ -1366,8 +1400,12 @@ function bb_date($gmepoch, $format = false, $friendly_date = true)
/** @var \TorrentPier\Di $di */
$di = \TorrentPier\Di::getInstance();
- if (!$format) $format = $di->config->get('default_dateformat');
- if (empty($lang)) require_once($di->config->get('default_lang_dir') . 'main.php');
+ if (!$format) {
+ $format = $di->config->get('default_dateformat');
+ }
+ if (empty($lang)) {
+ require_once($di->config->get('default_lang_dir') . 'main.php');
+ }
if (empty($userdata['session_logged_in'])) {
$tz = $di->config->get('board_timezone');
@@ -1394,12 +1432,14 @@ function bb_date($gmepoch, $format = false, $friendly_date = true)
$date = 'yesterday' . gmdate($time_format, $gmepoch + (3600 * $tz));
} elseif ($today == 1 && $month != 1) {
$yesterday = date('t', mktime(0, 0, 0, ($month - 1), 1, $year));
- if ($date_today == $yesterday && $date_month == ($month - 1) && $date_year == $year)
+ if ($date_today == $yesterday && $date_month == ($month - 1) && $date_year == $year) {
$date = 'yesterday' . gmdate($time_format, $gmepoch + (3600 * $tz));
+ }
} elseif ($today == 1 && $month == 1) {
$yesterday = date('t', mktime(0, 0, 0, 12, 1, ($year - 1)));
- if ($date_today == $yesterday && $date_month == 12 && $date_year == ($year - 1))
+ if ($date_today == $yesterday && $date_month == 12 && $date_year == ($year - 1)) {
$date = 'yesterday' . gmdate($time_format, $gmepoch + (3600 * $tz));
+ }
}
}
@@ -1411,7 +1451,9 @@ function birthday_age($date)
/** @var \TorrentPier\Di $di */
$di = \TorrentPier\Di::getInstance();
- if (!$date) return false;
+ if (!$date) {
+ return false;
+ }
$tz = TIMENOW + (3600 * $di->config->get('board_timezone'));
@@ -1422,7 +1464,7 @@ function birthday_age($date)
// Pagination routine, generates
// page number sequence
//
-function generate_pagination($base_url, $num_items, $per_page, $start_item, $add_prevnext_text = TRUE)
+function generate_pagination($base_url, $num_items, $per_page, $start_item, $add_prevnext_text = true)
{
global $lang, $template;
@@ -1504,7 +1546,6 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
if ($on_page < $total_pages) {
$page_string .= ' ' . $lang['NEXT_PAGE'] . '';
}
-
}
$pagination = ($page_string) ? ' : ' . $page_string : '';
@@ -1533,11 +1574,15 @@ function obtain_word_list(&$orig_word, &$replacement_word)
/** @var \TorrentPier\Cache\Adapter $cache */
$cache = $di->cache;
- if (!$di->config->get('use_word_censor')) return false;
+ if (!$di->config->get('use_word_censor')) {
+ return false;
+ }
if (!$cache->has('censored')) {
$sql = DB()->fetch_rowset("SELECT word, replacement FROM " . BB_WORDS);
- if (!$sql) $sql = [['word' => 1, 'replacement' => 1]];
+ if (!$sql) {
+ $sql = [['word' => 1, 'replacement' => 1]];
+ }
$cache->set('censored', $sql, 7200);
}
@@ -1753,7 +1798,7 @@ function cat_exists($cat_id)
//
class log_action
{
- var $log_type = [
+ public $log_type = [
# LOG_TYPE_NAME LOG_TYPE_ID
'mod_topic_delete' => 1,
'mod_topic_move' => 2,
@@ -1772,10 +1817,10 @@ class log_action
'adm_ban_email' => 15,
'adm_ban_name' => 16,
];
- var $log_type_select = [];
- var $log_disabled = false;
+ public $log_type_select = [];
+ public $log_disabled = false;
- function init()
+ public function init()
{
global $lang;
@@ -1784,12 +1829,16 @@ class log_action
}
}
- function mod($type_name, $args = array())
+ public function mod($type_name, $args = array())
{
global $userdata;
- if (empty($this->log_type)) $this->init();
- if ($this->log_disabled) return;
+ if (empty($this->log_type)) {
+ $this->init();
+ }
+ if ($this->log_disabled) {
+ return;
+ }
$forum_id =& $args['forum_id'];
$forum_id_new =& $args['forum_id_new'];
@@ -1825,7 +1874,7 @@ class log_action
DB()->query("INSERT INTO " . BB_LOG . " $sql_args");
}
- function admin($type_name, $args = array())
+ public function admin($type_name, $args = array())
{
$this->mod($type_name, $args);
}
@@ -1850,13 +1899,13 @@ function get_topic_icon($topic, $is_unread = null)
if ($topic['topic_type'] == POST_ANNOUNCE) {
$folder = $images['folder_announce'];
$folder_new = $images['folder_announce_new'];
- } else if ($topic['topic_type'] == POST_STICKY) {
+ } elseif ($topic['topic_type'] == POST_STICKY) {
$folder = $images['folder_sticky'];
$folder_new = $images['folder_sticky_new'];
- } else if ($topic['topic_status'] == TOPIC_LOCKED) {
+ } elseif ($topic['topic_status'] == TOPIC_LOCKED) {
$folder = $images['folder_locked'];
$folder_new = $images['folder_locked_new'];
- } else if (isset($topic['tracker_status'])) {
+ } elseif (isset($topic['tracker_status'])) {
$folder = ($t_hot) ? $images['folder_dl_hot'] : $images['folder_dl'];
$folder_new = ($t_hot) ? $images['folder_dl_hot_new'] : $images['folder_dl_new'];
}
@@ -1882,7 +1931,7 @@ function build_topic_pagination($url, $replies, $per_page)
$pg .= ' .. ';
$page = $total_pages - 2;
$j += ($total_pages - 3) * $per_page;
- } else if ($page < $total_pages) {
+ } elseif ($page < $total_pages) {
$pg .= ', ';
}
}
@@ -1979,7 +2028,7 @@ function print_page($args, $type = '', $mode = '')
$tpl = (is_array($args) && !empty($args['tpl'])) ? $args['tpl'] : $args;
$tpl = ($type === 'admin') ? ADMIN_TPL_DIR . $tpl : $tpl;
- $gen_simple_header = (is_array($args) && !empty($args['simple']) OR $type === 'simple') ? true : $gen_simple_header;
+ $gen_simple_header = (is_array($args) && !empty($args['simple']) or $type === 'simple') ? true : $gen_simple_header;
if ($mode !== 'no_header') {
require(PAGE_HEADER);
@@ -2044,7 +2093,9 @@ function init_sphinx()
global $sphinx;
if (!isset($sphinx)) {
- if (!class_exists('SphinxClient')) require(INC_DIR . 'api/sphinx.php');
+ if (!class_exists('SphinxClient')) {
+ require(INC_DIR . 'api/sphinx.php');
+ }
$sphinx = new SphinxClient();
$sphinx->SetConnectTimeout(5);
@@ -2092,7 +2143,7 @@ function get_title_match_topics($search)
if (!empty($result['matches'])) {
$where_ids = array_keys($result['matches']);
}
- } else if ($error = $sphinx->GetLastError()) {
+ } elseif ($error = $sphinx->GetLastError()) {
if (strpos($error, 'errno=110')) {
bb_die($lang['SEARCH_ERROR']);
}
@@ -2236,10 +2287,16 @@ function profile_url($data)
$title = $ranks[$user_rank]['rank_title'];
$style = $ranks[$user_rank]['rank_style'];
}
- if (empty($title)) $title = $lang['USER'];
- if (empty($style)) $style = 'colorUser';
+ if (empty($title)) {
+ $title = $lang['USER'];
+ }
+ if (empty($style)) {
+ $style = 'colorUser';
+ }
- if (!$di->config->get('color_nick')) $style = '';
+ if (!$di->config->get('color_nick')) {
+ $style = '';
+ }
$username = !empty($data['username']) ? $data['username'] : $lang['GUEST'];
$user_id = (!empty($data['user_id']) && $username != $lang['GUEST']) ? $data['user_id'] : GUEST_UID;
@@ -2269,7 +2326,7 @@ function get_avatar($user_id, $ext_id, $allow_avatar = true, $size = true, $heig
if ($user_id == BOT_UID && $di->config->get('avatars.bot_avatar')) {
$user_avatar = ' . $di->config->get('avatars.bot_avatar')) . ')
';
- } else if ($allow_avatar && $ext_id) {
+ } elseif ($allow_avatar && $ext_id) {
if (file_exists(get_avatar_path($user_id, $ext_id))) {
$user_avatar = ') . ')
';
}
diff --git a/library/includes/functions_admin.php b/library/includes/functions_admin.php
index e1758475a..88fdfa702 100644
--- a/library/includes/functions_admin.php
+++ b/library/includes/functions_admin.php
@@ -1,6 +1,8 @@
admin('mod_post_delete', array(
'log_msg' => 'user: ' . get_usernames_for_log($user_id) . "
posts: $deleted_posts_count",
));
- } else if (!defined('IN_CRON')) {
+ } elseif (!defined('IN_CRON')) {
foreach ($log_topics as $row) {
$log_action->mod('mod_post_delete', array(
'forum_id' => $row['forum_id'],
diff --git a/library/includes/functions_admin_cron.php b/library/includes/functions_admin_cron.php
index 673e16780..281c3ca7b 100644
--- a/library/includes/functions_admin_cron.php
+++ b/library/includes/functions_admin_cron.php
@@ -88,7 +88,9 @@ function insert_cron_job($cron_arr)
if ($_POST['cron_script'] == $row['cron_script']) {
$langmode = $lang['SCRIPT_DUPLICATE'];
- } else $langmode = $lang['TITLE_DUPLICATE'];
+ } else {
+ $langmode = $lang['TITLE_DUPLICATE'];
+ }
$message = $langmode . "
" . sprintf($lang['CLICK_RETURN_JOBS_ADDED'], "", "") . "
" . sprintf($lang['CLICK_RETURN_JOBS'], "", "") . "
" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", "");
diff --git a/library/includes/functions_admin_torrent.php b/library/includes/functions_admin_torrent.php
index 29504c556..7d645ffb2 100644
--- a/library/includes/functions_admin_torrent.php
+++ b/library/includes/functions_admin_torrent.php
@@ -1,6 +1,8 @@
isset($lang[$config_name . '_expl']) ? $lang[$config_name . '_expl'] : '',
'L_' . strtoupper($config_name) . '_HEAD' => isset($lang[$config_name . '_head']) ? $lang[$config_name . '_head'] : '',
));
-
}
}
@@ -82,9 +83,9 @@ function update_config_table($table_name, $default_cfg, $cfg, $type)
if (isset($_POST[$config_name]) && $_POST[$config_name] != $cfg[$config_name]) {
if ($type == 'str') {
$config_value = $_POST[$config_name];
- } else if ($type == 'bool') {
+ } elseif ($type == 'bool') {
$config_value = ($_POST[$config_name]) ? 1 : 0;
- } else if ($type == 'num') {
+ } elseif ($type == 'num') {
$config_value = abs(intval($_POST[$config_name]));
} else {
return;
diff --git a/library/includes/functions_atom.php b/library/includes/functions_atom.php
index c35d4c1ce..f4107a94b 100644
--- a/library/includes/functions_atom.php
+++ b/library/includes/functions_atom.php
@@ -1,6 +1,8 @@
config->get('atom.path') . '/f/' . $forum_id . '.atom';
$select_tor_sql = $join_tor_sql = '';
- if ($forum_id == 0) $forum_data['atom_forum_name'] = 'Общая по всем разделам';
+ if ($forum_id == 0) {
+ $forum_data['atom_forum_name'] = 'Общая по всем разделам';
+ }
if ($forum_id > 0 && $forum_data['atom_tr_allowed']) {
$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)";
@@ -33,7 +37,7 @@ function update_forum_feed($forum_id, $forum_data)
ORDER BY t.topic_last_post_time DESC
LIMIT 100
";
- } else if ($forum_id > 0) {
+ } elseif ($forum_id > 0) {
$sql = "
SELECT
t.topic_id, t.topic_title, t.topic_status,
@@ -55,10 +59,14 @@ function update_forum_feed($forum_id, $forum_data)
$topics = array();
foreach ($topics_tmp as $topic) {
if (isset($topic['topic_status'])) {
- if ($topic['topic_status'] == TOPIC_MOVED) continue;
+ if ($topic['topic_status'] == TOPIC_MOVED) {
+ continue;
+ }
}
if (isset($topic['tor_status'])) {
- if ($di->config->get('tor_frozen.' . $topic['tor_status'])) continue;
+ if ($di->config->get('tor_frozen.' . $topic['tor_status'])) {
+ continue;
+ }
}
$topics[] = $topic;
}
@@ -66,8 +74,11 @@ function update_forum_feed($forum_id, $forum_data)
unlink($file_path);
return false;
}
- if (create_atom($file_path, 'f', $forum_id, htmlCHR($forum_data['atom_forum_name']), $topics)) return true;
- else return false;
+ if (create_atom($file_path, 'f', $forum_id, htmlCHR($forum_data['atom_forum_name']), $topics)) {
+ return true;
+ } else {
+ return false;
+ }
}
function update_user_feed($user_id, $username)
@@ -96,10 +107,14 @@ function update_user_feed($user_id, $username)
$topics = array();
foreach ($topics_tmp as $topic) {
if (isset($topic['topic_status'])) {
- if ($topic['topic_status'] == TOPIC_MOVED) continue;
+ if ($topic['topic_status'] == TOPIC_MOVED) {
+ continue;
+ }
}
if (isset($topic['tor_status'])) {
- if ($di->config->get('tor_frozen.' . $topic['tor_status'])) continue;
+ if ($di->config->get('tor_frozen.' . $topic['tor_status'])) {
+ continue;
+ }
}
$topics[] = $topic;
}
@@ -107,8 +122,11 @@ function update_user_feed($user_id, $username)
unlink($file_path);
return false;
}
- if (create_atom($file_path, 'u', $user_id, wbr($username), $topics)) return true;
- else return false;
+ if (create_atom($file_path, 'u', $user_id, wbr($username), $topics)) {
+ return true;
+ } else {
+ return false;
+ }
}
function create_atom($file_path, $mode, $id, $title, $topics)
@@ -118,11 +136,15 @@ function create_atom($file_path, $mode, $id, $title, $topics)
$dir = dirname($file_path);
if (!file_exists($dir)) {
- if (!bb_mkdir($dir)) return false;
+ if (!bb_mkdir($dir)) {
+ return false;
+ }
}
foreach ($topics as $topic) {
$last_time = $topic['topic_last_post_time'];
- if ($topic['topic_last_post_edit_time']) $last_time = $topic['topic_last_post_edit_time'];
+ if ($topic['topic_last_post_edit_time']) {
+ $last_time = $topic['topic_last_post_edit_time'];
+ }
$date = bb_date($last_time, 'Y-m-d', 0);
$time = bb_date($last_time, 'H:i:s', 0);
break;
@@ -150,12 +172,16 @@ function create_atom($file_path, $mode, $id, $title, $topics)
$topic_title = wbr($topic_title);
$author_name = ($topic['first_username']) ? wbr($topic['first_username']) : 'Гость';
$last_time = $topic['topic_last_post_time'];
- if ($topic['topic_last_post_edit_time']) $last_time = $topic['topic_last_post_edit_time'];
+ if ($topic['topic_last_post_edit_time']) {
+ $last_time = $topic['topic_last_post_edit_time'];
+ }
$date = bb_date($last_time, 'Y-m-d', 0);
$time = bb_date($last_time, 'H:i:s', 0);
$updated = '';
$checktime = TIMENOW - 604800; // неделя (week)
- if ($topic['topic_first_post_edit_time'] && $topic['topic_first_post_edit_time'] > $checktime) $updated = '[Обновлено] ';
+ if ($topic['topic_first_post_edit_time'] && $topic['topic_first_post_edit_time'] > $checktime) {
+ $updated = '[Обновлено] ';
+ }
$atom .= "\n";
$atom .= " <![CDATA[$updated$topic_title$tor_size]]>\n";
$atom .= " \n";
diff --git a/library/includes/functions_dev.php b/library/includes/functions_dev.php
index b1e3bac0c..6a81ca183 100644
--- a/library/includes/functions_dev.php
+++ b/library/includes/functions_dev.php
@@ -1,6 +1,8 @@
db->dbg)) {
$log .= get_sql_log_html($datastore->db, 'cache: datastore [' . $datastore->engine . ']');
- } else if (!empty($datastore->dbg)) {
+ } elseif (!empty($datastore->dbg)) {
$log .= get_sql_log_html($datastore, 'cache: datastore [' . $datastore->engine . ']');
}
diff --git a/library/includes/functions_group.php b/library/includes/functions_group.php
index d6658963b..16240a5a4 100644
--- a/library/includes/functions_group.php
+++ b/library/includes/functions_group.php
@@ -1,6 +1,8 @@
' . $lang['EMPTY_SUBJECT'] : $lang['EMPTY_SUBJECT'];
}
// Check message
if (!empty($message)) {
-
- } else if ($mode != 'delete') {
+ } elseif ($mode != 'delete') {
$error_msg .= (!empty($error_msg)) ? '
' . $lang['EMPTY_MESSAGE'] : $lang['EMPTY_MESSAGE'];
}
@@ -232,7 +233,7 @@ function update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $u
$forum_update_sql .= ($row['last_post_id']) ? ', forum_last_post_id = ' . $row['last_post_id'] : ', forum_last_post_id = 0';
}
}
- } else if ($post_data['first_post']) {
+ } elseif ($post_data['first_post']) {
$sql = "SELECT MIN(post_id) AS first_post_id FROM " . BB_POSTS . " WHERE topic_id = $topic_id";
if (!($result = DB()->sql_query($sql))) {
bb_die('Error in deleting post #3');
@@ -363,7 +364,7 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
if (!$notify_user && !empty($topic_watch)) {
DB()->query("DELETE FROM " . BB_TOPICS_WATCH . " WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']}");
- } else if ($notify_user && empty($topic_watch)) {
+ } elseif ($notify_user && empty($topic_watch)) {
DB()->query("
INSERT INTO " . BB_TOPICS_WATCH . " (user_id, topic_id, notify_status)
VALUES (" . $userdata['user_id'] . ", $topic_id, " . TOPIC_WATCH_NOTIFIED . ")
@@ -376,14 +377,18 @@ function insert_post($mode, $topic_id, $forum_id = '', $old_forum_id = '', $new_
{
global $userdata, $lang;
- if (!$topic_id) return;
+ if (!$topic_id) {
+ return;
+ }
$post_username = $post_subject = $post_text = $poster_ip = '';
$post_time = $current_time = TIMENOW;
if ($mode == 'after_move') {
- if (!$forum_id || !$old_forum_id) return;
+ if (!$forum_id || !$old_forum_id) {
+ return;
+ }
$sql = "SELECT forum_id, forum_name
FROM " . BB_FORUMS . "
@@ -393,18 +398,20 @@ function insert_post($mode, $topic_id, $forum_id = '', $old_forum_id = '', $new_
foreach (DB()->fetch_rowset($sql) as $row) {
$forum_names[$row['forum_id']] = htmlCHR($row['forum_name']);
}
- if (!$forum_names) return;
+ if (!$forum_names) {
+ return;
+ }
$post_text = sprintf($lang['BOT_TOPIC_MOVED_FROM_TO'], '[url=' . make_url(FORUM_URL . $old_forum_id) . ']' . $forum_names[$old_forum_id] . '[/url]', '[url=' . make_url(FORUM_URL . $forum_id) . ']' . $forum_names[$forum_id] . '[/url]', profile_url($userdata));
$poster_id = BOT_UID;
$poster_ip = '7f000001';
- } else if ($mode == 'after_split_to_old') {
+ } elseif ($mode == 'after_split_to_old') {
$post_text = sprintf($lang['BOT_MESS_SPLITS'], '[url=' . make_url(TOPIC_URL . $new_topic_id) . ']' . htmlCHR($new_topic_title) . '[/url]', profile_url($userdata));
$poster_id = BOT_UID;
$poster_ip = '7f000001';
- } else if ($mode == 'after_split_to_new') {
+ } elseif ($mode == 'after_split_to_new') {
$sql = "SELECT t.topic_title, p.post_time
FROM " . BB_TOPICS . " t, " . BB_POSTS . " p
WHERE t.topic_id = $old_topic_id
diff --git a/library/includes/functions_selects.php b/library/includes/functions_selects.php
index fdb209fef..efcf01aac 100644
--- a/library/includes/functions_selects.php
+++ b/library/includes/functions_selects.php
@@ -1,6 +1,8 @@
config->get('lang') as $key => $data) {
$selected = '';
- if ($key == $default_lang) $selected = ' selected="selected"';
+ if ($key == $default_lang) {
+ $selected = ' selected="selected"';
+ }
$lang_select .= '';
$x++;
}
@@ -49,7 +53,9 @@ function templates_select($default_style, $select_name = 'tpl_name')
$x = 0;
foreach ($di->config->get('templates') as $folder => $name) {
$selected = '';
- if ($folder == $default_style) $selected = ' selected="selected"';
+ if ($folder == $default_style) {
+ $selected = ' selected="selected"';
+ }
$templates_select .= '';
$x++;
}
diff --git a/library/includes/functions_torrent.php b/library/includes/functions_torrent.php
index efc48712a..599b64c1c 100644
--- a/library/includes/functions_torrent.php
+++ b/library/includes/functions_torrent.php
@@ -1,6 +1,8 @@
$f) {
$totallen += (float)$f['length'];
}
@@ -197,8 +207,9 @@ function tracker_register($topic_id, $mode = '', $tor_status = TOR_NOT_APPROVED,
if (!DB()->sql_query($sql)) {
$sql_error = DB()->sql_error();
- if ($sql_error['code'] == 1062) // Duplicate entry
- {
+ if ($sql_error['code'] == 1062) {
+ // Duplicate entry
+
return torrent_error_exit($lang['BT_REG_FAIL_SAME_HASH']);
}
bb_die('Could not register torrent on tracker');
@@ -213,7 +224,7 @@ function tracker_register($topic_id, $mode = '', $tor_status = TOR_NOT_APPROVED,
if ($reg_mode == 'request' || $reg_mode == 'newtopic') {
set_die_append_msg($forum_id, $topic_id);
bb_die(sprintf($lang['BT_REGISTERED'], DOWNLOAD_URL . $topic_id));
- } else if ($reg_mode == 'mcp_tor_register') {
+ } elseif ($reg_mode == 'mcp_tor_register') {
return 'OK';
}
@@ -256,7 +267,9 @@ function change_tor_type($topic_id, $tor_status_gold)
/** @var \TorrentPier\Di $di */
$di = \TorrentPier\Di::getInstance();
- if (!IS_AM) bb_die($lang['ONLY_FOR_MOD']);
+ if (!IS_AM) {
+ bb_die($lang['ONLY_FOR_MOD']);
+ }
$tor_status_gold = intval($tor_status_gold);
$info_hash = null;
@@ -289,7 +302,9 @@ function send_torrent_with_passkey($t_data)
if (!isset($row['tor_status'])) {
bb_die($lang['PASSKEY_ERR_TOR_NOT_REG']);
} elseif ($di->config->get('tor_frozen.' . $row['tor_status'])) {
- if (!IS_AM) bb_die("Раздача имеет статус: {$lang['TOR_STATUS_NAME'][$row['tor_status']]}
Скачивание запрещено"); //TODO: перевести
+ if (!IS_AM) {
+ bb_die("Раздача имеет статус: {$lang['TOR_STATUS_NAME'][$row['tor_status']]}
Скачивание запрещено");
+ } //TODO: перевести
}
$passkey_val = '';
@@ -610,7 +625,7 @@ function bdecode_r($str, &$pos)
if (($pos < 0) || ($pos >= $strlen)) {
return null;
- } else if ($str[$pos] == 'i') {
+ } elseif ($str[$pos] == 'i') {
$pos++;
$numlen = strspn($str, '-0123456789', $pos);
$spos = $pos;
@@ -622,7 +637,7 @@ function bdecode_r($str, &$pos)
$pos++;
return floatval(substr($str, $spos, $numlen));
}
- } else if ($str[$pos] == 'd') {
+ } elseif ($str[$pos] == 'd') {
$pos++;
$ret = array();
@@ -640,14 +655,14 @@ function bdecode_r($str, &$pos)
if ($val === null) {
return null;
- } else if (!is_array($key)) {
+ } elseif (!is_array($key)) {
$ret[$key] = $val;
}
}
}
}
return null;
- } else if ($str[$pos] == 'l') {
+ } elseif ($str[$pos] == 'l') {
$pos++;
$ret = array();
diff --git a/library/includes/functions_upload.php b/library/includes/functions_upload.php
index 8273b293c..b0c3a5b2f 100644
--- a/library/includes/functions_upload.php
+++ b/library/includes/functions_upload.php
@@ -1,31 +1,33 @@
0,
'max_width' => 0,
'max_height' => 0,
'allowed_ext' => array(),
'upload_path' => '',
);
- var $file = array(
+ public $file = array(
'name' => '',
'type' => '',
'size' => 0,
'tmp_name' => '',
'error' => UPLOAD_ERR_NO_FILE,
);
- var $orig_name = '';
- var $file_path = ''; // Stored file path
- var $file_ext = '';
- var $file_ext_id = '';
- var $file_size = '';
- var $ext_ids = array(); // array_flip($di->config->get('file_id_ext'))
- var $errors = array();
- var $img_types = array(
+ public $orig_name = '';
+ public $file_path = ''; // Stored file path
+ public $file_ext = '';
+ public $file_ext_id = '';
+ public $file_size = '';
+ public $ext_ids = array(); // array_flip($di->config->get('file_id_ext'))
+ public $errors = array();
+ public $img_types = array(
1 => 'gif',
2 => 'jpg',
3 => 'png',
@@ -34,7 +36,7 @@ class upload_common
8 => 'tiff',
);
- function init($cfg = array(), $post_params = array(), $uploaded_only = true)
+ public function init($cfg = array(), $post_params = array(), $uploaded_only = true)
{
global $lang;
@@ -107,13 +109,13 @@ class upload_common
return true;
}
- function store($mode = '', $params = array())
+ public function store($mode = '', $params = array())
{
if ($mode == 'avatar') {
delete_avatar($params['user_id'], $this->file_ext_id);
$file_path = get_avatar_path($params['user_id'], $this->file_ext_id);
return $this->_move($file_path);
- } else if ($mode == 'attach') {
+ } elseif ($mode == 'attach') {
delete_attach($params['topic_id'], $this->file_ext_id);
$file_path = get_attach_path($params['topic_id'], $this->file_ext_id);
return $this->_move($file_path);
@@ -122,7 +124,7 @@ class upload_common
}
}
- function _move($file_path)
+ public function _move($file_path)
{
$dir = dirname($file_path);
if (!file_exists($dir)) {
diff --git a/library/includes/functions_validate.php b/library/includes/functions_validate.php
index a2db0f798..0e0a1f83e 100644
--- a/library/includes/functions_validate.php
+++ b/library/includes/functions_validate.php
@@ -1,6 +1,8 @@
USERNAME_MAX_LENGTH) {
return $lang['USERNAME_TOO_LONG'];
- } else if (mb_strlen($username, 'UTF-8') < USERNAME_MIN_LENGTH) {
+ } elseif (mb_strlen($username, 'UTF-8') < USERNAME_MIN_LENGTH) {
return $lang['USERNAME_TOO_SMALL'];
}
// Allowed symbols
@@ -83,10 +85,11 @@ function validate_email($email, $check_ban_and_taken = true)
$email_sql = DB()->escape($email);
if ($row = DB()->fetch_row("SELECT `user_email` FROM " . BB_USERS . " WHERE user_email = '$email_sql' LIMIT 1")) {
- if ($row['user_email'] == $userdata['user_email'])
+ if ($row['user_email'] == $userdata['user_email']) {
return false;
- else
+ } else {
return $lang['EMAIL_TAKEN'];
+ }
}
}
diff --git a/library/includes/init_bb.php b/library/includes/init_bb.php
index d51eab43c..2b23be4c4 100644
--- a/library/includes/init_bb.php
+++ b/library/includes/init_bb.php
@@ -1,10 +1,18 @@
data;
-if (DBG_USER) require(INC_DIR . 'functions_dev.php');
+if (DBG_USER) {
+ require(INC_DIR . 'functions_dev.php');
+}
$html = new html_common();
$log_action = new log_action();
@@ -357,7 +367,7 @@ if (($di->config->get('board_disable') || file_exists(BB_DISABLED)) && !defined(
// admin lock
send_no_cache_headers();
bb_die('BOARD_DISABLE');
- } else if (file_exists(BB_DISABLED)) {
+ } elseif (file_exists(BB_DISABLED)) {
// trigger lock
cron_release_deadlock();
send_no_cache_headers();
diff --git a/library/includes/online_userlist.php b/library/includes/online_userlist.php
index 27c0dba7e..289c8f115 100644
--- a/library/includes/online_userlist.php
+++ b/library/includes/online_userlist.php
@@ -1,6 +1,8 @@
fetch_rowset($sql) as $u) {
if ($level == ADMIN) {
$name = "$name";
$users_cnt['admin']++;
- } else if ($level == MOD) {
+ } elseif ($level == MOD) {
$name = "$name";
$users_cnt['mod']++;
- } else if ($level == GROUP_MEMBER) {
+ } elseif ($level == GROUP_MEMBER) {
$name = "$name";
$users_cnt['group_member']++;
} else {
@@ -86,7 +88,9 @@ if ($ulist) {
$inline = $block = $short = array();
foreach ($ulist as $level => $users) {
- if (empty($users)) continue;
+ if (empty($users)) {
+ continue;
+ }
if (count($users) > 200) {
$style = 'margin: 3px 0; padding: 2px 4px; border: 1px inset; height: 200px; overflow: auto;';
@@ -106,7 +110,7 @@ if ($ulist) {
if (!$online['userlist']) {
$online['userlist'] = $online_short['userlist'] = $lang['NONE'];
-} else if (isset($_REQUEST['f'])) {
+} elseif (isset($_REQUEST['f'])) {
$online['userlist'] = $online_short['userlist'] = $lang['BROWSING_FORUM'] . ' ' . $online['userlist'];
}
diff --git a/library/includes/page_footer.php b/library/includes/page_footer.php
index 351d5938b..b7dee5c5c 100644
--- a/library/includes/page_footer.php
+++ b/library/includes/page_footer.php
@@ -1,6 +1,8 @@