diff --git a/admin/admin_user_search.php b/admin/admin_user_search.php index 1d6169d0..718548b4 100644 --- a/admin/admin_user_search.php +++ b/admin/admin_user_search.php @@ -108,7 +108,6 @@ if (!isset($_REQUEST['dosearch'])) 'FORUMS_LIST' => $forums_list, 'LASTVISITED_LIST' => $lastvisited_list, - 'U_SEARCH_USER' => BB_ROOT . 'search.php?mode=searchuser', 'S_SEARCH_ACTION' => 'admin_user_search.php', )); } @@ -1050,4 +1049,4 @@ else } } -print_page('admin_user_search.tpl', 'admin'); +print_page('admin_user_search.tpl', 'admin'); \ No newline at end of file diff --git a/ajax.php b/ajax.php index 26cdbf50..7b2bcc04 100644 --- a/ajax.php +++ b/ajax.php @@ -230,7 +230,7 @@ class ajax_common { $this->response['action'] = $this->action; - if (sql_dbg_enabled()) + if (DBG_USER && SQL_DEBUG && !empty($_COOKIE['sql_log'])) { $this->response['sql_log'] = get_sql_log(); } @@ -428,4 +428,4 @@ class ajax_common { require(AJAX_DIR .'sitemap.php'); } -} +} \ No newline at end of file diff --git a/common.php b/common.php index acd39199..0931e9dc 100644 --- a/common.php +++ b/common.php @@ -44,7 +44,7 @@ define('FULL_URL', $server_protocol . $bb_cfg['server_name'] . $server_port . $b unset($server_protocol, $server_port); // Debug options -define('DBG_USER', isset($_COOKIE[COOKIE_DBG])); +define('DBG_USER', (isset($_COOKIE[COOKIE_DBG]))); // Board/Tracker shared constants and functions define('BB_BT_TORRENTS', 'bb_bt_torrents'); diff --git a/library/ajax/posts.php b/library/ajax/posts.php index 2c26fd28..44e7c4ef 100644 --- a/library/ajax/posts.php +++ b/library/ajax/posts.php @@ -18,7 +18,7 @@ if (isset($this->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']) @@ -34,7 +34,7 @@ elseif (isset($this->request['topic_id'])) WHERE t.topic_id = $topic_id AND f.forum_id = t.forum_id LIMIT 1"); - if(!$post) $this->ajax_die($lang['INVALID_TOPIC_ID_DB']); + if(!$post) $this->ajax_die('not post'); $is_auth = auth(AUTH_ALL, $post['forum_id'], $userdata, $post); } diff --git a/library/includes/page_footer.php b/library/includes/page_footer.php index e63955a9..9b9eb9c3 100644 --- a/library/includes/page_footer.php +++ b/library/includes/page_footer.php @@ -19,7 +19,7 @@ if (!empty($template)) $template->pparse('page_footer'); } -$show_dbg_info = (DBG_USER && !(isset($_GET['pane']) && $_GET['pane'] == 'left')); +$show_dbg_info = (DBG_USER && IS_ADMIN && !(isset($_GET['pane']) && $_GET['pane'] == 'left')); if(!$bb_cfg['gzip_compress']) { @@ -75,7 +75,7 @@ echo ' '; -if ($show_dbg_info && SQL_DEBUG) +if (DBG_USER && SQL_DEBUG && !(isset($_GET['pane']) && $_GET['pane'] == 'left')) { require(INC_DIR . 'page_footer_dev.php'); } diff --git a/library/includes/sessions.php b/library/includes/sessions.php index b5bebc56..822fa80e 100644 --- a/library/includes/sessions.php +++ b/library/includes/sessions.php @@ -496,7 +496,7 @@ class user_common { bb_setcookie(COOKIE_DATA, $c_sdata_curr, COOKIE_PERSIST, true); } - if (isset($bb_cfg['dbg_users'][$this->data['user_id']]) && !DBG_USER) + if (isset($bb_cfg['dbg_users'][$this->data['user_id']]) && !isset($_COOKIE[COOKIE_DBG])) { bb_setcookie(COOKIE_DBG, 1, COOKIE_SESSION); } @@ -878,4 +878,4 @@ function session_pagestart ($user_ip = USER_IP, $page_id = 0, $req_login = false $user->session_start(array('req_login' => $req_login)); return $user->data; -} +} \ No newline at end of file diff --git a/styles/templates/admin/admin_forums.tpl b/styles/templates/admin/admin_forums.tpl index 84154a03..07dd206f 100644 --- a/styles/templates/admin/admin_forums.tpl +++ b/styles/templates/admin/admin_forums.tpl @@ -210,13 +210,13 @@ function hl (id, on) {L_POSTS_SHORT}: {c.f.NUM_POSTS}   - {L_EDIT} + edit  ·  - {L_PERMISSIONS} + perm  ·  - {L_SYNC} + sync  ·  - {L_DELETE} + x   {c.f.PRUNE_DAYS} @@ -241,4 +241,4 @@ function hl (id, on)
- + \ No newline at end of file diff --git a/styles/templates/admin/admin_ranks.tpl b/styles/templates/admin/admin_ranks.tpl index ed8abe87..a70d2882 100644 --- a/styles/templates/admin/admin_ranks.tpl +++ b/styles/templates/admin/admin_ranks.tpl @@ -65,7 +65,8 @@ {L_RANK_TITLE} {L_RANK_IMAGE} - {L_ACTION} + {L_EDIT} + {L_DELETE} @@ -85,4 +86,4 @@ - + \ No newline at end of file diff --git a/styles/templates/admin/admin_user_ban.tpl b/styles/templates/admin/admin_user_ban.tpl index 8d41e006..2e4163a3 100644 --- a/styles/templates/admin/admin_user_ban.tpl +++ b/styles/templates/admin/admin_user_ban.tpl @@ -11,7 +11,7 @@ {L_USERNAME}: - {S_HIDDEN_FIELDS} + {S_HIDDEN_FIELDS} {L_UNBAN_USERNAME} diff --git a/styles/templates/admin/admin_user_search.tpl b/styles/templates/admin/admin_user_search.tpl index 9cd08bb4..4cb4c34c 100644 --- a/styles/templates/admin/admin_user_search.tpl +++ b/styles/templates/admin/admin_user_search.tpl @@ -13,7 +13,7 @@ {L_SEARCH_USERS_ADVANCED} - {L_USERNAME}:   
{L_SEARCH_USERNAME_EXPLAIN} + {L_USERNAME}:  
{L_SEARCH_USERNAME_EXPLAIN}   @@ -91,7 +91,7 @@ -  
{L_SEARCH_USERS_MISC_EXPLAIN} +  
{L_SEARCH_USERS_MISC_EXPLAIN}   @@ -160,4 +160,4 @@ - + \ No newline at end of file diff --git a/styles/templates/admin/index.tpl b/styles/templates/admin/index.tpl index 4b927651..56585ab2 100644 --- a/styles/templates/admin/index.tpl +++ b/styles/templates/admin/index.tpl @@ -149,9 +149,14 @@ ajax.callback.manage_admin = function(data) {
+

{L_FORUM_STATS}

+ - + + + + @@ -219,4 +224,4 @@ ajax.callback.manage_admin = function(data) { - + \ No newline at end of file diff --git a/styles/templates/default/index.tpl b/styles/templates/default/index.tpl index c983ee19..eb50e4c1 100644 --- a/styles/templates/default/index.tpl +++ b/styles/templates/default/index.tpl @@ -160,7 +160,7 @@
-

{L_STATISTICS}

+

{L_WHOSONLINE}

{L_FORUM_STATS}{L_STATISTIC}{L_VALUE}{L_STATISTIC}{L_VALUE}
{L_NUMBER_POSTS}:
@@ -243,4 +243,4 @@ - + \ No newline at end of file