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

NOISSUE remove reference operator.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
addons/blogapi/blogapi.addon.php
View file

@ -191,7 +191,7 @@ if($called_position == 'before_module_proc')
$category = "";
if($oDocument->get('category_srl'))
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$category_list = $oDocumentModel->getCategoryList($oDocument->get('module_srl'));
if($category_list[$oDocument->get('category_srl')])
{
@ -281,7 +281,7 @@ if($called_position == 'before_module_proc')
$file_count = count($file_list);
if($file_count)
{
$oFileController = &getController('file');
$oFileController = getController('file');
for($i = 0; $i < $file_count; $i++)
{
$file_info['tmp_name'] = sprintf('%s%s', $tmp_uploaded_path, $file_list[$i]);
@ -395,7 +395,7 @@ if($called_position == 'before_module_proc')
$file_count = count($file_list);
if($file_count)
{
$oFileController = &getController('file');
$oFileController = getController('file');
for($i = 0; $i < $file_count; $i++)
{
$file_info['tmp_name'] = sprintf('%s%s', $tmp_uploaded_path, $file_list[$i]);
@ -414,7 +414,7 @@ if($called_position == 'before_module_proc')
}
}
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
$output = $oDocumentController->updateDocument($oDocument, $obj, TRUE);
if(!$output->toBool())

4
addons/mobile/classes/mobile.class.php
View file

@ -282,7 +282,7 @@ class mobileXE
*/
function setTitle($title)
{
$oModuleController = &getController('module');
$oModuleController = getController('module');
$this->title = $title;
$oModuleController->replaceDefinedLangCode($this->title);
}
@ -301,7 +301,7 @@ class mobileXE
*/
function setContent($content)
{
$oModuleController = &getController('module');
$oModuleController = getController('module');
$allow_tag_array = array('<a>','<br>','<p>','<b>','<i>','<u>','<em>','<small>','<strong>','<big>','<table>','<tr>','<td>');
// Links/wrap, remove all tags except gangjoman
$content = strip_tags($content, implode($allow_tag_array));

2
classes/context/Context.class.php
View file

@ -761,7 +761,7 @@ class Context
*/
public function getSiteTitle()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$moduleConfig = $oModuleModel->getModuleConfig('module');
if(isset($moduleConfig->siteTitle))

2
classes/display/DisplayHandler.class.php
View file

@ -74,7 +74,7 @@ class DisplayHandler extends Handler
// execute add-on
$called_position = 'before_display_content';
$oAddonController = &getController('addon');
$oAddonController = getController('addon');
$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
if(file_exists($addon_file)) include($addon_file);

2
classes/extravar/Extravar.class.php
View file

@ -451,7 +451,7 @@ class ExtraItem
break;
// address
case "kr_zip" :
if(($oKrzipModel = &getModel('krzip')) && method_exists($oKrzipModel , 'getKrzipCodeSearchHtml' ))
if(($oKrzipModel = getModel('krzip')) && method_exists($oKrzipModel , 'getKrzipCodeSearchHtml' ))
{
$buff[] = $oKrzipModel->getKrzipCodeSearchHtml($column_name, $value);
}

4
classes/module/ModuleHandler.class.php
View file

@ -132,7 +132,7 @@ class ModuleHandler extends Handler
if(!$this->document_srl && $this->mid && $this->entry)
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$this->document_srl = $oDocumentModel->getDocumentSrlByAlias($this->mid, $this->entry);
if($this->document_srl)
{
@ -238,7 +238,7 @@ class ModuleHandler extends Handler
// use the site default layout.
if($module_info->{$targetSrl} == -1)
{
$oLayoutAdminModel = &getAdminModel('layout');
$oLayoutAdminModel = getAdminModel('layout');
$layoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($viewType, $module_info->site_srl);
}
else

20
config/func.inc.php
View file

@ -76,7 +76,7 @@ $time_zone = array(
* @param string $kind admin, null
* @return mixed Module instance
*/
function &getModule($module_name, $type = 'view', $kind = '')
function getModule($module_name, $type = 'view', $kind = '')
{
return ModuleHandler::getModuleInstance($module_name, $type, $kind);
}
@ -87,7 +87,7 @@ function &getModule($module_name, $type = 'view', $kind = '')
* @param string $module_name The module name to get a controller instance
* @return mixed Module controller instance
*/
function &getController($module_name)
function getController($module_name)
{
return getModule($module_name, 'controller');
}
@ -98,7 +98,7 @@ function &getController($module_name)
* @param string $module_name The module name to get a admin controller instance
* @return mixed Module admin controller instance
*/
function &getAdminController($module_name)
function getAdminController($module_name)
{
return getModule($module_name, 'controller', 'admin');
}
@ -109,7 +109,7 @@ function &getAdminController($module_name)
* @param string $module_name The module name to get a view instance
* @return mixed Module view instance
*/
function &getView($module_name)
function getView($module_name)
{
return getModule($module_name, 'view');
}
@ -131,7 +131,7 @@ function &getMobile($module_name)
* @param string $module_name The module name to get a admin view instance
* @return mixed Module admin view instance
*/
function &getAdminView($module_name)
function getAdminView($module_name)
{
return getModule($module_name, 'view', 'admin');
}
@ -142,7 +142,7 @@ function &getAdminView($module_name)
* @param string $module_name The module name to get a model instance
* @return mixed Module model instance
*/
function &getModel($module_name)
function getModel($module_name)
{
return getModule($module_name, 'model');
}
@ -153,7 +153,7 @@ function &getModel($module_name)
* @param string $module_name The module name to get a admin model instance
* @return mixed Module admin model instance
*/
function &getAdminModel($module_name)
function getAdminModel($module_name)
{
return getModule($module_name, 'model', 'admin');
}
@ -164,7 +164,7 @@ function &getAdminModel($module_name)
* @param string $module_name The module name to get a api instance
* @return mixed Module api class instance
*/
function &getAPI($module_name)
function getAPI($module_name)
{
return getModule($module_name, 'api');
}
@ -175,7 +175,7 @@ function &getAPI($module_name)
* @param string $module_name The module name to get a wap instance
* @return mixed Module wap class instance
*/
function &getWAP($module_name)
function getWAP($module_name)
{
return getModule($module_name, 'wap');
}
@ -186,7 +186,7 @@ function &getWAP($module_name)
* @param string $module_name The module name to get a class instance
* @return mixed Module class instance
*/
function &getClass($module_name)
function getClass($module_name)
{
return getModule($module_name, 'class');
}

4
modules/admin/admin.admin.controller.php
View file

@ -483,7 +483,7 @@ class adminAdminController extends admin
function procAdminUpdateSitelock()
{
$vars = Context::getRequestVars();
$oInstallController = &getController('install');
$oInstallController = getController('install');
$db_info = Context::getDbInfo();
@ -508,7 +508,7 @@ class adminAdminController extends admin
$db_info->sitelock_whitelist = $whitelist;
$oInstallController = &getController('install');
$oInstallController = getController('install');
if(!$oInstallController->makeConfigFile())
{
return new Object(-1, 'msg_invalid_request');

44
modules/document/document.admin.controller.php
View file

@ -32,7 +32,7 @@ class documentAdminController extends document
$document_count = count($document_srl_list);
if(!$document_count) return $this->stop('msg_cart_is_null');
// Delete a doc
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
for($i=0;$i<$document_count;$i++)
{
$document_srl = trim($document_srl_list[$i]);
@ -55,8 +55,8 @@ class documentAdminController extends document
{
if(!count($document_srl_list)) return;
$oDocumentModel = &getModel('document');
$oDocumentController = &getController('document');
$oDocumentModel = getModel('document');
$oDocumentController = getController('document');
$oDB = &DB::getInstance();
$oDB->begin();
@ -86,7 +86,7 @@ class documentAdminController extends document
// Move the attached file if the target module is different
if($module_srl != $obj->module_srl && $oDocument->hasUploadedFiles())
{
$oFileController = &getController('file');
$oFileController = getController('file');
$files = $oDocument->getUploadedFiles();
if(is_array($files))
@ -216,10 +216,10 @@ class documentAdminController extends document
{
if(count($document_srl_list) < 1) return;
$oDocumentModel = &getModel('document');
$oDocumentController = &getController('document');
$oDocumentModel = getModel('document');
$oDocumentController = getController('document');
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$oDB = &DB::getInstance();
$oDB->begin();
@ -286,7 +286,7 @@ class documentAdminController extends document
$file_info = array();
$file_info['tmp_name'] = $val->uploaded_filename;
$file_info['name'] = $val->source_filename;
$oFileController = &getController('file');
$oFileController = getController('file');
$inserted_file = $oFileController->insertFile($file_info, $module_srl, $obj->document_srl, 0, true);
// if image/video files
if($val->direct_download == 'Y')
@ -332,12 +332,12 @@ class documentAdminController extends document
// Move the comments
if($oDocument->getCommentCount())
{
$oCommentModel = &getModel('comment');
$oCommentModel = getModel('comment');
$comment_output = $oCommentModel->getCommentList($document_srl, 0, true, 99999999);
$comments = $comment_output->data;
if(count($comments) > 0)
{
$oCommentController = &getController('comment');
$oCommentController = getController('comment');
$success_count = 0;
$p_comment_srl = array();
foreach($comments as $comment_obj)
@ -354,7 +354,7 @@ class documentAdminController extends document
$file_info = array();
$file_info['tmp_name'] = $val->uploaded_filename;
$file_info['name'] = $val->source_filename;
$oFileController = &getController('file');
$oFileController = getController('file');
$inserted_file = $oFileController->insertFile($file_info, $module_srl, $comment_srl, 0, true);
// if image/video files
if($val->direct_download == 'Y')
@ -386,7 +386,7 @@ class documentAdminController extends document
}
// Move the trackbacks
$oTrackbackModel = &getModel('trackback');
$oTrackbackModel = getModel('trackback');
if($oTrackbackModel && $oDocument->getTrackbackCount())
{
$trackbacks = $oTrackbackModel->getTrackbackList($oDocument->document_srl);
@ -434,7 +434,7 @@ class documentAdminController extends document
{
$args = new stdClass();
$args->module_srl = $module_srl;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$args->module_srl = $module_srl;
$document_list = $oDocumentModel->getDocumentList($args);
$documents = $document_list->data;
@ -475,7 +475,7 @@ class documentAdminController extends document
// Get the basic information
$config = Context::gets('thumbnail_type');
// Insert by creating the module Controller object
$oModuleController = &getController('module');
$oModuleController = getController('module');
$output = $oModuleController->insertModuleConfig('document',$config);
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminConfig');
@ -569,7 +569,7 @@ class documentAdminController extends document
}
// insert or update
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
$output = $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $name, $type, $is_required, $search, $default, $desc, $eid);
if(!$output->toBool()) return $output;
@ -589,7 +589,7 @@ class documentAdminController extends document
$var_idx = Context::get('var_idx');
if(!$module_srl || !$var_idx) return new Object(-1,'msg_invalid_request');
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
$output = $oDocumentController->deleteDocumentExtraKeys($module_srl, $var_idx);
if(!$output->toBool()) return $output;
@ -608,11 +608,11 @@ class documentAdminController extends document
if(!$type || !$module_srl || !$var_idx) return new Object(-1,'msg_invalid_request');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
if(!$module_info->module_srl) return new Object(-1,'msg_invalid_request');
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
if(!$extra_keys[$var_idx]) return new Object(-1,'msg_invalid_request');
@ -719,7 +719,7 @@ class documentAdminController extends document
/*function restoreTrash($trash_srl){
$oDB = &DB::getInstance();
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$trash_args->trash_srl = $trash_srl;
@ -780,8 +780,8 @@ class documentAdminController extends document
{
if(is_array($originObject)) $originObject = (object)$originObject;
$oDocumentController = &getController('document');
$oDocumentModel = &getModel('document');
$oDocumentController = getController('document');
$oDocumentModel = getModel('document');
$oDB = &DB::getInstance();
$oDB->begin();
@ -830,7 +830,7 @@ class documentAdminController extends document
$oDocument = new documentItem();
$oDocument->setAttribute($originObject);
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
$output = $oDocumentController->deleteDocument($oDocument->get('document_srl'), true, true, $oDocument);
return $output;
}

2
modules/document/document.admin.model.php
View file

@ -32,7 +32,7 @@ class documentAdminModel extends document
// get a module_srl if mid is returned instead of modul_srl
if($obj->mid)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
unset($obj->mid);
}

12
modules/document/document.admin.view.php
View file

@ -17,7 +17,7 @@ class documentAdminView extends document
function init()
{
// check current location in admin menu
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$info = $oModuleModel->getModuleActionXml('document');
foreach($info->menu AS $key => $menu)
{
@ -49,7 +49,7 @@ class documentAdminView extends document
$args->module_srl = Context::get('module_srl');
// get a list
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$columnList = array('document_srl', 'title', 'member_srl', 'nick_name', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status');
$output = $oDocumentModel->getDocumentList($args, false, true, $columnList);
@ -83,7 +83,7 @@ class documentAdminView extends document
*/
function dispDocumentAdminConfig()
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$config = $oDocumentModel->getDocumentConfig();
Context::set('config',$config);
@ -108,7 +108,7 @@ class documentAdminView extends document
$args->order_type = 'desc'; // /< sorting values by order
// get Status name list
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$statusNameList = $oDocumentModel->getStatusNameList();
// get a list
@ -146,7 +146,7 @@ class documentAdminView extends document
$args->document_srl = Context::get('document_srl');
if(!$args->document_srl) return $this->dispDocumentAdminList();
$oModel = &getModel('document');
$oModel = getModel('document');
$oDocument = $oModel->getDocument($args->document_srl);
if(!$oDocument->isExists()) return $this->dispDocumentAdminList();
Context::set('oDocument', $oDocument);
@ -184,7 +184,7 @@ class documentAdminView extends document
$args->module_srl = Context::get('module_srl');
// get a list
$oDocumentAdminModel = &getAdminModel('document');
$oDocumentAdminModel = getAdminModel('document');
$output = $oDocumentAdminModel->getDocumentTrashList($args);
// Set values of document_admin_model::getDocumentTrashList() objects for a template

8
modules/document/document.class.php
View file

@ -31,7 +31,7 @@ class document extends ModuleObject
function moduleInstall()
{
// Register action forward (to use in administrator mode)
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oDB = &DB::getInstance();
$oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
@ -58,7 +58,7 @@ class document extends ModuleObject
*/
function checkUpdate() {
$oDB = &DB::getInstance();
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// 2007. 7. 25: Add a column(notify_message) for notification
if(!$oDB->isColumnExists("documents","notify_message")) return true;
@ -134,8 +134,8 @@ class document extends ModuleObject
function moduleUpdate()
{
$oDB = &DB::getInstance();
$oModuleModel = &getModel('module');
$oModuleController = &getController('module');
$oModuleModel = getModel('module');
$oModuleController = getController('module');
// 2007. 7. 25: Add a column(notify_message) for notification
if(!$oDB->isColumnExists("documents","notify_message"))

94
modules/document/document.controller.php
View file

@ -29,12 +29,12 @@ class documentController extends document
$document_srl = Context::get('target_srl');
if(!$document_srl) return new Object(-1, 'msg_invalid_request');
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
$module_srl = $oDocument->get('module_srl');
if(!$module_srl) return new Object(-1, 'msg_invalid_request');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
if($document_config->use_vote_up=='N') return new Object(-1, 'msg_invalid_request');
@ -72,12 +72,12 @@ class documentController extends document
$document_srl = Context::get('target_srl');
if(!$document_srl) return new Object(-1, 'msg_invalid_request');
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
$module_srl = $oDocument->get('module_srl');
if(!$module_srl) return new Object(-1, 'msg_invalid_request');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
if($document_config->use_vote_down=='N') return new Object(-1, 'msg_invalid_request');
@ -150,11 +150,11 @@ class documentController extends document
$module_srl = $obj->module_srl;
if(!$module_srl) return new Object();
// Delete the document
$oDocumentAdminController = &getAdminController('document');
$oDocumentAdminController = getAdminController('document');
$output = $oDocumentAdminController->deleteModuleDocument($module_srl);
if(!$output->toBool()) return $output;
// Delete the category
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
$output = $oDocumentController->deleteModuleCategory($module_srl);
if(!$output->toBool()) return $output;
// Delete extra key and variable, because module deleted
@ -220,7 +220,7 @@ class documentController extends document
// Register it if no given document_srl exists
if(!$obj->document_srl) $obj->document_srl = getNextSequence();
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
// Set to 0 if the category_srl doesn't exist
if($obj->category_srl)
{
@ -358,7 +358,7 @@ class documentController extends document
$oDB = &DB::getInstance();
$oDB->begin();
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
if(!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl');
$module_srl = $obj->module_srl;
$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
@ -401,7 +401,7 @@ class documentController extends document
unset($obj->_saved_doc_content);
unset($obj->_saved_doc_message);
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
// Set the category_srl to 0 if the changed category is not exsiting.
if($source_obj->get('category_srl')!=$obj->category_srl)
{
@ -573,7 +573,7 @@ class documentController extends document
if(!$isEmptyTrash)
{
// get model object of the document
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
// Check if the documnet exists
$oDocument = $oDocumentModel->getDocument($document_srl, $is_admin);
}
@ -687,7 +687,7 @@ class documentController extends document
if(!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
else $trash_args->trash_srl = $obj->trash_srl;
// Get its module_srl which the document belongs to
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($obj->document_srl);
$trash_args->module_srl = $oDocument->get('module_srl');
@ -732,7 +732,7 @@ class documentController extends document
$oTrashVO->setSerializedObject(serialize($oDocument->variables));
$oTrashVO->setDescription($obj->description);
$oTrashAdminController = &getAdminController('trash');
$oTrashAdminController = getAdminController('trash');
$output = $oTrashAdminController->insertTrash($oTrashVO);
if(!$output->toBool())
{
@ -995,7 +995,7 @@ class documentController extends document
return new Object(-1, $failed_voted);
}
// Get the original document
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
// Pass if the author's IP address is as same as visitor's.
if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
@ -1005,7 +1005,7 @@ class documentController extends document
}
// Create a member model object
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$member_srl = $oMemberModel->getLoggedMemberSrl();
// Check if document's author is a member.
@ -1120,7 +1120,7 @@ class documentController extends document
}
// Get the original document
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
// Pass if the author's IP address is as same as visitor's.
@ -1133,7 +1133,7 @@ class documentController extends document
if($oDocument->get('member_srl'))
{
// Create a member model object
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$member_srl = $oMemberModel->getLoggedMemberSrl();
// Pass after registering a session if author's information is same as the currently logged-in user's.
if($member_srl && $member_srl == $oDocument->get('member_srl'))
@ -1260,7 +1260,7 @@ class documentController extends document
if($obj->parent_srl)
{
// Get its parent category
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$parent_category = $oDocumentModel->getCategory($obj->parent_srl);
$obj->list_order = $parent_category->list_order;
$this->updateCategoryListOrder($parent_category->module_srl, $parent_category->list_order+1);
@ -1305,7 +1305,7 @@ class documentController extends document
function updateCategoryCount($module_srl, $category_srl, $document_count = 0)
{
// Create a document model object
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
if(!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl);
$args = new stdClass;
@ -1338,7 +1338,7 @@ class documentController extends document
{
$args = new stdClass();
$args->category_srl = $category_srl;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$category_info = $oDocumentModel->getCategory($category_srl);
// Display an error that the category cannot be deleted if it has a child
$output = executeQuery('document.getChildCategoryCount', $args);
@ -1378,7 +1378,7 @@ class documentController extends document
*/
function moveCategoryUp($category_srl)
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
// Get information of the selected category
$args = new stdClass;
$args->category_srl = $category_srl;
@ -1425,7 +1425,7 @@ class documentController extends document
*/
function moveCategoryDown($category_srl)
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
// Get information of the selected category
$args = new stdClass;
$args->category_srl = $category_srl;
@ -1469,7 +1469,7 @@ class documentController extends document
*/
function addXmlJsFilter($module_srl)
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
if(!count($extra_keys)) return;
@ -1520,7 +1520,7 @@ class documentController extends document
$args->module_srl = $this->module_srl;
}
// Check permissions
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
@ -1531,7 +1531,7 @@ class documentController extends document
else $args->group_srls = implode(',', $args->group_srls);
$args->parent_srl = (int)$args->parent_srl;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDB = &DB::getInstance();
$oDB->begin();
@ -1587,10 +1587,10 @@ class documentController extends document
// If target_srl exists, be a sibling
$target_category_srl = Context::get('target_srl');
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$source_category = $oDocumentModel->getCategory($source_category_srl);
// Check permissions
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
@ -1651,13 +1651,13 @@ class documentController extends document
$oDB = &DB::getInstance();
$oDB->begin();
// Check permissions
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) return new Object(-1,'msg_not_permitted');
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
// Get original information
$category_info = $oDocumentModel->getCategory($args->category_srl);
if($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
@ -1692,7 +1692,7 @@ class documentController extends document
// Check input values
$module_srl = Context::get('module_srl');
// Check permissions
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
@ -1713,7 +1713,7 @@ class documentController extends document
// Return if there is no information you need for creating a cache file
if(!$module_srl) return false;
// Get module information (to obtain mid)
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'mid', 'site_srl');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
$mid = $module_info->mid;
@ -1853,7 +1853,7 @@ class documentController extends document
else $group_check_code = "true";
$title = $node->title;
$oModuleAdminModel = &getAdminModel('module');
$oModuleAdminModel = getAdminModel('module');
$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
if(count($langs))
@ -1940,7 +1940,7 @@ class documentController extends document
$title = $node->title;
$description = $node->description;
$oModuleAdminModel = &getAdminModel('module');
$oModuleAdminModel = getAdminModel('module');
$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
if(count($langs))
@ -2057,7 +2057,7 @@ class documentController extends document
if(!$document_srls || !count($document_srls)) return new Object();
// Check if each of module administrators exists. Top-level administator will have a permission to modify every document of all modules.(Even to modify temporarily saved or trashed documents)
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$module_srls = array_keys($document_srls);
for($i=0;$i<count($module_srls);$i++)
{
@ -2122,7 +2122,7 @@ class documentController extends document
$document_srl_count = count($document_srl_list);
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$document_items = array();
foreach($document_srl_list as $document_srl)
{
@ -2135,7 +2135,7 @@ class documentController extends document
if($message_content)
{
$oCommunicationController = &getController('communication');
$oCommunicationController = getController('communication');
$logged_info = Context::get('logged_info');
@ -2154,10 +2154,10 @@ class documentController extends document
}
}
// Set a spam-filer not to be filtered to spams
$oSpamController = &getController('spamfilter');
$oSpamController = getController('spamfilter');
$oSpamController->setAvoidLog();
$oDocumentAdminController = &getAdminController('document');
$oDocumentAdminController = getAdminController('document');
if($type == 'move')
{
if(!$module_srl) return new Object(-1, 'fail_to_move');
@ -2242,7 +2242,7 @@ class documentController extends document
$document_config->use_status = Context::get('use_status');
$oModuleController = &getController('module');
$oModuleController = getController('module');
for($i=0;$i<count($module_srl);$i++)
{
$srl = trim($module_srl[$i]);
@ -2280,8 +2280,8 @@ class documentController extends document
$obj->title = cut_str(strip_tags($obj->content), 20, '...');
}
$oDocumentModel = &getModel('document');
$oDocumentController = &getController('document');
$oDocumentModel = getModel('document');
$oDocumentController = getController('document');
// Check if already exist geulinji
$oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
@ -2334,7 +2334,7 @@ class documentController extends document
if(count($documentSrlList) > 0)
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$columnList = array('document_srl', 'title', 'nick_name', 'status');
$documentList = $oDocumentModel->getDocuments($documentSrlList, $this->grant->is_admin, false, $columnList);
}
@ -2376,8 +2376,8 @@ class documentController extends document
public function updateUploaedCount($documentSrlList)
{
$oDocumentModel = &getModel('document');
$oFileModel = &getModel('file');
$oDocumentModel = getModel('document');
$oFileModel = getModel('file');
if(is_array($documentSrlList))
{
@ -2405,12 +2405,12 @@ class documentController extends document
*/
function triggerCopyModuleExtraKeys(&$obj)
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$documentExtraKeys = $oDocumentModel->getExtraKeys($obj->originModuleSrl);
if(is_array($documentExtraKeys) && is_array($obj->moduleSrlList))
{
$oDocumentController=&getController('document');
$oDocumentController=getController('document');
foreach($obj->moduleSrlList AS $key=>$value)
{
foreach($documentExtraKeys AS $extraItem)
@ -2423,10 +2423,10 @@ class documentController extends document
function triggerCopyModule(&$obj)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$documentConfig = $oModuleModel->getModulePartConfig('document', $obj->originModuleSrl);
$oModuleController = &getController('module');
$oModuleController = getController('module');
if(is_array($obj->moduleSrlList))
{
foreach($obj->moduleSrlList AS $key=>$moduleSrl)

50
modules/document/document.item.php
View file

@ -117,7 +117,7 @@ class documentItem extends Object
$this->add('tag_list', $tag_list);
}
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$GLOBALS['XE_DOCUMENT_LIST'][$this->document_srl] = $this;
if($load_extra_vars)
{
@ -141,7 +141,7 @@ class documentItem extends Object
$logged_info = Context::get('logged_info');
if($logged_info->is_admin == 'Y') return true;
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$grant = $oModuleModel->getGrant($oModuleModel->getModuleInfoByModuleSrl($this->get('module_srl')), $logged_info);
if($grant->manager) return true;
@ -174,7 +174,7 @@ class documentItem extends Object
if(is_null($allow_trackback_status))
{
// If the trackback module is configured to be disabled, do not allow. Otherwise, check the setting of each module.
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$trackback_config = $oModuleModel->getModuleConfig('trackback');
if(!$trackback_config)
{
@ -209,7 +209,7 @@ class documentItem extends Object
function isSecret()
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
return $this->get('status') == $oDocumentModel->getConfigStatus('secret') ? true : false;
}
@ -268,7 +268,7 @@ class documentItem extends Object
$receiver_srl = $this->get('member_srl');
$sender_member_srl = $logged_info->member_srl;
// Send a message
$oCommunicationController = &getController('communication');
$oCommunicationController = getController('communication');
$oCommunicationController->sendMessage($sender_member_srl, $receiver_srl, $title, $content, false);
}
@ -482,7 +482,7 @@ class documentItem extends Object
*/
function getTransContent($add_popup_menu = true, $add_content_info = true, $resource_realpath = false, $add_xe_content_class = true)
{
$oEditorController = &getController('editor');
$oEditorController = getController('editor');
$content = $this->getContent($add_popup_menu, $add_content_info, $resource_realpath, $add_xe_content_class);
$content = $oEditorController->transComponent($content);
@ -581,7 +581,7 @@ class documentItem extends Object
if(!$this->document_srl) return;
// Generate a key to prevent spams
$oTrackbackModel = &getModel('trackback');
$oTrackbackModel = getModel('trackback');
if($oTrackbackModel) return $oTrackbackModel->getTrackbackUrl($this->document_srl, $this->getDocumentMid());
}
@ -591,7 +591,7 @@ class documentItem extends Object
*/
function updateReadedCount()
{
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
if($oDocumentController->updateReadedCount($this))
{
$readed_count = $this->get('readed_count');
@ -602,7 +602,7 @@ class documentItem extends Object
function isExtraVarsExists()
{
if(!$this->get('module_srl')) return false;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$extra_keys = $oDocumentModel->getExtraKeys($this->get('module_srl'));
return count($extra_keys)?true:false;
}
@ -611,7 +611,7 @@ class documentItem extends Object
{
if(!$this->get('module_srl') || !$this->document_srl) return null;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
return $oDocumentModel->getExtraVars($this->get('module_srl'), $this->document_srl);
}
@ -686,7 +686,7 @@ class documentItem extends Object
}
// Get a list of comments
$oCommentModel = &getModel('comment');
$oCommentModel = getModel('comment');
$output = $oCommentModel->getCommentList($this->document_srl, $cpage, $is_admin);
if(!$output->toBool() || !count($output->data)) return;
// Create commentItem object from a comment list
@ -725,7 +725,7 @@ class documentItem extends Object
if(!$this->allowTrackback() || !$this->get('trackback_count')) return;
$oTrackbackModel = &getModel('trackback');
$oTrackbackModel = getModel('trackback');
return $oTrackbackModel->getTrackbackList($this->document_srl, $is_admin);
}
@ -750,7 +750,7 @@ class documentItem extends Object
$config = $GLOBALS['__document_config__'];
if(!$config)
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$config = $oDocumentModel->getDocumentConfig();
$GLOBALS['__document_config__'] = $config;
}
@ -772,7 +772,7 @@ class documentItem extends Object
// Find an iamge file among attached files if exists
if($this->get('uploaded_count'))
{
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$file_list = $oFileModel->getFiles($this->document_srl, array(), 'file_srl', true);
if(count($file_list))
{
@ -928,7 +928,7 @@ class documentItem extends Object
if(!$this->uploadedFiles[$sortIndex])
{
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$this->uploadedFiles[$sortIndex] = $oFileModel->getFiles($this->document_srl, array(), $sortIndex, true);
}
@ -944,7 +944,7 @@ class documentItem extends Object
$module_srl = $this->get('module_srl');
if(!$module_srl) $module_srl = Context::get('module_srl');
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
return $oEditorModel->getModuleEditor('document', $module_srl, $this->document_srl, 'document_srl', 'content');
}
@ -970,7 +970,7 @@ class documentItem extends Object
{
if(!$this->isEnableComment()) return;
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
return $oEditorModel->getModuleEditor('comment', $this->get('module_srl'), $comment_srl, 'comment_srl', 'content');
}
@ -981,7 +981,7 @@ class documentItem extends Object
function getProfileImage()
{
if(!$this->isExists() || !$this->get('member_srl')) return;
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$profile_info = $oMemberModel->getProfileImage($this->get('member_srl'));
if(!$profile_info) return;
@ -997,12 +997,12 @@ class documentItem extends Object
// Pass if a document doesn't exist
if(!$this->isExists() || !$this->get('member_srl')) return;
// Get signature information
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$signature = $oMemberModel->getSignature($this->get('member_srl'));
// Check if a maximum height of signiture is set in the member module
if(!isset($GLOBALS['__member_signature_max_height']))
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
$GLOBALS['__member_signature_max_height'] = $member_config->signature_max_height;
}
@ -1038,7 +1038,7 @@ class documentItem extends Object
$status = $this->get('status');
if(empty($status)) return false;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$configStatusList = $oDocumentModel->getStatusList();
if($status == $configStatusList['public'] || $status == $configStatusList['publish'])
@ -1078,7 +1078,7 @@ class documentItem extends Object
*/
function getDocumentMid()
{
$model = &getModel('module');
$model = getModel('module');
$module = $model->getModuleInfoByModuleSrl($this->get('module_srl'));
return $module->mid;
}
@ -1089,7 +1089,7 @@ class documentItem extends Object
*/
function getDocumentType()
{
$model = &getModel('module');
$model = getModel('module');
$module = $model->getModuleInfoByModuleSrl($this->get('module_srl'));
return $module->module;
}
@ -1100,7 +1100,7 @@ class documentItem extends Object
*/
function getDocumentAlias()
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
return $oDocumentModel->getAlias($this->document_srl);
}
@ -1110,7 +1110,7 @@ class documentItem extends Object
*/
function getModuleName()
{
$model = &getModel('module');
$model = getModel('module');
$module = $model->getModuleInfoByModuleSrl($this->get('module_srl'));
return $module->browser_title;
}

34
modules/document/document.model.php
View file

@ -475,18 +475,18 @@ class documentModel extends document
// call trigger
ModuleHandler::triggerCall('document.getDocumentMenu', 'before', $menu_list);
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
// Members must be a possible feature
if($logged_info->member_srl)
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$columnList = array('document_srl', 'module_srl', 'member_srl', 'ipaddress');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
$module_srl = $oDocument->get('module_srl');
$member_srl = $oDocument->get('member_srl');
if(!$module_srl) return new Object(-1, 'msg_invalid_request');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
if($document_config->use_vote_up!='N' && $member_srl!=$logged_info->member_srl)
{
@ -518,7 +518,7 @@ class documentModel extends document
// If you are managing to find posts by ip
if($logged_info->is_admin == 'Y')
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($document_srl); //before setting document recycle
if($oDocument->isExists())
@ -708,7 +708,7 @@ class documentModel extends document
// If the target file to the cache file regeneration category
if(!file_exists($filename))
{
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
}
@ -807,7 +807,7 @@ class documentModel extends document
$xml_file = sprintf('files/cache/document_category/%s.xml.php',$module_srl);
if(!file_exists($xml_file))
{
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
$oDocumentController->makeCategoryFile($module_srl);
}
return $xml_file;
@ -823,7 +823,7 @@ class documentModel extends document
$php_file = sprintf('files/cache/document_category/%s.php',$module_srl);
if(!file_exists($php_file))
{
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
$oDocumentController->makeCategoryFile($module_srl);
}
return $php_file;
@ -838,7 +838,7 @@ class documentModel extends document
{
if($obj->mid)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
unset($obj->mid);
}
@ -864,7 +864,7 @@ class documentModel extends document
{
if($obj->mid)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
unset($obj->mid);
}
@ -912,7 +912,7 @@ class documentModel extends document
{
if(!$GLOBALS['__document_config__'])
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('document');
if(!$config) $config = new stdClass();
@ -955,7 +955,7 @@ class documentModel extends document
Context::loadJavascriptPlugin('ui.tree');
// Get a list of member groups
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$group_list = $oMemberModel->getGroups($module_info->site_srl);
Context::set('group_list', $group_list);
@ -974,8 +974,8 @@ class documentModel extends document
*/
function getDocumentCategoryTplInfo()
{
$oModuleModel = &getModel('module');
$oMemberModel = &getModel('member');
$oModuleModel = getModel('module');
$oMemberModel = getModel('member');
// Get information on the menu for the parameter settings
$module_srl = Context::get('module_srl');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
@ -1174,13 +1174,13 @@ class documentModel extends document
$point = Context::get('point');
if($point != -1) $point = 1;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$columnList = array('document_srl', 'module_srl');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
$module_srl = $oDocument->get('module_srl');
if(!$module_srl) return new Object(-1, 'msg_invalid_request');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
if($point == -1)
{
@ -1198,7 +1198,7 @@ class documentModel extends document
$output = executeQueryArray('document.getVotedMemberList',$args);
if(!$output->toBool()) return $output;
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
if($output->data)
{
foreach($output->data as $k => $d)
@ -1300,7 +1300,7 @@ class documentModel extends document
// If that came across mid module_srl instead of a direct module_srl guhaejum
if($searchOpt->mid)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$args->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
unset($searchOpt->mid);
}

14
modules/document/document.view.php
View file

@ -29,11 +29,11 @@ class documentView extends document
$document_srl = Context::get('document_srl');
// module_info not use in UI
//$oModuleModel = &getModel('module');
//$oModuleModel = getModel('module');
//$module_info = $oModuleModel->getModuleInfoByDocumentSrl($document_srl);
// Create the document object. If the document module of basic data structures, write it all works .. -_-;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
// Creates an object for displaying the selected document
$oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager);
if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request');
@ -83,12 +83,12 @@ class documentView extends document
if(count($document_srl_list))
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$document_list = $oDocumentModel->getDocuments($document_srl_list, $this->grant->is_admin);
Context::set('document_list', $document_list);
}
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// The combination of module categories list and the list of modules
if(count($module_list)>1) Context::set('module_list', $module_categories);
@ -128,7 +128,7 @@ class documentView extends document
if(!$current_module_srl) return new Object();
}
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
if($current_module_srl)
{
$document_config = $oModuleModel->getModulePartConfig('document', $current_module_srl);
@ -155,7 +155,7 @@ class documentView extends document
{
$this->setLayoutFile('popup_layout');
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
// Get the saved document (module_srl is set to member_srl instead)
@ -165,7 +165,7 @@ class documentView extends document
$args->page = (int)Context::get('page');
$args->list_count = 10;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$output = $oDocumentModel->getDocumentList($args, true);
Context::set('total_count', $output->total_count);
Context::set('total_page', $output->total_page);

4
modules/editor/components/poll_maker/poll_maker.class.php
View file

@ -26,7 +26,7 @@ class poll_maker extends EditorHandler
function getPopupContent()
{
// Wanted Skins survey
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/poll/');
Context::set('skin_list', $skin_list);
// Pre-compiled source code to compile template return to
@ -54,7 +54,7 @@ class poll_maker extends EditorHandler
if(!$width) $width = 400;
$style = sprintf('width:%dpx', $width);
// poll model object creation to come get it return html
$oPollModel = &getModel('poll');
$oPollModel = getModel('poll');
return $oPollModel->getPollHtml($poll_srl, $style, $skin);
}
}

8
modules/editor/editor.admin.controller.php
View file

@ -44,7 +44,7 @@ class editorAdminController extends editor
$output = $this->editorCheckUse($componentList,$site_module_info->site_srl);
if(!$output->toBool()) return new Object();
$oEditorController = &getController('editor');
$oEditorController = getController('editor');
$oEditorController->removeCache($site_module_info->site_srl);
$this->setRedirectUrl(Context::get('error_return_url'));
}
@ -130,7 +130,7 @@ class editorAdminController extends editor
else $output = executeQuery('editor.updateSiteComponent', $args);
if(!$output->toBool()) return $output;
$oEditorController = &getController('editor');
$oEditorController = getController('editor');
$oEditorController->removeCache($args->site_srl);
$this->setMessage('success_updated');
@ -142,7 +142,7 @@ class editorAdminController extends editor
*/
function procEditorAdminGeneralConfig()
{
$oModuleController = &getController('module');
$oModuleController = getController('module');
$configVars = Context::getRequestVars();
if($configVars->font_defined != 'Y') $config->font_defined = $configVars->font_defined = 'N';
@ -188,7 +188,7 @@ class editorAdminController extends editor
if(!$site_srl) $output = executeQuery('editor.insertComponent', $args);
else $output = executeQuery('editor.insertSiteComponent', $args);
$oEditorController = &getController('editor');
$oEditorController = getController('editor');
$oEditorController->removeCache($site_srl);
return $output;
}

12
modules/editor/editor.admin.view.php
View file

@ -25,8 +25,8 @@ class editorAdminView extends editor
$site_srl = (int)$site_module_info->site_srl;
// Get a type of component
$oEditorModel = &getModel('editor');
$oModuleModel = &getModel('module');
$oEditorModel = getModel('editor');
$oModuleModel = getModel('module');
$editor_config = $oModuleModel->getModuleConfig('editor');
if(!$editor_config)
@ -58,7 +58,7 @@ class editorAdminView extends editor
}
// Get install info, update info, count
$oAutoinstallModel = &getModel('autoinstall');
$oAutoinstallModel = getModel('autoinstall');
foreach($component_list as $component_name => $xml_info)
{
$component_count++;
@ -142,15 +142,15 @@ class editorAdminView extends editor
$component_name = Context::get('component_name');
// Get information of the editor component
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$component = $oEditorModel->getComponent($component_name,$site_srl);
Context::set('component', $component);
// Get a group list to set a group
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$group_list = $oMemberModel->getGroups($site_srl);
Context::set('group_list', $group_list);
// Get a mid list
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$args =new stdClass();
$args->site_srl = $site_srl;

10
modules/editor/editor.class.php
View file

@ -13,9 +13,9 @@ class editor extends ModuleObject
function moduleInstall()
{
// Register action forward (to use in administrator mode)
$oModuleController = &getController('module');
$oModuleController = getController('module');
// Add the default editor component
$oEditorController = &getAdminController('editor');
$oEditorController = getAdminController('editor');
$oEditorController->insertComponent('colorpicker_text',true);
$oEditorController->insertComponent('colorpicker_bg',true);
$oEditorController->insertComponent('emoticon',true);
@ -44,7 +44,7 @@ class editor extends ModuleObject
*/
function checkUpdate()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$oDB = &DB::getInstance();
// 2009. 06. 15 Save module_srl when auto-saving
@ -72,8 +72,8 @@ class editor extends ModuleObject
*/
function moduleUpdate()
{
$oModuleModel = &getModel('module');
$oModuleController = &getController('module');
$oModuleModel = getModel('module');
$oModuleController = getController('module');
$oDB = &DB::getInstance();
// Save module_srl when auto-saving 15/06/2009

26
modules/editor/editor.controller.php
View file

@ -36,7 +36,7 @@ class editorController extends editor
*/
function procEditorRemoveSavedDoc()
{
$oEditorController = &getController('editor');
$oEditorController = getController('editor');
$oEditorController->deleteSavedDoc(true);
}
@ -49,7 +49,7 @@ class editorController extends editor
$method = Context::get('method');
if(!$component) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$oComponent = &$oEditorModel->getComponentObject($component);
if(!$oComponent->toBool()) return $oComponent;
@ -131,7 +131,7 @@ class editorController extends editor
$editor_config->enable_autosave = Context::get('enable_autosave');
if($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
$oModuleController = &getController('module');
$oModuleController = getController('module');
for($i=0;$i<count($module_srl);$i++)
{
$srl = trim($module_srl[$i]);
@ -157,7 +157,7 @@ class editorController extends editor
$module_srl = $module_info->module_srl;
if($module_srl)
{
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$editor_config = $oEditorModel->getEditorConfig($module_srl);
$content_style = $editor_config->content_style;
if($content_style)
@ -228,7 +228,7 @@ class editorController extends editor
if(!$xml_obj->attrs->editor_component) return $match[0];
// Get converted codes by using component::transHTML()
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$oComponent = &$oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0);
if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) return $match[0];
@ -272,8 +272,8 @@ class editorController extends editor
{
$editor_sequence = Context::get('editor_sequence');
$primary_key = Context::get('primary_key');
$oEditorModel = &getModel('editor');
$oFileController = &getController('file');
$oEditorModel = getModel('editor');
$oFileController = getController('file');
$saved_doc = $oEditorModel->getSavedDoc(null);
@ -323,7 +323,7 @@ class editorController extends editor
$saved_doc = $output->data;
if(!$saved_doc) return;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
if(!$oSaved->isExists())
{
@ -352,7 +352,7 @@ class editorController extends editor
*/
function makeCache($filter_enabled = true, $site_srl)
{
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$args = new stdClass;
if($filter_enabled) $args->enabled = "Y";
@ -464,7 +464,7 @@ class editorController extends editor
// Pass if configured
if($component_list->{$component_name}) continue;
// Insert data into the DB
$oEditorController = &getAdminController('editor');
$oEditorController = getAdminController('editor');
$oEditorController->insertComponent($component_name, false, $site_srl);
// Add to component_list
unset($xml_info);
@ -486,17 +486,17 @@ class editorController extends editor
*/
function removeCache($site_srl = 0)
{
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
FileHandler::removeFile($oEditorModel->getCacheFile(true, $site_srl));
FileHandler::removeFile($oEditorModel->getCacheFile(false, $site_srl));
}
function triggerCopyModule(&$obj)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$editorConfig = $oModuleModel->getModulePartConfig('editor', $obj->originModuleSrl);
$oModuleController = &getController('module');
$oModuleController = getController('module');
if(is_array($obj->moduleSrlList))
{
foreach($obj->moduleSrlList AS $key=>$moduleSrl)

16
modules/editor/editor.model.php
View file

@ -26,12 +26,12 @@ class editorModel extends editor
if(!$GLOBALS['__editor_module_config__'][$module_srl] && $module_srl)
{
// Get trackback settings of the selected module
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$GLOBALS['__editor_module_config__'][$module_srl] = $oModuleModel->getModulePartConfig('editor', $module_srl);
}
$editor_config = $GLOBALS['__editor_module_config__'][$module_srl];
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$editor_default_config = $oModuleModel->getModuleConfig('editor');
if(!is_object($editor_config)) $editor_config = new stdClass();
@ -240,7 +240,7 @@ class editorModel extends editor
$files_count = 0;
if($allow_fileupload)
{
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
// Get upload configuration to set on SWFUploader
$file_config = $oFileModel->getUploadConfig();
$file_config->allowed_attach_size = $file_config->allowed_attach_size*1024*1024;
@ -251,7 +251,7 @@ class editorModel extends editor
$upload_status = $oFileModel->getUploadStatus();
Context::set('upload_status', $upload_status);
// Upload enabled (internally caching)
$oFileController = &getController('file');
$oFileController = getController('file');
$oFileController->setUploadInfo($editor_sequence, $upload_target_srl);
// Check if the file already exists
if($upload_target_srl) $files_count = $oFileModel->getFilesCount($upload_target_srl);
@ -476,7 +476,7 @@ class editorModel extends editor
// Return null if no result is auto-saved
if(!$saved_doc) return;
// Check if the auto-saved document already exists
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
if($oSaved->isExists()) return;
// Move all the files if the auto-saved data contains document_srl and file
@ -484,12 +484,12 @@ class editorModel extends editor
if($saved_doc->document_srl && $upload_target_srl && !Context::get('document_srl'))
{
$saved_doc->module_srl = $auto_save_args->module_srl;
$oFileController = &getController('file');
$oFileController = getController('file');
$oFileController->moveFile($saved_doc->document_srl, $saved_doc->module_srl, $upload_target_srl);
}
else if($upload_target_srl) $saved_doc->document_srl = $upload_target_srl;
// Change auto-saved data
$oEditorController = &getController('editor');
$oEditorController = getController('editor');
$oEditorController->deleteSavedDoc(false);
$oEditorController->doSaveDoc($saved_doc);
@ -554,7 +554,7 @@ class editorModel extends editor
$cache_file = $this->getCacheFile(false, $site_srl);
if($from_db || !file_exists($cache_file))
{
$oEditorController = &getController('editor');
$oEditorController = getController('editor');
$oEditorController->makeCache(false, $site_srl);
}

14
modules/editor/editor.view.php
View file

@ -29,7 +29,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');
$oEditorModel = getModel('editor');
$oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence, $site_srl);
if(!$oComponent->toBool())
{
@ -60,7 +60,7 @@ class editorView extends editor
$site_module_info = Context::get('site_module_info');
$site_srl = (int)$site_module_info->site_srl;
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$component = $oEditorModel->getComponent($component_name, $site_srl);
Context::set('component', $component);
@ -85,12 +85,12 @@ class editorView extends editor
if(!$current_module_srl) return new Object();
}
// Get editors settings
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$editor_config = $oEditorModel->getEditorConfig($current_module_srl);
Context::set('editor_config', $editor_config);
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// Get a list of editor skin
$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
Context::set('editor_skin_list', $editor_skin_list);
@ -111,7 +111,7 @@ class editorView extends editor
}
Context::set('content_style_list', $content_style_list);
// Get a group list
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$site_module_info = Context::get('site_module_info');
$group_list = $oMemberModel->getGroups($site_module_info->site_srl);
Context::set('group_list', $group_list);
@ -141,7 +141,7 @@ class editorView extends editor
function dispEditorSkinColorset()
{
$skin = Context::get('skin');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$skin);
$colorset = $skin_info->colorset;
Context::set('colorset', $colorset);
@ -149,7 +149,7 @@ class editorView extends editor
function dispEditorConfigPreview()
{
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$config = $oEditorModel->getEditorConfig();
$mode = Context::get('mode');

8
modules/file/file.admin.controller.php
View file

@ -68,7 +68,7 @@ class fileAdminController extends file
$file_count = count($file_srl_list);
if(!$file_count) return $this->stop('msg_file_cart_is_null');
$oFileController = &getController('file');
$oFileController = getController('file');
// Delete the post
for($i=0;$i<$file_count;$i++)
{
@ -99,7 +99,7 @@ class fileAdminController extends file
$config->allow_outlink_format = Context::get('allow_outlink_format');
$config->allow_outlink_site = Context::get('allow_outlink_site');
// Create module Controller object
$oModuleController = &getController('module');
$oModuleController = getController('module');
$output = $oModuleController->insertModuleConfig('file',$config);
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminConfig');
@ -141,7 +141,7 @@ class fileAdminController extends file
if($userFileAllowSize > $iniMinSzie || $userAttachAllowSize > $iniMinSzie)
return new Object(-1, 'input size over than config in php.ini');
$oModuleController = &getController('module');
$oModuleController = getController('module');
for($i=0;$i<count($module_srl);$i++)
{
$srl = trim($module_srl[$i]);
@ -166,7 +166,7 @@ class fileAdminController extends file
$file_srl = (int)Context::get('file_srl');
//$fileSrlList = array(500, 502);
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$output = $oFileModel->getFile($file_srl);
//$output = $oFileModel->getFile($fileSrlList);

2
modules/file/file.admin.model.php
View file

@ -85,7 +85,7 @@ class fileAdminModel extends file
// Return if no result or an error occurs
if(!$output->toBool()||!count($output->data)) return $output;
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
foreach($output->data as $key => $file)
{

10
modules/file/file.admin.view.php
View file

@ -31,16 +31,16 @@ class fileAdminView extends file
$args->isvalid = Context::get('isvalid');
$args->module_srl = Context::get('module_srl');
// Get a list
$oFileAdminModel = &getAdminModel('file');
$oFileAdminModel = getAdminModel('file');
$columnList = array('file_srl', 'upload_target_srl', 'upload_target_type', 'sid', 'module_srl'
, 'source_filename', 'isvalid', 'file_size', 'download_count', 'files.regdate', 'ipaddress', 'member.member_srl', 'member.nick_name');
$output = $oFileAdminModel->getFileList($args, $columnList);
// Get the document for looping a list
if($output->data)
{
$oCommentModel = &getModel('comment');
$oDocumentModel = &getModel('document');
$oModuleModel = &getModel('module');
$oCommentModel = getModel('comment');
$oDocumentModel = getModel('document');
$oModuleModel = getModel('module');
$file_list = array();
$document_list = array();
@ -214,7 +214,7 @@ class fileAdminView extends file
*/
function dispFileAdminConfig()
{
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$config = $oFileModel->getFileConfig();
Context::set('config',$config);
// Set a template file

8
modules/file/file.class.php
View file

@ -14,7 +14,7 @@ class file extends ModuleObject
function moduleInstall()
{
// Register action forward (to use in administrator mode)
$oModuleController = &getController('module');
$oModuleController = getController('module');
// Save the default settings for attachments
$config = new stdClass;
@ -54,7 +54,7 @@ class file extends ModuleObject
function checkUpdate()
{
$oDB = &DB::getInstance();
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// 2007. 10. 17 Create a trigger to insert, update, delete documents and comments
if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
@ -89,8 +89,8 @@ class file extends ModuleObject
function moduleUpdate()
{
$oDB = &DB::getInstance();
$oModuleModel = &getModel('module');
$oModuleController = &getController('module');
$oModuleModel = getModel('module');
$oModuleController = getController('module');
// 2007. 10. 17 Create a trigger to insert, update, delete documents and comments
if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
$oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before');

30
modules/file/file.controller.php
View file

@ -31,7 +31,7 @@ class fileController extends file
if(!is_uploaded_file($file_info['tmp_name'])) exit();
// Basic variables setting
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$editor_sequence = Context::get('editor_sequence');
$upload_target_srl = intval(Context::get('uploadTargetSrl'));
if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
@ -158,7 +158,7 @@ class fileController extends file
*/
function procFileDownload()
{
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$file_srl = Context::get('file_srl');
$sid = Context::get('sid');
@ -280,7 +280,7 @@ class fileController extends file
public function procFileOutput()
{
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$file_srl = Context::get('file_srl');
$file_key = Context::get('file_key');
if(strstr($_SERVER['HTTP_USER_AGENT'], "Android")) $is_android = true;
@ -361,7 +361,7 @@ class fileController extends file
$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
$logged_info = Context::get('logged_info');
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$srls = explode(',',$file_srl);
if(!count($srls)) return;
@ -401,7 +401,7 @@ class fileController extends file
global $lang;
if(count($fileSrlList) > 0)
{
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$fileList = $oFileModel->getFile($fileSrlList);
if(!is_array($fileList)) $fileList = array($fileList);
@ -434,7 +434,7 @@ class fileController extends file
$document_srl = $obj->document_srl;
if(!$document_srl) return new Object();
// Get numbers of attachments
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$obj->uploaded_count = $oFileModel->getFilesCount($document_srl);
return new Object();
@ -483,7 +483,7 @@ class fileController extends file
$comment_srl = $obj->comment_srl;
if(!$comment_srl) return new Object();
// Get numbers of attachments
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$obj->uploaded_count = $oFileModel->getFilesCount($comment_srl);
return new Object();
@ -533,7 +533,7 @@ class fileController extends file
$module_srl = $obj->module_srl;
if(!$module_srl) return new Object();
$oFileController = &getAdminController('file');
$oFileController = getAdminController('file');
return $oFileController->deleteModuleFiles($module_srl);
}
@ -620,7 +620,7 @@ class fileController extends file
$logged_info = Context::get('logged_info');
if($logged_info->is_admin != 'Y')
{
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$config = $oFileModel->getFileConfig($module_srl);
$allowed_filesize = $config->allowed_filesize * 1024 * 1024;
$allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
@ -689,7 +689,7 @@ class fileController extends file
}
}
// Get member information
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$member_srl = $oMemberModel->getLoggedMemberSrl();
// List file information
$args = new stdClass;
@ -757,7 +757,7 @@ class fileController extends file
$srls = explode(',',$file_srl);
if(!count($srls)) return;
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
$documentSrlList = array();
for($i=0;$i<count($srls);$i++)
@ -813,7 +813,7 @@ class fileController extends file
function deleteFiles($upload_target_srl)
{
// Get a list of attachements
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$columnList = array('uploaded_filename', 'module_srl');
$file_list = $oFileModel->getFiles($upload_target_srl, $columnList);
// Success returned if no attachement exists
@ -853,7 +853,7 @@ class fileController extends file
{
if($source_srl == $target_srl) return;
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$file_list = $oFileModel->getFiles($source_srl);
if(!$file_list) return;
@ -906,10 +906,10 @@ class fileController extends file
function triggerCopyModule(&$obj)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$fileConfig = $oModuleModel->getModulePartConfig('file', $obj->originModuleSrl);
$oModuleController = &getController('module');
$oModuleController = getController('module');
if(is_array($obj->moduleSrlList))
{
foreach($obj->moduleSrlList AS $key=>$moduleSrl)

8
modules/file/file.model.php
View file

@ -24,7 +24,7 @@ class fileModel extends file
*/
function getFileList()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$mid = Context::get('mid');
$editor_sequence = Context::get('editor_sequence');
@ -109,7 +109,7 @@ class fileModel extends file
function getFileConfig($module_srl = null)
{
// Get configurations (using module model object)
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$file_module_config = $oModuleModel->getModuleConfig('file');
@ -298,10 +298,10 @@ class fileModel extends file
return $file_grant;
}
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$grant = $oModuleModel->getGrant($oModuleModel->getModuleInfoByModuleSrl($file_info->module_srl), $member_info);
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
if($oDocument->isExists()) $document_grant = $oDocument->isGranted();

4
modules/file/file.view.php
View file

@ -34,11 +34,11 @@ class fileView extends file
if(!$current_module_srl) return new Object();
}
// Get file configurations of the module
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
$file_config = $oFileModel->getFileModuleConfig($current_module_srl);
Context::set('file_config', $file_config);
// Get a permission for group setting
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$site_module_info = Context::get('site_module_info');
$group_list = $oMemberModel->getGroups($site_module_info->site_srl);
Context::set('group_list', $group_list);

16
modules/importer/importer.admin.controller.php
View file

@ -98,7 +98,7 @@ class importerAdminController extends importer
*/
function procImporterAdminSync()
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$member_config = $oMemberModel->getMemberConfig();
$postFix = ($member_config->identifier == 'email_address') ? 'ByEmail' : '';
@ -298,7 +298,7 @@ class importerAdminController extends importer
case 'ttxml' :
if(!$target_module) return new Object(-1,'msg_invalid_request');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module');
$target_module_info = $oModuleModel->getModuleInfoByModuleSrl($target_module, $columnList);
@ -348,13 +348,13 @@ class importerAdminController extends importer
// Create the xmlParser object
$oXmlParser = new XmlParser();
// Create objects for importing member information
$this->oMemberController = &getController('member');
$this->oMemberModel = &getModel('member');
$this->oMemberController = getController('member');
$this->oMemberModel = getModel('member');
// Get a default member group
$default_group = $this->oMemberModel->getDefaultGroup();
$default_group_srl = $default_group->group_srl;
// Get information of the Webmaster
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
// Open an index file
$f = fopen($index_file,"r");
@ -601,8 +601,8 @@ class importerAdminController extends importer
// Pre-create the objects needed
$this->oXmlParser = new XmlParser();
// Get category information of the target module
$oDocumentController = &getController('document');
$oDocumentModel = &getModel('document');
$oDocumentController = getController('document');
$oDocumentModel = getModel('document');
$category_list = $category_titles = array();
$category_list = $oDocumentModel->getCategoryList($module_srl);
if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
@ -636,7 +636,7 @@ class importerAdminController extends importer
$output = $oDocumentController->insertCategory($obj);
if($output->toBool()) $match_sequence[$sequence] = $output->get('category_srl');
}
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
$oDocumentController->makeCategoryFile($module_srl);
}
FileHandler::removeFile($category_file);

6
modules/importer/importer.admin.view.php
View file

@ -34,14 +34,14 @@ class importerAdminView extends importer
$template_filename = "member";
break;
case 'ttxml' :
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
//$mid_list = $oModuleModel->getMidList(); //perhaps mid_list variables not use
//Context::set('mid_list', $mid_list);
$template_filename = "ttxml";
break;
case 'module' :
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
//$mid_list = $oModuleModel->getMidList(); //perhaps mid_list variables not use
//Context::set('mid_list', $mid_list);
@ -67,7 +67,7 @@ class importerAdminView extends importer
*/
function dispImporterAdminImportForm()
{
$oDocumentModel = &getModel('document'); //for document lang use in this page
$oDocumentModel = getModel('document'); //for document lang use in this page
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('index');

6
modules/importer/ttimport.class.php
View file

@ -36,8 +36,8 @@ class ttimport
// Pre-create the objects needed
$this->oXmlParser = new XmlParser();
// Get category information of the target module
$oDocumentController = &getController('document');
$oDocumentModel = &getModel('document');
$oDocumentController = getController('document');
$oDocumentModel = getModel('document');
$category_list = $category_titles = array();
$category_list = $oDocumentModel->getCategoryList($module_srl);
if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
@ -76,7 +76,7 @@ class ttimport
$category_list = $oDocumentModel->getCategoryList($module_srl);
if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
// Get administrator information
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$member_info = $oMemberModel->getMemberInfoByUserID($user_id);
$author_xml_id = 0;

20
modules/install/install.admin.controller.php
View file

@ -22,7 +22,7 @@ class installAdminController extends install
$module_name = Context::get('module_name');
if(!$module_name) return new object(-1, 'invalid_request');
$oInstallController = &getController('install');
$oInstallController = getController('install');
$oInstallController->installModule($module_name, './modules/'.$module_name);
$this->setMessage('success_installed');
@ -37,7 +37,7 @@ class installAdminController extends install
$module_name = Context::get('module_name');
if(!$module_name) return new object(-1, 'invalid_request');
$oModule = &getModule($module_name, 'class');
$oModule = getModule($module_name, 'class');
if($oModule) $output = $oModule->moduleUpdate();
else $output = new Object(-1, 'invalid_request');
@ -109,7 +109,7 @@ class installAdminController extends install
unset($db_info->lang_type);
$oInstallController = &getController('install');
$oInstallController = getController('install');
if(!$oInstallController->makeConfigFile())
{
return new Object(-1, 'msg_invalid_request');
@ -122,7 +122,7 @@ class installAdminController extends install
$site_args = new stdClass;
$site_args->site_srl = 0;
$site_args->domain = $default_url;
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->updateSite($site_args);
}
$this->setRedirectUrl(Context::get('error_return_url'));
@ -139,16 +139,16 @@ class installAdminController extends install
$site_args = new stdClass();
$site_args->site_srl = 0;
$site_args->index_module_srl = Context::get('index_module_srl');
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->updateSite($site_args);
// get menu item info
$menuItemSrl = Context::get('menu_item_srl');
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$output = $oMenuAdminModel->getMenuItemInfo($menuItemSrl);
// update homeSitemap.php cache file
$oMenuAdminController = &getAdminController('menu');
$oMenuAdminController = getAdminController('menu');
$homeMenuCacheFile = $oMenuAdminController->getHomeMenuCacheFile();
if(file_exists($homeMenuCacheFile))
{
@ -229,7 +229,7 @@ class installAdminController extends install
unset($db_info->lang_type);
Context::setDBInfo($db_info);
$oInstallController = &getController('install');
$oInstallController = getController('install');
if(!$oInstallController->makeConfigFile())
{
return new Object(-1, 'msg_invalid_request');
@ -239,7 +239,7 @@ class installAdminController extends install
$site_args->site_srl = 0;
$site_args->index_module_srl = Context::get('index_module_srl');//
$site_args->default_language = Context::get('change_lang_type');//
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->updateSite($site_args);
//언어 선택
@ -311,7 +311,7 @@ class installAdminController extends install
if(!$config->thumbnail_type || $config->thumbnail_type != 'ratio' ) $args->thumbnail_type = 'crop';
else $args->thumbnail_type = 'ratio';
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->insertModuleConfig('document',$args);
unset($args);

12
modules/install/install.controller.php
View file

@ -187,7 +187,7 @@ class installController extends install
}
// save selected lang info
$oInstallAdminController = &getAdminController('install');
$oInstallAdminController = getAdminController('install');
$oInstallAdminController->saveLangSelected(array(Context::getLangType()));
// Display a message that installation is completed
@ -435,7 +435,7 @@ class installController extends install
*/
function installDownloadedModule()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// Create a table ny finding schemas/*.xml file in each module
$module_list = FileHandler::readDir('./modules/', NULL, false, true);
foreach($module_list as $module_path)
@ -450,7 +450,7 @@ class installController extends install
}
// Install "module" module in advance
$this->installModule('module','./modules/module');
$oModule = &getClass('module');
$oModule = getClass('module');
if($oModule->checkUpdate()) $oModule->moduleUpdate();
// Determine the order of module installation depending on category
$install_step = array('system','content','member');
@ -464,7 +464,7 @@ class installController extends install
if($module == 'module') continue;
$this->installModule($module, sprintf('./modules/%s', $module));
$oModule = &getClass($module);
$oModule = getClass($module);
if(is_object($oModule) && method_exists($oModule, 'checkUpdate'))
{
if($oModule->checkUpdate()) $oModule->moduleUpdate();
@ -485,7 +485,7 @@ class installController extends install
if($module == 'module') continue;
$this->installModule($module, sprintf('./modules/%s', $module));
$oModule = &getClass($module);
$oModule = getClass($module);
if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
{
if($oModule->checkUpdate()) $oModule->moduleUpdate();
@ -518,7 +518,7 @@ class installController extends install
}
// Create a table and module instance and then execute install() method
unset($oModule);
$oModule = &getClass($module);
$oModule = getClass($module);
if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
return new Object();
}

6
modules/install/install.view.php
View file

@ -21,7 +21,7 @@ class installView extends install
// Error occurs if already installed
if(Context::isInstalled()) return $this->stop('msg_already_installed');
// Install a controller
$oInstallController = &getController('install');
$oInstallController = getController('install');
$this->install_enable = $oInstallController->checkInstallEnv();
// If the environment is installable, execute installController::makeDefaultDirectory()
if($this->install_enable) $oInstallController->makeDefaultDirectory();
@ -45,7 +45,7 @@ class installView extends install
}
unset($GLOBALS['__DB__']);
Context::set('install_config', true, true);
$oInstallController = &getController('install');
$oInstallController = getController('install');
$output = $oInstallController->procInstall();
if (!$output->toBool()) return $output;
header("location: ./");
@ -63,7 +63,7 @@ class installView extends install
*/
function dispInstallCheckEnv()
{
$oInstallController = &getController('install');
$oInstallController = getController('install');
$useRewrite = $oInstallController->checkRewriteUsable() ? 'Y' : 'N';
$_SESSION['use_rewrite'] = $useRewrite;
Context::set('use_rewrite', $useRewrite);

8
modules/integration_search/integration_search.admin.controller.php
View file

@ -24,7 +24,7 @@ class integration_searchAdminController extends integration_search
function procIntegration_searchAdminInsertConfig()
{
// Get configurations (using module model object)
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('integration_search');
$args->skin = Context::get('skin');
@ -33,7 +33,7 @@ class integration_searchAdminController extends integration_search
if(!$args->target_module_srl) $args->target_module_srl = '';
$args->skin_vars = $config->skin_vars;
$oModuleController = &getController('module');
$oModuleController = getController('module');
$output = $oModuleController->insertModuleConfig('integration_search',$args);
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent');
@ -48,7 +48,7 @@ class integration_searchAdminController extends integration_search
function procIntegration_searchAdminInsertSkin()
{
// Get configurations (using module model object)
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('integration_search');
$args->skin = $config->skin;
@ -114,7 +114,7 @@ class integration_searchAdminController extends integration_search
// Serialize and save
$args->skin_vars = serialize($obj);
$oModuleController = &getController('module');
$oModuleController = getController('module');
$output = $oModuleController->insertModuleConfig('integration_search',$args);
$this->setMessage('success_updated', 'info');

6
modules/integration_search/integration_search.admin.view.php
View file

@ -22,7 +22,7 @@ class integration_searchAdminView extends integration_search
function init()
{
// Get configurations (using module model object)
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$this->config = $oModuleModel->getModuleConfig('integration_search');
Context::set('config',$this->config);
@ -37,7 +37,7 @@ class integration_searchAdminView extends integration_search
function dispIntegration_searchAdminContent()
{
// Get a list of skins(themes)
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$skin_list = $oModuleModel->getSkins($this->module_path);
Context::set('skin_list',$skin_list);
// Get a list of module categories
@ -75,7 +75,7 @@ class integration_searchAdminView extends integration_search
*/
function dispIntegration_searchAdminSkinInfo()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $this->config->skin);
$skin_vars = unserialize($this->config->skin_vars);
// value for skin_info extra_vars

8
modules/integration_search/integration_search.class.php
View file

@ -15,7 +15,7 @@ class integration_search extends ModuleObject
function moduleInstall()
{
// Registered in action forward
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->insertActionForward('integration_search', 'view', 'IS');
return new Object();
@ -28,7 +28,7 @@ class integration_search extends ModuleObject
*/
function checkUpdate()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('integration_search');
if($config->skin)
@ -50,7 +50,7 @@ class integration_search extends ModuleObject
*/
function moduleUpdate()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('message');
if($config->skin)
@ -62,7 +62,7 @@ class integration_search extends ModuleObject
if(is_dir($template_path))
{
$config->skin = implode('|@|', $config_parse);
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->updateModuleConfig('integration_search', $config);
}
}

12
modules/integration_search/integration_search.model.php
View file

@ -55,7 +55,7 @@ class integration_searchModel extends module
$args->statusList = array('PUBLIC');
if(!$args->module_srl) unset($args->module_srl);
// Get a list of documents
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
return $oDocumentModel->getDocumentList($args);
}
@ -97,7 +97,7 @@ class integration_searchModel extends module
$args->sort_index = 'list_order';
$args->order_type = 'asc';
// Get a list of documents
$oCommentModel = &getModel('comment');
$oCommentModel = getModel('comment');
$output = $oCommentModel->getTotalCommentList($args);
if(!$output->toBool()|| !$output->data) return $output;
return $output;
@ -117,7 +117,7 @@ class integration_searchModel extends module
*/
function getTrackbacks($target, $module_srls_list, $search_target = "title", $search_keyword, $page=1, $list_count = 20)
{
$oTrackbackModel = &getAdminModel('trackback');
$oTrackbackModel = getAdminModel('trackback');
if(!$oTrackbackModel) return new Object();
$args = new stdClass();
@ -168,7 +168,7 @@ class integration_searchModel extends module
$args->isvalid = 'Y';
$args->direct_download = $direct_download=='Y'?'Y':'N';
// Get a list of documents
$oFileAdminModel = &getAdminModel('file');
$oFileAdminModel = getAdminModel('file');
$output = $oFileAdminModel->getFileList($args);
if(!$output->toBool() || !$output->data) return $output;
@ -212,7 +212,7 @@ class integration_searchModel extends module
}
$output->data = $list;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$document_list = $oDocumentModel->getDocuments($target_list);
if($document_list) foreach($document_list as $key => $val)
{
@ -227,7 +227,7 @@ class integration_searchModel extends module
}
}
$oCommentModel = &getModel('comment');
$oCommentModel = getModel('comment');
$comment_list = $oCommentModel->getComments($target_list);
if($comment_list) foreach($comment_list as $key => $val)
{

6
modules/integration_search/integration_search.view.php
View file

@ -34,8 +34,8 @@ class integration_searchView extends integration_search
*/
function IS()
{
$oFile = &getClass('file');
$oModuleModel = &getModel('module');
$oFile = getClass('file');
$oModuleModel = getModel('module');
// Check permissions
if(!$this->grant->access) return new Object(-1,'msg_not_permitted');
@ -82,7 +82,7 @@ class integration_searchView extends integration_search
// Create integration search model object
if($is_keyword)
{
$oIS = &getModel('integration_search');
$oIS = getModel('integration_search');
switch($where)
{
case 'document' :

52
modules/layout/layout.admin.controller.php
View file

@ -68,7 +68,7 @@ class layoutAdminController extends layout
*/
function initLayout($layout_srl, $layout_name)
{
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
// Import a sample layout if it is faceoff
if($oLayoutModel->useDefaultLayout($layout_name))
{
@ -103,8 +103,8 @@ class layoutAdminController extends layout
$args = Context::gets('layout_srl','title');
// Get layout information
$oLayoutModel = &getModel('layout');
$oMenuAdminModel = &getAdminModel('menu');
$oLayoutModel = getModel('layout');
$oMenuAdminModel = getAdminModel('menu');
$layout_info = $oLayoutModel->getLayout($args->layout_srl);
if($layout_info->menu)
@ -121,7 +121,7 @@ class layoutAdminController extends layout
// if menu is -1, get default menu in site
if($menu_srl == -1)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$start_module = $oModuleModel->getSiteInfo(0, $columnList);
$tmpArgs->url = $start_module->mid;
$tmpArgs->site_srl = 0;
@ -214,8 +214,8 @@ class layoutAdminController extends layout
}
// Save header script into "config" of layout module
$oModuleModel = &getModel('module');
$oModuleController = &getController('module');
$oModuleModel = getModel('module');
$oModuleController = getController('module');
$layout_config = new stdClass();
$layout_config->header_script = Context::get('header_script');
$oModuleController->insertModulePartConfig('layout',$args->layout_srl,$layout_config);
@ -253,7 +253,7 @@ class layoutAdminController extends layout
$output = executeQuery('layout.updateLayout', $args);
if($output->toBool())
{
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$cache_file = $oLayoutModel->getUserLayoutCache($args->layout_srl, Context::getLangType());
FileHandler::removeFile($cache_file);
//remove from cache
@ -286,7 +286,7 @@ class layoutAdminController extends layout
*/
function deleteLayout($layout_srl, $force = FALSE)
{
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
if(!$force)
{
@ -299,9 +299,9 @@ class layoutAdminController extends layout
// uninstall package
$path = $layoutInfo->path;
$oAutoinstallModel = &getModel('autoinstall');
$oAutoinstallModel = getModel('autoinstall');
$packageSrl = $oAutoinstallModel->getPackageSrlByPath($path);
$oAutoinstallAdminController = &getAdminController('autoinstall');
$oAutoinstallAdminController = getAdminController('autoinstall');
if($packageSrl)
{
@ -363,7 +363,7 @@ class layoutAdminController extends layout
return new Object(-1, 'msg_invalid_request');
}
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl);
FileHandler::writeFile($layout_file, $code);
@ -384,7 +384,7 @@ class layoutAdminController extends layout
if(!$layout_srl) return new Object(-1, 'msg_invalid_request');
// delete user layout file
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl);
FileHandler::removeFile($layout_file);
@ -430,7 +430,7 @@ class layoutAdminController extends layout
*/
function insertUserLayoutImage($layout_srl,$source)
{
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
if(!is_dir($path)) FileHandler::makeDir($path);
@ -470,7 +470,7 @@ class layoutAdminController extends layout
*/
function removeUserLayoutImage($layout_srl,$filename)
{
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
@unlink($path . $filename);
}
@ -484,7 +484,7 @@ class layoutAdminController extends layout
*/
function procLayoutAdminUserValueInsert()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$mid = Context::get('mid');
if(!$mid) return new Object(-1, 'msg_invalid_request');
@ -495,7 +495,7 @@ class layoutAdminController extends layout
$layout_srl = $module_info->layout_srl;
if(!$layout_srl) return new Object(-1, 'msg_invalid_request');
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
// save tmp?
$temp = Context::get('saveTemp');
@ -541,7 +541,7 @@ class layoutAdminController extends layout
*/
function insertUserLayoutValue($layout_srl,$arr)
{
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$file = $oLayoutModel->getUserLayoutIni($layout_srl);
FileHandler::writeIniFile($file, $arr);
}
@ -555,7 +555,7 @@ class layoutAdminController extends layout
*/
function addExtension($layout_srl,$arg,$content)
{
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$reg = '/(<\!\-\- start\-e1 \-\->)(.*)(<\!\-\- end\-e1 \-\->)/i';
$extension_content = '\1' .stripslashes($arg->e1) . '\3';
$content = preg_replace($reg,$extension_content,$content);
@ -581,7 +581,7 @@ class layoutAdminController extends layout
*/
function deleteUserLayoutTempFile($layout_srl)
{
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$file_list = $oLayoutModel->getUserLayoutTempFileList($layout_srl);
foreach($file_list as $key => $file)
{
@ -599,7 +599,7 @@ class layoutAdminController extends layout
if(!$layout_srl) return new Object('-1','msg_invalid_request');
require_once(_XE_PATH_.'libs/tar.class.php');
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
// Copy files to temp path
$file_path = $oLayoutModel->getUserLayoutPath($layout_srl);
@ -703,7 +703,7 @@ class layoutAdminController extends layout
$layout_srl = Context::get('layout_srl');
if(!$layout_srl) exit();
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
if(!move_uploaded_file($file['tmp_name'], $user_layout_path . 'faceoff.tar')) exit();
@ -729,7 +729,7 @@ class layoutAdminController extends layout
return $this->stop('msg_empty_origin_layout');
}
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout = $oLayoutModel->getLayout($sourceArgs->layout_srl);
if(!$sourceArgs->title)
@ -758,7 +758,7 @@ class layoutAdminController extends layout
}
}
$oModuleController = &getController('module');
$oModuleController = getController('module');
$layout_config = new stdClass();
$layout_config->header_script = $extra_vars->header_script;
@ -853,7 +853,7 @@ class layoutAdminController extends layout
*/
function _copyLayoutFile($sourceLayoutSrl, $targetLayoutSrl)
{
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$sourceLayoutPath = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($sourceLayoutSrl));
$targetLayoutPath = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($targetLayoutSrl));
@ -895,7 +895,7 @@ class layoutAdminController extends layout
*/
function importLayout($layout_srl, $source_file)
{
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
$file_list = $oLayoutModel->getUserLayoutFileList($layout_srl);
foreach($file_list as $key => $file)
@ -979,7 +979,7 @@ class layoutAdminController extends layout
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile("after_delete_config_image.html");
$oModel = &getModel('layout');
$oModel = getModel('layout');
$layoutInfo = $oModel->getLayout($layoutSrl);
if($layoutInfo->extra_var_count)

10
modules/layout/layout.admin.model.php
View file

@ -61,7 +61,7 @@ class layoutAdminModel extends layout
$layout_srl = Context::get('layout_srl');
// Get layout information
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayout($layout_srl);
// Error appears if there is no layout information is registered
@ -71,7 +71,7 @@ class layoutAdminModel extends layout
}
// Get a menu list
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$menu_list = $oMenuAdminModel->getMenus();
Context::set('menu_list', $menu_list);
@ -102,7 +102,7 @@ class layoutAdminModel extends layout
// Set the layout with its information
$layout_srl = Context::get('layout_srl');
// Get layout information
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayout($layout_srl);
// Error appears if there is no layout information is registered
if(!$layout_info)
@ -111,7 +111,7 @@ class layoutAdminModel extends layout
}
// Get Layout Code
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
if(!file_exists($layout_file))
@ -144,7 +144,7 @@ class layoutAdminModel extends layout
$layout_image_path = $oLayoutModel->getUserLayoutImagePath($layout_info->layout_srl);
Context::set('layout_image_path', $layout_image_path);
// Set widget list
$oWidgetModel = &getModel('widget');
$oWidgetModel = getModel('widget');
$widget_list = $oWidgetModel->getDownloadedWidgetList();
Context::set('widget_list', $widget_list);

30
modules/layout/layout.admin.view.php
View file

@ -26,7 +26,7 @@ class layoutAdminView extends layout
$type = ($type != 'M') ? 'P' : 'M';
// Set a layout list
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_list = $oLayoutModel->getDownloadedLayoutList($type, true);
if(!is_array($layout_list))
{
@ -36,7 +36,7 @@ class layoutAdminView extends layout
if($type == 'P')
{
// get Theme layout
$oAdminModel = &getAdminModel('admin');
$oAdminModel = getAdminModel('admin');
$themeList = $oAdminModel->getThemeList();
$themeLayoutList = array();
foreach($themeList as $themeInfo)
@ -78,7 +78,7 @@ class layoutAdminView extends layout
if(!in_array($type, array('P', 'M'))) $type = 'P';
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$pcLayoutCount = $oLayoutModel->getInstalledLayoutCount('P');
$mobileLayoutCount = $oLayoutModel->getInstalledLayoutCount('M');
@ -142,7 +142,7 @@ class layoutAdminView extends layout
if(!in_array($type, array('P', 'M'))) $type = 'P';
if(!$layout) return $this->stop('msg_invalid_request');
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayoutInfo($layout, null, $type);
if(!$layout_info) return $this->stop('msg_invalid_request');
@ -165,7 +165,7 @@ class layoutAdminView extends layout
*/
function dispLayoutAdminInsert()
{
$oModel = &getModel('layout');
$oModel = getModel('layout');
$type = Context::get('type');
if(!in_array($type, array('P', 'M'))) $type = 'P';
@ -181,7 +181,7 @@ class layoutAdminView extends layout
if(!$layout_info) return $this->stop('msg_invalid_request');
// get Menu list
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$menu_list = $oMenuAdminModel->getMenus();
Context::set('menu_list', $menu_list);
@ -209,7 +209,7 @@ class layoutAdminView extends layout
*/
function dispLayoutAdminModify()
{
$oLayoutAdminModel = &getAdminModel('layout');
$oLayoutAdminModel = getAdminModel('layout');
$oLayoutAdminModel->setLayoutAdminSetInfoView();
Context::set('is_sitemap', '0');
@ -231,13 +231,13 @@ class layoutAdminView extends layout
// Set the layout with its information
$layout_srl = Context::get('layout_srl');
// Get layout information
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayout($layout_srl);
// Error appears if there is no layout information is registered
if(!$layout_info) return $this->dispLayoutAdminInstalledList();
// Get Layout Code
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
if(!file_exists($layout_file))
{
@ -269,7 +269,7 @@ class layoutAdminView extends layout
$layout_image_path = $oLayoutModel->getUserLayoutImagePath($layout_info->layout_srl);
Context::set('layout_image_path', $layout_image_path);
// Set widget list
$oWidgetModel = &getModel('widget');
$oWidgetModel = getModel('widget');
$widget_list = $oWidgetModel->getDownloadedWidgetList();
Context::set('widget_list', $widget_list);
@ -299,7 +299,7 @@ class layoutAdminView extends layout
$code_css = Context::get('code_css');
if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request');
// Get the layout information
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayout($layout_srl);
if(!$layout_info) return new Object(-1, 'msg_invalid_request');
// Separately handle the layout if its type is faceoff
@ -363,11 +363,11 @@ class layoutAdminView extends layout
$delete_tmp = Context::get('delete_tmp');
if($delete_tmp =='Y')
{
$oLayoutAdminController = &getAdminController('layout');
$oLayoutAdminController = getAdminController('layout');
$oLayoutAdminController->deleteUserLayoutTempFile($layout_srl);
}
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
// layout file is used as a temp.
$oLayoutModel->setUseUserLayoutTemp();
// Apply CSS in inline style
@ -394,7 +394,7 @@ class layoutAdminView extends layout
$oTemplate = &TemplateHandler::getInstance();
Context::set('content', $oTemplate->compile($this->module_path.'tpl','about_faceoff'));
// Change widget codes in Javascript mode
$oWidgetController = &getController('widget');
$oWidgetController = getController('widget');
$oWidgetController->setWidgetCodeInJavascriptMode();
// Set a template file
$this->setTemplateFile('faceoff_layout_edit');
@ -408,7 +408,7 @@ class layoutAdminView extends layout
{
$layoutSrl = Context::get('layout_srl');
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout = $oLayoutModel->getLayout($layoutSrl);
Context::set('layout', $layout);

2
modules/layout/layout.class.php
View file

@ -67,7 +67,7 @@ class layout extends ModuleObject
$oDB->addColumn('layouts','site_srl','number',11,0,true);
}
// 2009. 02. 26 Move the previous layout for faceoff
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$files = FileHandler::readDir('./files/cache/layout');
for($i=0,$c=count($files);$i<$c;$i++)
{

6
modules/layout/layout.model.php
View file

@ -277,7 +277,7 @@ class layoutModel extends layout
// If deleted layout files, delete layout instance
// if (!$layout_info) {
// $oLayoutController = &getAdminController('layout');
// $oLayoutController = getAdminController('layout');
// $oLayoutController->deleteLayout($layout_srl);
// return;
// }
@ -337,7 +337,7 @@ class layoutModel extends layout
*/
function getDownloadedLayoutList($layout_type = "P", $withAutoinstallInfo = false)
{
if ($withAutoinstallInfo) $oAutoinstallModel = &getModel('autoinstall');
if ($withAutoinstallInfo) $oAutoinstallModel = getModel('autoinstall');
// Get a list of downloaded layout and installed layout
$searched_list = $this->_getInstalledLayoutDirectories($layout_type);
@ -720,7 +720,7 @@ class layoutModel extends layout
}
// header_script
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$layout_config = $oModuleModel->getModulePartConfig('layout', $layout_srl);
$header_script = trim($layout_config->header_script);

6
modules/layout/layout.view.php
View file

@ -23,7 +23,7 @@ class layoutView extends layout
function dispLayoutInfo()
{
// Get the layout information
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayoutInfo(Context::get('selected_layout'));
if(!$layout_info) exit();
Context::set('layout_info', $layout_info);
@ -61,7 +61,7 @@ class layoutView extends layout
// if module is 'ARTiCLE' and from site design setting, make content directly
if($module == 'ARTICLE' && !$mid)
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument(0, true);
$t = Context::getLang('article_preview_title');
@ -328,7 +328,7 @@ class layoutView extends layout
$code_css = Context::get('code_css');
if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request');
// Get the layout information
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayout($layout_srl);
if(!$layout_info) return new Object(-1, 'msg_invalid_request');
// Separately handle the layout if its type is faceoff

38
modules/member/member.admin.controller.php
View file

@ -68,7 +68,7 @@ class memberAdminController extends member
if($args->member_srl)
{
// Create a member model object
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// Get memebr profile
$columnList = array('member_srl');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl, 0, $columnList);
@ -87,7 +87,7 @@ class memberAdminController extends member
}
}
$oMemberController = &getController('member');
$oMemberController = getController('member');
// Execute insert or update depending on the value of member_srl
if(!$args->member_srl)
{
@ -140,7 +140,7 @@ class memberAdminController extends member
// Separate all the values into DB entries and others
$member_srl = Context::get('member_srl');
$oMemberController = &getController('member');
$oMemberController = getController('member');
$output = $oMemberController->deleteMember($member_srl);
if(!$output->toBool()) return $output;
@ -375,7 +375,7 @@ class memberAdminController extends member
function createSignupForm($identifier)
{
global $lang;
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// Get join form list which is additionally set
$extendItems = $oMemberModel->getJoinFormList();
@ -655,7 +655,7 @@ class memberAdminController extends member
}
// Check ID duplicated
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$config = $oMemberModel->getMemberConfig();
foreach($config->signupForm as $item)
{
@ -691,7 +691,7 @@ class memberAdminController extends member
$signupItem->description = $args->description;
$signupItem->isPublic = 'Y';
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$config = $oMemberModel->getMemberConfig();
unset($config->agreement);
@ -709,7 +709,7 @@ class memberAdminController extends member
}
}
}
$oModuleController = &getController('module');
$oModuleController = getController('module');
$output = $oModuleController->updateModuleConfig('member', $config);
$this->setMessage('success_registed');
@ -727,7 +727,7 @@ class memberAdminController extends member
$member_join_form_srl = Context::get('member_join_form_srl');
$this->deleteJoinForm($member_join_form_srl);
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$config = $oMemberModel->getMemberConfig();
unset($config->agreement);
@ -739,7 +739,7 @@ class memberAdminController extends member
break;
}
}
$oModuleController = &getController('module');
$oModuleController = getController('module');
$output = $oModuleController->updateModuleConfig('member', $config);
}
@ -788,7 +788,7 @@ class memberAdminController extends member
$oDB = &DB::getInstance();
$oDB->begin();
$oMemberController = &getController('member');
$oMemberController = getController('member');
foreach($members as $key=>$member_srl)
{
$args = new stdClass();
@ -847,7 +847,7 @@ class memberAdminController extends member
// Send a message
if($message)
{
$oCommunicationController = &getController('communication');
$oCommunicationController = getController('communication');
$logged_info = Context::get('logged_info');
$title = cut_str($message,10,'...');
@ -872,7 +872,7 @@ class memberAdminController extends member
$target_member_srls = Context::get('target_member_srls');
if(!$target_member_srls) return new Object(-1, 'msg_invalid_request');
$member_srls = explode(',', $target_member_srls);
$oMemberController = &getController('member');
$oMemberController = getController('member');
foreach($member_srls as $member)
{
@ -1043,11 +1043,11 @@ class memberAdminController extends member
// Assign an administrator
$args->is_admin = 'Y';
// Get admin group and set
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$admin_group = $oMemberModel->getAdminGroup();
$args->group_srl_list = $admin_group->group_srl;
$oMemberController = &getController('member');
$oMemberController = getController('member');
return $oMemberController->insertMember($args);
}
@ -1125,7 +1125,7 @@ class memberAdminController extends member
function deleteGroup($group_srl, $site_srl = 0)
{
// Create a member model object
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// Check the group_srl (If is_default == 'Y', it cannot be deleted)
$columnList = array('group_srl', 'is_default');
$group_info = $oMemberModel->getGroup($group_srl, $columnList);
@ -1155,8 +1155,8 @@ class memberAdminController extends member
{
$vars = Context::getRequestVars();
$oMemberModel = &getModel('member');
$oModuleController = &getController('module');
$oMemberModel = getModel('member');
$oModuleController = getController('module');
// group image mark option
$config = $oMemberModel->getMemberConfig();
@ -1311,7 +1311,7 @@ class memberAdminController extends member
*/
function moveJoinFormUp($member_join_form_srl)
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// Get information of the join form
$args = new stdClass;
$args->member_join_form_srl = $member_join_form_srl;
@ -1358,7 +1358,7 @@ class memberAdminController extends member
*/
function moveJoinFormDown($member_join_form_srl)
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// Get information of the join form
$args = new stdClass;
$args->member_join_form_srl = $member_join_form_srl;

6
modules/member/member.admin.model.php
View file

@ -192,11 +192,11 @@ class memberAdminModel extends member
if(!$skin) $tpl = "";
else
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
Context::set('skin_info', $skin_info);
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if(!$config->colorset) $config->colorset = "white";
Context::set('config', $config);
@ -269,7 +269,7 @@ class memberAdminModel extends member
Context::set('formInfo', $output->data);
}
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$config = $oMemberModel->getMemberConfig();
foreach($config->signupForm as $item)
{

32
modules/member/member.admin.view.php
View file

@ -35,7 +35,7 @@ class memberAdminView extends member
*/
function init()
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$this->memberConfig = $oMemberModel->getMemberConfig();
Context::set('config', $this->memberConfig);
$oSecurity = new Security();
@ -73,8 +73,8 @@ class memberAdminView extends member
*/
function dispMemberAdminList()
{
$oMemberAdminModel = &getAdminModel('member');
$oMemberModel = &getModel('member');
$oMemberAdminModel = getAdminModel('member');
$oMemberModel = getModel('member');
$output = $oMemberAdminModel->getMemberList();
$filter = Context::get('filter_type');
@ -204,7 +204,7 @@ class memberAdminView extends member
{
$oModuleModel = getModel('module');
// Get a layout list
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_list = $oLayoutModel->getLayoutList();
Context::set('layout_list', $layout_list);
@ -231,11 +231,11 @@ class memberAdminView extends member
*/
function dispMemberAdminConfigOLD()
{
$oModuleModel = &getModel('module');
$oMemberModel = &getModel('member');
$oModuleModel = getModel('module');
$oMemberModel = getModel('member');
// Get a layout list
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_list = $oLayoutModel->getLayoutList();
Context::set('layout_list', $layout_list);
@ -253,7 +253,7 @@ class memberAdminView extends member
Context::set('mskin_list', $mskin_list);
// retrieve skins of editor
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
Context::set('editor_skin_list', $oEditorModel->getEditorSkinList());
// get an editor
@ -303,8 +303,8 @@ class memberAdminView extends member
*/
function dispMemberAdminInfo()
{
$oMemberModel = &getModel('member');
$oModuleModel = &getModel('module');
$oMemberModel = getModel('member');
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
Context::set('member_config', $member_config);
@ -336,7 +336,7 @@ class memberAdminView extends member
function dispMemberAdminInsert()
{
// retrieve extend form
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$memberInfo = Context::get('member_info');
if(isset($memberInfo))
@ -348,7 +348,7 @@ class memberAdminView extends member
// get an editor for the signature
if($memberInfo->member_srl)
{
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$option = new stdClass();
$option->primary_key_name = 'member_srl';
$option->content_key_name = 'signature';
@ -385,7 +385,7 @@ class memberAdminView extends member
*/
function _getMemberInputTag($memberInfo, $isAdmin = false)
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$extend_form_list = $oMemberModel->getCombineJoinForm($memberInfo);
$security = new Security($extend_form_list);
$security->encodeHTML('..column_title', '..description', '..default_value.');
@ -595,7 +595,7 @@ class memberAdminView extends member
}
else if($extendForm->column_type == 'kr_zip')
{
$krzipModel = &getModel('krzip');
$krzipModel = getModel('krzip');
if($krzipModel && method_exists($krzipModel , 'getKrzipCodeSearchHtml' ))
{
$template = $krzipModel->getKrzipCodeSearchHtml($extendForm->column_name, $extendForm->value);
@ -630,7 +630,7 @@ class memberAdminView extends member
*/
function dispMemberAdminGroupList()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$output = $oModuleModel->getModuleFileBoxList();
Context::set('fileBoxList', $output->data);
@ -647,7 +647,7 @@ class memberAdminView extends member
$member_join_form_srl = Context::get('member_join_form_srl');
if($member_join_form_srl)
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$join_form = $oMemberModel->getJoinForm($member_join_form_srl);
if(!$join_form) Context::set('member_join_form_srl','',true);

32
modules/member/member.class.php
View file

@ -22,7 +22,7 @@ class member extends ModuleObject {
{
if(!Context::isInstalled()) return;
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
// Set to use SSL upon actions related member join/information/password and so on. 2013.02.15
@ -41,12 +41,12 @@ class member extends ModuleObject {
function moduleInstall()
{
// Register action forward (to use in administrator mode)
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oDB = &DB::getInstance();
$oDB->addIndex("member_group","idx_site_title", array("site_srl","title"),true);
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$args = $oModuleModel->getModuleConfig('member');
$isNotInstall = empty($args);
@ -68,10 +68,10 @@ class member extends ModuleObject {
if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
global $lang;
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// Create a member controller object
$oMemberController = &getController('member');
$oMemberAdminController = &getAdminController('member');
$oMemberController = getController('member');
$oMemberAdminController = getAdminController('member');
if(!$args->signupForm || !is_array($args->signupForm))
{
@ -129,7 +129,7 @@ class member extends ModuleObject {
}
}
// Register denied ID(default + module name)
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$module_list = $oModuleModel->getModuleList();
foreach($module_list as $key => $val)
{
@ -162,7 +162,7 @@ class member extends ModuleObject {
function checkUpdate()
{
$oDB = &DB::getInstance();
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// check member directory (11/08/2007 added)
if(!is_dir("./files/member_extra_info")) return true;
// check member directory (22/10/2007 added)
@ -190,7 +190,7 @@ class member extends ModuleObject {
if(!$oDB->isColumnExists("member", "list_order")) return true;
if(!$oDB->isIndexExists("member","idx_list_order")) return true;
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
// check signup form ordering info
if(!$config->signupForm) return true;
@ -230,7 +230,7 @@ class member extends ModuleObject {
function moduleUpdate()
{
$oDB = &DB::getInstance();
$oModuleController = &getController('module');
$oModuleController = getController('module');
// Check member directory
FileHandler::makeDir('./files/member_extra_info/image_name');
FileHandler::makeDir('./files/member_extra_info/image_mark');
@ -299,9 +299,9 @@ class member extends ModuleObject {
$oDB->addIndex("member","idx_list_order", array("list_order"));
}
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
$oModuleController = &getController('module');
$oModuleController = getController('module');
// check agreement value exist
if($config->agreement)
@ -313,7 +313,7 @@ class member extends ModuleObject {
$output = $oModuleController->updateModuleConfig('member', $config);
}
$oMemberAdminController = &getAdminController('member');
$oMemberAdminController = getAdminController('member');
// check signup form ordering info
if(!$config->signupForm || !is_array($config->signupForm))
{
@ -334,7 +334,7 @@ class member extends ModuleObject {
if(is_dir($template_path))
{
$config->skin = implode('|@|', $config_parse);
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->updateModuleConfig('member', $config);
}
}
@ -382,7 +382,7 @@ class member extends ModuleObject {
if($error == 0) return new Object($error, $message);
// Create a member model object
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$config = $oMemberModel->getMemberConfig();
// Check if there is recoding table.
@ -427,7 +427,7 @@ class member extends ModuleObject {
if($error == 0 || !$args->member_srl) return new Object($error, $message);
// Create a member model object
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$config = $oMemberModel->getMemberConfig();
// Check if there is recoding table.

128
modules/member/member.controller.php
View file

@ -55,7 +55,7 @@ class memberController extends member
$output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false);
if (!$output->toBool()) return $output;
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
// Check change_password_date
@ -64,7 +64,7 @@ class memberController extends member
// Check if change_password_date is set
if($limit_date > 0)
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
if($this->memberInfo->change_password_date < date ('YmdHis', strtotime ('-' . $limit_date . ' day')))
{
$this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword'));
@ -102,7 +102,7 @@ class memberController extends member
$output = new Object();
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if($config->after_logout_url)
$output->redirect_url = $config->after_logout_url;
@ -125,7 +125,7 @@ class memberController extends member
if(!$document_srl) $document_srl = (int)Context::get('target_srl');
if(!$document_srl) return new Object(-1,'msg_invalid_request');
// Get document
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($document_srl);
// Variables
$args = new stdClass();
@ -191,7 +191,7 @@ class memberController extends member
$document_srl = (int)Context::get('document_srl');
if(!$document_srl) return new Object(-1,'msg_invalid_request');
// Variables
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
$oDocumentController->deleteDocument($document_srl, true);
}
@ -206,7 +206,7 @@ class memberController extends member
$value = Context::get('value');
if(!$value) return;
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// Check if logged-in
$logged_info = Context::get('logged_info');
@ -402,7 +402,7 @@ class memberController extends member
return $this->stop('msg_invalid_request');
}
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
if(!$this->memberInfo->password)
{
@ -553,7 +553,7 @@ class memberController extends member
$logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl;
// Create a member model object
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// Get information of member_srl
$columnList = array('member_srl', 'password');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
@ -591,7 +591,7 @@ class memberController extends member
$logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl;
// Create a member model object
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// Get information of member_srl
if(!$this->memberInfo->password)
{
@ -630,7 +630,7 @@ class memberController extends member
$logged_info = Context::get('logged_info');
if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_profile_image');
// Return if member module is set not to use an image name or the user is not an administrator ;
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') return $this->stop('msg_not_uploaded_profile_image');
@ -656,7 +656,7 @@ class memberController extends member
// Check uploaded file
if(!checkUploadedFile($target_file)) return;
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
// Get an image size
$max_width = $config->profile_image_max_width;
@ -695,7 +695,7 @@ class memberController extends member
$logged_info = Context::get('logged_info');
if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name');
// Return if member module is set not to use an image name or the user is not an administrator ;
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name');
@ -720,7 +720,7 @@ class memberController extends member
// Check uploaded file
if(!checkUploadedFile($target_file)) return;
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
// Get an image size
$max_width = $config->image_name_max_width;
@ -756,7 +756,7 @@ class memberController extends member
if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$profile_image = $oMemberModel->getProfileImage($member_srl);
FileHandler::removeFile($profile_image->file);
}
@ -780,7 +780,7 @@ class memberController extends member
if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$image_name = $oMemberModel->getImageName($member_srl);
FileHandler::removeFile($image_name->file);
}
@ -804,7 +804,7 @@ class memberController extends member
$logged_info = Context::get('logged_info');
if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark');
// Membership in the images mark the module using the ban was set by an administrator or return;
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark');
@ -829,7 +829,7 @@ class memberController extends member
// Check uploaded file
if(!checkUploadedFile($target_file)) return;
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
// Get an image size
$max_width = $config->image_mark_max_width;
@ -865,7 +865,7 @@ class memberController extends member
if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$image_mark = $oMemberModel->getImageMark($member_srl);
FileHandler::removeFile($image_mark->file);
}
@ -882,8 +882,8 @@ class memberController extends member
$email_address = Context::get('email_address');
if(!$email_address) return new Object(-1, 'msg_invalid_request');
$oMemberModel = &getModel('member');
$oModuleModel = &getModel('module');
$oMemberModel = getModel('member');
$oModuleModel = getModel('module');
// Check if a member having the same email address exists
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
@ -952,7 +952,7 @@ class memberController extends member
$oTemplate = &TemplateHandler::getInstance();
$content = $oTemplate->compile($tpl_path, 'find_member_account_mail');
// Get information of the Webmaster
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
// Send a mail
$oMail = new Mail();
@ -978,7 +978,7 @@ class memberController extends member
*/
function procMemberFindAccountByQuestion()
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$config = $oMemberModel->getMemberConfig();
$email_address = Context::get('email_address');
@ -988,7 +988,7 @@ class memberController extends member
if(($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) return new Object(-1, 'msg_invalid_request');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// Check if a member having the same email address exists
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
@ -1078,7 +1078,7 @@ class memberController extends member
$member_srl = Context::get('member_srl');
if(!$member_srl) return new Object(-1, 'msg_invalid_request');
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// Get information of the member
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
// Check if the member is set to allow a request to re-send an authentication mail
@ -1104,7 +1104,7 @@ class memberController extends member
Context::set('auth_args', $auth_args);
Context::set('memberInfo', $member_info);
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
if(!$member_config->skin) $member_config->skin = "default";
if(!$member_config->colorset) $member_config->colorset = "white";
@ -1120,7 +1120,7 @@ class memberController extends member
$oTemplate = &TemplateHandler::getInstance();
$content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
// Get information of the Webmaster
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
// Send a mail
$oMail = new Mail();
@ -1145,7 +1145,7 @@ class memberController extends member
$email_address = Context::get('email_address');
if(!$email_address) return $this->stop('msg_invalid_request');
// Log test by using email_address
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$args = new stdClass;
$args->email_address = $email_address;
@ -1169,7 +1169,7 @@ class memberController extends member
// Get content of the email to send a member
Context::set('memberInfo', $memberInfo);
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
if(!$member_config->skin) $member_config->skin = "default";
if(!$member_config->colorset) $member_config->colorset = "white";
@ -1185,7 +1185,7 @@ class memberController extends member
$oTemplate = &TemplateHandler::getInstance();
$content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
// Get information of the Webmaster
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
// Send a mail
$oMail = new Mail();
@ -1219,7 +1219,7 @@ class memberController extends member
return $this->stop('msg_invalid_request');
}
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
if($member_srl)
{
@ -1271,7 +1271,7 @@ class memberController extends member
function _sendAuthMail($auth_args, $member_info)
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$member_config = $oMemberModel->getMemberConfig();
// Get content of the email to send a member
Context::set('auth_args', $auth_args);
@ -1332,7 +1332,7 @@ class memberController extends member
$logged_info = Context::get('logged_info');
if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$columnList = array('site_srl', 'group_srl', 'title');
$default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl, $columnList);
$this->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, $site_module_info->site_srl);
@ -1384,7 +1384,7 @@ class memberController extends member
$agreement = trim($args->agreement);
unset($args->agreement);
$oModuleController = &getController('module');
$oModuleController = getController('module');
$output = $oModuleController->insertModuleConfig('member',$args);
if(!$output->toBool()) return $output;
@ -1531,7 +1531,7 @@ class memberController extends member
return;
}
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$config = $oMemberModel->getMemberConfig();
$user_id = ($config->identifier == 'user_id') ? $output->data->user_id : $output->data->email_address;
@ -1551,14 +1551,14 @@ class memberController extends member
if($key == $args->autologin_key)
{
// Check change_password_date
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
$limit_date = $member_config->change_password_date;
// Check if change_password_date is set
if($limit_date > 0)
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$columnList = array('member_srl', 'change_password_date');
if($config->identifier == 'user_id')
@ -1612,7 +1612,7 @@ class memberController extends member
$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'before', $trigger_obj);
if(!$trigger_output->toBool()) return $trigger_output;
// Create a member model object
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// check IP access count.
$config = $oMemberModel->getMemberConfig();
@ -1705,7 +1705,7 @@ class memberController extends member
$content = sprintf(Context::getLang('login_fail_report_contents'),$message,date('Y-m-d h:i:sa'));
//send message
$oCommunicationController = &getController('communication');
$oCommunicationController = getController('communication');
$oCommunicationController->sendMessage($args->member_srl, $args->member_srl, $title, $content, true);
if($this->memberInfo->email_address && $this->memberInfo->allow_mailing == 'Y')
@ -1739,7 +1739,7 @@ class memberController extends member
}
if($this->memberInfo->is_admin == 'Y')
{
$oMemberAdminModel = &getAdminModel('member');
$oMemberAdminModel = getAdminModel('member');
if(!$oMemberAdminModel->getMemberAdminIPCheck())
{
$_SESSION['denied_admin'] = 'Y';
@ -1756,7 +1756,7 @@ class memberController extends member
*/
function setSessionInfo()
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// If your information came through the current session information to extract information from the users
if(!$this->memberInfo && $_SESSION['member_srl'] && $oMemberModel->isLogged() )
{
@ -1787,7 +1787,7 @@ class memberController extends member
$group_srl_list = array_keys($this->memberInfo->group_list);
$_SESSION['group_srls'] = $group_srl_list;
// If the group is designated as an administrator administrator
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$admin_group = $oMemberModel->getAdminGroup();
if($admin_group->group_srl && in_array($admin_group->group_srl, $group_srl_list)) $_SESSION['is_admin'] = 'Y';
}
@ -1844,7 +1844,7 @@ class memberController extends member
$output = ModuleHandler::triggerCall('member.insertMember', 'before', $args);
if(!$output->toBool()) return $output;
// Terms and Conditions portion of the information set up by members reaffirmed
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
$logged_info = Context::get('logged_info');
@ -1880,7 +1880,7 @@ class memberController extends member
if($args->homepage && !preg_match("/^[a-z]+:\/\//i",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) $args->blog = 'http://'.$args->blog;
// Create a model object
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// ID check is prohibited
if($oMemberModel->isDeniedID($args->user_id)) return new Object(-1,'denied_user_id');
// ID, nickname, email address of the redundancy check
@ -2000,7 +2000,7 @@ class memberController extends member
$output = ModuleHandler::triggerCall('member.updateMember', 'before', $args);
if(!$output->toBool()) return $output;
// Create a model object
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$logged_info = Context::get('logged_info');
// Get what you want to modify the original information
@ -2176,7 +2176,7 @@ class memberController extends member
$output = ModuleHandler::triggerCall('member.deleteMember', 'before', $trigger_obj);
if(!$output->toBool()) return $output;
// Create a model object
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// Bringing the user's information
if(!$this->memberInfo)
{
@ -2272,7 +2272,7 @@ class memberController extends member
function _updatePointByGroup($memberSrl, $groupSrlList)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$pointModuleConfig = $oModuleModel->getModuleConfig('point');
$pointGroup = $pointModuleConfig->point_group;
@ -2289,12 +2289,12 @@ class memberController extends member
if($maxLevel > 0)
{
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
$originPoint = $oPointModel->getPoint($memberSrl);
if($pointModuleConfig->level_step[$maxLevel] > $originPoint)
{
$oPointController = &getController('point');
$oPointController = getController('point');
$oPointController->setPoint($memberSrl, $pointModuleConfig->level_step[$maxLevel], 'update');
}
}
@ -2309,7 +2309,7 @@ class memberController extends member
if(!$newEmail) return $this->stop('msg_invalid_request');
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
if($member_srl) return new Object(-1,'msg_exists_email_address');
@ -2326,7 +2326,7 @@ class memberController extends member
return $output;
}
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
@ -2404,7 +2404,7 @@ class memberController extends member
$logged_info = Context::get('logged_info');
$document_srl = Context::get('target_srl');
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$columnList = array('document_srl', 'module_srl', 'member_srl', 'ipaddress');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
$member_srl = $oDocument->get('member_srl');
@ -2413,7 +2413,7 @@ class memberController extends member
if(!$member_srl) return new Object();
if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object();
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
$oDocumentController->addDocumentPopupMenu($url,'cmd_spammer','','popup');
@ -2434,7 +2434,7 @@ class memberController extends member
$logged_info = Context::get('logged_info');
$comment_srl = Context::get('target_srl');
$oCommentModel = &getModel('comment');
$oCommentModel = getModel('comment');
$columnList = array('comment_srl', 'module_srl', 'member_srl', 'ipaddress');
$oComment = $oCommentModel->getComment($comment_srl, FALSE, $columnList);
$module_srl = $oComment->get('module_srl');
@ -2443,7 +2443,7 @@ class memberController extends member
if(!$member_srl) return new Object();
if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object();
$oCommentController = &getController('comment');
$oCommentController = getController('comment');
$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
$oCommentController->addCommentPopupMenu($url,'cmd_spammer','','popup');
@ -2469,7 +2469,7 @@ class memberController extends member
$isMoveToTrash = false;
// check grant
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, $logged_info);
@ -2478,8 +2478,8 @@ class memberController extends member
$proc_msg = "";
$oDocumentModel = &getModel('document');
$oCommentModel = &getModel('comment');
$oDocumentModel = getModel('document');
$oCommentModel = getModel('comment');
// delete or trash destination
// proc member
@ -2525,13 +2525,13 @@ class memberController extends member
$logged_info = Context::get('logged_info');
$spam_description = trim( Context::get('spam_description') );
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$columnList = array('member_srl', 'description');
// get member current infomation
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
$oDocumentModel = &getModel('document');
$oCommentModel = &getModel('comment');
$oDocumentModel = getModel('document');
$oCommentModel = getModel('comment');
$cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl);
$cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl);
$total_count = $cnt_comment + $cnt_document;
@ -2556,10 +2556,10 @@ class memberController extends member
* @return object
**/
private function _spammerDocuments($member_srl, $isMoveToTrash) {
$oDocumentController = &getController('document');
$oDocumentModel = &getModel('document');
$oCommentController = &getController('comment');
$oCommentModel = &getModel('comment');
$oDocumentController = getController('document');
$oDocumentModel = getModel('document');
$oCommentController = getController('comment');
$oCommentModel = getModel('comment');
// delete count by one request
$getContentsCount = 10;

6
modules/member/member.mobile.php
View file

@ -12,7 +12,7 @@ class memberMobile extends memberView
function init()
{
// Get the member configuration
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$this->member_config = $oMemberModel->getMemberConfig();
Context::set('member_config', $this->member_config);
$oSecurity = new Security();
@ -35,7 +35,7 @@ class memberMobile extends memberView
$member_srl = Context::get('member_srl');
if($member_srl)
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
if(!$this->memberInfo)
{
@ -49,7 +49,7 @@ class memberMobile extends memberView
$this->setTemplatePath($template_path);
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayout($this->member_config->mlayout_srl);
if($layout_info)
{

18
modules/member/member.model.php
View file

@ -32,7 +32,7 @@ class memberModel extends member
}
// Get member configuration stored in the DB
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if(!$config->signupForm || !is_array($config->signupForm))
@ -128,7 +128,7 @@ class memberModel extends member
ModuleHandler::triggerCall('member.getMemberMenu', 'before', $null);
$oMemberController = &getController('member');
$oMemberController = getController('member');
// Display member information (Don't display to non-logged user)
if($logged_info->member_srl)
{
@ -214,7 +214,7 @@ class memberModel extends member
{
$logged_info->group_list = $this->getMemberGroups($logged_info->member_srl, $site_module_info->site_srl);
// Add is_site_admin bool variable into logged_info if site_administrator is
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
if($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_site_admin = true;
else $logged_info->is_site_admin = false;
}
@ -224,7 +224,7 @@ class memberModel extends member
if(!count($logged_info->group_list))
{
$default_group = $this->getDefaultGroup(0);
$oMemberController = &getController('member');
$oMemberController = getController('member');
$oMemberController->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, 0);
$groups[$default_group->group_srl] = $default_group->title;
$logged_info->group_list = $groups;
@ -314,7 +314,7 @@ class memberModel extends member
{
if(!$GLOBALS['__member_info__'][$info->member_srl])
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
@ -897,7 +897,7 @@ class memberModel extends member
{
if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]))
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if($config->group_image_mark!='Y')
{
@ -969,7 +969,7 @@ class memberModel extends member
$args = new stdClass();
$args->member_srl = $member_srl;
$args->hashed_password = md5(sha1(md5($password_text)));
$oMemberController = &getController('member');
$oMemberController = getController('member');
$oMemberController->updateMemberPassword($args);
}
return true;
@ -983,7 +983,7 @@ class memberModel extends member
$args = new stdClass();
$args->member_srl = $member_srl;
$args->hashed_password = md5(sha1(md5($password_text)));
$oMemberController = &getController('member');
$oMemberController = getController('member');
$oMemberController->updateMemberPassword($args);
}
return true;
@ -1000,7 +1000,7 @@ class memberModel extends member
$args = new stdClass();
$args->member_srl = $member_srl;
$args->hashed_password = md5(sha1(md5($password_text)));
$oMemberController = &getController('member');
$oMemberController = getController('member');
$oMemberController->updateMemberPassword($args);
}
return true;

44
modules/member/member.view.php
View file

@ -17,7 +17,7 @@ class memberView extends member
function init()
{
// Get the member configuration
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$this->member_config = $oMemberModel->getMemberConfig();
Context::set('member_config', $this->member_config);
$oSecurity = new Security();
@ -46,7 +46,7 @@ class memberView extends member
// Template path
$this->setTemplatePath($template_path);
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayout($this->member_config->layout_srl);
if($layout_info)
{
@ -60,7 +60,7 @@ class memberView extends member
*/
function dispMemberInfo()
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$logged_info = Context::get('logged_info');
// Don't display member info to non-logged user
if(!$logged_info->member_srl) return $this->stop('msg_not_permitted');
@ -196,7 +196,7 @@ class memberView extends member
$member_config = $this->member_config;
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// Get the member information if logged-in
if($oMemberModel->isLogged()) return $this->stop('msg_already_logged');
// call a trigger (before)
@ -205,7 +205,7 @@ class memberView extends member
// Error appears if the member is not allowed to join
if($member_config->enable_join != 'Y') return $this->stop('msg_signup_disabled');
$oMemberAdminView = &getAdminView('member');
$oMemberAdminView = getAdminView('member');
$formTags = $oMemberAdminView->_getMemberInputTag($member_info);
Context::set('formTags', $formTags);
@ -225,7 +225,7 @@ class memberView extends member
function dispMemberModifyInfoBefore()
{
$logged_info = Context::get('logged_info');
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
if(!$oMemberModel->isLogged() || empty($logged_info))
{
return $this->stop('msg_not_logged');
@ -269,7 +269,7 @@ class memberView extends member
$member_config = $this->member_config;
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
@ -287,7 +287,7 @@ class memberView extends member
// Editor of the module set for signing by calling getEditor
if($member_info->member_srl)
{
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$option = new stdClass();
$option->primary_key_name = 'member_srl';
$option->content_key_name = 'signature';
@ -306,7 +306,7 @@ class memberView extends member
$this->member_info = $member_info;
$oMemberAdminView = &getAdminView('member');
$oMemberAdminView = getAdminView('member');
$formTags = $oMemberAdminView->_getMemberInputTag($member_info);
Context::set('formTags', $formTags);
@ -328,7 +328,7 @@ class memberView extends member
*/
function dispMemberOwnDocument()
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
@ -340,7 +340,7 @@ class memberView extends member
Context::set('search_target','member_srl');
Context::set('search_keyword',$member_srl);
$oDocumentAdminView = &getAdminView('document');
$oDocumentAdminView = getAdminView('document');
$oDocumentAdminView->dispDocumentAdminList();
Context::set('module_srl', $module_srl);
@ -352,7 +352,7 @@ class memberView extends member
*/
function dispMemberScrappedDocument()
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
@ -376,7 +376,7 @@ class memberView extends member
*/
function dispMemberSavedDocument()
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
// Get the saved document(module_srl is set to member_srl instead)
@ -386,7 +386,7 @@ class memberView extends member
$args->page = (int)Context::get('page');
$args->statusList = array('TEMP');
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$output = $oDocumentModel->getDocumentList($args, true);
Context::set('total_count', $output->total_count);
Context::set('total_page', $output->total_page);
@ -411,7 +411,7 @@ class memberView extends member
}
// get member module configuration.
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$config = $this->member_config;
Context::set('identifier', $config->identifier);
@ -425,7 +425,7 @@ class memberView extends member
*/
function dispMemberModifyPassword()
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
@ -457,7 +457,7 @@ class memberView extends member
*/
function dispMemberLeave()
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
@ -488,7 +488,7 @@ class memberView extends member
*/
function dispMemberLogout()
{
$oMemberController = &getController('member');
$oMemberController = getController('member');
$output = $oMemberController->procMemberLogout();
if(!$output->redirect_url)
$this->setRedirectUrl(getNotEncodedUrl('act', ''));
@ -554,7 +554,7 @@ class memberView extends member
if($authMemberSrl)
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$memberInfo = $oMemberModel->getMemberInfoByMemberSrl($authMemberSrl);
$_SESSION['auth_member_info'] = $memberInfo;
@ -580,7 +580,7 @@ class memberView extends member
*/
function addExtraFormValidatorMessage()
{
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$extraList = $oMemberModel->getUsedJoinFormList();
$js_code = array();
@ -625,14 +625,14 @@ class memberView extends member
$module_srl = Context::get('module_srl');
// check grant
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) return new Object(-1,'msg_not_permitted');
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
Context::loadLang('modules/document/lang/');
Context::set('spammer_info', $oMemberModel->getMemberInfoByMemberSrl($member_srl));

84
modules/menu/menu.admin.controller.php
View file

@ -132,10 +132,10 @@ class menuAdminController extends menu
{
$menu_srl = Context::get('menu_srl');
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$menuInfo = $oMenuAdminModel->getMenu($menu_srl);
$oAdmin = &getClass('admin');
$oAdmin = getClass('admin');
if($menuInfo->title == $oAdmin->getAdminMenuName())
return new Object(-1, 'msg_adminmenu_cannot_delete');
@ -149,7 +149,7 @@ class menuAdminController extends menu
}
// check home menu in originMenu
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$siteInfo = $oModuleModel->getSiteInfo($menuInfo->site_srl);
$isStartmenuInclude = false;
@ -195,7 +195,7 @@ class menuAdminController extends menu
$args = new stdClass();
$args->menu_srl = $menu_srl;
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$menuInfo = $oMenuAdminModel->getMenu($args->menu_srl);
// Delete modules
@ -206,7 +206,7 @@ class menuAdminController extends menu
}
$oModuleController = getController('module');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
foreach($output->data as $itemInfo)
{
@ -309,7 +309,7 @@ class menuAdminController extends menu
private function _setMenuSrl(&$parent_srl, &$menu_srl)
{
// set menu srl
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$itemInfo = $oMenuAdminModel->getMenuItemInfo($parent_srl);
// parent_srl is parent menu item's srl
if($itemInfo->menu_srl)
@ -356,7 +356,7 @@ class menuAdminController extends menu
else if(is_numeric($request->shortcut_target))
{
// Get original information
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$itemInfo = $oMenuAdminModel->getMenuItemInfo($request->shortcut_target);
if(!$itemInfo->menu_item_srl)
{
@ -495,14 +495,14 @@ class menuAdminController extends menu
$cmArgs->mid = $request->module_id;
// check already created module instance
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$output = $oModuleModel->getModuleInfoByMid($request->module_id);
if($output->module_srl)
{
return new Object(-1, 'msg_module_name_exists');
}
$oModuleController = &getController('module');
$oModuleController = getController('module');
$output = $oModuleController->insertModule($cmArgs);
return $output;
@ -526,7 +526,7 @@ class menuAdminController extends menu
if($request->menu_expand != "Y") $request->menu_expand = "N";
// Get original information
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$itemInfo = $oMenuAdminModel->getMenuItemInfo($request->menu_item_srl);
$args = $itemInfo;
@ -559,7 +559,7 @@ class menuAdminController extends menu
else
{
// check already created module instance
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
if($request->module_id != $itemInfo->url)
{
$output = $oModuleModel->getModuleInfoByMid($request->module_id);
@ -581,7 +581,7 @@ class menuAdminController extends menu
{
$moduleInfo->browser_title = $request->browser_title;
}
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->updateModule($moduleInfo);
$args->url = $request->module_id;
}
@ -617,7 +617,7 @@ class menuAdminController extends menu
{
$args = Context::getRequestVars();
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$item_info = $oMenuAdminModel->getMenuItemInfo($args->menu_item_srl);
$args->menu_srl = $item_info->menu_srl;
@ -708,8 +708,8 @@ class menuAdminController extends menu
*/
public function deleteItem($args)
{
$oModuleModel = &getModel('module');
$oMenuAdminModel = &getAdminModel('menu');
$oModuleModel = getModel('module');
$oMenuAdminModel = getAdminModel('menu');
// Get original information
$itemInfo = $oMenuAdminModel->getMenuItemInfo($args->menu_item_srl);
@ -731,7 +731,7 @@ class menuAdminController extends menu
$menu_title = $menuInfo->title;
// check admin menu delete
$oAdmin = &getClass('admin');
$oAdmin = getClass('admin');
if($menu_title == $oAdmin->getAdminMenuName() && $itemInfo->parent_srl == 0)
{
return $this->stop('msg_cannot_delete_for_admin_topmenu');
@ -819,7 +819,7 @@ class menuAdminController extends menu
if($node['is_shortcut'] != 'Y' && strncasecmp('http', $node['url'], 4) !== 0)
{
$oModuleController = getController('module');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// reference menu's url modify
$args->url = $node['url'];
@ -882,7 +882,7 @@ class menuAdminController extends menu
if(!$mode || !$parent_srl || !$target_srl) return new Object(-1,'msg_invalid_request');
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
// get original menu item info for cache file recreate
$originalItemInfo = $oMenuAdminModel->getMenuItemInfo($target_srl);
@ -922,8 +922,8 @@ class menuAdminController extends menu
if(!$this->homeModuleMid)
{
$oModuleModel = &getModel('module');
$oMenuAdminController = &getAdminController('menu');
$oModuleModel = getModel('module');
$oMenuAdminController = getAdminController('menu');
$columnList = array('modules.mid',);
$output = $oModuleModel->getSiteInfo(0, $columnList);
if($output->mid)
@ -959,12 +959,12 @@ class menuAdminController extends menu
//module's menu_srl move also
if($node['is_shortcut'] == 'N' && !empty($node['url']))
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$moduleInfo = $oModuleModel->getModuleInfoByMid($node['url']);
if($menu_srl != $moduleInfo->menu_srl)
{
$moduleInfo->menu_srl = $menu_srl;
$oModuleController = &getController('module');
$oModuleController = getController('module');
$output = $oModuleController->updateModule($moduleInfo);
}
}
@ -986,7 +986,7 @@ class menuAdminController extends menu
$parentSrl = Context::get('parent_srl');
$menuItemSrl = Context::get('menu_item_srl');
$oMenuModel = &getAdminModel('menu');
$oMenuModel = getAdminModel('menu');
$itemInfo = $oMenuModel->getMenuItemInfo($menuItemSrl);
$menuSrl = $itemInfo->menu_srl;
@ -1038,7 +1038,7 @@ class menuAdminController extends menu
private function _copyMenu($menuSrl, $parentSrl, &$originMenu)
{
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$menuItemInfo = $oMenuAdminModel->getMenuItemInfo($originMenu['node_srl']);
// default argument setting
@ -1059,7 +1059,7 @@ class menuAdminController extends menu
// if menu have a reference of module instance
if($menuItemInfo->is_shortcut == 'N' && strncasecmp('http', $originMenu['url'], 4) !== 0 )
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$moduleInfo = $oModuleModel->getModuleInfoByMid($originMenu['url']);
$args->module_type = $moduleInfo->module;
@ -1067,7 +1067,7 @@ class menuAdminController extends menu
$args->module_id = $moduleInfo->module.'_'.$randomMid;
$args->layout_srl = $moduleInfo->layout_srl;
$oModuleAdminController = &getAdminController('module');
$oModuleAdminController = getAdminController('module');
$copyArg = new stdClass();
$copyArg->module_srl = $moduleInfo->module_srl;
$copyArg->mid_1 = $args->module_id;
@ -1259,7 +1259,7 @@ class menuAdminController extends menu
function moveMenuItem($menu_srl, $parent_srl, $source_srl, $target_srl, $mode, $isShortcut='Y', $url=NULL)
{
// Get the original menus
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$target_item = $oMenuAdminModel->getMenuItemInfo($target_srl);
if($target_item->menu_item_srl != $target_srl) return new Object(-1,'msg_invalid_request');
@ -1295,12 +1295,12 @@ class menuAdminController extends menu
//module's menu_srl move also
if($isShortcut == 'N' && !empty($url))
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$moduleInfo = $oModuleModel->getModuleInfoByMid($url);
if($menu_srl != $moduleInfo->menu_srl)
{
$moduleInfo->menu_srl = $menu_srl;
$oModuleController = &getController('module');
$oModuleController = getController('module');
$output = $oModuleController->updateModule($moduleInfo);
}
@ -1344,7 +1344,7 @@ class menuAdminController extends menu
// Check input value
$menu_srl = Context::get('menu_srl');
// Get information of the menu
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$menu_info = $oMenuAdminModel->getMenu($menu_srl);
$menu_title = $menu_info->title;
// Re-generate the xml file
@ -1415,7 +1415,7 @@ class menuAdminController extends menu
*/
function procMenuAdminAllActList()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$installed_module_list = $oModuleModel->getModulesXmlInfo();
if(is_array($installed_module_list))
{
@ -1444,14 +1444,14 @@ class menuAdminController extends menu
// variable setting
$logged_info = Context::get('logged_info');
//$oMenuAdminModel = &getAdminModel('menu');
$oMemberModel = &getModel('member');
//$oMenuAdminModel = getAdminModel('menu');
$oMemberModel = getModel('member');
//$parentMenuInfo = $oMenuAdminModel->getMenuItemInfo($requestArgs->parent_srl);
$groupSrlList = $oMemberModel->getMemberGroups($logged_info->member_srl);
//preg_match('/\{\$lang->menu_gnb\[(.*?)\]\}/i', $parentMenuInfo->name, $m);
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
//$info = $oModuleModel->getModuleInfoXml($moduleName);
$info = $oModuleModel->getModuleActionXml($moduleName);
@ -1482,7 +1482,7 @@ class menuAdminController extends menu
$args->listorder = -1*$args->menu_item_srl;
// Check if already exists
$oMenuModel = &getAdminModel('menu');
$oMenuModel = getAdminModel('menu');
$item_info = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
// Update if exists
if($item_info->menu_item_srl == $args->menu_item_srl)
@ -1517,7 +1517,7 @@ class menuAdminController extends menu
$exposure = Context::get('exposure');
$htPerm = Context::get('htPerm');
$oMenuModel = &getAdminModel('menu');
$oMenuModel = getAdminModel('menu');
$itemInfo = $oMenuModel->getMenuItemInfo($menuItemSrl);
$args = $itemInfo;
@ -1546,10 +1546,10 @@ class menuAdminController extends menu
// Module Access update
unset($args);
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$menuInfo = $oMenuAdminModel->getMenu($itemInfo->menu_srl);
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$moduleInfo = $oModuleModel->getModuleInfoByMid($itemInfo->url, $menuInfo->site_srl);
$xml_info = $oModuleModel->getModuleActionXML($moduleInfo->module);
@ -1615,7 +1615,7 @@ class menuAdminController extends menu
if($site_srl)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('sites.domain');
$site_info = $oModuleModel->getSiteInfo($site_srl, $columnList);
$domain = $site_info->domain;
@ -1728,7 +1728,7 @@ class menuAdminController extends menu
{
if(!$source_node) return;
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
foreach($source_node as $menu_item_srl => $node)
{
@ -1823,7 +1823,7 @@ class menuAdminController extends menu
$output = array("buff"=>"", "url_list"=>array());
if(!$source_node) return $output;
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
foreach($source_node as $menu_item_srl => $node)
{
@ -1972,7 +1972,7 @@ class menuAdminController extends menu
if($args->isNormalDelete == 'Y' || $args->isHoverDelete == 'Y' || $args->isActiveDelete == 'Y')
{
$oMenuModel = &getAdminModel('menu');
$oMenuModel = getAdminModel('menu');
$itemInfo = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
if($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) FileHandler::removeFile($itemInfo->normal_btn);

26
modules/menu/menu.admin.model.php
View file

@ -181,7 +181,7 @@ class menuAdminModel extends menu
}
else if(strncasecmp('http', $menuItem->url, 4) !== 0)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url, 0);
if(!$moduleInfo) $menuItem->moduleType = 'url';
else
@ -214,8 +214,8 @@ class menuAdminModel extends menu
}
// get groups
$oMemberModel = &getModel('member');
$oModuleAdminModel = &getAdminModel('module');
$oMemberModel = getModel('member');
$oModuleAdminModel = getAdminModel('module');
$output = $oMemberModel->getGroups();
if(is_array($output))
{
@ -237,7 +237,7 @@ class menuAdminModel extends menu
}
$menuItem->groupList = $groupList;
$oModuleController = &getController('module');
$oModuleController = getController('module');
$menuItem->name_key = $menuItem->name;
$oModuleController->replaceDefinedLangCode($menuItem->name);
@ -275,7 +275,7 @@ class menuAdminModel extends menu
$site_srl = (int)$site_module_info->site_srl;
}
// Get language code
$oModuleAdminModel = &getAdminModel('module');
$oModuleAdminModel = getAdminModel('module');
return $oModuleAdminModel->getLangCode($site_srl, $source_name, TRUE);
}
@ -290,7 +290,7 @@ class menuAdminModel extends menu
$menu_item_srl = Context::get('menu_item_srl');
$parent_srl = Context::get('parent_srl');
// Get a list of member groups
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$group_list = $oMemberModel->getGroups();
Context::set('group_list', $group_list);
@ -393,7 +393,7 @@ class menuAdminModel extends menu
*/
function getModuleListInSitemap($site_srl = 0)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$moduleList = array('page');
$output = $oModuleModel->getModuleListByInstance($site_srl);
@ -482,8 +482,8 @@ class menuAdminModel extends menu
$siteSrl = (int)$site_module_info->site_srl;
}
$oModuleModel = &getModel('module');
$oMenuAdminController = &getAdminController('menu');
$oModuleModel = getModel('module');
$oMenuAdminController = getAdminController('menu');
$columnList = array('modules.mid', 'modules.browser_title', 'sites.index_module_srl');
$start_module = $oModuleModel->getSiteInfo(0, $columnList);
@ -520,7 +520,7 @@ class menuAdminModel extends menu
$menuListFromDB = $this->getMenus($siteSrl);
if(is_array($menuListFromDB))
{
$oAdmin = &getClass('admin');
$oAdmin = getClass('admin');
foreach($menuListFromDB AS $key=>$value)
{
if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
@ -596,7 +596,7 @@ class menuAdminModel extends menu
}
// get module info
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$moduleInfo = $oModuleModel->getModuleInfoByMid($menuItemInfo->url);
// get xml info
@ -609,7 +609,7 @@ class menuAdminModel extends menu
if($moduleConfInfo->simple_setup_index_act)
{
$oTargetmoduleAdminModel = &getAdminModel($moduleInfo->module);
$oTargetmoduleAdminModel = getAdminModel($moduleInfo->module);
$advancedSetupUrl = getUrl('', 'module', 'admin', 'act', $moduleConfInfo->setup_index_act, 'module_srl', $moduleInfo->module_srl);
$simpleSetupHtml = $oTargetmoduleAdminModel->{$moduleConfInfo->simple_setup_index_act}($moduleInfo->module_srl, $advancedSetupUrl);
@ -628,7 +628,7 @@ class menuAdminModel extends menu
*/
private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed, $menuSrl,$siteSrl = 0)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// if url is empty and is_shortcut is 'N', change to is_shortcut 'Y'
if(!$menu['url'] && $menu['is_shortcut'] == 'N')
{

14
modules/menu/menu.admin.view.php
View file

@ -39,9 +39,9 @@ class menuAdminView extends menu
else $site_srl = (int)$site_module_info->site_srl;
}
$oAdmin = &getClass('admin');
$oAdmin = getClass('admin');
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$menuListFromDB = $oMenuAdminModel->getMenus();
if(is_array($menuListFromDB)) $output = array_reverse($menuListFromDB);
@ -79,11 +79,11 @@ class menuAdminView extends menu
Context::set('menu_list', $menuList);
// get installed module list
$oPageController = &getController('page'); //for lang
$oPageController = getController('page'); //for lang
$resultModuleList = $oMenuAdminModel->getModuleListInSitemap($site_srl);
Context::set('module_list', $resultModuleList);
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layoutList = $oLayoutModel->getLayoutList();
Context::set('layout_list', $layoutList);
@ -96,13 +96,13 @@ class menuAdminView extends menu
}
else
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$default_mid = $oModuleModel->getDefaultMid();
Context::set('current_layout', $default_mid->layout_srl);
}
// get default group list
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$output = $oMemberModel->getGroups();
if(is_array($output))
{
@ -135,7 +135,7 @@ class menuAdminView extends menu
*/
function _menuInfoSetting(&$menu)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
if($menu['url'] && strncasecmp('http', $menu['url'], 4) !== 0)
{
unset($midInfo);

10
modules/menu/menu.class.php
View file

@ -66,7 +66,7 @@ class menu extends ModuleObject
$oDB->addColumn('menu_item', 'is_shortcut', 'char', 1, 'N');
// check empty url and change shortcut type
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminModel = getAdminModel('menu');
$output = $oMenuAdminModel->getMenus();
if(is_array($output))
@ -98,7 +98,7 @@ class menu extends ModuleObject
}
}
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// if duplicate reference, change type to shortcut
$shortcutItemList = array_diff_assoc($menuItemAllList, $menuItemUniqueList);
foreach($output AS $key=>$value)
@ -145,11 +145,11 @@ class menu extends ModuleObject
*/
function recompileCache()
{
$oMenuAdminController = &getAdminController('menu');
$oMenuAdminModel = &getAdminModel('menu');
$oMenuAdminController = getAdminController('menu');
$oMenuAdminModel = getAdminModel('menu');
// get home module id
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('modules.mid',);
$output = $oModuleModel->getSiteInfo(0, $columnList);
$homeModuleMid = $output->mid;

2
modules/message/message.admin.controller.php
View file

@ -22,7 +22,7 @@ class messageAdminController extends message
// Get information
$args = Context::gets('skin', 'mskin', 'colorset', 'mcolorset');
// Create a module Controller object
$oModuleController = &getController('module');
$oModuleController = getController('module');
$output = $oModuleController->insertModuleConfig('message',$args);
if(!$output->toBool()) return $output;

2
modules/message/message.admin.view.php
View file

@ -20,7 +20,7 @@ class messageAdminView extends message
function dispMessageAdminConfig()
{
// Get a list of skins(themes)
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$skin_list = $oModuleModel->getskins($this->module_path);
Context::set('skin_list', $skin_list);

6
modules/message/message.class.php
View file

@ -20,7 +20,7 @@ class message extends ModuleObject
*/
function checkUpdate()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('message');
if($config->skin)
@ -40,7 +40,7 @@ class message extends ModuleObject
*/
function moduleUpdate()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('message');
if($config->skin)
@ -52,7 +52,7 @@ class message extends ModuleObject
if(is_dir($template_path))
{
$config->skin = implode('|@|', $config_parse);
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->updateModuleConfig('message', $config);
}
}

4
modules/message/message.mobile.php
View file

@ -16,13 +16,13 @@ class messageMobile extends messageView
function dispMessage()
{
// Get configurations (using module model object)
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('message');
if(!$config->mskin) $config->mskin = 'default';
// Set the template path
$template_path = sprintf('%sm.skins/%s', $this->module_path, $config->mskin);
// Get the member configuration
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
Context::set('member_config', $member_config);
// Set a flag to check if the https connection is made when using SSL and create https url

2
modules/message/message.view.php
View file

@ -20,7 +20,7 @@ class messageView extends message
function dispMessage()
{
// Get configurations (using module model object)
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$this->module_config = $config = $oModuleModel->getModuleConfig('message', $this->module_info->site_srl);
if(!$config)

26
modules/module/module.admin.controller.php
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');

20
modules/module/module.admin.model.php
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;

24
modules/module/module.admin.view.php
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;

14
modules/module/module.class.php
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();
}
}

44
modules/module/module.controller.php
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);

12
modules/module/module.model.php
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);

6
modules/module/module.view.php
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);

34
modules/page/page.admin.controller.php
View file

@ -20,8 +20,8 @@ class pageAdminController extends page
function procPageAdminInsert()
{
// Create model/controller object of the module module
$oModuleController = &getController('module');
$oModuleModel = &getModel('module');
$oModuleController = getController('module');
$oModuleModel = getModel('module');
// Set board module
$args = Context::getRequestVars();
$args->module = 'page';
@ -131,7 +131,7 @@ class pageAdminController extends page
$mcontent = Context::get('mcontent');
$type = Context::get('type');
// Guhaeom won information page
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
if($type == "mobile")
{
@ -148,8 +148,8 @@ class pageAdminController extends page
$this->putDocumentsInPageToArray($module_info->content, $document_srls);
$this->putDocumentsInPageToArray($module_info->mcontent, $document_srls);
$oDocumentModel = &getModel('document');
$oDocumentController = &getController('document');
$oDocumentModel = getModel('document');
$oDocumentController = getController('document');
$obj = new stdClass();
$obj->module_srl = $module_srl;
$obj->list_count = 99999999;
@ -163,12 +163,12 @@ class pageAdminController extends page
}
}
// Creates an object of the controller module module
$oModuleController = &getController('module');
$oModuleController = getController('module');
// Save
$output = $oModuleController->updateModule($module_info);
if(!$output->toBool()) return $output;
// On the page, change the validity status of the attached file
$oFileController = &getController('file');
$oFileController = getController('file');
$oFileController->setFilesValid($module_info->module_srl);
// Create cache file
//$this->procPageAdminRemoveWidgetCache();
@ -186,7 +186,7 @@ class pageAdminController extends page
{
$module_srl = Context::get('module_srl');
// Get an original
$oModuleController = &getController('module');
$oModuleController = getController('module');
$output = $oModuleController->deleteModule($module_srl);
if(!$output->toBool()) return $output;
@ -206,7 +206,7 @@ class pageAdminController extends page
// Get the basic information
$args = Context::getRequestVars();
// Insert by creating the module Controller object
$oModuleController = &getController('module');
$oModuleController = getController('module');
$output = $oModuleController->insertModuleConfig('page',$args);
return $output;
}
@ -220,7 +220,7 @@ class pageAdminController extends page
$upload_target_srl = Context::get('upload_target_srl');
$module_srl = Context::get('module_srl');
// Create the controller object file class
$oFileController = &getController('file');
$oFileController = getController('file');
$output = $oFileController->insertFile($module_srl, $upload_target_srl);
// Attachment to the output of the list, java script
$oFileController->printUploadedFileList($upload_target_srl);
@ -237,7 +237,7 @@ class pageAdminController extends page
$module_srl = Context::get('module_srl');
$file_srl = Context::get('file_srl');
// Create the controller object file class
$oFileController = &getController('file');
$oFileController = getController('file');
if($file_srl) $output = $oFileController->deleteFile($file_srl, $this->grant->manager);
// Attachment to the output of the list, java script
$oFileController->printUploadedFileList($upload_target_srl);
@ -250,13 +250,13 @@ class pageAdminController extends page
{
$module_srl = Context::get('module_srl');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'content');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
$content = $module_info->content;
// widget controller re-run of the cache files
$oWidgetController = &getController('widget');
$oWidgetController = getController('widget');
$oWidgetController->recompileWidget($content);
if($module_info->page_type == 'WIDGET')
@ -281,7 +281,7 @@ class pageAdminController extends page
{
$logged_info = Context::get('logged_info');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$grant = $oModuleModel->getGrant($this->module_info, $logged_info);
if (!$grant->manager)
@ -299,10 +299,10 @@ class pageAdminController extends page
if($obj->title == '') $obj->title = 'Untitled';
// document module의 model 객체 생성
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
// document module의 controller 객체 생성
$oDocumentController = &getController('document');
$oDocumentController = getController('document');
// 이미 존재하는 글인지 체크
$oDocument = $oDocumentModel->getDocument($obj->document_srl, true);
@ -331,7 +331,7 @@ class pageAdminController extends page
$msg_code = 'success_registed';
$document_srl = $output->get('document_srl');
$oModuleController = &getController('module');
$oModuleController = getController('module');
$this->module_info->{$target} = $document_srl;
$oModuleController->updateModule($this->module_info);
}

26
modules/page/page.admin.view.php
View file

@ -19,7 +19,7 @@ class pageAdminView extends page
// Pre-check if module_srl exists. Set module_info if exists
$module_srl = Context::get('module_srl');
// Create module model object
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// module_srl two come over to save the module, putting the information in advance
if($module_srl)
{
@ -65,11 +65,11 @@ class pageAdminView extends page
if(in_array($search_target,$search_target_list) && $search_keyword) $args->{$search_target} = $search_keyword;
$output = executeQuery('page.getPageList', $args);
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$page_list = $oModuleModel->addModuleExtraVars($output->data);
moduleModel::syncModuleToSite($page_list);
$oModuleAdminModel = &getAdminModel('module'); /* @var $oModuleAdminModel moduleAdminModel */
$oModuleAdminModel = getAdminModel('module'); /* @var $oModuleAdminModel moduleAdminModel */
$tabChoice = array('tab1'=>1, 'tab3'=>1);
$selected_manage_content = $oModuleAdminModel->getSelectedManageHTML($this->xml_info->grant, $tabChoice, $this->module_path);
@ -105,13 +105,13 @@ class pageAdminView extends page
// If the layout is destined to add layout information haejum (layout_title, layout)
if($module_info->layout_srl)
{
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayout($module_info->layout_srl);
$module_info->layout = $layout_info->layout;
$module_info->layout_title = $layout_info->layout_title;
}
// Get a layout list
$oLayoutModel = &getModel('layout');
$oLayoutModel = getModel('layout');
$layout_list = $oLayoutModel->getLayoutList();
Context::set('layout_list', $layout_list);
@ -121,7 +121,7 @@ class pageAdminView extends page
if($this->module_info->page_type == 'ARTICLE')
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$skin_list = $oModuleModel->getSkins($this->module_path);
Context::set('skin_list',$skin_list);
@ -149,7 +149,7 @@ class pageAdminView extends page
// call by reference content from other modules to come take a year in advance for putting the variable declaration
$content = '';
$oEditorView = &getView('editor');
$oEditorView = getView('editor');
$oEditorView->triggerDispEditorAdditionSetup($content);
Context::set('setup_content', $content);
// Set a template file
@ -250,7 +250,7 @@ class pageAdminView extends page
// $content = str_replace('$', '&#36;', $content);
Context::set('page_content', $content);
// Set widget list
$oWidgetModel = &getModel('widget');
$oWidgetModel = getModel('widget');
$widget_list = $oWidgetModel->getDownloadedWidgetList();
Context::set('widget_list', $widget_list);
@ -264,7 +264,7 @@ class pageAdminView extends page
function _setArticleTypeContentModify($isMobile = false)
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument(0, true);
if($isMobile)
@ -303,7 +303,7 @@ class pageAdminView extends page
$module_srl = Context::get('module_srl');
if(!$module_srl) return $this->dispContent();
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module', 'mid');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
Context::set('module_info',$module_info);
@ -320,7 +320,7 @@ class pageAdminView extends page
function dispPageAdminGrantInfo()
{
// Common module settings page, call rights
$oModuleAdminModel = &getAdminModel('module');
$oModuleAdminModel = getAdminModel('module');
$grant_content = $oModuleAdminModel->getModuleGrantHTML($this->module_info->module_srl, $this->xml_info->grant);
Context::set('grant_content', $grant_content);
@ -335,7 +335,7 @@ class pageAdminView extends page
*/
function dispPageAdminSkinInfo()
{
$oModuleAdminModel = &getAdminModel('module');
$oModuleAdminModel = getAdminModel('module');
$skin_content = $oModuleAdminModel->getModuleSkinHTML($this->module_info->module_srl);
Context::set('skin_content', $skin_content);
@ -347,7 +347,7 @@ class pageAdminView extends page
*/
function dispPageAdminMobileSkinInfo()
{
$oModuleAdminModel = &getAdminModel('module');
$oModuleAdminModel = getAdminModel('module');
$skin_content = $oModuleAdminModel->getModuleMobileSkinHTML($this->module_info->module_srl);
Context::set('skin_content', $skin_content);

2
modules/page/page.api.php
View file

@ -13,7 +13,7 @@ class pageAPI extends page
function dispPageIndex(&$oModule)
{
$page_content = Context::get('page_content');
$oWidgetController = &getController('widget');
$oWidgetController = getController('widget');
$requestMethod = Context::getRequestMethod();
Context::setResponseMethod('HTML');

4
modules/page/page.mobile.php
View file

@ -68,7 +68,7 @@ class pageMobile extends pageView
}
else
{
$oWidgetController = &getController('widget');
$oWidgetController = getController('widget');
$page_content = $oWidgetController->transWidgetCode($this->module_info->mcontent);
FileHandler::writeFile($cache_file, $page_content);
}
@ -98,7 +98,7 @@ class pageMobile extends pageView
{
$oTemplate = &TemplateHandler::getInstance();
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument(0, true);
if($this->module_info->mdocument_srl)

6
modules/page/page.view.php
View file

@ -73,7 +73,7 @@ class pageView extends page
}
else
{
$oWidgetController = &getController('widget');
$oWidgetController = getController('widget');
$page_content = $oWidgetController->transWidgetCode($this->module_info->content);
FileHandler::writeFile($this->cache_file, $page_content);
}
@ -90,7 +90,7 @@ class pageView extends page
{
$oTemplate = &TemplateHandler::getInstance();
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument(0, true);
if($this->module_info->document_srl)
@ -143,7 +143,7 @@ class pageView extends page
$content = FileHandler::readFile($cache_file);
}
// Create opage controller
$oPageController = &getController('page');
$oPageController = getController('page');
// change url of image, css, javascript and so on if the page is from external server
$content = $oPageController->replaceSrc($content, $path);

2
modules/page/page.wap.php
View file

@ -17,7 +17,7 @@ class pageWap extends page
// Check permissions
if(!$this->grant->access) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
// The contents of the widget chuchulham
$oWidgetController = &getController('widget');
$oWidgetController = getController('widget');
$content = $oWidgetController->transWidgetCode($this->module_info->content);
$oMobile->setContent($content);
}

16
modules/point/point.admin.controller.php
View file

@ -20,7 +20,7 @@ class pointAdminController extends point
function procPointAdminInsertConfig()
{
// Get the configuration information
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
// Arrange variables
$args = Context::getRequestVars();
@ -50,7 +50,7 @@ class pointAdminController extends point
if($args->disable_read_document == 'Y') $config->disable_read_document = 'Y';
else $config->disable_read_document = 'N';
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$group_list = $oMemberModel->getGroups();
// Per-level group configurations
@ -81,7 +81,7 @@ class pointAdminController extends point
// A function to calculate per-level points
$config->expression = $args->expression;
// Save
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->insertModuleConfig('point', $config);
$this->setMessage('success_updated');
@ -109,7 +109,7 @@ class pointAdminController extends point
}
}
$oModuleController = &getController('module');
$oModuleController = getController('module');
if(count($module_config))
{
foreach($module_config as $module_srl => $config)
@ -138,7 +138,7 @@ class pointAdminController extends point
if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
else $module_srl = array($module_srl);
// Save configurations
$oModuleController = &getController('module');
$oModuleController = getController('module');
for($i=0;$i<count($module_srl);$i++)
{
$srl = trim($module_srl[$i]);
@ -186,7 +186,7 @@ class pointAdminController extends point
}
$point = $m[2];
$oPointController = &getController('point');
$oPointController = getController('point');
$output = $oPointController->setPoint($member_srl, (int)$point, $action);
$this->setError(-1);
@ -203,7 +203,7 @@ class pointAdminController extends point
{
@set_time_limit(0);
// Get per-module points information
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
$module_config = $oModuleModel->getModulePartConfigs('point');
@ -350,7 +350,7 @@ class pointAdminController extends point
if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
else $module_srl = array($module_srl);
// Save configurations
$oModuleController = &getController('module');
$oModuleController = getController('module');
for($i=0;$i<count($module_srl);$i++)
{
$srl = trim($module_srl[$i]);

12
modules/point/point.admin.view.php
View file

@ -13,7 +13,7 @@ class pointAdminView extends point
function init()
{
// Get teh configuration information
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
// Set the configuration variable
Context::set('config', $config);
@ -36,7 +36,7 @@ class pointAdminView extends point
$level_icon_list = FileHandler::readDir("./modules/point/icons");
Context::set('level_icon_list', $level_icon_list);
// Get the list of groups
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$group_list = $oMemberModel->getGroups();
$selected_group_list = array();
if(count($group_list))
@ -61,7 +61,7 @@ class pointAdminView extends point
function dispPointAdminModuleConfig()
{
// Get a list of mid
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'mid', 'browser_title');
$mid_list = $oModuleModel->getMidList(null, $columnList);
Context::set('mid_list', $mid_list);
@ -89,13 +89,13 @@ class pointAdminView extends point
*/
function dispPointAdminPointList()
{
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
$args = new stdClass();
$args->list_count = 20;
$args->page = Context::get('page');
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$memberConfig = $oMemberModel->getMemberConfig();
Context::set('identifier', $memberConfig->identifier);
@ -109,7 +109,7 @@ class pointAdminView extends point
Context::set('member_list', $output->data);
Context::set('page_navigation', $output->page_navigation);
// Create a member model object
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
// Get a list of groups
$this->group_list = $oMemberModel->getGroups();
Context::set('group_list', $this->group_list);

14
modules/point/point.class.php
View file

@ -13,11 +13,11 @@ class point extends ModuleObject
function moduleInstall()
{
// Registration in action forward (for using in the administrator mode)
$oModuleController = &getController('module');
$oModuleController = getController('module');
// Create a directory to store points information
FileHandler::makeDir('./files/member_extra_info/point');
$oModuleController = &getController('module');
$oModuleController = getController('module');
// The highest level
$config = new stdClass;
$config->max_level = 30;
@ -66,7 +66,7 @@ class point extends ModuleObject
// Save configurations
$oModuleController->insertModuleConfig('point', $config);
// Cash act list for faster execution
$oPointController = &getAdminController('point');
$oPointController = getAdminController('point');
$oPointController->cacheActList();
// Add a trigger for registration/insert document/insert comment/upload a file/download
$oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after');
@ -96,7 +96,7 @@ class point extends ModuleObject
function checkUpdate()
{
// Get the information of the point module
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// Add a trigger for registration/insert document/insert comment/upload a file/download
if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) return true;
if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) return true;
@ -128,8 +128,8 @@ class point extends ModuleObject
function moduleUpdate()
{
// Get the information of the point module
$oModuleModel = &getModel('module');
$oModuleController = &getController('module');
$oModuleModel = getModel('module');
$oModuleController = getController('module');
// Add a trigger for registration/insert document/insert comment/upload a file/download
if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after'))
$oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after');
@ -178,7 +178,7 @@ class point extends ModuleObject
function recompileCache()
{
// redefine point action file
$oPointAdminController = &getAdminController('point');
$oPointAdminController = getAdminController('point');
$oPointAdminController->cacheActList();
}
}

74
modules/point/point.controller.php
View file

@ -20,12 +20,12 @@ class pointController extends point
function triggerInsertMember(&$obj)
{
// Get the point module information
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
// Get the member_srl of the newly registered member
$member_srl = $obj->member_srl;
// Get the points of the member
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
$cur_point = $oPointModel->getPoint($member_srl, true);
$point = $config->signup_point;
@ -46,10 +46,10 @@ class pointController extends point
// If the last login is not today, give the points
if(substr($obj->last_login,0,8)==date("Ymd")) return new Object();
// Get the point module information
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
// Get the points of the member
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
$cur_point = $oPointModel->getPoint($member_srl, true);
$point = $config->login_point;
@ -65,7 +65,7 @@ class pointController extends point
*/
function triggerInsertDocument(&$obj)
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
if($obj->status != $oDocumentModel->getConfigStatus('temp'))
{
$module_srl = $obj->module_srl;
@ -74,11 +74,11 @@ class pointController extends point
// The fix to disable giving points for saving the document temporarily
if($module_srl == $member_srl) return new Object();
// Get the point module information
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
$module_config = $oModuleModel->getModulePartConfig('point',$module_srl);
// Get the points of the member
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
$cur_point = $oPointModel->getPoint($member_srl, true);
$point = $module_config['insert_document'];
@ -101,20 +101,20 @@ class pointController extends point
*/
function triggerUpdateDocument(&$obj)
{
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$document_srl = $obj->document_srl;
$oDocument = $oDocumentModel->getDocument($document_srl);
// if status is TEMP or PUBLIC... give not point, only status is empty
if($oDocument->get('status') == $oDocumentModel->getConfigStatus('temp') && $obj->status != $oDocumentModel->getConfigStatus('temp'))
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// Get the point module information
$config = $oModuleModel->getModuleConfig('point');
$module_config = $oModuleModel->getModulePartConfig('point',$obj->module_srl);
// Get the points of the member
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
$cur_point = $oPointModel->getPoint($oDocument->get('member_srl'), true);
$point = $module_config['insert_document'];
@ -139,11 +139,11 @@ class pointController extends point
$document_srl = $obj->document_srl;
$member_srl = $obj->member_srl;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($document_srl);
if(!$oDocument->isExists()) return new Object();
// Get the point module information
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
$module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl'));
// The process related to clearing the post comments
@ -168,7 +168,7 @@ class pointController extends point
if($member_srl) unset($member_srls[abs($member_srl)]);
if(!count($member_srls)) return new Object();
// Remove all the points for each member
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
// Get the points
$point = $module_config['download_file'];
foreach($member_srls as $member_srl => $cnt)
@ -194,10 +194,10 @@ class pointController extends point
$logged_info = Context::get('logged_info');
if(!$logged_info->member_srl) return new Object();
// Get the points of the member
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
$cur_point = $oPointModel->getPoint($member_srl, true);
// Get the point module information
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@ -226,15 +226,15 @@ class pointController extends point
if(!$module_srl || !$member_srl) return new Object();
// Do not increase the points if the member is the author of the post
$document_srl = $obj->document_srl;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($document_srl);
if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new Object();
// Get the point module information
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
// Get the points of the member
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
$cur_point = $oPointModel->getPoint($member_srl, true);
$point = $module_config['insert_comment'];
@ -251,9 +251,9 @@ class pointController extends point
*/
function triggerDeleteComment(&$obj)
{
$oModuleModel = &getModel('module');
$oPointModel = &getModel('point');
$oDocumentModel = &getModel('document');
$oModuleModel = getModel('module');
$oPointModel = getModel('point');
$oDocumentModel = getModel('document');
$module_srl = $obj->module_srl;
$member_srl = abs($obj->member_srl);
@ -301,11 +301,11 @@ class pointController extends point
$member_srl = $obj->member_srl;
if(!$module_srl || !$member_srl) return new Object();
// Get the point module information
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
// Get the points of the member
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
$cur_point = $oPointModel->getPoint($member_srl, true);
$point = $module_config['upload_file'];
@ -329,7 +329,7 @@ class pointController extends point
// Pass if it is your file
if(abs($obj->member_srl) == abs($member_srl)) return new Object();
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
// If it is set not to allow downloading for non-logged in users, do not permit
@ -339,7 +339,7 @@ class pointController extends point
else return new Object();
}
// Get the points of the member
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
$cur_point = $oPointModel->getPoint($member_srl, true);
// Get the points
$point = $module_config['download_file'];
@ -364,11 +364,11 @@ class pointController extends point
// Pass if it is your file
if(abs($obj->member_srl) == abs($member_srl)) return new Object();
// Get the point module information
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
// Get the points of the member
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
$cur_point = $oPointModel->getPoint($member_srl, true);
// Get the points
$point = $module_config['download_file'];
@ -386,8 +386,8 @@ class pointController extends point
*/
function triggerUpdateReadedCount(&$obj)
{
$oModuleModel = &getModel('module');
$oPointModel = &getModel('point');
$oModuleModel = getModel('module');
$oPointModel = getModel('point');
// Get visitor information
$logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl;
@ -446,11 +446,11 @@ class pointController extends point
$member_srl = $obj->member_srl;
if(!$module_srl || !$member_srl) return new Object();
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
$cur_point = $oPointModel->getPoint($member_srl, true);
if( $obj->point > 0 )
@ -482,9 +482,9 @@ class pointController extends point
if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
// Get configuration information
$oMemberModel = &getModel('member');
$oModuleModel = &getModel('module');
$oPointModel = &getModel('point');
$oMemberModel = getModel('member');
$oModuleModel = getModel('module');
$oPointModel = getModel('point');
$config = $oModuleModel->getModuleConfig('point');
// Get the default configuration information
@ -530,7 +530,7 @@ class pointController extends point
$oDB->begin();
// If there are points, update, if no, insert
$oPointModel = &getModel('point');
$oPointModel = getModel('point');
if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
else executeQuery("point.insertPoint", $args);
@ -657,10 +657,10 @@ class pointController extends point
function triggerCopyModule(&$obj)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$pointConfig = $oModuleModel->getModulePartConfig('point', $obj->originModuleSrl);
$oModuleController = &getController('module');
$oModuleController = getController('module');
if(is_array($obj->moduleSrlList))
{
foreach($obj->moduleSrlList AS $key=>$moduleSrl)

4
modules/point/point.model.php
View file

@ -99,7 +99,7 @@ class pointModel extends point
if(count($member_srls)==0) return;
array_unique($member_srls);
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
$info = array();
@ -180,7 +180,7 @@ class pointModel extends point
if($output->total_count)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
foreach($output->data as $key => $val)

2
modules/point/point.view.php
View file

@ -33,7 +33,7 @@ class pointView extends point
if(!$current_module_srl) return new Object();
}
// Get the configuration information
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('point');
if($current_module_srl)

4
modules/poll/poll.admin.controller.php
View file

@ -23,7 +23,7 @@ class pollAdminController extends poll
$config->skin = Context::get('skin');
$config->colorset = Context::get('colorset');
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->insertModuleConfig('poll', $config);
$this->setMessage('success_updated');
@ -65,7 +65,7 @@ class pollAdminController extends poll
{
$poll_index_srl = (int)Context::get('poll_index_srl');
$oPollAdminModel = &getAdminModel('poll');
$oPollAdminModel = getAdminModel('poll');
//$columnList = array('comment_srl');
$args = new stdClass;
$args->pollIndexSrlList = array($poll_index_srl);

4
modules/poll/poll.admin.model.php
View file

@ -45,8 +45,8 @@ class pollAdminModel extends poll
$poll_srl = Context::get('poll_srl');
$upload_target_srl = Context::get('upload_target_srl');
$oDocumentModel = &getModel('document');
$oCommentModel = &getModel('comment');
$oDocumentModel = getModel('document');
$oCommentModel = getModel('comment');
$oDocument = $oDocumentModel->getDocument($upload_target_srl);

10
modules/poll/poll.admin.view.php
View file

@ -48,7 +48,7 @@ class pollAdminView extends poll
$args->sort_index = 'P.list_order'; // Sorting value
// Get the list
$oPollAdminModel = &getAdminModel('poll');
$oPollAdminModel = getAdminModel('poll');
$output = $oPollAdminModel->getPollListWithMember($args);
// check poll type. document or comment
@ -60,11 +60,11 @@ class pollAdminView extends poll
$uploadTargetSrlList[] = $value->upload_target_srl;
}
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$targetDocumentOutput = $oDocumentModel->getDocuments($uploadTargetSrlList);
if(!is_array($targetDocumentOutput)) $targetDocumentOutput = array();
$oCommentModel = &getModel('comment');
$oCommentModel = getModel('comment');
$columnList = array('comment_srl', 'document_srl');
$targetCommentOutput = $oCommentModel->getComments($uploadTargetSrlList, $columnList);
if(!is_array($targetCommentOutput)) $targetCommentOutput = array();
@ -102,7 +102,7 @@ class pollAdminView extends poll
*/
function dispPollAdminConfig()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// Get the configuration information
$config = $oModuleModel->getModuleConfig('poll');
Context::set('config', $config);
@ -164,7 +164,7 @@ class pollAdminView extends poll
Context::set('poll',$poll);
// Configure the skin and the colorset for the default configuration
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$poll_config = $oModuleModel->getModuleConfig('poll');
Context::set('poll_config', $poll_config);

10
modules/poll/poll.class.php
View file

@ -13,9 +13,9 @@ class poll extends ModuleObject
function moduleInstall()
{
// Register in the action forward (to use in administrator mode)
$oModuleController = &getController('module');
$oModuleController = getController('module');
// Set the default skin
$oModuleController = &getController('module');
$oModuleController = getController('module');
$config = new stdClass;
$config->skin = 'default';
@ -37,7 +37,7 @@ class poll extends ModuleObject
*/
function checkUpdate()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// 2007.10.17 When deleting posts/comments delete the poll as well
if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) return true;
if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) return true;
@ -54,8 +54,8 @@ class poll extends ModuleObject
*/
function moduleUpdate()
{
$oModuleModel = &getModel('module');
$oModuleController = &getController('module');
$oModuleModel = getModel('module');
$oModuleController = getController('module');
// 2007.10.17 When deleting posts/comments delete the poll as well
if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after'))
$oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');

6
modules/poll/poll.controller.php
View file

@ -140,7 +140,7 @@ class pollController extends poll
// If there is no response item, display an error
if(!count($item_srls)) return new Object(-1, 'msg_check_poll_item');
// Make sure is the poll has already been taken
$oPollModel = &getModel('poll');
$oPollModel = getModel('poll');
if($oPollModel->isPolled($poll_srl)) return new Object(-1, 'msg_already_poll');
$oDB = &DB::getInstance();
@ -205,7 +205,7 @@ class pollController extends poll
$skin = Context::get('skin');
if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) $skin = 'default';
$oPollModel = &getModel('poll');
$oPollModel = getModel('poll');
$tpl = $oPollModel->getPollResultHtml($poll_srl, $skin);
$this->add('poll_srl', $poll_srl);
@ -224,7 +224,7 @@ class pollController extends poll
global $lang;
if(count($pollSrlList) > 0)
{
$oPollAdminModel = &getAdminModel('poll');
$oPollAdminModel = getAdminModel('poll');
$args = new stdClass;
$args->pollIndexSrlList = $pollSrlList;
$output = $oPollAdminModel->getPollListWithMember($args);

2
modules/poll/poll.model.php
View file

@ -149,7 +149,7 @@ class pollModel extends poll
{
$skin = Context::get('skin');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
for($i=0;$i<count($skin_info->colorset);$i++)

8
modules/rss/rss.admin.controller.php
View file

@ -23,7 +23,7 @@ class rssAdminController extends rss
*/
function procRssAdminInsertConfig()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$total_config = $oModuleModel->getModuleConfig('rss');
$config_vars = Context::getRequestVars();
@ -92,7 +92,7 @@ class rssAdminController extends rss
{
$delImage = Context::get('del_image');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$originConfig = $oModuleModel->getModuleConfig('rss');
// Get a variable for the delete request
@ -160,7 +160,7 @@ class rssAdminController extends rss
*/
function setFeedConfig($config)
{
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->insertModuleConfig('rss',$config);
return new Object();
}
@ -177,7 +177,7 @@ class rssAdminController extends rss
*/
function setRssModuleConfig($module_srl, $open_rss, $open_total_feed = 'N', $feed_description = 'N', $feed_copyright = 'N')
{
$oModuleController = &getController('module');
$oModuleController = getController('module');
$config = new stdClass;
$config->open_rss = $open_rss;
$config->open_total_feed = $open_total_feed;

4
modules/rss/rss.admin.view.php
View file

@ -25,14 +25,14 @@ class rssAdminView extends rss
*/
function dispRssAdminIndex()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$rss_config = $oModuleModel->getModulePartConfigs('rss');
$total_config = $oModuleModel->getModuleConfig('rss');
if(!$total_config)
{
$total_config = new stdClass();
}
$oRssModel = &getModel('rss');
$oRssModel = getModel('rss');
if($rss_config)
{

8
modules/rss/rss.class.php
View file

@ -15,7 +15,7 @@ class rss extends ModuleObject
function moduleInstall()
{
// Register in action forward
$oModuleController = &getController('module');
$oModuleController = getController('module');
$oModuleController->insertActionForward('rss', 'view', 'rss');
$oModuleController->insertActionForward('rss', 'view', 'atom');
@ -33,7 +33,7 @@ class rss extends ModuleObject
*/
function checkUpdate()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// Add the Action forward for atom
if(!$oModuleModel->getActionForward('atom')) return true;
// 2007. 10. Add a trigger for participating additional configurations of the service module
@ -56,8 +56,8 @@ class rss extends ModuleObject
*/
function moduleUpdate()
{
$oModuleModel = &getModel('module');
$oModuleController = &getController('module');
$oModuleModel = getModel('module');
$oModuleController = getController('module');
// Add atom act
if(!$oModuleModel->getActionForward('atom'))
$oModuleController->insertActionForward('rss', 'view', 'atom');

8
modules/rss/rss.controller.php
View file

@ -23,7 +23,7 @@ class rssController extends rss
*/
function triggerRssUrlInsert()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$total_config = $oModuleModel->getModuleConfig('rss');
$current_module_srl = Context::get('module_srl');
$site_module_info = Context::get('site_module_info');
@ -39,7 +39,7 @@ class rssController extends rss
if(!$current_module_srl) return new Object();
// Imported rss settings of the selected module
$oRssModel = &getModel('rss');
$oRssModel = getModel('rss');
$rss_config = $oRssModel->getRssModuleConfig($current_module_srl);
if($rss_config->open_rss != 'N')
@ -68,10 +68,10 @@ class rssController extends rss
function triggerCopyModule(&$obj)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$rssConfig = $oModuleModel->getModulePartConfig('rss', $obj->originModuleSrl);
$oModuleController = &getController('module');
$oModuleController = getController('module');
if(is_array($obj->moduleSrlList))
{
foreach($obj->moduleSrlList AS $key=>$moduleSrl)

2
modules/rss/rss.model.php
View file

@ -45,7 +45,7 @@ class rssModel extends rss
function getRssModuleConfig($module_srl)
{
// Get the configurations of the rss module
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$module_rss_config = $oModuleModel->getModulePartConfig('rss', $module_srl);
if(!$module_rss_config)
{

2
modules/session/session.admin.controller.php
View file

@ -19,7 +19,7 @@ class sessionAdminController extends session
*/
function procSessionAdminClear()
{
$oSessionController = &getController('session');
$oSessionController = getController('session');
$oSessionController->gc(0);
$this->add('result',Context::getLang('session_cleared'));

2
modules/session/session.class.php
View file

@ -47,7 +47,7 @@ class session extends ModuleObject
function moduleUpdate()
{
$oDB = &DB::getInstance();
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
if(!$oDB->isTableExists('session')) $oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');

4
modules/spamfilter/spamfilter.admin.controller.php
View file

@ -23,7 +23,7 @@ class spamfilterAdminController extends spamfilter
if($argsConfig->check_trackback!='Y') $argsConfig->check_trackback = 'N';
if($argsConfig->limits!='Y') $argsConfig->limits = 'N';
// Create and insert the module Controller object
$oModuleController = &getController('module');
$oModuleController = getController('module');
$moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter',$argsConfig);
if(!$moduleConfigOutput->toBool()) return $moduleConfigOutput;
@ -35,7 +35,7 @@ class spamfilterAdminController extends spamfilter
{
//스팸IP 추가
$ipaddress_list = Context::get('ipaddress_list');
$oSpamfilterController = &getController('spamfilter');
$oSpamfilterController = getController('spamfilter');
if($ipaddress_list)
{
$output = $oSpamfilterController->insertIP($ipaddress_list);

6
modules/spamfilter/spamfilter.admin.view.php
View file

@ -22,7 +22,7 @@ class spamfilterAdminView extends spamfilter
function dispSpamfilterAdminDeniedIPList()
{
// Get the list of denied IP addresses and words
$oSpamFilterModel = &getModel('spamfilter');
$oSpamFilterModel = getModel('spamfilter');
$ip_list = $oSpamFilterModel->getDeniedIPList();
Context::set('ip_list', $ip_list);
@ -40,7 +40,7 @@ class spamfilterAdminView extends spamfilter
function dispSpamfilterAdminDeniedWordList()
{
// Get the list of denied IP addresses and words
$oSpamFilterModel = &getModel('spamfilter');
$oSpamFilterModel = getModel('spamfilter');
$word_list = $oSpamFilterModel->getDeniedWordList();
Context::set('word_list', $word_list);
@ -57,7 +57,7 @@ class spamfilterAdminView extends spamfilter
function dispSpamfilterAdminConfigBlock()
{
// Get configurations (using module model object)
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('spamfilter');
Context::set('config',$config);

8
modules/spamfilter/spamfilter.class.php
View file

@ -13,7 +13,7 @@ class spamfilter extends ModuleObject
function moduleInstall()
{
// Register action forward (to use in administrator mode)
$oModuleController = &getController('module');
$oModuleController = getController('module');
// 2007.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
$oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
$oModuleController->insertTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
@ -33,7 +33,7 @@ class spamfilter extends ModuleObject
function checkUpdate()
{
$oDB = &DB::getInstance();
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// 2007.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
@ -61,8 +61,8 @@ class spamfilter extends ModuleObject
function moduleUpdate()
{
$oDB = &DB::getInstance();
$oModuleModel = &getModel('module');
$oModuleController = &getController('module');
$oModuleModel = getModel('module');
$oModuleController = getController('module');
// 2007.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
$oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');

10
modules/spamfilter/spamfilter.controller.php
View file

@ -39,7 +39,7 @@ class spamfilterController extends spamfilter
if($grant->manager) return new Object();
}
$oFilterModel = &getModel('spamfilter');
$oFilterModel = getModel('spamfilter');
// Check if the IP is prohibited
$output = $oFilterModel->isDeniedIP();
if(!$output->toBool()) return $output;
@ -76,7 +76,7 @@ class spamfilterController extends spamfilter
if($grant->manager) return new Object();
}
$oFilterModel = &getModel('spamfilter');
$oFilterModel = getModel('spamfilter');
// Check if the IP is prohibited
$output = $oFilterModel->isDeniedIP();
if(!$output->toBool()) return $output;
@ -104,7 +104,7 @@ class spamfilterController extends spamfilter
{
if($_SESSION['avoid_log']) return new Object();
$oFilterModel = &getModel('spamfilter');
$oFilterModel = getModel('spamfilter');
// Confirm if the trackbacks have been added more than once to your document
$output = $oFilterModel->isInsertedTrackback($obj->document_srl);
if(!$output->toBool()) return $output;
@ -117,8 +117,8 @@ class spamfilterController extends spamfilter
$output = $oFilterModel->isDeniedWord($text);
if(!$output->toBool()) return $output;
// Start Filtering
$oTrackbackModel = &getModel('trackback');
$oTrackbackController = &getController('trackback');
$oTrackbackModel = getModel('trackback');
$oTrackbackController = getController('trackback');
list($ipA,$ipB,$ipC,$ipD) = explode('.',$_SERVER['REMOTE_ADDR']);
$ipaddress = $ipA.'.'.$ipB.'.'.$ipC;

Some files were not shown because too many files have changed in this diff Show more