fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-05 09:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix unnecessary assignment by reference, which causes E_NOTICE

Browse source
This commit is contained in:
Kijin Sung 2024-01-04 01:16:40 +09:00
parent ed15587c4f
commit 6c113c22ed
35 changed files with 80 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

3
widgets/content/content.class.php
View file

@ -682,7 +682,6 @@ class content extends WidgetHandler
function _compile($args,$content_items)
{
$oTemplate = TemplateHandler::getInstance();
// Set variables for widget
$widget_info = new stdClass();
$widget_info->modules_info = $args->modules_info;
@ -741,6 +740,8 @@ class content extends WidgetHandler
Context::set('widget_info', $widget_info);
$tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
$oTemplate = TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, "content");
}
}

4
widgets/counter_status/counter_status.class.php
View file

@ -22,7 +22,7 @@ class counter_status extends WidgetHandler
$output = $oCounterModel->getStatus(array('00000000', date('Ymd', $_SERVER['REQUEST_TIME']-60*60*24), date('Ymd')), $site_module_info->site_srl);
if(count($output))
{
foreach($output as $key => $val)
foreach($output as $key => $val)
{
if(!$key) Context::set('total_counter', $val);
elseif($key == date("Ymd")) Context::set('today_counter', $val);
@ -35,7 +35,7 @@ class counter_status extends WidgetHandler
// Specify a template file
$tpl_file = 'counter_status';
// Compile a template
$oTemplate = &TemplateHandler::getInstance();
$oTemplate = TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, $tpl_file);
}
}

4
widgets/language_select/language_select.class.php
View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) NAVER <http://www.navercorp.com> */
/**
* @class language_select
* @class language_select
* @author NAVER (developers@xpressengine.com)
* @brief Language selector
* @version 0.1
@ -23,7 +23,7 @@ class language_select extends WidgetHandler
Context::set('colorset', $args->colorset);
// Compile a template
$oTemplate = &TemplateHandler::getInstance();
$oTemplate = TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, $tpl_file);
}
}

2
widgets/login_info/login_info.class.php
View file

@ -81,7 +81,7 @@ class login_info extends WidgetHandler
Context::set('ssl_mode', $ssl_mode);
// Compile a template
$oTemplate = &TemplateHandler::getInstance();
$oTemplate = TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, $tpl_file);
}
}

39
widgets/mcontent/mcontent.class.php
View file

@ -381,19 +381,19 @@ class mcontent extends WidgetHandler
{
// Remove tags
$content = strip_tags($content);
// Convert temporarily html entity for truncate
$content = html_entity_decode($content, ENT_QUOTES);
// Replace all whitespaces to single space
$content = utf8_trim(utf8_normalize_spaces($content));
// Truncate string
$content = cut_str($content, $str_size, '...');
return escape($content);
}
/**
* @brief function to receive contents from rss url
* For Tistory blog in Korea, the original RSS url has location header without contents. Fixed to work as same as rss_reader widget.
@ -496,7 +496,7 @@ class mcontent extends WidgetHandler
$content_items[] = $content_item;
}
}
else if($xml_doc->feed && $xml_doc->feed->attrs->xmlns == 'http://www.w3.org/2005/Atom')
else if($xml_doc->feed && $xml_doc->feed->attrs->xmlns == 'http://www.w3.org/2005/Atom')
{
// Atom 1.0 spec supported by misol
$rss->title = $xml_doc->feed->title->body;
@ -513,25 +513,25 @@ class mcontent extends WidgetHandler
}
}
else if($links->attrs->rel == 'alternate') $rss->link = $links->attrs->href;
$items = $xml_doc->feed->entry;
if(!$items) return;
if($items && !is_array($items)) $items = array($items);
$content_items = array();
foreach ($items as $key => $value)
{
if($key >= $args->list_count) break;
unset($item);
foreach($value as $key2 => $value2)
{
if(is_array($value2)) $value2 = array_shift($value2);
$item->{$key2} = $this->_getRssBody($value2);
}
$content_item = new mcontentItem($rss->title);
$links = $value->link;
if(is_array($links))
@ -546,7 +546,7 @@ class mcontent extends WidgetHandler
}
}
else if($links->attrs->rel == 'alternate') $item->link = $links->attrs->href;
$content_item->setContentsLink($rss->link);
if($item->title)
{
@ -555,22 +555,22 @@ class mcontent extends WidgetHandler
$content_item->setTitle($item->title);
$content_item->setNickName(max($item->author,$item->{'dc:creator'}));
$content_item->setAuthorSite($value->author->uri->body);
//$content_item->setCategory($item->category);
$item->description = ($item->content) ? $item->content : $item->description = $item->summary;
$item->description = preg_replace('!<a href=!is','<a target="_blank" rel="noopener" href=', $item->description);
if(($item->content && stripos($value->content->attrs->type, "html") === FALSE) || (!$item->content && stripos($value->summary->attrs->type, "html") === FALSE))
{
$item->description = htmlspecialchars($item->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
}
$content_item->setContent($this->_getSummary($item->description, $args->content_cut_size));
$content_item->setLink($item->link);
$date = date('YmdHis', strtotime(max($item->published,$item->updated,$item->{'dc:date'})));
$content_item->setRegdate($date);
$content_items[] = $content_item;
}
}
@ -621,7 +621,6 @@ class mcontent extends WidgetHandler
function _compile($args,$content_items)
{
$oTemplate = &TemplateHandler::getInstance();
// Set variables for widget
$widget_info = new stdClass();
$widget_info->modules_info = $args->modules_info;
@ -654,6 +653,8 @@ class mcontent extends WidgetHandler
Context::set('widget_info', $widget_info);
$tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
$oTemplate = TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, "content");
}
}

4
widgets/pollWidget/pollWidget.class.php
View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) NAVER <http://www.navercorp.com> */
/**
* @class language_select
* @class language_select
* @author NAVER (developers@xpressengine.com)
* @brief Language selector
* @version 0.1
@ -32,7 +32,7 @@ class pollWidget extends WidgetHandler
Context::set('style', $args->style);
// Compile a template
$oTemplate = &TemplateHandler::getInstance();
$oTemplate = TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, $tpl_file);
}
}