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

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

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

@ -170,7 +170,7 @@ class menuAdminController extends menu
{
if(!$moduleInfos || !is_array($moduleInfos) || count($moduleInfos) == 0 || $menuSrl == 0)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
foreach($moduleInfos as $moduleInfo)
@ -214,7 +214,7 @@ class menuAdminController extends menu
$oMenuAdminController = getAdminController('menu');
$oMenuAdminController->makeXmlFile($menuSrl);
return new Object();
return new BaseObject();
}
@ -252,7 +252,7 @@ class menuAdminController extends menu
$oAdmin = getClass('admin');
if($menuInfo->title == $oAdmin->getAdminMenuName())
return new Object(-1, 'msg_adminmenu_cannot_delete');
return new BaseObject(-1, 'msg_adminmenu_cannot_delete');
// get menu properies with child menu
$phpFile = sprintf("./files/cache/menu/%s.php", $menu_srl);
@ -283,13 +283,13 @@ class menuAdminController extends menu
if($isStartmenuInclude)
{
return new Object(-1, 'msg_cannot_delete_homemenu');
return new BaseObject(-1, 'msg_cannot_delete_homemenu');
}
$output = $this->deleteMenu($menu_srl);
if(!$output->toBool())
{
return new Object(-1, $output->message);
return new BaseObject(-1, $output->message);
}
$this->setMessage('success_deleted', 'info');
@ -371,7 +371,7 @@ class menuAdminController extends menu
$oDB->commit();
return new Object(0,'success_deleted');
return new BaseObject(0,'success_deleted');
}
/**
@ -389,13 +389,13 @@ class menuAdminController extends menu
if(!$request->parent_srl || !$request->menu_name)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
$this->_setMenuSrl($request->parent_srl, $request->menu_srl);
if(!$request->menu_srl)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
if($request->is_shortcut == 'Y')
@ -409,7 +409,7 @@ class menuAdminController extends menu
if($result->error < 0)
{
return new Object($result->error, $result->message);
return new BaseObject($result->error, $result->message);
}
// recreate menu cache file
@ -475,7 +475,7 @@ class menuAdminController extends menu
$itemInfo = $oMenuAdminModel->getMenuItemInfo($request->shortcut_target);
if(!$itemInfo->menu_item_srl)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
unset($itemInfo->normal_btn, $itemInfo->hover_btn, $itemInfo->active_btn);
@ -540,7 +540,7 @@ class menuAdminController extends menu
if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
// when menu copy, module already copied
@ -549,7 +549,7 @@ class menuAdminController extends menu
$result = $this->_insertModule($request, $args);
if(!$result->toBool())
{
return new Object(-1, $result->message);
return new BaseObject(-1, $result->message);
}
}
@ -560,7 +560,7 @@ class menuAdminController extends menu
if(!$request->module_id)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
$args->url = $request->module_id;
@ -625,7 +625,7 @@ class menuAdminController extends menu
$output = $oModuleModel->getModuleInfoByMid($request->module_id);
if($output->module_srl)
{
return new Object(-1, 'msg_module_name_exists');
return new BaseObject(-1, 'msg_module_name_exists');
}
$oModuleController = getController('module');
@ -644,7 +644,7 @@ class menuAdminController extends menu
if(!$request->menu_item_srl || !$request->menu_name)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
// variables set
@ -671,7 +671,7 @@ class menuAdminController extends menu
$newItemInfo = $oMenuAdminModel->getMenuItemInfo($request->shortcut_target);
if(!$newItemInfo->menu_item_srl)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
$args->url = $newItemInfo->url;
@ -691,7 +691,7 @@ class menuAdminController extends menu
$output = $oModuleModel->getModuleInfoByMid($request->module_id);
if($output->module_srl)
{
return new Object(-1, 'msg_module_name_exists');
return new BaseObject(-1, 'msg_module_name_exists');
}
}
@ -699,7 +699,7 @@ class menuAdminController extends menu
$moduleInfo = $oModuleModel->getModuleInfoByMid($itemInfo->url);
if(!$moduleInfo)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
$moduleInfo->mid = $request->module_id;
@ -855,7 +855,7 @@ class menuAdminController extends menu
if(!$output->toBool()) return $output;
if($output->data->count > 0)
{
return new Object(-1001, 'msg_cannot_delete_for_child');
return new BaseObject(-1001, 'msg_cannot_delete_for_child');
}
}
@ -892,7 +892,7 @@ class menuAdminController extends menu
$this->_checkHomeMenuInOriginMenu($originMenu, $siteInfo->mid, $isStartmenuInclude);
if($isStartmenuInclude)
{
return new Object(-1, 'msg_cannot_delete_homemenu');
return new BaseObject(-1, 'msg_cannot_delete_homemenu');
}
$oDB = DB::getInstance();
@ -909,7 +909,7 @@ class menuAdminController extends menu
$this->add('menu_title', $menu_title);
$this->add('menu_item_srl', $parent_srl);
return new Object(0, 'success_deleted');
return new BaseObject(0, 'success_deleted');
}
private function _checkHomeMenuInOriginMenu($originMenu, $startMid, &$isStartmenuInclude)
@ -982,7 +982,7 @@ class menuAdminController extends menu
}
}
}
return new Object(0, 'success');
return new BaseObject(0, 'success');
}
private function _recursiveDeleteMenuItem(&$oDB, &$menuInfo, $node)
@ -990,7 +990,7 @@ class menuAdminController extends menu
$output = $this->_deleteMenuItem($oDB, $menuInfo, $node);
if(!$output->toBool())
{
return new Object(-1, $output->message);
return new BaseObject(-1, $output->message);
}
if(is_array($node['list']))
@ -1013,7 +1013,7 @@ class menuAdminController extends menu
$source_srl = Context::get('source_srl'); // Same hierarchy's menu item serial number
$target_srl = Context::get('target_srl'); // Self menu item serial number
if(!$mode || !$parent_srl || !$target_srl) return new Object(-1,'msg_invalid_request');
if(!$mode || !$parent_srl || !$target_srl) return new BaseObject(-1,'msg_invalid_request');
$oMenuAdminModel = getAdminModel('menu');
@ -1023,7 +1023,7 @@ class menuAdminController extends menu
$targetMenuItemInfo = $oMenuAdminModel->getMenuItemInfo($target_srl);
if(!$originalItemInfo->menu_item_srl || (!$targetMenuInfo->menu_srl && !$targetMenuItemInfo->menu_item_srl))
{
return new Object(-1, 'msg_empty_menu_item');
return new BaseObject(-1, 'msg_empty_menu_item');
}
// get menu properies with child menu
@ -1407,7 +1407,7 @@ class menuAdminController extends 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');
if($target_item->menu_item_srl != $target_srl) return new BaseObject(-1,'msg_invalid_request');
// Move the menu location(change the order menu appears)
if($mode == 'move')
{
@ -1418,7 +1418,7 @@ class menuAdminController extends menu
if($source_srl)
{
$source_item = $oMenuAdminModel->getMenuItemInfo($source_srl);
if($source_item->menu_item_srl != $source_srl) return new Object(-1,'msg_invalid_request');
if($source_item->menu_item_srl != $source_srl) return new BaseObject(-1,'msg_invalid_request');
$args->listorder = $source_item->listorder-1;
}
else