fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 18:51:41 +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

2
modules/editor/components/emoticon/emoticon.class.php
View file

@ -28,7 +28,7 @@ class emoticon extends EditorHandler
function getEmoticonList()
{
$emoticon = Context::get('emoticon');
if(!$emoticon || !preg_match("/^([a-z0-9\_]+)$/i",$emoticon)) return new Object(-1,'msg_invalid_request');
if(!$emoticon || !preg_match("/^([a-z0-9\_]+)$/i",$emoticon)) return new BaseObject(-1,'msg_invalid_request');
$list = $this->getEmoticons($emoticon);

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

@ -39,10 +39,10 @@ class editorAdminController extends editor
}
$output = $this->editorListOrder($component_names,$site_module_info->site_srl);
if(!$output->toBool()) return new Object();
if(!$output->toBool()) return new BaseObject();
$output = $this->editorCheckUse($componentList,$site_module_info->site_srl);
if(!$output->toBool()) return new Object();
if(!$output->toBool()) return new BaseObject();
$oEditorController = getController('editor');
$oEditorController->removeCache($site_module_info->site_srl);
@ -70,7 +70,7 @@ class editorAdminController extends editor
$output = executeQuery('editor.updateSiteComponent', $args);
}
}
if(!$output->toBool()) return new Object();
if(!$output->toBool()) return new BaseObject();
unset($componentList);
return $output;
@ -99,7 +99,7 @@ class editorAdminController extends editor
$output = executeQuery('editor.updateSiteComponent', $args);
}
if(!$output->toBool()) return new Object();
if(!$output->toBool()) return new BaseObject();
$list_order_num++;
}
}
@ -251,7 +251,7 @@ class editorAdminController extends editor
// Check if the component exists
if(!$site_srl) $output = executeQuery('editor.isComponentInserted', $args);
else $output = executeQuery('editor.isSiteComponentInserted', $args);
if($output->data->count) return new Object(-1, 'msg_component_is_not_founded');
if($output->data->count) return new BaseObject(-1, 'msg_component_is_not_founded');
// Inert a component
$args->list_order = getNextSequence();
if(!$site_srl) $output = executeQuery('editor.insertComponent', $args);

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

@ -84,7 +84,7 @@ class editor extends ModuleObject
// 2009. 04. 14 Add a trigger from compiled codes of the editor component
$oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
return new Object();
return new BaseObject();
}
/**
@ -152,7 +152,7 @@ class editor extends ModuleObject
$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after');
}
return new Object(0, 'success_updated');
return new BaseObject(0, 'success_updated');
}
/**

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

@ -47,18 +47,18 @@ class editorController extends editor
{
$component = Context::get('component');
$method = Context::get('method');
if(!$component) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
if(!$component) return new BaseObject(-1, sprintf(lang('msg_component_is_not_founded'), $component));
$oEditorModel = getModel('editor');
$oComponent = &$oEditorModel->getComponentObject($component);
if(!$oComponent->toBool()) return $oComponent;
if(!method_exists($oComponent, $method)) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
if(!method_exists($oComponent, $method)) return new BaseObject(-1, sprintf(lang('msg_component_is_not_founded'), $component));
//$output = call_user_method($method, $oComponent);
//$output = call_user_func(array($oComponent, $method));
if(method_exists($oComponent, $method)) $output = $oComponent->{$method}();
else return new Object(-1,sprintf('%s method is not exists', $method));
else return new BaseObject(-1,sprintf('%s method is not exists', $method));
if($output instanceof Object && !$output->toBool()) return $output;
@ -93,13 +93,13 @@ class editorController extends editor
$module_info = $oModuleModel->getModuleInfoByModuleSrl($srl);
if (!$module_info->module_srl)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
$module_grant = $oModuleModel->getGrant($module_info, $logged_info);
if (!$module_grant->manager)
{
return new Object(-1, 'msg_not_permitted');
return new BaseObject(-1, 'msg_not_permitted');
}
$module_srl[] = $srl;
@ -171,7 +171,7 @@ class editorController extends editor
*/
function triggerEditorComponentCompile(&$content)
{
if(Context::getResponseMethod()!='HTML') return new Object();
if(Context::getResponseMethod()!='HTML') return new BaseObject();
$module_info = Context::get('module_info');
$module_srl = $module_info->module_srl;
@ -253,7 +253,7 @@ class editorController extends editor
}
$content = $this->transComponent($content);
return new Object();
return new BaseObject();
}
/**
@ -350,7 +350,7 @@ class editorController extends editor
function triggerDeleteSavedDoc(&$obj)
{
$this->deleteSavedDoc(false);
return new Object();
return new BaseObject();
}
/**

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

@ -466,11 +466,11 @@ class editorModel extends editor
// Create an object of the component and execute
$class_path = sprintf('%scomponents/%s/', $this->module_path, $component);
$class_file = sprintf('%s%s.class.php', $class_path, $component);
if(!file_exists($class_file)) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
if(!file_exists($class_file)) return new BaseObject(-1, sprintf(lang('msg_component_is_not_founded'), $component));
// Create an object after loading the class file
require_once($class_file);
$oComponent = new $component($editor_sequence, $class_path);
if(!$oComponent) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
if(!$oComponent) return new BaseObject(-1, sprintf(lang('msg_component_is_not_founded'), $component));
// Add configuration information
$component_info = $this->getComponent($component, $site_srl);
$oComponent->setInfo($component_info);

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

@ -88,7 +88,7 @@ class editorView extends editor
// Get information of the current module
$current_module_info = Context::get('current_module_info');
$current_module_srl = $current_module_info->module_srl;
if(!$current_module_srl) return new Object();
if(!$current_module_srl) return new BaseObject();
}
// Get editors settings
$oEditorModel = getModel('editor');
@ -135,7 +135,7 @@ class editorView extends editor
$tpl = $oTemplate->compile($this->module_path.'tpl', 'editor_module_config');
$obj .= $tpl;
return new Object();
return new BaseObject();
}