fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-11 04:52:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Convert most methods in DocumentModel to static

Browse source
This commit is contained in:
Kijin Sung 2020-05-23 14:13:35 +09:00
parent 55ee9d03cb
commit 145ce98268
2 changed files with 93 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/document/document.class.php
View file

@ -16,12 +16,13 @@ class document extends ModuleObject
* Search option to use in admin page * Search option to use in admin page
* @var array * @var array
*/ */
var $search_option = array('title','content','title_content','user_name',); // /< Search options public $search_option = array('title', 'content', 'title_content', 'user_name');
/** /**
* Status list * Status list
* @var array * @var array
*/ */
var $statusList = array('private'=>'PRIVATE', 'public'=>'PUBLIC', 'secret'=>'SECRET', 'temp'=>'TEMP'); public static $statusList = array('private' => 'PRIVATE', 'public' => 'PUBLIC', 'secret' => 'SECRET', 'temp' => 'TEMP');
/** /**
* Implement if additional tasks are necessary when installing * Implement if additional tasks are necessary when installing
@ -386,27 +387,27 @@ class document extends ModuleObject
* Document Status List * Document Status List
* @return array * @return array
*/ */
function getStatusList() public static function getStatusList()
{ {
return $this->statusList; return self::$statusList;
} }
/** /**
* Return default status * Return default status
* @return string * @return string
*/ */
function getDefaultStatus() public static function getDefaultStatus()
{ {
return $this->statusList['public']; return self::$statusList['public'];
} }
/** /**
* Return status by key * Return status by key
* @return string * @return string
*/ */
function getConfigStatus($key) public static function getConfigStatus($key)
{ {
return $this->statusList[$key]; return self::$statusList[$key];
} }
} }
/* End of file document.class.php */ /* End of file document.class.php */

170
modules/document/document.model.php
View file

@ -10,7 +10,7 @@
*/ */
class documentModel extends document class documentModel extends document
{ {
private $documentConfig = NULL; protected static $_config;
/** /**
* Initialization * Initialization
@ -25,7 +25,7 @@ class documentModel extends document
* @param int $document_srl * @param int $document_srl
* @return void * @return void
*/ */
function isGranted($document_srl) public static function isGranted($document_srl)
{ {
return $_SESSION['granted_document'][$document_srl]; return $_SESSION['granted_document'][$document_srl];
} }
@ -35,7 +35,7 @@ class documentModel extends document
* @param array $document_srls * @param array $document_srls
* @return object * @return object
*/ */
function getDocumentExtraVarsFromDB($document_srls) public static function getDocumentExtraVarsFromDB($document_srls)
{ {
$args = new stdClass; $args = new stdClass;
$args->document_srl = $document_srls; $args->document_srl = $document_srls;
@ -46,7 +46,7 @@ class documentModel extends document
* Extra variables for each article will not be processed bulk select and apply the macro city * Extra variables for each article will not be processed bulk select and apply the macro city
* @return void * @return void
*/ */
function setToAllDocumentExtraVars() public static function setToAllDocumentExtraVars()
{ {
// get document list // get document list
$_document_list = &$GLOBALS['XE_DOCUMENT_LIST']; $_document_list = &$GLOBALS['XE_DOCUMENT_LIST'];
@ -78,7 +78,7 @@ class documentModel extends document
// get extra values of documents // get extra values of documents
$extra_values = array(); $extra_values = array();
$output = $this->getDocumentExtraVarsFromDB($document_srls); $output = self::getDocumentExtraVarsFromDB($document_srls);
foreach($output->data as $key => $val) foreach($output->data as $key => $val)
{ {
if(strval($val->value) === '') if(strval($val->value) === '')
@ -104,7 +104,7 @@ class documentModel extends document
// get extra keys of the module // get extra keys of the module
if(!isset($module_extra_keys[$module_srl])) if(!isset($module_extra_keys[$module_srl]))
{ {
$module_extra_keys[$module_srl] = $this->getExtraKeys($module_srl); $module_extra_keys[$module_srl] = self::getExtraKeys($module_srl);
} }
// set extra variables of the document // set extra variables of the document
@ -155,7 +155,7 @@ class documentModel extends document
* @param array $columnList * @param array $columnList
* @return documentItem * @return documentItem
*/ */
function getDocument($document_srl = 0, $is_admin = false, $load_extra_vars = true, $columnList = array()) public static function getDocument($document_srl = 0, $is_admin = false, $load_extra_vars = true, $columnList = array())
{ {
if(!$document_srl) if(!$document_srl)
{ {
@ -185,7 +185,7 @@ class documentModel extends document
* @param array $columnList * @param array $columnList
* @return array value type is documentItem * @return array value type is documentItem
*/ */
function getDocuments($document_srls, $is_admin = false, $load_extra_vars = true, $columnList = array()) public static function getDocuments($document_srls, $is_admin = false, $load_extra_vars = true, $columnList = array())
{ {
if (!is_array($document_srls)) if (!is_array($document_srls))
{ {
@ -220,7 +220,7 @@ class documentModel extends document
if($load_extra_vars) if($load_extra_vars)
{ {
$this->setToAllDocumentExtraVars(); self::setToAllDocumentExtraVars();
} }
return $documents; return $documents;
@ -234,9 +234,9 @@ class documentModel extends document
* @param array $columnList * @param array $columnList
* @return Object * @return Object
*/ */
function getDocumentList($obj, $except_notice = false, $load_extra_vars = true, $columnList = array()) public static function getDocumentList($obj, $except_notice = false, $load_extra_vars = true, $columnList = array())
{ {
$sort_check = $this->_setSortIndex($obj, $load_extra_vars); $sort_check = self::_setSortIndex($obj, $load_extra_vars);
$obj->sort_index = $sort_check->sort_index; $obj->sort_index = $sort_check->sort_index;
$obj->isExtraVars = $sort_check->isExtraVars; $obj->isExtraVars = $sort_check->isExtraVars;
$obj->except_notice = $except_notice; $obj->except_notice = $except_notice;
@ -259,7 +259,7 @@ class documentModel extends document
// execute query // execute query
else else
{ {
$this->_setSearchOption($obj, $args, $query_id, $use_division); self::_setSearchOption($obj, $args, $query_id, $use_division);
$output = executeQueryArray($query_id, $args, $args->columnList); $output = executeQueryArray($query_id, $args, $args->columnList);
} }
@ -287,7 +287,7 @@ class documentModel extends document
if($load_extra_vars) if($load_extra_vars)
{ {
$this->setToAllDocumentExtraVars(); self::setToAllDocumentExtraVars();
} }
// Call trigger (after) // Call trigger (after)
@ -302,7 +302,7 @@ class documentModel extends document
* @param array $columnList * @param array $columnList
* @return object|void * @return object|void
*/ */
function getNoticeList($obj, $columnList = array()) public static function getNoticeList($obj, $columnList = array())
{ {
$args = new stdClass(); $args = new stdClass();
$args->module_srl = $obj->module_srl; $args->module_srl = $obj->module_srl;
@ -324,7 +324,7 @@ class documentModel extends document
$output->data[$attribute->document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$attribute->document_srl]; $output->data[$attribute->document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$attribute->document_srl];
} }
$this->setToAllDocumentExtraVars(); self::setToAllDocumentExtraVars();
return $output; return $output;
} }
@ -335,7 +335,7 @@ class documentModel extends document
* @param int $module_srl * @param int $module_srl
* @return array * @return array
*/ */
function getExtraKeys($module_srl) public static function getExtraKeys($module_srl)
{ {
if(!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl])) if(!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
{ {
@ -414,12 +414,12 @@ class documentModel extends document
* @param int $document_srl * @param int $document_srl
* @return array * @return array
*/ */
function getExtraVars($module_srl, $document_srl) public static function getExtraVars($module_srl, $document_srl)
{ {
if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl])) if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
{ {
$this->getDocument($document_srl); self::getDocument($document_srl);
$this->setToAllDocumentExtraVars(); self::setToAllDocumentExtraVars();
} }
if(empty($GLOBALS['XE_EXTRA_VARS'][$document_srl]) || !is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) if(empty($GLOBALS['XE_EXTRA_VARS'][$document_srl]) || !is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
{ {
@ -436,7 +436,7 @@ class documentModel extends document
* Printing, scrap, recommendations and negative, reported the Add Features * Printing, scrap, recommendations and negative, reported the Add Features
* @return void * @return void
*/ */
function getDocumentMenu() public function getDocumentMenu()
{ {
// Post number and the current login information requested Wanted // Post number and the current login information requested Wanted
$document_srl = Context::get('target_srl'); $document_srl = Context::get('target_srl');
@ -548,7 +548,7 @@ class documentModel extends document
* @param object $search_obj * @param object $search_obj
* @return int * @return int
*/ */
function getDocumentCount($module_srl, $search_obj = NULL) public static function getDocumentCount($module_srl, $search_obj = NULL)
{ {
if(is_null($search_obj)) $search_obj = new stdClass(); if(is_null($search_obj)) $search_obj = new stdClass();
$search_obj->module_srl = $module_srl; $search_obj->module_srl = $module_srl;
@ -564,7 +564,7 @@ class documentModel extends document
* @param object $search_obj * @param object $search_obj
* @return array * @return array
*/ */
function getDocumentCountByGroupStatus($search_obj = NULL) public static function getDocumentCountByGroupStatus($search_obj = NULL)
{ {
$output = executeQuery('document.getDocumentCountByGroupStatus', $search_obj); $output = executeQuery('document.getDocumentCountByGroupStatus', $search_obj);
if(!$output->toBool()) return array(); if(!$output->toBool()) return array();
@ -572,7 +572,7 @@ class documentModel extends document
return $output->data; return $output->data;
} }
function getDocumentExtraVarsCount($module_srl, $search_obj = NULL) public static function getDocumentExtraVarsCount($module_srl, $search_obj = NULL)
{ {
// Additional search options // Additional search options
$args = new stdClass(); $args = new stdClass();
@ -596,13 +596,13 @@ class documentModel extends document
* @param object $opt * @param object $opt
* @return int * @return int
*/ */
function getDocumentPage($oDocument, $opt) public static function getDocumentPage($oDocument, $opt)
{ {
$sort_check = $this->_setSortIndex($opt); $sort_check = self::_setSortIndex($opt);
$opt->sort_index = $sort_check->sort_index; $opt->sort_index = $sort_check->sort_index;
$opt->isExtraVars = $sort_check->isExtraVars; $opt->isExtraVars = $sort_check->isExtraVars;
$this->_setSearchOption($opt, $args, $query_id, $use_division); self::_setSearchOption($opt, $args, $query_id, $use_division);
if($sort_check->isExtraVars || !$opt->list_count) if($sort_check->isExtraVars || !$opt->list_count)
{ {
@ -653,7 +653,7 @@ class documentModel extends document
* @param array $columnList * @param array $columnList
* @return object * @return object
*/ */
function getCategory($category_srl, $columnList = array()) public static function getCategory($category_srl, $columnList = array())
{ {
$args =new stdClass(); $args =new stdClass();
$args->category_srl = $category_srl; $args->category_srl = $category_srl;
@ -681,7 +681,7 @@ class documentModel extends document
* @param int $category_srl * @param int $category_srl
* @return bool * @return bool
*/ */
function getCategoryChlidCount($category_srl) public static function getCategoryChlidCount($category_srl)
{ {
$args = new stdClass(); $args = new stdClass();
$args->category_srl = $category_srl; $args->category_srl = $category_srl;
@ -697,7 +697,7 @@ class documentModel extends document
* @param array $columnList * @param array $columnList
* @return array * @return array
*/ */
function getCategoryList($module_srl, $columnList = array()) public static function getCategoryList($module_srl, $columnList = array())
{ {
// Category of the target module file swollen // Category of the target module file swollen
$module_srl = intval($module_srl); $module_srl = intval($module_srl);
@ -713,7 +713,7 @@ class documentModel extends document
// Cleanup of category // Cleanup of category
$document_category = array(); $document_category = array();
$this->_arrangeCategory($document_category, $menu->list, 0); self::_arrangeCategory($document_category, $menu->list, 0);
return $document_category; return $document_category;
} }
@ -724,7 +724,7 @@ class documentModel extends document
* @param int $depth * @param int $depth
* @return void * @return void
*/ */
function _arrangeCategory(&$document_category, $list, $depth) public static function _arrangeCategory(&$document_category, $list, $depth)
{ {
if(!countobj($list)) return; if(!countobj($list)) return;
$idx = 0; $idx = 0;
@ -773,7 +773,7 @@ class documentModel extends document
$document_category[$key] = $obj; $document_category[$key] = $obj;
if(count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth+1); if(count($val['list'])) self::_arrangeCategory($document_category, $val['list'], $depth+1);
} }
$document_category[$list_order[0]]->first = true; $document_category[$list_order[0]]->first = true;
$document_category[$list_order[count($list_order)-1]]->last = true; $document_category[$list_order[count($list_order)-1]]->last = true;
@ -785,7 +785,7 @@ class documentModel extends document
* @param int $category_srl * @param int $category_srl
* @return int * @return int
*/ */
function getCategoryDocumentCount($module_srl, $category_srl) public static function getCategoryDocumentCount($module_srl, $category_srl)
{ {
$args = new stdClass; $args = new stdClass;
$args->module_srl = $module_srl; $args->module_srl = $module_srl;
@ -799,7 +799,7 @@ class documentModel extends document
* @param int $module_srl * @param int $module_srl
* @return string * @return string
*/ */
function getCategoryXmlFile($module_srl) public static function getCategoryXmlFile($module_srl)
{ {
$module_srl = intval($module_srl); $module_srl = intval($module_srl);
$xml_file = sprintf('files/cache/document_category/%d.xml.php',$module_srl); $xml_file = sprintf('files/cache/document_category/%d.xml.php',$module_srl);
@ -816,7 +816,7 @@ class documentModel extends document
* @param int $module_srl * @param int $module_srl
* @return string * @return string
*/ */
function getCategoryPhpFile($module_srl) public static function getCategoryPhpFile($module_srl)
{ {
$module_srl = intval($module_srl); $module_srl = intval($module_srl);
$php_file = sprintf('files/cache/document_category/%d.php',$module_srl); $php_file = sprintf('files/cache/document_category/%d.php',$module_srl);
@ -833,7 +833,7 @@ class documentModel extends document
* @param object $obj * @param object $obj
* @return object * @return object
*/ */
function getMonthlyArchivedList($obj) public static function getMonthlyArchivedList($obj)
{ {
if($obj->mid) if($obj->mid)
{ {
@ -859,7 +859,7 @@ class documentModel extends document
* @param object $obj * @param object $obj
* @return object * @return object
*/ */
function getDailyArchivedList($obj) public static function getDailyArchivedList($obj)
{ {
if($obj->mid) if($obj->mid)
{ {
@ -885,11 +885,11 @@ class documentModel extends document
* Get a list for a particular module * Get a list for a particular module
* @return void|Object * @return void|Object
*/ */
function getDocumentCategories() public function getDocumentCategories()
{ {
if(!Context::get('is_logged')) throw new Rhymix\Framework\Exceptions\NotPermitted; if(!Context::get('is_logged')) throw new Rhymix\Framework\Exceptions\NotPermitted;
$module_srl = intval(Context::get('module_srl')); $module_srl = intval(Context::get('module_srl'));
$categories= $this->getCategoryList($module_srl); $categories= self::getCategoryList($module_srl);
$lang = Context::get('lang'); $lang = Context::get('lang');
// No additional category // No additional category
$output = "0,0,{$lang->none_category}\n"; $output = "0,0,{$lang->none_category}\n";
@ -907,20 +907,13 @@ class documentModel extends document
* Wanted to set document information * Wanted to set document information
* @return object * @return object
*/ */
function getDocumentConfig() public static function getDocumentConfig()
{ {
if ($this->documentConfig === NULL) if (self::$_config === null)
{ {
$oModuleModel = getModel('module'); self::$_config = ModuleModel::getModuleConfig('document') ?: new stdClass;;
$config = $oModuleModel->getModuleConfig('document');
if (!$config)
{
$config = new stdClass();
}
$this->documentConfig = $config;
} }
return $this->documentConfig; return self::$_config;
} }
/** /**
@ -929,10 +922,10 @@ class documentModel extends document
* @param int $module_srl * @param int $module_srl
* @return string * @return string
*/ */
function getExtraVarsHTML($module_srl) public function getExtraVarsHTML($module_srl)
{ {
// Bringing existing extra_keys // Bringing existing extra_keys
$extra_keys = $this->getExtraKeys($module_srl); $extra_keys = self::getExtraKeys($module_srl);
Context::set('extra_keys', $extra_keys); Context::set('extra_keys', $extra_keys);
$security = new Security(); $security = new Security();
$security->encodeHTML('extra_keys..', 'selected_var_idx'); $security->encodeHTML('extra_keys..', 'selected_var_idx');
@ -947,9 +940,9 @@ class documentModel extends document
* @param int $module_srl * @param int $module_srl
* @return string * @return string
*/ */
function getCategoryHTML($module_srl) public function getCategoryHTML($module_srl)
{ {
$category_xml_file = $this->getCategoryXmlFile($module_srl); $category_xml_file = self::getCategoryXmlFile($module_srl);
Context::set('category_xml_file', $category_xml_file); Context::set('category_xml_file', $category_xml_file);
@ -973,7 +966,7 @@ class documentModel extends document
* Manager on the page to add information about a particular menu from the server after compiling tpl compiled a direct return html * Manager on the page to add information about a particular menu from the server after compiling tpl compiled a direct return html
* @return void|Object * @return void|Object
*/ */
function getDocumentCategoryTplInfo() public function getDocumentCategoryTplInfo()
{ {
$oModuleModel = getModel('module'); $oModuleModel = getModel('module');
$oMemberModel = getModel('member'); $oMemberModel = getModel('member');
@ -985,7 +978,7 @@ class documentModel extends document
if(!$grant->manager) throw new Rhymix\Framework\Exceptions\NotPermitted; if(!$grant->manager) throw new Rhymix\Framework\Exceptions\NotPermitted;
$category_srl = Context::get('category_srl'); $category_srl = Context::get('category_srl');
$category_info = $this->getCategory($category_srl); $category_info = self::getCategory($category_srl);
if(!$category_info) if(!$category_info)
{ {
throw new Rhymix\Framework\Exceptions\InvalidRequest; throw new Rhymix\Framework\Exceptions\InvalidRequest;
@ -1000,7 +993,7 @@ class documentModel extends document
* @param string $alias * @param string $alias
* @return int|void * @return int|void
*/ */
function getDocumentSrlByAlias($mid, $alias) public static function getDocumentSrlByAlias($mid, $alias)
{ {
if(!$mid || !$alias) return null; if(!$mid || !$alias) return null;
$site_module_info = Context::get('site_module_info'); $site_module_info = Context::get('site_module_info');
@ -1019,7 +1012,7 @@ class documentModel extends document
* @param string $title * @param string $title
* @return int|void * @return int|void
*/ */
function getDocumentSrlByTitle($module_srl, $title) public static function getDocumentSrlByTitle($module_srl, $title)
{ {
if(!$module_srl || !$title) return null; if(!$module_srl || !$title) return null;
$args = new stdClass; $args = new stdClass;
@ -1039,7 +1032,7 @@ class documentModel extends document
* @param int $document_srl * @param int $document_srl
* @return string|void * @return string|void
*/ */
function getAlias($document_srl) public static function getAlias($document_srl)
{ {
if(!$document_srl) return null; if(!$document_srl) return null;
$args = new stdClass; $args = new stdClass;
@ -1057,7 +1050,7 @@ class documentModel extends document
* @param int $page * @param int $page
* @return object * @return object
*/ */
function getHistories($document_srl, $list_count, $page) public static function getHistories($document_srl, $list_count, $page)
{ {
$args = new stdClass; $args = new stdClass;
$args->list_count = $list_count; $args->list_count = $list_count;
@ -1072,7 +1065,7 @@ class documentModel extends document
* @param int $history_srl * @param int $history_srl
* @return object * @return object
*/ */
function getHistory($history_srl) public static function getHistory($history_srl)
{ {
$args = new stdClass; $args = new stdClass;
$args->history_srl = $history_srl; $args->history_srl = $history_srl;
@ -1085,7 +1078,7 @@ class documentModel extends document
* @param object $obj * @param object $obj
* @return object * @return object
*/ */
function getTrashList($obj) public static function getTrashList($obj)
{ {
// Variable check // Variable check
$args = new stdClass; $args = new stdClass;
@ -1127,8 +1120,8 @@ class documentModel extends document
break; break;
case 'is_notice' : case 'is_notice' :
case 'is_secret' : case 'is_secret' :
if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public')); if($search_keyword=='N') $args->statusList = array(self::getConfigStatus('public'));
elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret')); elseif($search_keyword=='Y') $args->statusList = array(self::getConfigStatus('secret'));
break; break;
case 'member_srl' : case 'member_srl' :
case 'readed_count' : case 'readed_count' :
@ -1166,7 +1159,7 @@ class documentModel extends document
* vote up, vote down member list in Document View page * vote up, vote down member list in Document View page
* @return void|Object * @return void|Object
*/ */
function getDocumentVotedMemberList() public function getDocumentVotedMemberList()
{ {
$args = new stdClass; $args = new stdClass;
$document_srl = Context::get('document_srl'); $document_srl = Context::get('document_srl');
@ -1216,12 +1209,17 @@ class documentModel extends document
* Return status name list * Return status name list
* @return array * @return array
*/ */
function getStatusNameList() public static function getStatusNameList()
{ {
global $lang; global $lang;
if(!isset($lang->status_name_list)) if(!isset($lang->status_name_list))
return array_flip($this->getStatusList()); {
else return $lang->status_name_list; return array_flip(self::getStatusList());
}
else
{
return $lang->status_name_list;
}
} }
/** /**
@ -1230,7 +1228,7 @@ class documentModel extends document
* @param bool $load_extra_vars * @param bool $load_extra_vars
* @return object * @return object
*/ */
function _setSortIndex($obj, $load_extra_vars = true) public static function _setSortIndex($obj, $load_extra_vars = true)
{ {
$args = new stdClass; $args = new stdClass;
$args->sort_index = $obj->sort_index; $args->sort_index = $obj->sort_index;
@ -1244,7 +1242,7 @@ class documentModel extends document
} }
// check it can use extra variable // check it can use extra variable
if(!$load_extra_vars || !$extra_keys = $this->getExtraKeys($obj->module_srl)) if(!$load_extra_vars || !$extra_keys = self::getExtraKeys($obj->module_srl))
{ {
$args->sort_index = 'list_order'; $args->sort_index = 'list_order';
return $args; return $args;
@ -1277,7 +1275,7 @@ class documentModel extends document
* @param bool $use_division * @param bool $use_division
* @return void * @return void
*/ */
function _setSearchOption($searchOpt, &$args, &$query_id, &$use_division) public static function _setSearchOption($searchOpt, &$args, &$query_id, &$use_division)
{ {
$args = new stdClass; $args = new stdClass;
$args->module_srl = $searchOpt->module_srl; $args->module_srl = $searchOpt->module_srl;
@ -1292,7 +1290,7 @@ class documentModel extends document
$args->start_date = $searchOpt->start_date ?: null; $args->start_date = $searchOpt->start_date ?: null;
$args->end_date = $searchOpt->end_date ?: null; $args->end_date = $searchOpt->end_date ?: null;
$args->s_is_notice = $searchOpt->except_notice ? 'N' : null; $args->s_is_notice = $searchOpt->except_notice ? 'N' : null;
$args->statusList = $searchOpt->statusList ?: array($this->getConfigStatus('public'), $this->getConfigStatus('secret')); $args->statusList = $searchOpt->statusList ?: array(self::getConfigStatus('public'), self::getConfigStatus('secret'));
$args->columnList = $searchOpt->columnList ?: array(); $args->columnList = $searchOpt->columnList ?: array();
// get directly module_srl by mid // get directly module_srl by mid
@ -1304,7 +1302,7 @@ class documentModel extends document
// add subcategories // add subcategories
if($args->category_srl) if($args->category_srl)
{ {
$category_list = $this->getCategoryList($args->module_srl); $category_list = self::getCategoryList($args->module_srl);
if(isset($category_list[$args->category_srl])) if(isset($category_list[$args->category_srl]))
{ {
$categories = $category_list[$args->category_srl]->childs; $categories = $category_list[$args->category_srl]->childs;
@ -1376,15 +1374,15 @@ class documentModel extends document
case 'is_secret' : case 'is_secret' :
if($search_keyword == 'N') if($search_keyword == 'N')
{ {
$args->statusList = array($this->getConfigStatus('public')); $args->statusList = array(self::getConfigStatus('public'));
} }
elseif($search_keyword == 'Y') elseif($search_keyword == 'Y')
{ {
$args->statusList = array($this->getConfigStatus('secret')); $args->statusList = array(self::getConfigStatus('secret'));
} }
elseif($search_keyword == 'temp') elseif($search_keyword == 'temp')
{ {
$args->statusList = array($this->getConfigStatus('temp')); $args->statusList = array(self::getConfigStatus('temp'));
} }
break; break;
default : default :
@ -1404,7 +1402,7 @@ class documentModel extends document
if(!getModel('module')->getGrant($module_info, Context::get('logged_info'))->manager) if(!getModel('module')->getGrant($module_info, Context::get('logged_info'))->manager)
{ {
$args->comment_is_secret = 'N'; $args->comment_is_secret = 'N';
$args->statusList = array($this->getConfigStatus('public')); $args->statusList = array(self::getConfigStatus('public'));
} }
} }
} }
@ -1484,7 +1482,7 @@ class documentModel extends document
* @param int $member_srl * @param int $member_srl
* @return int * @return int
*/ */
function getDocumentCountByMemberSrl($member_srl) public static function getDocumentCountByMemberSrl($member_srl)
{ {
$args = new stdClass(); $args = new stdClass();
$args->member_srl = $member_srl; $args->member_srl = $member_srl;
@ -1501,7 +1499,7 @@ class documentModel extends document
* @param int $count * @param int $count
* @return object * @return object
*/ */
function getDocumentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0 ) public static function getDocumentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0)
{ {
$args = new stdClass(); $args = new stdClass();
$args->member_srl = $member_srl; $args->member_srl = $member_srl;
@ -1515,7 +1513,7 @@ class documentModel extends document
return $document_list; return $document_list;
} }
function getDocumentUpdateLog($document_srl) public static function getDocumentUpdateLog($document_srl)
{ {
$args = new stdClass(); $args = new stdClass();
$args->document_srl = $document_srl; $args->document_srl = $document_srl;
@ -1524,17 +1522,17 @@ class documentModel extends document
return $output; return $output;
} }
function getUpdateLog($update_id) public static function getUpdateLog($update_id)
{ {
$args = new stdClass(); $args = new stdClass();
$args->update_id = $update_id; $args->update_id = $update_id;
$output = exeCuteQuery('document.getUpdateLog', $args); $output = exeCuteQuery('document.getUpdateLog', $args);
$updage_log = $output->data; $update_log = $output->data;
return $updage_log; return $update_log;
} }
function getUpdateLogAdminisExists($document_srl = null) public static function getUpdateLogAdminisExists($document_srl = null)
{ {
if($document_srl == null) if($document_srl == null)
{ {
@ -1553,9 +1551,9 @@ class documentModel extends document
return false; return false;
} }
function getDocumentExtraImagePath() public static function getDocumentExtraImagePath()
{ {
$documentConfig = getModel('document')->getDocumentConfig(); $documentConfig = self::getDocumentConfig();
if(Mobile::isFromMobilePhone()) if(Mobile::isFromMobilePhone())
{ {
$iconSkin = $documentConfig->micons; $iconSkin = $documentConfig->micons;