From 2e419e2f39be233959d28fde16ddd8afbcecde20 Mon Sep 17 00:00:00 2001 From: khongchi Date: Thu, 19 Dec 2013 01:11:09 +0900 Subject: [PATCH] =?UTF-8?q?NOISSUE=20PHP=20=EB=B2=84=EC=A0=84=20=ED=98=B8?= =?UTF-8?q?=ED=99=98=EC=84=B1=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addon/addon.admin.model.php | 4 +++ modules/module/module.admin.controller.php | 30 +++++++++++----------- modules/module/module.admin.view.php | 4 +-- modules/module/module.model.php | 2 +- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/modules/addon/addon.admin.model.php b/modules/addon/addon.admin.model.php index 28e2a8576..dfb923e75 100644 --- a/modules/addon/addon.admin.model.php +++ b/modules/addon/addon.admin.model.php @@ -305,12 +305,16 @@ class addonAdminModel extends addon $addon_info->title = $xml_obj->title->body; $addon_info->description = trim($xml_obj->author->description->body); $addon_info->version = $xml_obj->attrs->version; + $date_obj = new stdClass(); sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d); $addon_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d); + + $author_obj = new stdClass(); $author_obj->name = $xml_obj->author->name->body; $author_obj->email_address = $xml_obj->author->attrs->email_address; $author_obj->homepage = $xml_obj->author->attrs->link; + $addon_info->author = array(); $addon_info->author[] = $author_obj; diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index ef54c8579..181626934 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -138,9 +138,9 @@ class moduleAdminController extends module $extra_args = new stdClass(); $extra_args->module_srl = $module_srl; $extra_output = executeQueryArray('module.getModuleExtraVars', $extra_args); + $extra_vars = new stdClass(); if($extra_output->toBool() && is_array($extra_output->data)) { - $extra_vars = new stdClass(); foreach($extra_output->data as $info) { $extra_vars->{$info->name} = $info->value; @@ -238,7 +238,7 @@ class moduleAdminController extends module } else { - $mseeage = $lang->success_registed; + $message = $lang->success_registed; $this->setMessage('success_registed'); } @@ -306,11 +306,13 @@ class moduleAdminController extends module $grant_list->manager = new stdClass(); $grant_list->manager->default = 'manager'; + $grant = new stdClass(); foreach($grant_list as $grant_name => $grant_info) { // Get the default value $default = Context::get($grant_name.'_default'); // -1 = Log-in user only, -2 = site members only, -3 = manager only, 0 = all users + $grant->{$grant_name} = array(); if(strlen($default)) { $grant->{$grant_name}[] = $default; @@ -329,7 +331,7 @@ class moduleAdminController extends module } continue; } - $grant->{$group_srls} = array(); + $grant->{$group_srls} = array(); // dead code???? } // Stored in the DB @@ -338,19 +340,16 @@ class moduleAdminController extends module $output = executeQuery('module.deleteModuleGrants', $args); if(!$output->toBool()) return $output; // Permissions stored in the DB - if($grant) + foreach($grant as $grant_name => $group_srls) { - foreach($grant as $grant_name => $group_srls) + foreach($group_srls as $val) { - foreach($group_srls as $val) - { - $args = new stdClass(); - $args->module_srl = $module_srl; - $args->name = $grant_name; - $args->group_srl = $val; - $output = executeQuery('module.insertModuleGrant', $args); - if(!$output->toBool()) return $output; - } + $args = new stdClass(); + $args->module_srl = $module_srl; + $args->name = $grant_name; + $args->group_srl = $val; + $output = executeQuery('module.insertModuleGrant', $args); + if(!$output->toBool()) return $output; } } $this->setMessage('success_registed'); @@ -587,6 +586,7 @@ class moduleAdminController extends module // Get the default value $default = Context::get($grant_name.'_default'); // -1 = Sign only, 0 = all users + $grant->{$grant_name} = array(); if(strlen($default)) { $grant->{$grant_name}[] = $default; @@ -608,7 +608,7 @@ class moduleAdminController extends module } continue; } - $grant->{$group_srls} = array(); + $grant->{$group_srls} = array(); // dead code, too?? } // Stored in the DB diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php index 519456e0a..fd3af03f3 100644 --- a/modules/module/module.admin.view.php +++ b/modules/module/module.admin.view.php @@ -174,8 +174,8 @@ class moduleAdminView extends module $skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/'.$module_info->module); Context::set('skin_list',$skin_list); // Get a layout list - $oLayoutMode = &getModel('layout'); - $layout_list = $oLayoutMode->getLayoutList(); + $oLayoutModel = &getModel('layout'); + $layout_list = $oLayoutModel->getLayoutList(); Context::set('layout_list', $layout_list); // Get a list of module categories $module_category = $oModuleModel->getModuleCategories(); diff --git a/modules/module/module.model.php b/modules/module/module.model.php index bcfb82d7c..c39b4deec 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -133,7 +133,7 @@ class moduleModel extends module if(!$output || !$output->data) { $domain = ''; unset($output); } } // If no virtual website was found, get default website - if($domain === '') + else { if($oCacheHandler->isSupport()) $output = $oCacheHandler->get('default_site'); if(!$output)