mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-29 17:19:56 +02:00
Code Issues Releases Wiki Activity

Issue #3216 PHP7 Fixes.

Browse Source
This commit is contained in:
Cameron
2019-01-17 13:20:56 -08:00
parent 68a4aaea16
commit 221f12088b
5 changed files with 73 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
e107_plugins/banner/banner.php
View File

@@ -42,9 +42,14 @@ if(e_QUERY)
exit;
}
if (!$BANNER_LOGIN_TABLE)
if (empty($BANNER_LOGIN_TABLE) || empty($BANNER_TABLE) || empty($BANNER_TABLE_START) || empty($BANNER_TABLE_END))
{
if(file_exists(THEME.'templates/banner/banner_template.php')) // v2.x location.
$BANNER_TABLE_START = '';
$BANNER_TABLE_END = '';
$BANNER_TABLE = '';
$BANNER_LOGIN_TABLE = '';
if(file_exists(THEME.'templates/banner/banner_template.php')) // v2.x location.
{
require_once (THEME.'templates/banner/banner_template.php');
}
@@ -93,35 +98,36 @@ if (isset($_POST['clientsubmit']))
{
$start_date = ($row['banner_startdate'] ? strftime("%d %B %Y", $row['banner_startdate']) : BANNERLAN_31);
$end_date = ($row['banner_enddate'] ? strftime("%d %B %Y", $row['banner_enddate']) : BANNERLAN_31);
$BANNER_TABLE_CLICKPERCENTAGE = ($row['banner_clicks'] && $row['banner_impressions'] ? round(($row['banner_clicks'] / $row['banner_impressions']) * 100)."%" : "-");
$BANNER_TABLE_IMPRESSIONS_LEFT = ($row['banner_impurchased'] ? $row['banner_impurchased'] - $row['banner_impressions'] : BANNERLAN_30);
$BANNER_TABLE_IMPRESSIONS_PURCHASED = ($row['banner_impurchased'] ? $row['banner_impurchased'] : BANNERLAN_30);
$BANNER_TABLE_CLIENTNAME = $row['banner_clientname'];
$BANNER_TABLE_BANNER_ID = $row['banner_id'];
$BANNER_TABLE_BANNER_CLICKS = $row['banner_clicks'];
$BANNER_TABLE_BANNER_IMPRESSIONS = $row['banner_impressions'];
$BANNER_TABLE_ACTIVE = LAN_VISIBILITY." ".($row['banner_active'] != "255" ? LAN_YES : "<b>".LAN_NO."</b>");
$BANNER_TABLE_STARTDATE = LAN_START." ".$start_date;
$BANNER_TABLE_ENDDATE = LAN_END." ".$end_date;
$scArray = array();
$scArray['BANNER_TABLE_CLICKPERCENTAGE'] = ($row['banner_clicks'] && $row['banner_impressions'] ? round(($row['banner_clicks'] / $row['banner_impressions']) * 100)."%" : "-");
$scArray['BANNER_TABLE_IMPRESSIONS_LEFT'] = ($row['banner_impurchased'] ? $row['banner_impurchased'] - $row['banner_impressions'] : BANNERLAN_30);
$scArray['BANNER_TABLE_IMPRESSIONS_PURCHASED'] = ($row['banner_impurchased'] ? $row['banner_impurchased'] : BANNERLAN_30);
$scArray['BANNER_TABLE_CLIENTNAME'] = $row['banner_clientname'];
$scArray['BANNER_TABLE_BANNER_ID'] = $row['banner_id'];
$scArray['BANNER_TABLE_BANNER_CLICKS'] = $row['banner_clicks'];
$scArray['BANNER_TABLE_BANNER_IMPRESSIONS'] = $row['banner_impressions'];
$scArray['BANNER_TABLE_ACTIVE'] = LAN_VISIBILITY." ".($row['banner_active'] != "255" ? LAN_YES : "<b>".LAN_NO."</b>");
$scArray['BANNER_TABLE_STARTDATE'] = LAN_START." ".$start_date;
$scArray['BANNER_TABLE_ENDDATE'] = LAN_END." ".$end_date;
if ($row['banner_ip'])
{
$tmp = explode("^", $row['banner_ip']);
$BANNER_TABLE_IP_LAN = (count($tmp)-1);
$scArray['BANNER_TABLE_IP_LAN'] = (count($tmp)-1);
for($a = 0; $a <= (count($tmp)-2); $a++) {
$BANNER_TABLE_IP .= $tmp[$a]."<br />";
$scArray['BANNER_TABLE_IP'] .= $tmp[$a]."<br />";
}
}
$textstring .= preg_replace("/\{(.*?)\}/e", '$\1', $BANNER_TABLE);
$textstring .= $tp->parseTemplate($BANNER_TABLE, true, $scArray);
}
}
$textstart = preg_replace("/\{(.*?)\}/e", '$\1', $BANNER_TABLE_START);
$textend = preg_replace("/\{(.*?)\}/e", '$\1', $BANNER_TABLE_END);
$textstart = $tp->parseTemplate($BANNER_TABLE_START, true, $scArray);
$textend = $tp->parseTemplate($BANNER_TABLE_END, true, $scArray);
$text = $textstart.$textstring.$textend;
$ns->tablerender(PAGE_NAME, $text);
@@ -130,15 +136,16 @@ if (isset($_POST['clientsubmit']))
exit;
}
$scArray = array();
$scArray['BANNER_LOGIN_TABLE_LOGIN'] = $frm->text("clientlogin", $id);
$scArray['BANNER_LOGIN_TABLE_PASSW'] = $frm->password("clientpassword", '');
$scArray['BANNER_LOGIN_TABLE_SUBMIT'] = $frm->button("clientsubmit", LAN_CONTINUE, "submit");
$BANNER_LOGIN_TABLE_LOGIN = $frm->text("clientlogin", $id);
$BANNER_LOGIN_TABLE_PASSW = $frm->password("clientpassword", $pw);
$BANNER_LOGIN_TABLE_SUBMIT = $frm->button("clientsubmit", LAN_CONTINUE, "submit");
$text = $tp->parseTemplate($BANNER_LOGIN_TABLE, true, $scArray);
$text = preg_replace("/\{(.*?)\}/e", '$\1', $BANNER_LOGIN_TABLE);
$ns->tablerender(BANNERLAN_19, $text);
require_once(FOOTERF);
?>

10
e107_plugins/list_new/admin_list_config.php
View File

@@ -55,8 +55,8 @@ $rc->list_pref = $rc->getListPrefs();
//render message if set
if(isset($message))
{
$MESSAGE = $message;
$t = preg_replace("/\{(.*?)\}/e", '$\1', $rc->template['ADMIN_MESSAGE']);
$scArray = array('MESSAGE' => $message);
$t = $tp->parseTemplate($rc->template['ADMIN_MESSAGE'], false, $scArray);
$mes->addInfo($message);
//$rc->e107->ns->tablerender('', $t);
}
@@ -73,7 +73,7 @@ e107::getRender()->tablerender(LAN_PLUGIN_LIST_NEW_NAME, $mes->render(). $text);
*/
function admin_list_config_adminmenu()
{
$act = "";
unset($var);
$var=array();
//$var['general']['text'] = LIST_ADMIN_OPT_1;
@@ -82,8 +82,10 @@ function admin_list_config_adminmenu()
$var['list-new-new-page']['text'] = LIST_ADMIN_OPT_4;
$var['list-new-new-menu']['text'] = LIST_ADMIN_OPT_5;
e107::getNav()->admin(LAN_OPTIONS.'--id--list_new', 'list-new-recent-page', $var);
return null;
}
require_once(e_ADMIN."footer.php");
?>