NOISSUE remove reference operator.

This commit is contained in:
bnu 2013-12-30 17:35:02 +09:00
parent 35384999c9
commit 194ce8614a
118 changed files with 859 additions and 859 deletions

View file

@ -119,8 +119,8 @@ class moduleAdminController extends module
return $this->_returnByProc($isProc);
}
$oModuleModel = &getModel('module');
$oModuleController = &getController('module');
$oModuleModel = getModel('module');
$oModuleController = getController('module');
// Get module information
$columnList = array('module', 'module_category_srl', 'layout_srl', 'use_mobile', 'mlayout_srl', 'menu_srl', 'site_srl', 'skin', 'mskin', 'description', 'mcontent', 'open_rss', 'header_text', 'footer_text', 'regdate');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
@ -198,7 +198,7 @@ class moduleAdminController extends module
if($module_info->module == 'page' && $extra_vars->page_type == 'ARTICLE')
{
// copy document
$oDocumentAdminController = &getAdminController('document');
$oDocumentAdminController = getAdminController('document');
$copyOutput = $oDocumentAdminController->copyDocumentModule(array($extra_vars->document_srl), $module_srl, $module_info->category_srl);
$document_srls = $copyOutput->get('copied_srls');
if($document_srls && count($document_srls) > 0)
@ -275,8 +275,8 @@ class moduleAdminController extends module
*/
function procModuleAdminInsertGrant()
{
$oModuleController = &getController('module');
$oModuleModel = &getModel('module');
$oModuleController = getController('module');
$oModuleModel = getModel('module');
// Get module_srl
$module_srl = Context::get('module_srl');
// Get information of the module
@ -365,7 +365,7 @@ class moduleAdminController extends module
$mode = Context::get('_mode');
$mode = $mode === 'P' ? 'P' : 'M';
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module', 'skin', 'mskin', 'is_skin_fix', 'is_mskin_fix');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
if($module_info->module_srl)
@ -479,7 +479,7 @@ class moduleAdminController extends module
}
}
*/
$oModuleController = &getController('module');
$oModuleController = getController('module');
if($mode === 'M')
{
@ -511,8 +511,8 @@ class moduleAdminController extends module
$module_srls = explode(',',$vars->module_srls);
if(count($module_srls) < 1) return new Object(-1,'msg_invalid_request');
$oModuleModel = &getModel('module');
$oModuleController= &getController('module');
$oModuleModel = getModel('module');
$oModuleController= getController('module');
$columnList = array('module_srl', 'module', 'menu_srl', 'site_srl', 'mid', 'browser_title', 'is_default', 'content', 'mcontent', 'open_rss', 'regdate');
$updateList = array('module_category_srl','layout_srl','skin','mlayout_srl','mskin','description','header_text','footer_text', 'use_mobile');
foreach($updateList as $key=>$val)
@ -566,8 +566,8 @@ class moduleAdminController extends module
$modules = explode(',',$module_srls);
if(count($modules) < 1) return new Object(-1,'msg_invalid_request');
$oModuleController = &getController('module');
$oModuleModel = &getModel('module');
$oModuleController = getController('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0], $columnList);
@ -733,8 +733,8 @@ class moduleAdminController extends module
{
if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
$oModuleController = &getController('module');
$oModuleModel = &getModel('module');
$oModuleController = getController('module');
$oModuleModel = getModel('module');
// Variable setting for site keyword
$site_keyword = Context::get('site_keyword');
$site_srl = Context::get('site_srl');

View file

@ -21,8 +21,8 @@ class moduleAdminModel extends module
*/
function getModuleAdminModuleList()
{
$oModuleController = &getController('module');
$oModuleModel = &getModel('module');
$oModuleController = getController('module');
$oModuleModel = getModel('module');
$args = new stdClass;
$args->module_srls = Context::get('module_srls');
$output = executeQueryArray('module.getModulesInfo', $args);
@ -61,7 +61,7 @@ class moduleAdminModel extends module
if($modulePath)
{
// get the skins path
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$skin_list = $oModuleModel->getSkins($modulePath);
Context::set('skin_list',$skin_list);
@ -70,7 +70,7 @@ class moduleAdminModel extends module
}
// get the layouts path
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_list = $oLayoutModel->getLayoutList();
Context::set('layout_list', $layout_list);
@ -107,7 +107,7 @@ class moduleAdminModel extends module
Context::set('grant_list', $grant_list);
// Get a list of groups
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$group_list = $oMemberModel->getGroups(0);
Context::set('group_list', $group_list);
@ -142,11 +142,11 @@ class moduleAdminModel extends module
}
// get member module's config
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$member_config = $oMemberModel->getMemberConfig();
Context::set('member_config', $member_config);
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'site_srl');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
// Grant virtual permission for access and manager
@ -194,7 +194,7 @@ class moduleAdminModel extends module
$admin_member = $oModuleModel->getAdminId($module_srl);
Context::set('admin_member', $admin_member);
// Get a list of groups
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$group_list = $oMemberModel->getGroups($module_info->site_srl);
Context::set('group_list', $group_list);
@ -223,7 +223,7 @@ class moduleAdminModel extends module
return new Object(0);
}
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$xmlInfo = $oModuleModel->getModuleActionXml($targetModule);
// Grant virtual permission for access and manager
@ -313,7 +313,7 @@ class moduleAdminModel extends module
{
$mode = $mode === 'P' ? 'P' : 'M';
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
if(!$module_info) return;

View file

@ -30,9 +30,9 @@ class moduleAdminView extends module
function dispModuleAdminList()
{
// Obtain a list of modules
$oAdminModel = &getAdminModel('admin');
$oModuleModel = &getModel('module');
$oAutoinstallModel = &getModel('autoinstall');
$oAdminModel = getAdminModel('admin');
$oModuleModel = getModel('module');
$oAutoinstallModel = getModel('autoinstall');
$module_list = $oModuleModel->getModuleList();
if(is_array($module_list))
@ -83,7 +83,7 @@ class moduleAdminView extends module
function dispModuleAdminInfo()
{
// Obtain a list of modules
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleInfoXml(Context::get('selected_module'));
Context::set('module_info', $module_info);
@ -105,7 +105,7 @@ class moduleAdminView extends module
$module_category_srl = Context::get('module_category_srl');
// Obtain a list of modules
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// Display the category page if a category is selected
//Security
$security = new Security();
@ -143,7 +143,7 @@ class moduleAdminView extends module
// Get a target module to copy
$module_srl = Context::get('module_srl');
// Get information of the module
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module', 'mid', 'browser_title');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
Context::set('module_info', $module_info);
@ -167,14 +167,14 @@ class moduleAdminView extends module
$modules = explode(',',$module_srls);
if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0], $columnList);
// Get a skin list of the module
$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/'.$module_info->module);
Context::set('skin_list',$skin_list);
// Get a layout list
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_list = $oLayoutModel->getLayoutList();
Context::set('layout_list', $layout_list);
// Get a list of module categories
@ -226,7 +226,7 @@ class moduleAdminView extends module
$modules = explode(',',$module_srls);
if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module', 'site_srl');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0], $columnList);
$xml_info = $oModuleModel->getModuleActionXml($module_info->module);
@ -247,7 +247,7 @@ class moduleAdminView extends module
$grant_list->manager->default = 'manager';
Context::set('grant_list', $grant_list);
// Get a list of groups
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$group_list = $oMemberModel->getGroups($module_info->site_srl);
Context::set('group_list', $group_list);
$security = new Security();
@ -278,7 +278,7 @@ class moduleAdminView extends module
$args->search_target = Context::get('search_target'); // /< search (title, contents ...)
$args->search_keyword = Context::get('search_keyword'); // /< keyword to search
$oModuleAdminModel = &getAdminModel('module');
$oModuleAdminModel = getAdminModel('module');
$output = $oModuleAdminModel->getLangListByLangcode($args);
Context::set('total_count', $output->total_count);
@ -298,7 +298,7 @@ class moduleAdminView extends module
function dispModuleAdminFileBox()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$output = $oModuleModel->getModuleFileBoxList();
$page = Context::get('page');
$page = $page?$page:1;

View file

@ -13,7 +13,7 @@ class module extends ModuleObject
function moduleInstall()
{
// Register action forward (to use in administrator mode)
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oDB = &DB::getInstance();
$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"), true);
@ -130,8 +130,8 @@ class module extends ModuleObject
// 2008. 10. 27 module_part_config Add a multi-index to the table and check all information of module_configg
if(!$oDB->isIndexExists("module_part_config","idx_module_part_config"))
{
$oModuleModel = &getModel('module');
$oModuleController = &getController('module');
$oModuleModel = getModel('module');
$oModuleController = getController('module');
$modules = $oModuleModel->getModuleList();
foreach($modules as $key => $module_info)
{
@ -201,8 +201,8 @@ class module extends ModuleObject
// Move permission, skin info, extection info, admin ID of all modules to the table, grants
if($oDB->isColumnExists('modules', 'grants'))
{
$oModuleController = &getController('module');
$oDocumentController = &getController('document');
$oModuleController = getController('module');
$oDocumentController = getController('document');
// Get a value of the current system language code
$lang_code = Context::getLangType();
// Get module_info of all modules
@ -265,7 +265,7 @@ class module extends ModuleObject
$oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $val->name, $val->type, $val->is_required, $val->search, $val->default, $val->desc, 'extra_vars'.$var_idx);
}
// 2009-04-14 Fixed a bug that only 100 extra vars are moved
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$total_count = $oDocumentModel->getDocumentCount($module_srl);
if($total_count > 0)
@ -597,7 +597,7 @@ class module extends ModuleObject
*/
function recompileCache()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$oModuleModel->getModuleList();
}
}

View file

@ -157,7 +157,7 @@ class moduleController extends module
$args->module = $module;
$args->site_srl = $site_srl;
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$origin_config = $oModuleModel->getModuleConfig($module, $site_srl);
if(!$origin_config) $origin_config = new stdClass;
@ -229,7 +229,7 @@ class moduleController extends module
{
if(isSiteID($domain))
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
if($oModuleModel->isIDExists($domain, 0)) return new Object(-1,'msg_already_registed_vid');
}
else
@ -244,7 +244,7 @@ class moduleController extends module
$args->default_language = Context::getLangType();
$columnList = array('modules.site_srl');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
if($output) return new Object(-1,'msg_already_registed_vid');
@ -260,7 +260,7 @@ class moduleController extends module
*/
function updateSite($args)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('sites.site_srl', 'sites.domain');
$site_info = $oModuleModel->getSiteInfo($args->site_srl, $columnList);
@ -359,7 +359,7 @@ class moduleController extends module
if(!$output->toBool()) return $output;
// Check whether the module name already exists
if(!$args->site_srl) $args->site_srl = 0;
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new Object(-1, 'msg_module_name_exists');
// begin transaction
@ -417,7 +417,7 @@ class moduleController extends module
// if menu is not created, create menu also. and does not supported that in virtual site.
if(!$menuOutput->data && !$args->site_srl)
{
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$tempMenu = $oMenuAdminModel->getMenuByTitle(array('Temporary menu'));
if(!$tempMenu)
@ -454,7 +454,7 @@ class moduleController extends module
return $menuItemOutput;
}
$oMenuAdminController = &getAdminController('menu');
$oMenuAdminController = getAdminController('menu');
$oMenuAdminController->makeXmlFile($tempMenu->menu_srl);
}
}
@ -488,7 +488,7 @@ class moduleController extends module
$oDB = &DB::getInstance();
$oDB->begin();
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'site_srl', 'browser_title', 'mid');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
@ -550,7 +550,7 @@ class moduleController extends module
$menuOutput = executeQueryArray('menu.getMenuItemByUrl', $menuArgs);
if($menuOutput->data && count($menuOutput->data))
{
$oMenuAdminController = &getAdminController('menu');
$oMenuAdminController = getAdminController('menu');
foreach($menuOutput->data as $itemInfo)
{
$itemInfo->url = $args->mid;
@ -614,7 +614,7 @@ class moduleController extends module
$site_module_info = Context::get('site_module_info');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$output = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
$args = new stdClass();
@ -625,7 +625,7 @@ class moduleController extends module
unset($output);
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$menuOutput = $oMenuAdminModel->getMenuList($args);
// get menu_srl by site_srl
@ -648,7 +648,7 @@ class moduleController extends module
$args->menu_item_srl = $output->data->menu_item_srl;
$args->is_force = 'N';
$oMenuAdminController = &getAdminController('menu');
$oMenuAdminController = getAdminController('menu');
$output = $oMenuAdminController->deleteItem($args);
if($output->isSuccess)
@ -676,7 +676,7 @@ class moduleController extends module
if(!$module_srl) return new Object(-1,'msg_invalid_request');
// check start module
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('sites.index_module_srl');
$start_module = $oModuleModel->getSiteInfo(0, $columnList);
if($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule');
@ -796,7 +796,7 @@ class moduleController extends module
}
if(!count($admins)) return new Object();
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$member_config = $oMemberModel->getMemberConfig();
if($member_config->identifier == 'email_address')
{
@ -826,7 +826,7 @@ class moduleController extends module
*/
function insertAdminId($module_srl, $admin_id)
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$member_config = $oMemberModel->getMemberConfig();
if($member_config->identifier == 'email_address')
@ -851,7 +851,7 @@ class moduleController extends module
if($admin_id)
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
}
@ -1070,14 +1070,14 @@ class moduleController extends module
$site_module_info = Context::get('site_module_info');
if(!$site_module_info)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$site_module_info = $oModuleModel->getDefaultMid();
Context::set('site_module_info', $site_module_info);
}
$cache_file = sprintf('%sfiles/cache/lang_defined/%d.%s.php', _XE_PATH_, $site_module_info->site_srl, Context::getLangType());
if(!file_exists($cache_file))
{
$oModuleAdminController = &getAdminController('module');
$oModuleAdminController = getAdminController('module');
$oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
}
@ -1087,7 +1087,7 @@ class moduleController extends module
$cacheFileMtime = filemtime($cache_file);
if($cacheFileMtime < $moduleAdminControllerMtime)
{
$oModuleAdminController = &getAdminController('module');
$oModuleAdminController = getAdminController('module');
$oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
}
@ -1179,7 +1179,7 @@ class moduleController extends module
// have file
if($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name']))
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
FileHandler::removeFile($output->data->filename);
@ -1220,7 +1220,7 @@ class moduleController extends module
$vars->module_filebox_srl = getNextSequence();
// get file path
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
FileHandler::makeDir($path);
$save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $vars->ext);
@ -1269,7 +1269,7 @@ class moduleController extends module
function deleteModuleFileBox($vars)
{
// delete real file
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
FileHandler::removeFile($output->data->filename);

View file

@ -1421,7 +1421,7 @@ class moduleModel extends module
function checkNeedUpdate($module_name)
{
// Check if it is upgraded to module.class.php on each module
$oDummy = &getModule($module_name, 'class');
$oDummy = getModule($module_name, 'class');
if($oDummy && method_exists($oDummy, "checkUpdate"))
{
return $oDummy->checkUpdate();
@ -1478,7 +1478,7 @@ class moduleModel extends module
else $info->need_install = false;
// Check if it is upgraded to module.class.php on each module
$oDummy = null;
$oDummy = &getModule($module_name, 'class');
$oDummy = getModule($module_name, 'class');
if($oDummy && method_exists($oDummy, "checkUpdate"))
{
$info->need_update = $oDummy->checkUpdate();
@ -1952,7 +1952,7 @@ class moduleModel extends module
function getModuleFileBoxList()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$args = new stdClass();
$args->page = Context::get('page');
@ -2005,11 +2005,11 @@ class moduleModel extends module
$param = explode("=",$param);
if($param[0] == 'selected_widget') $selected_widget = $param[1];
}
$oWidgetModel = &getModel('widget');
$oWidgetModel = getModel('widget');
if($selected_widget) $widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
Context::set('allow_multiple', $widget_info->extra_var->images->allow_multiple);
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$output = $oModuleModel->getModuleFileBoxList();
Context::set('filebox_list', $output->data);
@ -2114,7 +2114,7 @@ class moduleModel extends module
$langCode = Context::get('langCode');
if (!$langCode) return;
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->replaceDefinedLangCode($langCode);
$this->add('lang', $langCode);

View file

@ -30,7 +30,7 @@ class moduleView extends module
$skin_info_xml = sprintf("%sskins/%s/skin.xml", $module_path, $skin);
if(!file_exists($skin_info_xml)) $this->stop("msg_invalid_request");
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
Context::set('skin_info',$skin_info);
@ -45,7 +45,7 @@ class moduleView extends module
{
if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// Extract the number of virtual sites
$output = executeQuery('module.getSiteCount');
$site_count = $output->data->count;
@ -148,7 +148,7 @@ class moduleView extends module
//]]></script>',$input_name);
Context::addHtmlHeader($addscript);
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$output = $oModuleModel->getModuleFileBoxList();
Context::set('filebox_list', $output->data);