fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +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

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)