mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

PHP8 fixes.

Browse Source
This commit is contained in:
Cameron
2021-01-14 11:32:02 -08:00
parent 3a166c253b
commit 7e90b791ba
2 changed files with 57 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_plugins/banner/e_shortcode.php
View File

@@ -16,29 +16,36 @@
* @subpackage banner * @subpackage banner
*/ */
class banner_shortcodes extends e_shortcode class banner_shortcodes extends e_shortcode
{ {
// $parm now can be array, old campaign $parm still allowed.... // $parm now can be array, old campaign $parm still allowed....
function sc_banner($parm = '') function sc_banner($parm = '')
{ {
$sql = e107::getDb(); $sql = e107::getDb();
$tp = e107::getParser(); $tp = e107::getParser();
mt_srand((double) microtime() * 1000000); mt_srand((double) microtime() * 1000000);
$seed = mt_rand(1, 2000000000); $seed = mt_rand(1, 2000000000);
$time = time(); $time = time();
$campaign = (is_array($parm)?$parm['campaign']:$parm); $campaign = (isset($parm['campaign']) ? $parm['campaign'] : $parm);
$query = " (banner_startdate=0 OR banner_startdate <= {$time}) AND (banner_enddate=0 OR banner_enddate > {$time}) AND (banner_impurchased=0 OR banner_impressions<=banner_impurchased)" . ($campaign ? " AND banner_campaign='" . $tp->toDB($campaign) . "'" : '') . " $query = " (banner_startdate=0 OR banner_startdate <= {$time}) AND (banner_enddate=0 OR banner_enddate > {$time}) AND (banner_impurchased=0 OR banner_impressions<=banner_impurchased)" . ($campaign ? " AND banner_campaign='" . $tp->toDB($campaign) . "'" : '') . "
AND banner_active IN (" . USERCLASS_LIST . ") "; AND banner_active IN (" . USERCLASS_LIST . ") ";
if($tags = e107::getRegistry('core/form/related')) if($tags = e107::getRegistry('core/form/related'))
{ {
$tags_regexp = "'(^|,)(" . str_replace(",", "|", $tags) . ")(,|$)'"; $tags_regexp = "'(^|,)(" . str_replace(",", "|", $tags) . ")(,|$)'";
$query .= " AND banner_keywords REGEXP " . $tags_regexp; $query .= " AND banner_keywords REGEXP " . $tags_regexp;
} }
$query .= " ORDER BY RAND($seed) LIMIT 1"; $query .= " ORDER BY RAND($seed) LIMIT 1";
if($sql->select('banner', 'banner_id, banner_image, banner_clickurl, banner_description', $query)) if($sql->select('banner', 'banner_id, banner_image, banner_clickurl, banner_description', $query))
{ {
$row = $sql->fetch(); $row = $sql->fetch();
return $this->renderBanner($row, $parm); return $this->renderBanner($row, $parm);
} }
else else
@@ -50,6 +57,7 @@ class banner_shortcodes extends e_shortcode
// Also used by banner_menu.php // Also used by banner_menu.php
public function renderBanner($row, $parm = null) public function renderBanner($row, $parm = null)
{ {
$sql = e107::getDb('banner'); $sql = e107::getDb('banner');
$tp = e107::getParser(); $tp = e107::getParser();
if(!$row['banner_image']) if(!$row['banner_image'])
@@ -78,6 +86,7 @@ class banner_shortcodes extends e_shortcode
case 'js': case 'js':
case 'php': // Code - may 'echo' text, or may return it as a value case 'php': // Code - may 'echo' text, or may return it as a value
$file_data = file_get_contents(e_IMAGE . 'banners/' . $row['banner_image']); $file_data = file_get_contents(e_IMAGE . 'banners/' . $row['banner_image']);
return $file_data; return $file_data;
break; break;

6
e107_plugins/social/e_shortcode.php
View File

@@ -100,8 +100,11 @@ class social_shortcodes extends e_shortcode
$newList = array(); $newList = array();
$tmp = explode(",",$parm['type']); $tmp = explode(",",$parm['type']);
foreach($tmp as $v) foreach($tmp as $v)
{
if(isset($social[$v]))
{ {
$newList[$v] = $social[$v]; $newList[$v] = $social[$v];
}
} }
@@ -386,9 +389,12 @@ class social_shortcodes extends e_shortcode
$newlist = array(); $newlist = array();
$tmp = explode(",",$parm['type']); $tmp = explode(",",$parm['type']);
foreach($tmp as $v) foreach($tmp as $v)
{
if(isset($opt[$v]))
{ {
$newlist[$v] = $opt[$v]; $newlist[$v] = $opt[$v];
} }
}
$opt = $newlist; $opt = $newlist;