From 2920779907bc59720c4eb292011bdb73471671f3 Mon Sep 17 00:00:00 2001 From: Moc Date: Mon, 8 Jul 2013 14:27:02 +0200 Subject: [PATCH] Chatbox - chat.php code clean-up and UI fixes --- e107_plugins/chatbox_menu/chat.php | 77 ++++++++++++++---------------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/e107_plugins/chatbox_menu/chat.php b/e107_plugins/chatbox_menu/chat.php index 06478d703..d93599854 100644 --- a/e107_plugins/chatbox_menu/chat.php +++ b/e107_plugins/chatbox_menu/chat.php @@ -6,31 +6,26 @@ * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * - * - * - * $Source: /cvs_backup/e107_0.8/e107_plugins/chatbox_menu/chat.php,v $ - * $Revision$ - * $Date$ - * $Author$ */ require_once('../../class2.php'); if (!plugInstalled('chatbox_menu')) { - header('Location: '.e_BASE.'index.php'); + header('Location: '.e_BASE.'index.php'); exit; } include_lan(e_PLUGIN."chatbox_menu/languages/".e_LANGUAGE."/".e_LANGUAGE.".php"); - -require_once(HEADERF); -$sql->db_Select("menus", "*", "menu_name='chatbox_menu'"); -$row = $sql->db_Fetch(); +require_once(HEADERF); +$mes = e107::getMessage(); +$sql->select("menus", "*", "menu_name='chatbox_menu'"); +$row = $sql->fetch(); if (!check_class($row['menu_class'])) { - $ns->tablerender(CHATBOX_L23, "
".CHATBOX_L24."
"); + $mes->addError(CHATBOX_L24); + $ns->tablerender(CHATBOX_L23, $mes->render()); require_once(FOOTERF); exit; } @@ -47,14 +42,14 @@ if($_POST['moderate'] && CB_MOD) { foreach(array_keys($_POST['block']) as $k){ $kk[] = intval($k); } $blocklist = implode(",", $kk); - $sql->db_Select_gen("UPDATE #chatbox SET cb_blocked=1 WHERE cb_id IN ({$blocklist})"); + $sql->gen("UPDATE #chatbox SET cb_blocked=1 WHERE cb_id IN ({$blocklist})"); } if(isset($_POST['unblock'])) { foreach(array_keys($_POST['unblock']) as $k){ $kk[] = intval($k); } $unblocklist = implode(",", $kk); - $sql->db_Select_gen("UPDATE #chatbox SET cb_blocked=0 WHERE cb_id IN ({$unblocklist})"); + $sql->gen("UPDATE #chatbox SET cb_blocked=0 WHERE cb_id IN ({$unblocklist})"); } if(isset($_POST['delete'])) @@ -65,44 +60,44 @@ if($_POST['moderate'] && CB_MOD) WHERE c.cb_id IN (".$deletelist.")"); $rowlist = $sql -> db_getList(); foreach ($rowlist as $row) { - $sql -> db_Select_gen("UPDATE #user SET user_chats=user_chats-1 where user_id = ".intval($row['user_id'])); + $sql->gen("UPDATE #user SET user_chats=user_chats-1 where user_id = ".intval($row['user_id'])); } - $sql -> db_Select_gen("DELETE FROM #chatbox WHERE cb_id IN ({$deletelist})"); + $sql->gen("DELETE FROM #chatbox WHERE cb_id IN ({$deletelist})"); } $e107cache->clear("nq_chatbox"); - $message = CHATBOX_L18; + $mes->addSuccess(CHATBOX_L18); } // when coming from search.php -if (strstr(e_QUERY, "fs")) -{ - $cgtm = intval(str_replace(".fs", "", e_QUERY)); +if (strstr(e_QUERY, "fs")) +{ + $cgtm = intval(str_replace(".fs", "", e_QUERY)); $fs = TRUE; } // end search -if (e_QUERY ? $from = intval(e_QUERY) : $from = 0); +if (e_QUERY ? $from = intval(e_QUERY) : $from = 0); -$chat_total = $sql->db_Count('chatbox'); +$chat_total = $sql->count('chatbox'); $qry_where = (CB_MOD ? "1" : "cb_blocked=0"); // when coming from search.php calculate page number -if ($fs) -{ +if ($fs) +{ $page_count = 0; $row_count = 0; $sql->db_Select("chatbox", "*", "{$qry_where} ORDER BY cb_datestamp DESC"); - while ($row = $sql -> db_Fetch()) - { - if ($row['cb_id'] == $cgtm) - { + while ($row = $sql->fetch()) + { + if ($row['cb_id'] == $cgtm) + { $from = $page_count; break; } $row_count++; - if ($row_count == 30) - { + if ($row_count == 30) + { $row_count = 0; $page_count += 30; } @@ -110,7 +105,7 @@ if ($fs) } // end search -$sql->db_Select("chatbox", "*", "{$qry_where} ORDER BY cb_datestamp DESC LIMIT ".intval($from).", 30"); +$sql->select("chatbox", "*", "{$qry_where} ORDER BY cb_datestamp DESC LIMIT ".intval($from).", 30"); $obj2 = new convert; $chatList = $sql->db_getList(); @@ -156,23 +151,21 @@ foreach ($chatList as $row) $textstart = preg_replace("/\{(.*?)\}/e", '$\1', $CHAT_TABLE_START); $textend = preg_replace("/\{(.*?)\}/e", '$\1', $CHAT_TABLE_END); $text = $textstart.$textstring.$textend; + if(CB_MOD) { $text = "
".$text."
"; } -if($message) -{ - $ns->tablerender("", $message); -} -$parms = "{$chat_total},30,{$from},".e_SELF.'?[FROM]'; -$text .= "
".$tp->parseTemplate("{NEXTPREV={$parms}}").'
'; - -$ns->tablerender(CHATBOX_L20, $text); +$parms = "{$chat_total},30,{$from},".e_SELF.'?[FROM]'; +$text .= "
".$tp->parseTemplate("{NEXTPREV={$parms}}").'
'; -//require_once(e_HANDLER."np_class.php"); -//$ix = new nextprev("chat.php", $from, 30, $chat_total, CHATBOX_L21); +$ns->tablerender(CHATBOX_L20, $mes->render().$text); + + +//require_once(e_HANDLER."np_class.php"); +//$ix = new nextprev("chat.php", $from, 30, $chat_total, CHATBOX_L21); require_once(FOOTERF); -?> +?>