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

php7.2호환을 위해 변경한 클래스 Object 를 BaseObject으로 변경

Browse source
This commit is contained in:
BJRambo 2017-11-28 20:01:28 +09:00
parent f4c19a3e0f
commit f3f40f6859
109 changed files with 976 additions and 976 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -130,7 +130,7 @@ class layoutAdminController extends layout
$output = executeQuery('menu.getMenuItemByUrl', $tmpArgs);
if(!$output->toBool())
{
return new Object(-1, 'fail_to_update');
return new BaseObject(-1, 'fail_to_update');
}
$menu_srl = $output->data->menu_srl;
@ -313,7 +313,7 @@ class layoutAdminController extends layout
if(!$output->toBool())
{
return new Object(-1, $output->message);
return new BaseObject(-1, $output->message);
}
}
}
@ -334,7 +334,7 @@ class layoutAdminController extends layout
if(!$output->toBool()) return $output;
return new Object(0,'success_deleted');
return new BaseObject(0,'success_deleted');
}
/**
@ -356,7 +356,7 @@ class layoutAdminController extends layout
if(!$layout_srl || !$code || !$is_post)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
$oLayoutModel = getModel('layout');
@ -377,7 +377,7 @@ class layoutAdminController extends layout
function procLayoutAdminCodeReset()
{
$layout_srl = Context::get('layout_srl');
if(!$layout_srl) return new Object(-1, 'msg_invalid_request');
if(!$layout_srl) return new BaseObject(-1, 'msg_invalid_request');
// delete user layout file
$oLayoutModel = getModel('layout');
@ -480,13 +480,13 @@ class layoutAdminController extends layout
$oModuleModel = getModel('module');
$mid = Context::get('mid');
if(!$mid) return new Object(-1, 'msg_invalid_request');
if(!$mid) return new BaseObject(-1, 'msg_invalid_request');
$site_module_info = Context::get('site_module_info');
$columnList = array('layout_srl');
$module_info = $oModuleModel->getModuleInfoByMid($mid, $site_module_info->site_srl, $columnList);
$layout_srl = $module_info->layout_srl;
if(!$layout_srl) return new Object(-1, 'msg_invalid_request');
if(!$layout_srl) return new BaseObject(-1, 'msg_invalid_request');
$oLayoutModel = getModel('layout');
@ -589,7 +589,7 @@ class layoutAdminController extends layout
function procLayoutAdminUserLayoutExport()
{
$layout_srl = Context::get('layout_srl');
if(!$layout_srl) return new Object('-1','msg_invalid_request');
if(!$layout_srl) return new BaseObject('-1','msg_invalid_request');
$oLayoutModel = getModel('layout');

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

@ -295,11 +295,11 @@ class layoutAdminView extends layout
$layout_srl = Context::get('layout_srl');
$code = Context::get('code');
$code_css = Context::get('code_css');
if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request');
if(!$layout_srl || !$code) return new BaseObject(-1, 'msg_invalid_request');
// Get the layout information
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayout($layout_srl);
if(!$layout_info) return new Object(-1, 'msg_invalid_request');
if(!$layout_info) return new BaseObject(-1, 'msg_invalid_request');
// Separately handle the layout if its type is faceoff
if($layout_info && $layout_info->type == 'faceoff') $oLayoutModel->doActivateFaceOff($layout_info);
// Apply CSS directly

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

@ -16,7 +16,7 @@ class layout extends ModuleObject
// Create a directory to be used in the layout
FileHandler::makeDir('./files/cache/layout');
return new Object();
return new BaseObject();
}
/**
@ -104,7 +104,7 @@ class layout extends ModuleObject
}
}
}
return new Object(0, 'success_updated');
return new BaseObject(0, 'success_updated');
}
/**

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

@ -319,7 +319,7 @@ class layoutView extends layout
if(!checkCSRF())
{
$this->stop('msg_invalid_request');
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
// admin check
@ -331,11 +331,11 @@ class layoutView extends layout
$code = Context::get('code');
$code_css = Context::get('code_css');
if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request');
if(!$layout_srl || !$code) return new BaseObject(-1, 'msg_invalid_request');
// Get the layout information
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayout($layout_srl);
if(!$layout_info) return new Object(-1, 'msg_invalid_request');
if(!$layout_info) return new BaseObject(-1, 'msg_invalid_request');
// Separately handle the layout if its type is faceoff
if($layout_info && $layout_info->type == 'faceoff') $oLayoutModel->doActivateFaceOff($layout_info);
// Apply CSS directly