1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00

Fixes #1697 - PHP7 compatibility fix for chatbox moderate page.

This commit is contained in:
Cameron
2016-06-13 08:18:38 -07:00
parent fb223639c1
commit 675046b65f
3 changed files with 61 additions and 28 deletions

View File

@@ -34,9 +34,12 @@ if(!isset($pref['cb_mod']))
{ {
$pref['cb_mod'] = e_UC_ADMIN; $pref['cb_mod'] = e_UC_ADMIN;
} }
define("CB_MOD", check_class($pref['cb_mod'])); define("CB_MOD", check_class($pref['cb_mod']));
if($_POST['moderate'] && CB_MOD)
if(!empty($_POST['moderate']) && CB_MOD)
{ {
if(isset($_POST['block'])) if(isset($_POST['block']))
{ {
@@ -69,10 +72,13 @@ if($_POST['moderate'] && CB_MOD)
} }
// when coming from search.php // when coming from search.php
$fs = false;
if (strstr(e_QUERY, "fs")) if (strstr(e_QUERY, "fs"))
{ {
$cgtm = intval(str_replace(".fs", "", e_QUERY)); $cgtm = intval(str_replace(".fs", "", e_QUERY));
$fs = TRUE; $fs = true;
} }
// end search // end search
@@ -87,7 +93,7 @@ if ($fs)
{ {
$page_count = 0; $page_count = 0;
$row_count = 0; $row_count = 0;
$sql->db_Select("chatbox", "*", "{$qry_where} ORDER BY cb_datestamp DESC"); $sql->select("chatbox", "*", "{$qry_where} ORDER BY cb_datestamp DESC");
while ($row = $sql->fetch()) while ($row = $sql->fetch())
{ {
if ($row['cb_id'] == $cgtm) if ($row['cb_id'] == $cgtm)
@@ -110,10 +116,28 @@ $obj2 = new convert;
$chatList = $sql->db_getList(); $chatList = $sql->db_getList();
$frm = e107::getForm(); $frm = e107::getForm();
$vars = array();
$flag = false;
if (empty($CHAT_TABLE))
{
if (file_exists(THEME."chat_template.php"))
{
require_once(THEME."chat_template.php");
}
else
{
require_once(e_PLUGIN."chatbox_menu/chat_template.php");
}
}
$textstring = '';
foreach ($chatList as $row) foreach ($chatList as $row)
{ {
$CHAT_TABLE_DATESTAMP = $tp->toDate($row['cb_datestamp'], "relative"); $vars['CHAT_TABLE_DATESTAMP'] = $tp->toDate($row['cb_datestamp'], "relative");
$CHAT_TABLE_NICK = preg_replace("/[0-9]+\./", "", $row['cb_nick']); $vars['CHAT_TABLE_NICK'] = preg_replace("/[0-9]+\./", "", $row['cb_nick']);
$cb_message = $tp->toHTML($row['cb_message'], TRUE,'USER_BODY'); $cb_message = $tp->toHTML($row['cb_message'], TRUE,'USER_BODY');
if($row['cb_blocked']) if($row['cb_blocked'])
@@ -140,25 +164,24 @@ foreach ($chatList as $row)
$cb_message .= "</div>"; $cb_message .= "</div>";
} }
$CHAT_TABLE_MESSAGE = $cb_message; $vars['CHAT_TABLE_MESSAGE'] = $cb_message;
$CHAT_TABLE_FLAG = ($flag ? "forumheader3" : "forumheader4"); $vars['CHAT_TABLE_FLAG'] = ($flag ? "forumheader3" : "forumheader4");
if (!$CHAT_TABLE) {
if (file_exists(THEME."chat_template.php")) // $textstring .= preg_replace("/\{(.*?)\}/e", '$\1', $CHAT_TABLE);
{ $textstring .= $tp->parseTemplate($CHAT_TABLE, true, $vars);
require_once(THEME."chat_template.php"); $flag = (!$flag ? true : false);
}
else
{
require_once(e_PLUGIN."chatbox_menu/chat_template.php");
}
}
$textstring .= preg_replace("/\{(.*?)\}/e", '$\1', $CHAT_TABLE);
$flag = (!$flag ? TRUE : FALSE);
} }
$textstart = preg_replace("/\{(.*?)\}/e", '$\1', $CHAT_TABLE_START);
$textend = preg_replace("/\{(.*?)\}/e", '$\1', $CHAT_TABLE_END); //print_a($CHAT_TABLE);
//$textstart = preg_replace("/\{(.*?)\}/e", '$\1', $CHAT_TABLE_START);
//$textend = preg_replace("/\{(.*?)\}/e", '$\1', $CHAT_TABLE_END);
$textstart = $tp->parseTemplate($CHAT_TABLE_START, true, $vars);
$textend = $tp->parseTemplate($CHAT_TABLE_END, true, $vars);
$text = $textstart.$textstring.$textend; $text = $textstart.$textstring.$textend;
if(CB_MOD) if(CB_MOD)

View File

@@ -3,13 +3,17 @@
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
// ##### CHAT TABLE ----------------------------------------------------------------------------- // ##### CHAT TABLE -----------------------------------------------------------------------------
if(!$CHAT_TABLE_START){
if(empty($CHAT_TABLE_START))
{
$CHAT_TABLE_START = " $CHAT_TABLE_START = "
<br /><table class='table table-striped' style='width:100%'>"; <br /><table class='table table-striped' style='width:100%'>";
} }
if(!$CHAT_TABLE)
if(empty($CHAT_TABLE))
{ {
//TODO review bullet //TODO review bullet
$CHAT_TABLE = "<tr><td> $CHAT_TABLE = "<tr><td>
<div class='spacer'> <div class='spacer'>
<div class='{CHAT_TABLE_FLAG}'> <div class='{CHAT_TABLE_FLAG}'>
@@ -20,11 +24,13 @@ if(!$CHAT_TABLE)
</div></td></tr>"; </div></td></tr>";
} }
if(!$CHAT_TABLE_END){
if(empty($CHAT_TABLE_END))
{
$CHAT_TABLE_END = " $CHAT_TABLE_END = "
</table>"; </table>";
} }
// ##### ------------------------------------------------------------------------------------------
?>

View File

@@ -279,7 +279,11 @@ if(!$text = $e107cache->retrieve("nq_chatbox"))
{ {
$pref['cb_mod'] = e_UC_ADMIN; $pref['cb_mod'] = e_UC_ADMIN;
} }
define("CB_MOD", check_class($pref['cb_mod']));
if(!defined('CB_MOD'))
{
define("CB_MOD", check_class($pref['cb_mod']));
}
$qry = " $qry = "
SELECT c.*, u.user_name, u.user_image FROM #chatbox AS c SELECT c.*, u.user_name, u.user_image FROM #chatbox AS c