From 7daa63cedf913b86d2567b0baf9e5a8cc05f26c7 Mon Sep 17 00:00:00 2001 From: bnu Date: Wed, 4 Dec 2013 20:17:14 +0900 Subject: [PATCH] =?UTF-8?q?PHP=205.4=20=EC=9D=B4=EC=83=81=EC=97=90?= =?UTF-8?q?=EC=84=9C=EC=9D=98=20=ED=98=B8=ED=99=98=EC=84=B1=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EA=B0=9C=EC=84=A0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/mobile/classes/mobile.class.php | 8 ++++---- modules/admin/admin.admin.controller.php | 2 +- modules/file/file.controller.php | 9 +++++++-- modules/importer/importer.admin.controller.php | 6 +++--- modules/importer/ttimport.class.php | 4 ++-- modules/menu/menu.admin.controller.php | 2 +- modules/module/module.admin.controller.php | 2 +- modules/module/module.class.php | 4 ++-- modules/module/module.model.php | 2 +- 9 files changed, 22 insertions(+), 17 deletions(-) diff --git a/addons/mobile/classes/mobile.class.php b/addons/mobile/classes/mobile.class.php index 01ad804cb..85819846d 100644 --- a/addons/mobile/classes/mobile.class.php +++ b/addons/mobile/classes/mobile.class.php @@ -523,7 +523,7 @@ class mobileXE $this->setUpperUrl(getUrl('cmid',$upper_srl), Context::getLang('cmd_go_upper')); if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $cur_item['url'])) { - $obj = null; + $obj = array(); $obj['href'] = getUrl('','mid',$cur_item['url']); $obj['link'] = $obj['text'] = '['.$cur_item['text'].']'; $childs[] = $obj; @@ -541,7 +541,7 @@ class mobileXE foreach($list as $key => $val) { if(!$val['text']) continue; - $obj = null; + $obj = array(); if(!count($val['list'])) { $obj['href'] = getUrl('','mid',$val['url']); @@ -574,7 +574,7 @@ class mobileXE } $lang_supported = Context::get('lang_supported'); $lang_type = Context::getLangType(); - $obj = null; + $obj = array(); $obj['link'] = $obj['text'] = Context::getLang('president_lang').' : '.$lang_supported[$lang_type]; $obj['href'] = getUrl('sel_lang',$lang_type); $childs[] = $obj; @@ -583,7 +583,7 @@ class mobileXE { foreach($lang_supported as $key => $val) { - $obj = null; + $obj = array(); $obj['link'] = $obj['text'] = $val; $obj['href'] = getUrl('sel_lang',$key); $childs[] = $obj; diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index d05189685..6e7241220 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -456,7 +456,7 @@ class adminAdminController extends admin */ function _deleteAllFavorite() { - $args = NULL; + $args = new stdClass; $output = executeQuery('admin.deleteAllFavorite', $args); return $output; } diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index 9a3ac0b3d..dd10218f4 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -371,7 +371,7 @@ class fileController extends file $srl = (int)$srls[$i]; if(!$srl) continue; - $args = null; + $args = new stdClass; $args->file_srl = $srl; $output = executeQuery('file.getFile', $args); if(!$output->toBool()) continue; @@ -756,12 +756,13 @@ class fileController extends file $oDocumentController = &getController('document'); $documentSrlList = array(); + for($i=0;$ifile_srl = $srl; $output = executeQuery('file.getFile', $args); @@ -777,16 +778,20 @@ class fileController extends file $source_filename = $output->data->source_filename; $uploaded_filename = $output->data->uploaded_filename; + // Call a trigger (before) $trigger_obj = $output->data; $output = ModuleHandler::triggerCall('file.deleteFile', 'before', $trigger_obj); if(!$output->toBool()) return $output; + // Remove from the DB $output = executeQuery('file.deleteFile', $args); if(!$output->toBool()) return $output; + // Call a trigger (after) $trigger_output = ModuleHandler::triggerCall('file.deleteFile', 'after', $trigger_obj); if(!$trigger_output->toBool()) return $trigger_output; + // If successfully deleted, remove the file FileHandler::removeFile($uploaded_filename); } diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php index 6e68eb4f4..435e97237 100644 --- a/modules/importer/importer.admin.controller.php +++ b/modules/importer/importer.admin.controller.php @@ -418,7 +418,7 @@ class importerAdminController extends importer unset($obj->extra_vars); $obj->extra_vars = serialize($extra_vars); // Check if the same nickname is existing - $nick_args = null; + $nick_args = new stdClass; $nick_args->nick_name = $obj->nick_name; $nick_output = executeQuery('member.getMemberSrl', $nick_args); if(!$nick_output->toBool()) $obj->nick_name .= '_'.$obj->member_srl; @@ -767,7 +767,7 @@ class importerAdminController extends importer $tag_count = count($tag_list); for($i=0;$i<$tag_count;$i++) { - $args = null; + $args = new stdClass; $args->tag_srl = getNextSequence(); $args->module_srl = $module_srl; $args->document_srl = $obj->document_srl; @@ -947,7 +947,7 @@ class importerAdminController extends importer } } // Comment list first - $list_args = null; + $list_args = new stdClass; $list_args->comment_srl = $obj->comment_srl; $list_args->document_srl = $obj->document_srl; $list_args->module_srl = $obj->module_srl; diff --git a/modules/importer/ttimport.class.php b/modules/importer/ttimport.class.php index dc3d72be8..0a61441cf 100644 --- a/modules/importer/ttimport.class.php +++ b/modules/importer/ttimport.class.php @@ -264,7 +264,7 @@ class ttimport $tag_count = count($tag_list); for($i=0;$i<$tag_count;$i++) { - $args = null; + $args = new stdClass; $args->tag_srl = getNextSequence(); $args->module_srl = $module_srl; $args->document_srl = $obj->document_srl; @@ -659,7 +659,7 @@ class ttimport $tobj->sequence = $sequence; $tobj->parent_srl = $parent_srl; // Comment list first - $list_args = null; + $list_args = new stdClass; $list_args->comment_srl = $tobj->comment_srl; $list_args->document_srl = $tobj->document_srl; $list_args->module_srl = $tobj->module_srl; diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index ca6a6b6e8..6fe42a306 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -1535,7 +1535,7 @@ class menuAdminController extends menu $args->group_srls = $exposure; } - $args->group_srls = implode(',', $exposure); + if($exposure) $args->group_srls = implode(',', $exposure); } $output = executeQuery('menu.updateMenuItem', $args); diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index dd79bdf4a..ef54c8579 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -176,7 +176,7 @@ class moduleAdminController extends module $errorLog = array(); foreach($clones as $mid => $browser_title) { - $clone_args = null; + $clone_args = new stdClass; $clone_args = clone $module_info; $clone_args->module_srl = null; $clone_args->content = null; diff --git a/modules/module/module.class.php b/modules/module/module.class.php index fd4fe4458..3ea3a0ad7 100644 --- a/modules/module/module.class.php +++ b/modules/module/module.class.php @@ -572,7 +572,7 @@ class module extends ModuleObject { if($data->count == 1) continue; $domain = $data->domain; - $args = null; + $args = new stdClass; $args->domain = $domain; $output2 = executeQueryArray("module.getSiteByDomain", $args); $bFirst = true; @@ -584,7 +584,7 @@ class module extends ModuleObject continue; } $domain .= "_"; - $args = null; + $args = new stdClass; $args->domain = $domain; $args->site_srl = $site->site_srl; $output3 = executeQuery("module.updateSite", $args); diff --git a/modules/module/module.model.php b/modules/module/module.model.php index 7161d680a..0a7f57915 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -58,7 +58,7 @@ class moduleModel extends module function getSiteInfoByDomain($domain, $columnList = array()) { $args = new stdClass(); - $args->domain= $domain; + $args->domain = $domain; $output = executeQuery('module.getSiteInfoByDomain', $args, $columnList); return $output->data; }