From: <ma...@us...> - 2012-12-02 21:18:51
|
Revision: 10308 http://sourceforge.net/p/xoops/svn/10308 Author: mageg Date: 2012-12-02 21:18:49 +0000 (Sun, 02 Dec 2012) Log Message: ----------- rename renderbanner.php in bannerrender.php Modified Paths: -------------- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/blocks/banners_blocks.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/preloads/core.php Added Paths: ----------- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/bannerrender.php Removed Paths: ------------- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/renderbanner.php Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/blocks/banners_blocks.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/blocks/banners_blocks.php 2012-12-02 20:40:24 UTC (rev 10307) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/blocks/banners_blocks.php 2012-12-02 21:18:49 UTC (rev 10308) @@ -16,14 +16,14 @@ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package banners * @since 2.6.0 - * @author Mage Gr\xE9gory (AKA Mage) + * @author Mage Gr�gory (AKA Mage) * @version $Id$ */ function banners_blocks_show($options) { $block = array(); $xoops = Xoops::getInstance(); - require_once dirname(dirname(__FILE__)) . '/class/renderbanner.php'; - $render = new RenderBanner(); + require_once dirname(dirname(__FILE__)) . '/class/bannerrender.php'; + $render = new BannerRender(); switch ($options[0]) { case 'random': $nb_display = $options[1]; Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/bannerrender.php (from rev 10307, XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/renderbanner.php) =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/bannerrender.php (rev 0) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/bannerrender.php 2012-12-02 21:18:49 UTC (rev 10308) @@ -0,0 +1,112 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +*/ + +/** + * banners module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package banners + * @since 2.6.0 + * @author Mage Gr�gory (AKA Mage) + * @version $Id$ + */ + +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +class BannerRender +{ + /** + * Constructor + */ + public function __construct() + { + } + + /** + * Display banner + * + * @param $nb_banner + * @param $align + * @param $client + * @param $ids + * + * @return string + */ + public function displayBanner($nb_banner = 1, $align = 'H', $client = array(), $ids = '') + { + $xoops = Xoops::getInstance(); + if ($xoops->isActiveModule('banners')) { + // Get banners handler + $banner_Handler = $xoops->getModuleHandler('banner', 'banners'); + // Display banner + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria('status', 0, '!=')); + $criteria->setSort('RAND()'); + if (!empty($client)) { + if (!in_array(0, $client)) { + $criteria->add(new Criteria('cid', '(' . implode(',', $client) . ')', 'IN')); + } + } + if ($ids == '') { + $criteria->setLimit($nb_banner); + $criteria->setStart(0); + } else { + $criteria->add(new Criteria('bid', '(' . $ids . ')', 'IN')); + } + $banner_arr = $banner_Handler->getall($criteria); + $numrows = count($banner_arr); + $bannerobject = ''; + if ($numrows > 0) { + foreach (array_keys($banner_arr) as $i) { + $imptotal = $banner_arr[$i]->getVar("imptotal"); + $impmade = $banner_arr[$i]->getVar("impmade"); + $htmlbanner = $banner_arr[$i]->getVar("htmlbanner"); + $htmlcode = $banner_arr[$i]->getVar("htmlcode"); + $imageurl = $banner_arr[$i]->getVar("imageurl"); + $bid = $banner_arr[$i]->getVar("bid"); + $clickurl = $banner_arr[$i]->getVar("clickurl"); + /** + * Print the banner + */ + if ($htmlbanner) { + $bannerobject .= $htmlcode; + } else { + if (stristr($imageurl, '.swf')) { + $bannerobject .= '<a href="' . XOOPS_URL . '/modules/banners/index.php?op=click&bid=' . $bid . '" rel="external" title="' . $clickurl . '"></a>' . '<object type="application/x-shockwave-flash" width="468" height="60" data="' . $imageurl . '" style="z-index:100;">' . '<param name="movie" value="' . $imageurl . '" />' . '<param name="wmode" value="opaque" />' . '</object>'; + } else { + $bannerobject .= '<a href="' . XOOPS_URL . '/modules/banners/index.php?op=click&bid=' . $bid . '" rel="external" title="' . $clickurl . '"><img src="' . $imageurl . '" alt="' . $clickurl . '" /></a>'; + } + } + if ($align == 'V') { + $bannerobject .= '<br /><br />'; + } else { + $bannerobject .= ' '; + } + if ($xoops->getModuleConfig('banners_myip', 'banners') == $xoops->getEnv('REMOTE_ADDR')) { + // EMPTY + } else { + /** + * Check if this impression is the last one + */ + $impmade = $impmade + 1; + if ($imptotal > 0 && $impmade >= $imptotal) { + $xoops->db->queryF(sprintf('UPDATE %s SET status = %u, dateend = %u WHERE bid = %u', $xoops->db->prefix('banner'), 0, time(), $bid)); + } else { + $xoops->db->queryF(sprintf('UPDATE %s SET impmade = %u WHERE bid = %u', $xoops->db->prefix('banner'), $impmade, $bid)); + } + } + } + return $bannerobject; + } + } + } +} \ No newline at end of file Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/renderbanner.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/renderbanner.php 2012-12-02 20:40:24 UTC (rev 10307) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/renderbanner.php 2012-12-02 21:18:49 UTC (rev 10308) @@ -1,111 +0,0 @@ -<?php -/* - You may not change or alter any portion of this comment or credits - of supporting developers from this source code or any supporting source code - which is considered copyrighted (c) material of the original comment or credit authors. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ - -/** - * banners module - * - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package banners - * @since 2.6.0 - * @author Mage Gr\xE9gory (AKA Mage) - * @version $Id$ - */ - -defined('XOOPS_ROOT_PATH') or die('Restricted access'); - -class RenderBanner -{ - /** - * Constructor - */ - public function __construct() - { - - } - - /** - * Display banner - * @param $nb_banner - * @param $align - * @param $client - * @param $ids - * @return string - */ - public function displayBanner($nb_banner = 1, $align = 'H', $client = array(), $ids = '') - { - $xoops = Xoops::getInstance(); - if ($xoops->isActiveModule('banners')) { - // Get banners handler - $banner_Handler = $xoops->getModuleHandler('banner','banners'); - // Display banner - $criteria = new CriteriaCompo(); - $criteria->add(new Criteria('status', 0, '!=')); - $criteria->setSort('RAND()'); - if (!empty($client)) { - if (!in_array(0,$client)) { - $criteria->add(new Criteria('cid', '(' . implode(',', $client) . ')','IN')); - } - } - if ($ids == '') { - $criteria->setLimit($nb_banner); - $criteria->setStart(0); - } else { - $criteria->add(new Criteria('bid', '(' . $ids . ')','IN')); - } - $banner_arr = $banner_Handler->getall($criteria); - $numrows = count($banner_arr); - $bannerobject = ''; - if ($numrows > 0) { - foreach (array_keys($banner_arr) as $i) { - $imptotal = $banner_arr[$i]->getVar("imptotal"); - $impmade = $banner_arr[$i]->getVar("impmade"); - $htmlbanner = $banner_arr[$i]->getVar("htmlbanner"); - $htmlcode = $banner_arr[$i]->getVar("htmlcode"); - $imageurl = $banner_arr[$i]->getVar("imageurl"); - $bid = $banner_arr[$i]->getVar("bid"); - $clickurl = $banner_arr[$i]->getVar("clickurl"); - /** - * Print the banner - */ - if ($htmlbanner) { - $bannerobject .= $htmlcode; - } else { - if (stristr($imageurl, '.swf')) { - $bannerobject .= '<a href="' . XOOPS_URL . '/modules/banners/index.php?op=click&bid=' . $bid . '" rel="external" title="' . $clickurl . '"></a>' . '<object type="application/x-shockwave-flash" width="468" height="60" data="' . $imageurl . '" style="z-index:100;">' . '<param name="movie" value="' . $imageurl . '" />' . '<param name="wmode" value="opaque" />' . '</object>'; - } else { - $bannerobject .= '<a href="' . XOOPS_URL . '/modules/banners/index.php?op=click&bid=' . $bid . '" rel="external" title="' . $clickurl . '"><img src="' . $imageurl . '" alt="' . $clickurl . '" /></a>'; - } - } - if ($align == 'V') { - $bannerobject .= '<br /><br />'; - } else { - $bannerobject .= ' '; - } - if ($xoops->getModuleConfig('banners_myip', 'banners') == $xoops->getEnv('REMOTE_ADDR')) { - // EMPTY - } else { - /** - * Check if this impression is the last one - */ - $impmade = $impmade + 1; - if ($imptotal > 0 && $impmade >= $imptotal) { - $xoops->db->queryF(sprintf('UPDATE %s SET status = %u, dateend = %u WHERE bid = %u', $xoops->db->prefix('banner'), 0, time(), $bid)); - }else{ - $xoops->db->queryF(sprintf('UPDATE %s SET impmade = %u WHERE bid = %u', $xoops->db->prefix('banner'), $impmade, $bid)); - } - } - } - return $bannerobject; - } - } - } -} \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/preloads/core.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/preloads/core.php 2012-12-02 20:40:24 UTC (rev 10307) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/preloads/core.php 2012-12-02 21:18:49 UTC (rev 10308) @@ -16,7 +16,7 @@ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package banners * @since 2.6.0 - * @author Mage Gr\xE9gory (AKA Mage) + * @author Mage Gr�gory (AKA Mage) * @version $Id$ */ @@ -27,7 +27,7 @@ * * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @author Mage Gr\xE9gory (AKA Mage) + * @author Mage Gr�gory (AKA Mage) */ class BannersCorePreload extends XoopsPreloadItem { @@ -38,8 +38,8 @@ */ static public function eventCoreBannerDisplay($args) { - require_once dirname(dirname(__FILE__)) . '/class/renderbanner.php'; - $render = new RenderBanner(); + require_once dirname(dirname(__FILE__)) . '/class/bannerrender.php'; + $render = new BannerRender(); $args[0] = $render->displayBanner(); } } \ No newline at end of file |
From: <ma...@us...> - 2013-02-13 21:20:58
|
Revision: 11048 http://sourceforge.net/p/xoops/svn/11048 Author: mageg Date: 2013-02-13 21:20:54 +0000 (Wed, 13 Feb 2013) Log Message: ----------- add message if you doen't have banners Modified Paths: -------------- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/language/english/main.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/templates/banners_client.html Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php 2013-02-13 21:19:55 UTC (rev 11047) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php 2013-02-13 21:20:54 UTC (rev 11048) @@ -154,6 +154,8 @@ $xoops->tpl()->append_by_ref('popup_banner', $banner); unset($banner); } + } else { + $xoops->tpl()->assign('error_msg', $xoops->alert('error', _MD_BANNERS_INDEX_NOBANNER)); } // Display Page Navigation if ($banner_count > $nb_banners) { Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/language/english/main.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/language/english/main.php 2013-02-13 21:19:55 UTC (rev 11047) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/language/english/main.php 2013-02-13 21:20:54 UTC (rev 11048) @@ -16,9 +16,9 @@ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package banners * @since 2.6.0 - * @author Mage Gr\xE9gory (AKA Mage) + * @author Mage Gr�gory (AKA Mage) * @version $Id$ - */ + */ //index.php //define("_MD_BANNERS_INDEX_CLIENTNAME", "Displaying active banners for client: %s"); define("_MD_BANNERS_INDEX_DBERROR", "Database was not updated due to some error!"); @@ -39,4 +39,5 @@ define("_MD_BANNERS_INDEX_MAIL_OK", "Available Banner statistics for the selected banner have been sent to your account email address."); define("_MD_BANNERS_INDEX_MAIL_SUBJECT", "Your Banner Statistics at %s"); define("_MD_BANNERS_INDEX_NOMAIL", "Failed to send: E-Mail address does not exist."); +define("_MD_BANNERS_INDEX_NOBANNER", "You have no banners"); include_once('admin.php'); \ No newline at end of file Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/templates/banners_client.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/templates/banners_client.html 2013-02-13 21:19:55 UTC (rev 11047) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/templates/banners_client.html 2013-02-13 21:20:54 UTC (rev 11048) @@ -1,3 +1,4 @@ +<{$error_msg}> <{if $banner_count == true}> <h4><{$smarty.const._AM_BANNERS_BANNERS_CURRENT}></h4> <table id="xo-bannerslist-sorter" class="table table-striped table-bordered table-condensed"> |