diff --git a/modules/board/board.admin.model.php b/modules/board/board.admin.model.php index c526c4f3a..b4fcc83c1 100644 --- a/modules/board/board.admin.model.php +++ b/modules/board/board.admin.model.php @@ -65,7 +65,7 @@ class BoardAdminModel extends Board $admin_member = $oModuleModel->getAdminId($moduleSrl); Context::set('admin_member', $admin_member); - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); $html = $oTemplate->compile($this->module_path.'tpl/', 'board_setup_basic'); return $html; diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php index f206f6d7e..53293bd00 100644 --- a/modules/document/document.admin.controller.php +++ b/modules/document/document.admin.controller.php @@ -666,7 +666,7 @@ class DocumentAdminController extends Document $oDocumentController = getController('document'); $oDocumentModel = getModel('document'); - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); $oDB->begin(); //DB restore diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 12b5ec590..bab1861f6 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -1016,7 +1016,7 @@ class DocumentModel extends Document $security->encodeHTML('extra_keys..', 'selected_var_idx'); // Get information of module_grants - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); return $oTemplate->compile($this->module_path.'tpl', 'extra_keys'); } @@ -1037,7 +1037,7 @@ class DocumentModel extends Document $security->encodeHTML('group_list..title'); // Get information of module_grants - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); return $oTemplate->compile($this->module_path.'tpl', 'category_list'); } diff --git a/modules/editor/components/emoticon/emoticon.class.php b/modules/editor/components/emoticon/emoticon.class.php index 83895667b..11527d4c0 100644 --- a/modules/editor/components/emoticon/emoticon.class.php +++ b/modules/editor/components/emoticon/emoticon.class.php @@ -99,7 +99,7 @@ class emoticon extends EditorHandler $tpl_path = $this->component_path.'tpl'; $tpl_file = 'popup.html'; - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); return $oTemplate->compile($tpl_path, $tpl_file); } diff --git a/modules/editor/components/image_gallery/image_gallery.class.php b/modules/editor/components/image_gallery/image_gallery.class.php index 52fdb2ed4..8c7536f14 100644 --- a/modules/editor/components/image_gallery/image_gallery.class.php +++ b/modules/editor/components/image_gallery/image_gallery.class.php @@ -31,7 +31,7 @@ class image_gallery extends EditorHandler Context::set("tpl_path", $tpl_path); - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); return $oTemplate->compile($tpl_path, $tpl_file); } @@ -86,7 +86,7 @@ class image_gallery extends EditorHandler if($gallery_info->gallery_style == "list") $tpl_file = 'list_gallery.html'; else $tpl_file = 'slide_gallery.html'; - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); return $oTemplate->compile($tpl_path, $tpl_file); } } diff --git a/modules/editor/components/image_link/image_link.class.php b/modules/editor/components/image_link/image_link.class.php index 49700650d..1a9d099fa 100644 --- a/modules/editor/components/image_link/image_link.class.php +++ b/modules/editor/components/image_link/image_link.class.php @@ -31,7 +31,7 @@ class image_link extends EditorHandler Context::set("tpl_path", $tpl_path); - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); return $oTemplate->compile($tpl_path, $tpl_file); } diff --git a/modules/editor/components/poll_maker/poll_maker.class.php b/modules/editor/components/poll_maker/poll_maker.class.php index 746861103..c3de0ca6d 100644 --- a/modules/editor/components/poll_maker/poll_maker.class.php +++ b/modules/editor/components/poll_maker/poll_maker.class.php @@ -33,7 +33,7 @@ class poll_maker extends EditorHandler $tpl_path = $this->component_path.'tpl'; $tpl_file = 'popup.html'; - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); return $oTemplate->compile($tpl_path, $tpl_file); } @@ -71,7 +71,7 @@ class poll_maker extends EditorHandler Context::set('style', $args->style); // Compile a template - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); return $oTemplate->compile($tpl_path, $tpl_file); } } diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php index 55b37ce12..0025becdc 100644 --- a/modules/editor/editor.controller.php +++ b/modules/editor/editor.controller.php @@ -52,8 +52,8 @@ class EditorController extends Editor throw new Rhymix\Framework\Exception('msg_component_is_not_founded', $component); } - $oEditorModel = getModel('editor'); - $oComponent = &$oEditorModel->getComponentObject($component); + $oEditorModel = EditorModel::getInstance(); + $oComponent = $oEditorModel->getComponentObject($component); if(!$oComponent->toBool()) return $oComponent; if(!method_exists($oComponent, $method)) @@ -211,11 +211,11 @@ class EditorController extends Editor $module_srl = $module_info->module_srl ?? 0; if($module_srl) { - $editor_config = getModel('editor')->getEditorConfig($module_srl); + $editor_config = EditorModel::getEditorConfig($module_srl); } else { - $editor_config = getModel('module')->getModuleConfig('editor'); + $editor_config = ModuleModel::getModuleConfig('editor'); } if ($editor_config) @@ -280,8 +280,8 @@ class EditorController extends Editor } // Get converted codes by using component::transHTML() - $oEditorModel = getModel('editor'); - $oComponent = &$oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0); + $oEditorModel = EditorModel::getInstance(); + $oComponent = $oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0); if(!is_object($oComponent) || !method_exists($oComponent, 'transHTML')) { return $match[0]; @@ -327,9 +327,7 @@ class EditorController extends Editor { $editor_sequence = Context::get('editor_sequence'); $primary_key = Context::get('primary_key'); - $oEditorModel = getModel('editor'); - - $saved_doc = $oEditorModel->getSavedDoc(null); + $saved_doc = EditorModel::getSavedDoc(null); FileController::setUploadInfo($editor_sequence, $saved_doc->document_srl, intval($saved_doc->module_srl)); $vars = $this->getVariables(); diff --git a/modules/editor/editor.view.php b/modules/editor/editor.view.php index 9f4652d45..3284c1720 100644 --- a/modules/editor/editor.view.php +++ b/modules/editor/editor.view.php @@ -62,8 +62,7 @@ class EditorView extends Editor $site_module_info = Context::get('site_module_info'); $site_srl = (int)$site_module_info->site_srl; // Get compoenet object - $oEditorModel = getModel('editor'); - $oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence, $site_srl); + $oComponent = EditorModel::getComponentObject($component, $editor_sequence, $site_srl); if(!$oComponent->toBool()) { Context::set('message', sprintf($oComponent->getMessage(), $component)); @@ -174,7 +173,7 @@ class EditorView extends Editor $security->encodeHTML('editor_comment_colorset_list..title'); // Set a template file - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); $tpl = $oTemplate->compile($this->module_path.'tpl', 'editor_module_config'); $obj .= $tpl; diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index 4ef06c9fb..706adf716 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -1827,7 +1827,7 @@ class FileController extends File $args->file_srl = $vars->file_srl; $args->upload_target_srl = $upload_target_srl; - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); $oDB->begin(); $args->cover_image = 'N'; diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php index f44453ad2..8cdb5fa90 100644 --- a/modules/layout/layout.admin.controller.php +++ b/modules/layout/layout.admin.controller.php @@ -726,7 +726,7 @@ class LayoutAdminController extends Layout $args->layout_type = $layout->layout_type; if(!$args->layout_type) $args->layout_type = "P"; - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); $oDB->begin(); if(is_array($sourceArgs->title)) diff --git a/modules/layout/layout.admin.model.php b/modules/layout/layout.admin.model.php index 69e45a4ce..94be7370e 100644 --- a/modules/layout/layout.admin.model.php +++ b/modules/layout/layout.admin.model.php @@ -158,7 +158,7 @@ class LayoutAdminModel extends Layout $security->encodeHTML('layout_code_css', 'layout_code', 'widget_list..title'); $script = ''; - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); $html = $oTemplate->compile($this->module_path.'tpl/', 'layout_html_css_view'); $this->add('html', $script.$html); diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php index 27ccf2705..60b3d2cc9 100644 --- a/modules/layout/layout.admin.view.php +++ b/modules/layout/layout.admin.view.php @@ -214,7 +214,7 @@ class LayoutAdminView extends Layout Context::set('is_sitemap', '0'); $script = ''; - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); $content = $oTemplate->compile($this->module_path.'tpl/', 'layout_info_view'); Context::set('content', $content); @@ -336,7 +336,7 @@ class LayoutAdminView extends Layout FileHandler::writeFile($edited_layout_file, $code); // Compile - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); $layout_path = $layout_info->path; $layout_file = 'layout'; @@ -344,7 +344,6 @@ class LayoutAdminView extends Layout $layout_tpl = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file); Context::set('layout','none'); // Convert widgets and others - $oContext = &Context::getInstance(); Context::set('layout_tpl', $layout_tpl); // Delete Temporary Files FileHandler::removeFile($edited_layout_file); @@ -395,7 +394,7 @@ class LayoutAdminView extends Layout Context::addHtmlHeader($script); } - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); Context::set('content', $oTemplate->compile($this->module_path.'tpl','about_faceoff')); // Change widget codes in Javascript mode $oWidgetController = getController('widget'); diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index 019e0a135..4a04805c6 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -1102,7 +1102,7 @@ class LayoutModel extends Layout // Display menu when editing the faceOff page if(Context::get('act')=='dispLayoutAdminLayoutModify' && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)) { - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); Context::addBodyHeader($oTemplate->compile($this->module_path.'/tpl', 'faceoff_layout_menu')); } } diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php index 47ed913d8..ee6e87b7c 100644 --- a/modules/layout/layout.view.php +++ b/modules/layout/layout.view.php @@ -227,7 +227,6 @@ class LayoutView extends Layout Context::set('layout','none'); // Convert widgets and others - $oContext = Context::getInstance(); Context::set('layout_tpl', $layout_tpl); $this->setTemplatePath($this->module_path.'tpl'); $this->setTemplateFile('layout_preview'); @@ -371,7 +370,7 @@ class LayoutView extends Layout FileHandler::writeFile($edited_layout_file, $code); // Compile - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); $layout_path = $layout_info->path; $layout_file = 'layout'; @@ -379,7 +378,6 @@ class LayoutView extends Layout $layout_tpl = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file); Context::set('layout','none'); // Convert widgets and others - $oContext = &Context::getInstance(); Context::set('layout_tpl', $layout_tpl); // Delete Temporary Files FileHandler::removeFile($edited_layout_file); diff --git a/modules/member/member.admin.model.php b/modules/member/member.admin.model.php index 1cbb0d0c9..a699cc35d 100644 --- a/modules/member/member.admin.model.php +++ b/modules/member/member.admin.model.php @@ -222,7 +222,7 @@ class MemberAdminModel extends Member if(!$config->colorset) $config->colorset = "white"; Context::set('config', $config); - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); $tpl = $oTemplate->compile($this->module_path.'tpl', 'new_colorset_list'); } @@ -307,7 +307,7 @@ class MemberAdminModel extends Member $id_list = implode(',',$list); Context::set('id_list',$id_list); - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); $tpl = $oTemplate->compile($this->module_path.'tpl', 'insert_join_form'); $this->add('tpl', str_replace("\n"," ",$tpl)); diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index d28bb00c8..2ec31bfc9 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -3233,7 +3233,7 @@ class MemberController extends Member } if(!$args->birthday) $args->birthday = $orgMemberInfo->birthday; - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); $oDB->begin(); $output = executeQuery('member.updateMember', $args); diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php index a998793e8..d9461460d 100644 --- a/modules/menu/menu.admin.model.php +++ b/modules/menu/menu.admin.model.php @@ -325,7 +325,7 @@ class MenuAdminModel extends Menu $security->encodeHTML('item_info.name'); // Compile the template file into tpl variable and then return it - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); $tpl = $oTemplate->compile($this->module_path.'tpl', 'menu_item_info'); $this->add('tpl', str_replace("\n"," ",$tpl)); diff --git a/modules/menu/menu.mobile.php b/modules/menu/menu.mobile.php index af0b9ef4e..c06ae1efd 100644 --- a/modules/menu/menu.mobile.php +++ b/modules/menu/menu.mobile.php @@ -43,12 +43,12 @@ class MenuMobile extends moduleObject function dispMenuMenu() { $menu_srl = Context::get('menu_srl'); - $oAdminModel =& getAdminModel('menu'); + $oAdminModel = MenuAdminModel::getInstance(); $menu_info = $oAdminModel->getMenu($menu_srl); if(!$menu_srl) { - $oMenuAdminController = getAdminController('menu'); + $oMenuAdminController = MenuAdminController::getInstance(); $homeMenuCacheFile = $oMenuAdminController->getHomeMenuCacheFile(); if(file_exists($homeMenuCacheFile)) diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index bb4b8bff3..cc7f6b577 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -168,7 +168,7 @@ class ModuleAdminController extends Module } } - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); $oDB->begin(); // Copy a module $triggerObj = new stdClass(); diff --git a/modules/module/module.admin.model.php b/modules/module/module.admin.model.php index ec5115225..2f5aed737 100644 --- a/modules/module/module.admin.model.php +++ b/modules/module/module.admin.model.php @@ -130,7 +130,7 @@ class ModuleAdminModel extends Module Context::set('tabChoice', $tabChoice); // Get information of module_grants - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); return $oTemplate->compile($this->module_path.'tpl', 'include.manage_selected.html'); } @@ -208,7 +208,7 @@ class ModuleAdminModel extends Module $security->encodeHTML('admin_member..nick_name'); // Get information of module_grants - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); return $oTemplate->compile($this->module_path.'tpl', 'module_grants'); } @@ -392,7 +392,7 @@ class ModuleAdminModel extends Module $security->encodeHTML('module_info.browser_title'); $security->encodeHTML('skin_info...'); - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); return $oTemplate->compile($this->module_path.'tpl', 'skin_config'); } diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php index b076073ed..1178cc8ce 100644 --- a/modules/module/module.controller.php +++ b/modules/module/module.controller.php @@ -699,7 +699,7 @@ class ModuleController extends Module if(!$output->toBool()) return $output; // begin transaction - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); $oDB->begin(); $args = new stdClass(); diff --git a/modules/module/module.model.php b/modules/module/module.model.php index 5ed0b2ee9..af4501557 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -930,7 +930,7 @@ class ModuleModel extends Module $tmpPath = strtr($path, array('/' => ' ')); $tmpPath = trim($tmpPath); - $module = array_pop(explode(' ', $tmpPath)); + $module = array_last(explode(' ', $tmpPath)); if($dir == 'skins') { @@ -1525,7 +1525,7 @@ class ModuleModel extends Module public static function checkNeedInstall($module_name) { - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); $info = null; $moduledir = ModuleHandler::getModulePath($module_name); @@ -2489,7 +2489,7 @@ class ModuleModel extends Module $security = new Security(); $security->encodeHTML('filebox_list..comment', 'filebox_list..attributes.'); - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); $html = $oTemplate->compile(RX_BASEDIR . 'modules/module/tpl/', 'filebox_list_html'); $this->add('html', $html); diff --git a/modules/point/point.view.php b/modules/point/point.view.php index 38f0a6a0b..8f8db7bfe 100644 --- a/modules/point/point.view.php +++ b/modules/point/point.view.php @@ -61,7 +61,7 @@ class PointView extends Point $module_config['point_name'] = $config->point_name; Context::set('module_config', $module_config); // Set the template file - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); $tpl = $oTemplate->compile($this->module_path.'tpl', 'point_module_config'); $obj .= $tpl; } diff --git a/modules/poll/poll.admin.controller.php b/modules/poll/poll.admin.controller.php index 368ece63c..ed8aaf2bf 100644 --- a/modules/poll/poll.admin.controller.php +++ b/modules/poll/poll.admin.controller.php @@ -93,7 +93,7 @@ class PollAdminController extends Poll $args->poll_index_srl = $poll_index_srl; - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); $oDB->begin(); $output = executeQueryArray('poll.getPollByDeletePollTitle', $args); @@ -145,7 +145,7 @@ class PollAdminController extends Poll $args = new stdClass; $args->poll_srl = $poll_srl; - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); $oDB->begin(); $output = $oDB->executeQuery('poll.deletePoll', $args); diff --git a/modules/poll/poll.model.php b/modules/poll/poll.model.php index 6db6841e7..ba3752ef4 100644 --- a/modules/poll/poll.model.php +++ b/modules/poll/poll.model.php @@ -263,7 +263,7 @@ class PollModel extends Poll // The skin for the default configurations, and the colorset configurations $tpl_path = sprintf("%sskins/%s/", $this->module_path, $skin); - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); return $oTemplate->compile($tpl_path, $tpl_file); } @@ -312,7 +312,7 @@ class PollModel extends Poll // The skin for the default configurations, and the colorset configurations $tpl_path = sprintf("%sskins/%s/", $this->module_path, $skin); - $oTemplate = &TemplateHandler::getInstance(); + $oTemplate = TemplateHandler::getInstance(); return $oTemplate->compile($tpl_path, $tpl_file); } /** [TO REVIEW] diff --git a/modules/session/session.class.php b/modules/session/session.class.php index c93268880..9b8ffac27 100644 --- a/modules/session/session.class.php +++ b/modules/session/session.class.php @@ -24,7 +24,7 @@ class Session extends ModuleObject */ function moduleInstall() { - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); $oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid")); } @@ -43,7 +43,7 @@ class Session extends ModuleObject */ function moduleUpdate() { - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); if(!$oDB->isIndexExists("session","idx_session_update_mid")) { $oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid")); diff --git a/modules/trash/trash.admin.controller.php b/modules/trash/trash.admin.controller.php index 6f611ca33..5064dbed4 100644 --- a/modules/trash/trash.admin.controller.php +++ b/modules/trash/trash.admin.controller.php @@ -140,7 +140,7 @@ class TrashAdminController extends Trash if(is_array($trashSrlList)) { // begin transaction - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); $oDB->begin(); // eache restore method call in each classfile foreach($trashSrlList as $value) diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php index f965dcf99..2c898f3e3 100644 --- a/modules/trash/trash.admin.view.php +++ b/modules/trash/trash.admin.view.php @@ -111,11 +111,11 @@ class TrashAdminView extends Trash Context::set('oTrashVO',$output->data); Context::set('oOrigin',$originObject); - $oMemberModel = &getModel('member'); + $oMemberModel = getModel('member'); $remover_info = $oMemberModel->getMemberInfoByMemberSrl($output->data->getRemoverSrl()); Context::set('remover_info', $remover_info); - $oModuleModel = &getModel('module'); + $oModuleModel = getModel('module'); $module_info = $oModuleModel->getModuleInfoByModuleSrl($originObject->module_srl); Context::set('module_info', $module_info); diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php index 20cdcfff8..6555251b1 100644 --- a/widgets/content/content.class.php +++ b/widgets/content/content.class.php @@ -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"); } } diff --git a/widgets/counter_status/counter_status.class.php b/widgets/counter_status/counter_status.class.php index e0c9e776a..930af3b7d 100644 --- a/widgets/counter_status/counter_status.class.php +++ b/widgets/counter_status/counter_status.class.php @@ -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); } } diff --git a/widgets/language_select/language_select.class.php b/widgets/language_select/language_select.class.php index 6e8ee001c..ed86228a3 100644 --- a/widgets/language_select/language_select.class.php +++ b/widgets/language_select/language_select.class.php @@ -1,7 +1,7 @@ */ /** - * @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); } } diff --git a/widgets/login_info/login_info.class.php b/widgets/login_info/login_info.class.php index f64ae0a79..88a9182f7 100644 --- a/widgets/login_info/login_info.class.php +++ b/widgets/login_info/login_info.class.php @@ -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); } } diff --git a/widgets/mcontent/mcontent.class.php b/widgets/mcontent/mcontent.class.php index e7e788083..681b908ba 100644 --- a/widgets/mcontent/mcontent.class.php +++ b/widgets/mcontent/mcontent.class.php @@ -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('!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"); } } diff --git a/widgets/pollWidget/pollWidget.class.php b/widgets/pollWidget/pollWidget.class.php index de3ed3499..fc00f3d7d 100644 --- a/widgets/pollWidget/pollWidget.class.php +++ b/widgets/pollWidget/pollWidget.class.php @@ -1,7 +1,7 @@ */ /** - * @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); } }