mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

PHP Notice removal.

Browse Source
This commit is contained in:
Cameron
2016-03-13 00:16:08 -08:00
parent af1bbb1c8a
commit 3f6fe6cd85
8 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_core/shortcodes/batch/news_shortcodes.php
View File

@@ -256,13 +256,14 @@ class news_shortcodes extends e_shortcode
{ {
$category_name = e107::getParser()->toHTML($this->news_item['category_name'], FALSE ,'defs'); $category_name = e107::getParser()->toHTML($this->news_item['category_name'], FALSE ,'defs');
$category = array('id' => $this->news_item['category_id'], 'name' => $this->news_item['category_sef'] ); $category = array('id' => $this->news_item['category_id'], 'name' => $this->news_item['category_sef'] );
return "<a class='".$GLOBALS['NEWS_CSSMODE']."_category' style='".(isset($this->param['catlink']) ? $this->param['catlink'] : "#")."' href='".e107::getUrl()->create('news/list/category', $category)."'>".$category_name."</a>"; $categoryClass = varset($GLOBALS['NEWS_CSSMODE'],'');
return "<a class='".$categoryClass."_category' style='".(isset($this->param['catlink']) ? $this->param['catlink'] : "#")."' href='".e107::getUrl()->create('news/list/category', $category)."'>".$category_name."</a>";
} }
function sc_newsdate($parm) function sc_newsdate($parm)
{ {
$date = ($this->news_item['news_start'] > 0) ? $this->news_item['news_start'] : $this->news_item['news_datestamp']; $date = ($this->news_item['news_start'] > 0) ? $this->news_item['news_start'] : $this->news_item['news_datestamp'];
$con = new convert; $con = e107::getDate();
if($parm == '') if($parm == '')
{ {
return $con->convert_date($date, 'long'); return $con->convert_date($date, 'long');

2
e107_core/url/news/sef_noid_url.php
View File

@@ -160,7 +160,7 @@ class core_news_sef_noid_url extends eUrlConfig
*/ */
public function parse($pathInfo, $params, $request, $router, $config) public function parse($pathInfo, $params, $request, $router, $config)
{ {
$page = $params['page'] ? intval($params['page']) : '0'; $page = !empty($params['page']) ? intval($params['page']) : '0';
if(!$pathInfo) if(!$pathInfo)
{ {
## this var is used by default from legacy() method ## this var is used by default from legacy() method

3
e107_handlers/e_parse_class.php
View File

@@ -2408,7 +2408,10 @@ class e_parse extends e_parser
elseif(!empty($parm['w']) || !empty($parm['w']) ) elseif(!empty($parm['w']) || !empty($parm['w']) )
{ {
$this->thumbWidth($parm['w']); $this->thumbWidth($parm['w']);
if(isset($parm['h']))
{
$this->thumbHeight($parm['h']); $this->thumbHeight($parm['h']);
}
} }

3
e107_plugins/banner/banner.php
View File

@@ -37,7 +37,8 @@ if(e_QUERY)
$ip = e107::getIPHandler()->getIP(FALSE); $ip = e107::getIPHandler()->getIP(FALSE);
$newip = (strpos($row['banner_ip'], "{$ip}^") !== FALSE) ? $row['banner_ip'] : "{$row['banner_ip']}{$ip}^"; // what does this do? $newip = (strpos($row['banner_ip'], "{$ip}^") !== FALSE) ? $row['banner_ip'] : "{$row['banner_ip']}{$ip}^"; // what does this do?
$sql->update("banner", "banner_clicks = banner_clicks + 1, `banner_ip` = '{$newip}' WHERE `banner_id` = '{$query_string}'"); $sql->update("banner", "banner_clicks = banner_clicks + 1, `banner_ip` = '{$newip}' WHERE `banner_id` = '{$query_string}'");
header("Location: {$row['banner_clickurl']}"); // header("Location: {$row['banner_clickurl']}");
e107::redirect($row['banner_clickurl']);
exit; exit;
} }

2
e107_plugins/banner/banner_menu.php
View File

@@ -103,7 +103,7 @@ if(!empty($menu_pref['banner_campaign']) && !empty($menu_pref['banner_amount']))
$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)"; $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)";
$query .= (count($filter)) ? " AND (".implode(" OR ",$filter)." ) " : ""; $query .= (count($filter)) ? " AND (".implode(" OR ",$filter)." ) " : "";
$query .= ($parm ? " AND banner_campaign='".$tp->toDB($parm)."'" : ''); // $query .= ($parm ? " AND banner_campaign='".$tp->toDB($parm)."'" : '');
if($tags = e107::getRegistry('core/form/related')) if($tags = e107::getRegistry('core/form/related'))

4
e107_plugins/banner/e_shortcode.php
View File

@@ -106,7 +106,9 @@ class banner_shortcodes extends e_shortcode
break; break;
} }
$start = "<a class='e-tip' href='".e_HTTP.'banner.php?'.$row['banner_id']."' rel='external' title=\"".$tp->toAttribute($row['banner_tooltip'])."\">"; $tooltip = varset($row['banner_tooltip'],'');
$start = "<a class='e-tip' href='".e_HTTP.'banner.php?'.$row['banner_id']."' rel='external' title=\"".$tp->toAttribute($tooltip)."\">";
$item = $ban_ret; $item = $ban_ret;
$end = '</a>'; $end = '</a>';

1
e107_plugins/banner/languages/English_front.php
View File

@@ -8,7 +8,6 @@
* *
*/ */
define("PAGE_NAME", "Banner");
define("BANNERLAN_16", "Username: "); define("BANNERLAN_16", "Username: ");
define("BANNERLAN_17", "Password: "); define("BANNERLAN_17", "Password: ");

2
e107_plugins/news/news_months_menu.php
View File

@@ -118,7 +118,7 @@ if(false === $cached)
)); ));
$menu_text[] = $tp->simpleParse($template['item'], $vars); $menu_text[] = $tp->simpleParse($template['item'], $vars);
} }
$cached = $template['start'].implode($template['separator'], $menu_text).$template['end']; $cached = $template['start'].implode(varset($template['separator'],''), $menu_text).$template['end'];
if($cached) if($cached)
{ {
if(!$parms['showarchive']) $cached .= '<ul class="nav nav-list e-menu-link news-menu-archive"><li><a href="'.e_PLUGIN_ABS.'blogcalendar_menu/archive.php">'.BLOGCAL_L2.'</a></li></ul>'; if(!$parms['showarchive']) $cached .= '<ul class="nav nav-list e-menu-link news-menu-archive"><li><a href="'.e_PLUGIN_ABS.'blogcalendar_menu/archive.php">'.BLOGCAL_L2.'</a></li></ul>';