1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-27 01:40:22 +02:00

Fixes #3141 - Tweak banner menu display

If banner_amount is empty, display unlimited
This commit is contained in:
Tijn Kuyper
2019-02-01 14:59:04 +01:00
parent 8c055928e0
commit f4fe262a11

View File

@@ -13,8 +13,6 @@
* *
* Handles the display and sequencing of banners on web pages, including counting impressions * Handles the display and sequencing of banners on web pages, including counting impressions
* *
* @package e107_plugins
* @subpackage banner
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -33,9 +31,6 @@ else
require(e_PLUGIN.'banner/banner_template.php'); require(e_PLUGIN.'banner/banner_template.php');
} }
$menu_pref = e107::getConfig('menu')->getPref(''); // legacy preference lookup. $menu_pref = e107::getConfig('menu')->getPref(''); // legacy preference lookup.
if(defset('BOOTSTRAP')) if(defset('BOOTSTRAP'))
@@ -43,7 +38,6 @@ if(defset('BOOTSTRAP'))
$BANNER_MENU_START = $BANNER_TEMPLATE['menu']['start']; $BANNER_MENU_START = $BANNER_TEMPLATE['menu']['start'];
$BANNER_MENU_ITEM = $BANNER_TEMPLATE['menu']['item']; $BANNER_MENU_ITEM = $BANNER_TEMPLATE['menu']['item'];
$BANNER_MENU_END = $BANNER_TEMPLATE['menu']['end']; $BANNER_MENU_END = $BANNER_TEMPLATE['menu']['end'];
} }
else else
{ {
@@ -74,10 +68,10 @@ else
// print_a($menu_pref); //print_a($menu_pref);
if(!empty($menu_pref['banner_campaign']) && !empty($menu_pref['banner_amount'])) if(!empty($menu_pref['banner_campaign']) /*&& !empty($menu_pref['banner_amount'])*/)
{ {
$sc = e107::getScBatch('banner'); $sc = e107::getScBatch('banner');
@@ -124,7 +118,11 @@ if(!empty($menu_pref['banner_campaign']) && !empty($menu_pref['banner_amount']))
$ord[] = " RAND($seed) ASC"; $ord[] = " RAND($seed) ASC";
$query .= implode(', ',$ord); $query .= implode(', ',$ord);
$query .= " LIMIT ".intval($menu_pref['banner_amount']);
if(!empty($menu_pref['banner_amount'])) // if empty, show unlimited
{
$query .= " LIMIT ".intval($menu_pref['banner_amount']);
}
if($data = $sql->retrieve('banner', 'banner_id, banner_image, banner_clickurl,banner_campaign, banner_description', $query,true)) if($data = $sql->retrieve('banner', 'banner_id, banner_image, banner_clickurl,banner_campaign, banner_description', $query,true))
{ {
@@ -201,4 +199,3 @@ if(!empty($menu_pref['banner_campaign']) && !empty($menu_pref['banner_amount']))
} }
?>