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

NOISSUE cleanup

Browse source
This commit is contained in:
bnu 2014-01-29 14:59:04 +09:00
parent b758cf93dd
commit bd4372aff9
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/board/board.model.php
View file

@ -25,7 +25,7 @@ class boardModel extends module
// get the list config value, if it is not exitsted then setup the default value
$list_config = $oModuleModel->getModulePartConfig('board', $module_srl);
if(!$list_config || !count($list_config))
if(!$list_config || count($list_config) <= 0)
{
$list_config = array( 'no', 'title', 'nick_name','regdate','readed_count');
}

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

@ -53,11 +53,14 @@ class documentModel extends document
function setToAllDocumentExtraVars()
{
static $checked_documents = array();
$_document_list = &$GLOBALS['XE_DOCUMENT_LIST'];
// XE XE_DOCUMENT_LIST all documents that the object referred to the global variable settings
if(!count($GLOBALS['XE_DOCUMENT_LIST'])) return;
if(count($_document_list) <= 0) return;
// Find all called the document object variable has been set extension
$document_srls = array();
foreach($GLOBALS['XE_DOCUMENT_LIST'] as $key => $val)
foreach($_document_list as $key => $val)
{
if(!$val->document_srl || $checked_documents[$val->document_srl]) continue;
$checked_documents[$val->document_srl] = true;
@ -84,12 +87,11 @@ class documentModel extends document
$document_srl = $document_srls[$i];
unset($vars);
if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] || !is_object($GLOBALS['XE_DOCUMENT_LIST'][$document_srl]) || !$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->isExists()) continue;
$module_srl = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->get('module_srl');
if(!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) continue;
$module_srl = $_document_list[$document_srl]->get('module_srl');
$extra_keys = $this->getExtraKeys($module_srl);
$vars = $extra_vars[$document_srl];
$document_lang_code = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->get('lang_code');
$document_lang_code = $_document_list[$document_srl]->get('lang_code');
// Expand the variable processing
if(count($extra_keys))
{
@ -109,9 +111,9 @@ class documentModel extends document
$evars = new ExtraVar($module_srl);
$evars->setExtraVarKeys($extra_keys);
// Title Processing
if($vars[-1][$user_lang_code]) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->add('title',$vars[-1][$user_lang_code]);
if($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]);
// Information processing
if($vars[-2][$user_lang_code]) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->add('content',$vars[-2][$user_lang_code]);
if($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]);
if($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code])
{
@ -361,7 +363,7 @@ class documentModel extends document
*/
function getExtraKeys($module_srl)
{
if($GLOBALS['XE_EXTRA_KEYS'][$module_srl] === NULL)
if(!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
{
$keys = false;
$oCacheHandler = CacheHandler::getInstance('object', null, true);

7
modules/module/module.controller.php
View file

@ -418,16 +418,15 @@ class moduleController extends module
{
$menuArgs = new stdClass;
$menuArgs->menu_srl = $args->menu_srl;
$menuOutput = executeQuery('menu.getMenu', $menuArgs);
$menuOutput = executeQuery('menu.getMenu', $menuArgs);
// if menu is not created, create menu also. and does not supported that in virtual site.
if(!$menuOutput->data && !$args->site_srl)
{
debugPrint($args->menu_srl);
$oMenuAdminModel = getAdminModel('menu');
$oMenuAdminController = getAdminController('menu');
$menuSrl = $oMenuAdminController->getUnlinkedMenu();
$menuSrl = $oMenuAdminController->getUnlinkedMenu();
$menuArgs->menu_srl = $menuSrl;
$menuArgs->menu_item_srl = getNextSequence();