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

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

View file

@ -28,21 +28,21 @@ class documentController extends document
{
if(!Context::get('is_logged'))
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
}
$document_srl = Context::get('target_srl');
if(!$document_srl) return new Object(-1, 'msg_invalid_request');
if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
$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');
if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
$oModuleModel = getModel('module');
$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
if($document_config->use_vote_up=='N') return new Object(-1, 'msg_invalid_request');
if($document_config->use_vote_up=='N') return new BaseObject(-1, 'msg_invalid_request');
$point = 1;
$output = $this->updateVotedCount($document_srl, $point);
@ -60,18 +60,18 @@ class documentController extends document
{
if(!Context::get('is_logged'))
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
}
$document_srl = Context::get('target_srl');
if(!$document_srl) return new Object(-1, 'msg_invalid_request');
if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
if($oDocument->get('voted_count') <= 0)
{
return new Object(-1, 'msg_document_voted_cancel_not');
return new BaseObject(-1, 'msg_document_voted_cancel_not');
}
$point = 1;
$output = $this->updateVotedCountCancel($document_srl, $oDocument, $point);
@ -114,21 +114,21 @@ class documentController extends document
{
if(!Context::get('is_logged'))
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
}
$document_srl = Context::get('target_srl');
if(!$document_srl) return new Object(-1, 'msg_invalid_request');
if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
$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');
if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
$oModuleModel = getModel('module');
$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
if($document_config->use_vote_down=='N') return new Object(-1, 'msg_invalid_request');
if($document_config->use_vote_down=='N') return new BaseObject(-1, 'msg_invalid_request');
$point = -1;
$output = $this->updateVotedCount($document_srl, $point);
@ -146,18 +146,18 @@ class documentController extends document
{
if(!Context::get('is_logged'))
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
}
$document_srl = Context::get('target_srl');
if(!$document_srl) return new Object(-1, 'msg_invalid_request');
if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
if($oDocument->get('blamed_count') >= 0)
{
return new Object(-1, 'msg_document_voted_cancel_not');
return new BaseObject(-1, 'msg_document_voted_cancel_not');
}
$point = -1;
$output = $this->updateVotedCountCancel($document_srl, $oDocument, $point);
@ -229,13 +229,13 @@ class documentController extends document
{
if(!Context::get('is_logged'))
{
return new Object(-1, 'msg_not_logged');
return new BaseObject(-1, 'msg_not_logged');
}
$document_srl = intval(Context::get('target_srl'));
if(!$document_srl)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
// if an user select message from options, message would be the option.
@ -302,7 +302,7 @@ class documentController extends document
function triggerDeleteModuleDocuments(&$obj)
{
$module_srl = $obj->module_srl;
if(!$module_srl) return new Object();
if(!$module_srl) return new BaseObject();
// Delete the document
$oDocumentAdminController = getAdminController('document');
$output = $oDocumentAdminController->deleteModuleDocument($module_srl);
@ -320,7 +320,7 @@ class documentController extends document
// remove histories
$this->deleteDocumentHistory(null, null, $module_srl);
return new Object();
return new BaseObject();
}
/**
@ -349,7 +349,7 @@ class documentController extends document
{
if(!$manual_inserted && !checkCSRF())
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
// begin transaction
@ -420,7 +420,7 @@ class documentController extends document
}
elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl))
{
return new Object(-1, 'msg_not_permitted');
return new BaseObject(-1, 'msg_not_permitted');
}
// Set to 0 if the category_srl doesn't exist
@ -430,7 +430,7 @@ class documentController extends document
$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
if(count($category_list) > 0 && !$category_list[$obj->category_srl]->grant)
{
return new Object(-1, 'msg_not_permitted');
return new BaseObject(-1, 'msg_not_permitted');
}
if(count($category_list) > 0 && !$category_list[$obj->category_srl]) $obj->category_srl = 0;
}
@ -477,7 +477,7 @@ class documentController extends document
// Return error if content is empty.
if (!$manual_inserted && is_empty_html_content($obj->content))
{
return new Object(-1, 'msg_empty_content');
return new BaseObject(-1, 'msg_empty_content');
}
// if use editor of nohtml, Remove HTML tags from the contents.
@ -490,7 +490,7 @@ class documentController extends document
if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
// An error appears if both log-in info and user name don't exist.
if(!$logged_info->member_srl && !$obj->nick_name) return new Object(-1,'msg_invalid_request');
if(!$logged_info->member_srl && !$obj->nick_name) return new BaseObject(-1,'msg_invalid_request');
// Fix encoding of non-BMP UTF-8 characters.
$obj->title = utf8_mbencode($obj->title);
@ -578,10 +578,10 @@ class documentController extends document
{
if(!$manual_updated && !checkCSRF())
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
if(!$source_obj->document_srl || !$obj->document_srl) return new Object(-1,'msg_invalied_request');
if(!$source_obj->document_srl || !$obj->document_srl) return new BaseObject(-1,'msg_invalied_request');
// Default Status
if($obj->status)
@ -735,7 +735,7 @@ class documentController extends document
// Return error if content is empty.
if (!$manual_inserted && is_empty_html_content($obj->content))
{
return new Object(-1, 'msg_empty_content');
return new BaseObject(-1, 'msg_empty_content');
}
// if use editor of nohtml, Remove HTML tags from the contents.
@ -926,7 +926,7 @@ class documentController extends document
// Check if the documnet exists
$oDocument = $oDocumentModel->getDocument($document_srl, $is_admin);
}
else if($isEmptyTrash && $oDocument == null) return new Object(-1, 'document is not exists');
else if($isEmptyTrash && $oDocument == null) return new BaseObject(-1, 'document is not exists');
$oMemberModel = getModel('member');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($oDocument->get('member_srl'));
@ -934,13 +934,13 @@ class documentController extends document
if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y')
{
return new Object(-1, 'msg_document_is_admin_not_permitted');
return new BaseObject(-1, 'msg_document_is_admin_not_permitted');
}
if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new Object(-1, 'msg_invalid_document');
if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new BaseObject(-1, 'msg_invalid_document');
// Check if a permossion is granted
if(!$oDocument->isGranted()) return new Object(-1, 'msg_not_permitted');
if(!$oDocument->isGranted()) return new BaseObject(-1, 'msg_not_permitted');
//if empty trash, document already deleted, therefore document not delete
$args = new stdClass();
@ -1045,7 +1045,7 @@ class documentController extends document
$member_info = $oMemberModel->getMemberInfoByMemberSrl($oDocument->get('member_srl'));
if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y')
{
return new Object(-1, 'msg_admin_document_no_move_to_trash');
return new BaseObject(-1, 'msg_admin_document_no_move_to_trash');
}
$trash_args->module_srl = $oDocument->get('module_srl');
@ -1245,7 +1245,7 @@ class documentController extends document
*/
function insertDocumentExtraKey($module_srl, $var_idx, $var_name, $var_type, $var_is_required = 'N', $var_search = 'N', $var_default = '', $var_desc = '', $eid)
{
if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new Object(-1,'msg_invalid_request');
if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new BaseObject(-1,'msg_invalid_request');
$obj = new stdClass();
$obj->module_srl = $module_srl;
@ -1282,7 +1282,7 @@ class documentController extends document
*/
function deleteDocumentExtraKeys($module_srl, $var_idx = null)
{
if(!$module_srl) return new Object(-1,'msg_invalid_request');
if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
$obj = new stdClass();
$obj->module_srl = $module_srl;
if(!is_null($var_idx)) $obj->var_idx = $var_idx;
@ -1327,7 +1327,7 @@ class documentController extends document
$oDB->commit();
Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl");
return new Object();
return new BaseObject();
}
/**
@ -1342,7 +1342,7 @@ class documentController extends document
*/
function insertDocumentExtraVar($module_srl, $document_srl, $var_idx, $value, $eid = null, $lang_code = '')
{
if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new Object(-1,'msg_invalid_request');
if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new BaseObject(-1,'msg_invalid_request');
if(!$lang_code) $lang_code = Context::getLangType();
$obj = new stdClass;
@ -1397,7 +1397,7 @@ class documentController extends document
// Return fail if session already has information about votes
if($_SESSION['voted_document'][$document_srl])
{
return new Object(-1, $failed_voted);
return new BaseObject(-1, $failed_voted);
}
// Get the original document
$oDocumentModel = getModel('document');
@ -1406,7 +1406,7 @@ class documentController extends document
if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
{
$_SESSION['voted_document'][$document_srl] = false;
return new Object(-1, $failed_voted);
return new BaseObject(-1, $failed_voted);
}
// Create a member model object
$oMemberModel = getModel('member');
@ -1419,7 +1419,7 @@ class documentController extends document
if($member_srl && $member_srl == abs($oDocument->get('member_srl')))
{
$_SESSION['voted_document'][$document_srl] = false;
return new Object(-1, $failed_voted);
return new BaseObject(-1, $failed_voted);
}
}
// Use member_srl for logged-in members and IP address for non-members.
@ -1438,7 +1438,7 @@ class documentController extends document
if($output->data->count)
{
$_SESSION['voted_document'][$document_srl] = false;
return new Object(-1, $failed_voted);
return new BaseObject(-1, $failed_voted);
}
// begin transaction
$oDB = DB::getInstance();
@ -1508,7 +1508,7 @@ class documentController extends document
// Fail if session information already has a reported document
if($_SESSION['declared_document'][$document_srl])
{
return new Object(-1, 'failed_declared');
return new BaseObject(-1, 'failed_declared');
}
// Check if previously reported
@ -1543,7 +1543,7 @@ class documentController extends document
if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
{
$_SESSION['declared_document'][$document_srl] = true;
return new Object(-1, 'failed_declared');
return new BaseObject(-1, 'failed_declared');
}
// Check if document's author is a member.
@ -1556,7 +1556,7 @@ class documentController extends document
if($member_srl && $member_srl == abs($oDocument->get('member_srl')))
{
$_SESSION['declared_document'][$document_srl] = true;
return new Object(-1, 'failed_declared');
return new BaseObject(-1, 'failed_declared');
}
}
@ -1579,7 +1579,7 @@ class documentController extends document
if($output->data->count)
{
$_SESSION['declared_document'][$document_srl] = true;
return new Object(-1, 'failed_declared');
return new BaseObject(-1, 'failed_declared');
}
// begin transaction
@ -1765,7 +1765,7 @@ class documentController extends document
// Display an error that the category cannot be deleted if it has a child
$output = executeQuery('document.getChildCategoryCount', $args);
if(!$output->toBool()) return $output;
if($output->data->count>0) return new Object(-1, 'msg_cannot_delete_for_child');
if($output->data->count>0) return new BaseObject(-1, 'msg_cannot_delete_for_child');
// Delete a category information
$output = executeQuery('document.deleteCategory', $args);
if(!$output->toBool()) return $output;
@ -1834,7 +1834,7 @@ class documentController extends document
// Seek a full list of categories
$category_list = $oDocumentModel->getCategoryList($module_srl);
$category_srl_list = array_keys($category_list);
if(count($category_srl_list)<2) return new Object();
if(count($category_srl_list)<2) return new BaseObject();
$prev_category = NULL;
foreach($category_list as $key => $val)
@ -1843,9 +1843,9 @@ class documentController extends document
$prev_category = $val;
}
// Return if the previous category doesn't exist
if(!$prev_category) return new Object(-1,lang('msg_category_not_moved'));
if(!$prev_category) return new BaseObject(-1,lang('msg_category_not_moved'));
// Return if the selected category is the top level
if($category_srl_list[0]==$category_srl) return new Object(-1,lang('msg_category_not_moved'));
if($category_srl_list[0]==$category_srl) return new BaseObject(-1,lang('msg_category_not_moved'));
// Information of the selected category
$cur_args = new stdClass;
$cur_args->category_srl = $category_srl;
@ -1859,7 +1859,7 @@ class documentController extends document
$prev_args->title = $prev_category->title;
$this->updateCategory($prev_args);
return new Object();
return new BaseObject();
}
/**
@ -1881,7 +1881,7 @@ class documentController extends document
// Seek a full list of categories
$category_list = $oDocumentModel->getCategoryList($module_srl);
$category_srl_list = array_keys($category_list);
if(count($category_srl_list)<2) return new Object();
if(count($category_srl_list)<2) return new BaseObject();
for($i=0;$i<count($category_srl_list);$i++)
{
@ -1889,7 +1889,7 @@ class documentController extends document
}
$next_category_srl = $category_srl_list[$i+1];
if(!$category_list[$next_category_srl]) return new Object(-1,lang('msg_category_not_moved'));
if(!$category_list[$next_category_srl]) return new BaseObject(-1,lang('msg_category_not_moved'));
$next_category = $category_list[$next_category_srl];
// Information of the selected category
$cur_args = new stdClass;
@ -1904,7 +1904,7 @@ class documentController extends document
$next_args->title = $next_category->title;
$this->updateCategory($next_args);
return new Object();
return new BaseObject();
}
/**
@ -1969,7 +1969,7 @@ class documentController extends document
$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');
if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
if($args->expand !="Y") $args->expand = "N";
if(!is_array($args->group_srls)) $args->group_srls = str_replace('|@|',',',$args->group_srls);
@ -2039,7 +2039,7 @@ class documentController extends document
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) return new Object(-1,'msg_not_permitted');
if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
// First child of the parent_category_srl
$source_args = new stdClass;
@ -2100,14 +2100,14 @@ class documentController extends document
$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');
if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
$oDocumentModel = getModel('document');
// Get original information
$category_info = $oDocumentModel->getCategory($args->category_srl);
if($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
// Display an error that the category cannot be deleted if it has a child node
if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new Object(-1, 'msg_cannot_delete_for_child');
if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new BaseObject(-1, 'msg_cannot_delete_for_child');
// Remove from the DB
$output = $this->deleteCategory($args->category_srl);
if(!$output->toBool())
@ -2141,7 +2141,7 @@ class documentController extends document
$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');
if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
$xml_file = $this->makeCategoryFile($module_srl);
// Set return value
@ -2466,7 +2466,7 @@ class documentController extends document
*/
function procDocumentAddCart()
{
if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
// Get document_srl
$srls = explode(',',Context::get('srls'));
@ -2486,14 +2486,14 @@ class documentController extends document
$args->document_srls = implode(',',$document_srls);
$args->order_type = 'asc';
$output = executeQueryArray('document.getDocuments', $args);
if(!$output->data) return new Object();
if(!$output->data) return new BaseObject();
unset($document_srls);
foreach($output->data as $key => $val)
{
$document_srls[$val->module_srl][] = $val->document_srl;
}
if(!$document_srls || !count($document_srls)) return new Object();
if(!$document_srls || !count($document_srls)) return new BaseObject();
// 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');
@ -2518,7 +2518,7 @@ class documentController extends document
}
}
}
if(!count($document_srls)) return new Object();
if(!count($document_srls)) return new BaseObject();
foreach($document_srls as $module_srl => $documents)
{
@ -2540,7 +2540,7 @@ class documentController extends document
function procDocumentManageCheckedDocument()
{
@set_time_limit(0);
if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
$logged_info = Context::get('logged_info');
// Get request parameters.
@ -2596,13 +2596,13 @@ class documentController extends document
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_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');
}
}
@ -2612,22 +2612,22 @@ class documentController extends document
if($type == 'move')
{
if(!$target_module_srl) return new Object(-1, 'fail_to_move');
if(!$target_module_srl) return new BaseObject(-1, 'fail_to_move');
$oDocumentAdminController = getAdminController('document');
$output = $oDocumentAdminController->moveDocumentModule($document_srl_list, $target_module_srl, $target_category_srl);
if(!$output->toBool()) return new Object(-1, 'fail_to_move');
if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
$msg_code = 'success_moved';
}
else if($type == 'copy')
{
if(!$target_module_srl) return new Object(-1, 'fail_to_move');
if(!$target_module_srl) return new BaseObject(-1, 'fail_to_move');
$oDocumentAdminController = getAdminController('document');
$output = $oDocumentAdminController->copyDocumentModule($document_srl_list, $target_module_srl, $target_category_srl);
if(!$output->toBool()) return new Object(-1, 'fail_to_move');
if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
$msg_code = 'success_copied';
}
@ -2638,7 +2638,7 @@ class documentController extends document
foreach ($document_srl_list as $document_srl)
{
$output = $this->deleteDocument($document_srl, true);
if(!$output->toBool()) return new Object(-1, 'fail_to_delete');
if(!$output->toBool()) return new BaseObject(-1, 'fail_to_delete');
}
$oDB->commit();
$msg_code = 'success_deleted';
@ -2654,7 +2654,7 @@ class documentController extends document
{
$args->document_srl = $document_srl;
$output = $this->moveDocumentToTrash($args);
if(!$output || !$output->toBool()) return new Object(-1, 'fail_to_trash');
if(!$output || !$output->toBool()) return new BaseObject(-1, 'fail_to_trash');
}
$oDB->commit();
$msg_code = 'success_trashed';
@ -2712,13 +2712,13 @@ class documentController extends document
$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;
@ -2757,7 +2757,7 @@ class documentController extends document
{
if(!$this->module_srl)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
$obj = Context::getRequestVars();
@ -2780,12 +2780,12 @@ class documentController extends document
{
if(!$oDocument->isGranted())
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
if($oDocument->get('status') != $this->getConfigStatus('temp'))
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
$output = $this->updateDocument($oDocument, $obj);
@ -2817,7 +2817,7 @@ class documentController extends document
*/
function procDocumentGetList()
{
if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
$documentSrls = Context::get('document_srls');
if($documentSrls) $documentSrlList = explode(',', $documentSrls);