diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 408f906eb..d240193c3 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -93,7 +93,7 @@ function close() { // DB close $oDB = &DB::getInstance(); - if($oDB) $oDB->close(); + if(is_object($oDB)&&method_exists($oDB, 'close')) $oDB->close(); } /** diff --git a/modules/board/skins/default/comment_form.html b/modules/board/skins/default/comment_form.html index ef9a742e5..aa23ac301 100644 --- a/modules/board/skins/default/comment_form.html +++ b/modules/board/skins/default/comment_form.html @@ -32,7 +32,7 @@ -
+ diff --git a/modules/board/skins/default/delete_comment_form.html b/modules/board/skins/default/delete_comment_form.html index c08d194fa..5d5b87411 100644 --- a/modules/board/skins/default/delete_comment_form.html +++ b/modules/board/skins/default/delete_comment_form.html @@ -1,7 +1,7 @@ - + diff --git a/modules/board/skins/default/delete_form.html b/modules/board/skins/default/delete_form.html index 02d2fa595..d0dc9bf30 100644 --- a/modules/board/skins/default/delete_form.html +++ b/modules/board/skins/default/delete_form.html @@ -1,7 +1,7 @@ - + diff --git a/modules/board/skins/default/delete_trackback_form.html b/modules/board/skins/default/delete_trackback_form.html index 5ad48f1ec..bdeb3a4ae 100644 --- a/modules/board/skins/default/delete_trackback_form.html +++ b/modules/board/skins/default/delete_trackback_form.html @@ -1,7 +1,7 @@ - + diff --git a/modules/board/skins/default/filter/filter.delete_comment.xml b/modules/board/skins/default/filter/filter.delete_comment.xml index 7e24cf910..f1ec20610 100644 --- a/modules/board/skins/default/filter/filter.delete_comment.xml +++ b/modules/board/skins/default/filter/filter.delete_comment.xml @@ -1,19 +1,19 @@ - - - - + + + + - - - - - + + + + + - - - - - + + + + + diff --git a/modules/board/skins/default/filter/filter.delete_document.xml b/modules/board/skins/default/filter/filter.delete_document.xml index 06e6d36a9..1d1a14f9e 100644 --- a/modules/board/skins/default/filter/filter.delete_document.xml +++ b/modules/board/skins/default/filter/filter.delete_document.xml @@ -1,17 +1,17 @@ - - - - + +
+ + - - - - + + + + - - - - + + + +
diff --git a/modules/board/skins/default/filter/filter.delete_trackback.xml b/modules/board/skins/default/filter/filter.delete_trackback.xml index dd7336ef1..370b60da3 100644 --- a/modules/board/skins/default/filter/filter.delete_trackback.xml +++ b/modules/board/skins/default/filter/filter.delete_trackback.xml @@ -1,19 +1,19 @@ - - - - + +
+ + - - - - - + + + + + - - - - - + + + + +
diff --git a/modules/board/skins/default/filter/filter.input_password.xml b/modules/board/skins/default/filter/filter.input_password.xml index 39603f2e3..ebc2c1121 100644 --- a/modules/board/skins/default/filter/filter.input_password.xml +++ b/modules/board/skins/default/filter/filter.input_password.xml @@ -1,17 +1,17 @@ - - - - - + +
+ + + - - - - - + + + + + - - + +
diff --git a/modules/board/skins/default/filter/filter.insert.xml b/modules/board/skins/default/filter/filter.insert.xml index bef2f2e83..fa8d542a2 100644 --- a/modules/board/skins/default/filter/filter.insert.xml +++ b/modules/board/skins/default/filter/filter.insert.xml @@ -1,18 +1,18 @@ - - - - - - - - - - + +
+ + + + + + + + - - - - - + + + + +
diff --git a/modules/board/skins/default/filter/filter.insert_comment.xml b/modules/board/skins/default/filter/filter.insert_comment.xml index 1c60d5057..a57c471e3 100644 --- a/modules/board/skins/default/filter/filter.insert_comment.xml +++ b/modules/board/skins/default/filter/filter.insert_comment.xml @@ -1,29 +1,29 @@ - - - - - - - - - + +
+ + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + +
diff --git a/modules/board/skins/default/filter/filter.login.xml b/modules/board/skins/default/filter/filter.login.xml index d6e559d75..5ec18a97a 100644 --- a/modules/board/skins/default/filter/filter.login.xml +++ b/modules/board/skins/default/filter/filter.login.xml @@ -1,16 +1,16 @@ - - - - - + +
+ + + - - - - + + + + - - + +
diff --git a/modules/board/skins/default/filter/filter.logout.xml b/modules/board/skins/default/filter/filter.logout.xml index d8d0344d5..75e933e64 100644 --- a/modules/board/skins/default/filter/filter.logout.xml +++ b/modules/board/skins/default/filter/filter.logout.xml @@ -1,14 +1,14 @@ - - - - - + +
+ + + - - + + - - + +
diff --git a/modules/board/skins/default/filter/filter.search.xml b/modules/board/skins/default/filter/filter.search.xml index be1d9757f..1c527db76 100644 --- a/modules/board/skins/default/filter/filter.search.xml +++ b/modules/board/skins/default/filter/filter.search.xml @@ -1,15 +1,15 @@ - - - - - + +
+ + + - - - + + + - - + +
diff --git a/modules/board/skins/default/filter/filter.vote.xml b/modules/board/skins/default/filter/filter.vote.xml index bfda2105f..45c56a86e 100644 --- a/modules/board/skins/default/filter/filter.vote.xml +++ b/modules/board/skins/default/filter/filter.vote.xml @@ -1,14 +1,14 @@ - - - - + +
+ + - - - + + + - - + +
diff --git a/modules/board/skins/default/input_password_form.html b/modules/board/skins/default/input_password_form.html index 8971d1e28..89d88e64d 100644 --- a/modules/board/skins/default/input_password_form.html +++ b/modules/board/skins/default/input_password_form.html @@ -1,7 +1,7 @@ -
+ diff --git a/modules/board/skins/default/js/admin.js b/modules/board/skins/default/js/admin.js deleted file mode 100644 index 899158ccb..000000000 --- a/modules/board/skins/default/js/admin.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file : modules/board/js/admin.js - * @author : zero - * @desc : board 모듈의 관리자용 javascript - **/ - -/* 모듈 생성 후 */ -function procInsertModule(ret_obj, response_tags) { - var error = ret_obj['error']; - var message = ret_obj['message']; - var sid = ret_obj['sid']; - var act = ret_obj['act']; - var page = ret_obj['page']; - var module_srl = ret_obj['module_srl']; - alert(message); - - url = "./admin.php?sid="+sid+"&module_srl="+module_srl+"&page="+page+"&act="+act; - location.href = url; -} - -/* 카테고리 관련 작업들 */ -function doUpdateCategory(category_srl, mode, message) { - if(typeof(message)!='undefined'&&!confirm(message)) return; - - var fo_obj = xGetElementById('fo_module_category_info'); - fo_obj.category_srl.value = category_srl; - fo_obj.mode.value = mode; - - procFormFilter(fo_obj, update_category_info, procReload); -} - -/* 메세지 출력후 현페이지 리로드 */ -function procReload(ret_obj, response_tags) { - var error = ret_obj['error']; - var message = ret_obj['message']; - if(message) alert(message); - - location.href = location.href; -} diff --git a/modules/board/skins/default/login_form.html b/modules/board/skins/default/login_form.html index efb60da06..006d279c0 100644 --- a/modules/board/skins/default/login_form.html +++ b/modules/board/skins/default/login_form.html @@ -1,7 +1,7 @@ - + diff --git a/modules/board/skins/default/logout.html b/modules/board/skins/default/logout.html index 0ba1c5ec5..2fec8f877 100644 --- a/modules/board/skins/default/logout.html +++ b/modules/board/skins/default/logout.html @@ -1,7 +1,7 @@ - +
diff --git a/modules/board/skins/default/write_form.html b/modules/board/skins/default/write_form.html index d1380bb7a..92ce9f9fd 100644 --- a/modules/board/skins/default/write_form.html +++ b/modules/board/skins/default/write_form.html @@ -1,7 +1,7 @@ -fileupload)-->enctype="multipart/form-data"> +fileupload)-->enctype="multipart/form-data"> diff --git a/modules/install/tpl/form.mysql.html b/modules/install/tpl/form.mysql.html index cdc348d4f..c37bbd621 100644 --- a/modules/install/tpl/form.mysql.html +++ b/modules/install/tpl/form.mysql.html @@ -1,4 +1,3 @@ - diff --git a/modules/install/tpl/introduce.html b/modules/install/tpl/introduce.html index 1d08518a1..48e6a0334 100644 --- a/modules/install/tpl/introduce.html +++ b/modules/install/tpl/introduce.html @@ -1,4 +1,3 @@ -
diff --git a/modules/module/module.model.php b/modules/module/module.model.php index 820bb8774..6a1e66b33 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -33,30 +33,34 @@ $actions = $xml_obj->module->actions->action; ///< action list (필수) // 권한 정보의 정리 - if(is_array($grants)) $grant_list = $grants; - else $grant_list[] = $grants; + if($grants) { + if(is_array($grants)) $grant_list = $grants; + else $grant_list[] = $grants; - foreach($grant_list as $grant) { - $name = $grant->attrs->name; - $default = $grant->attrs->default; - $title = $grant->title->body; - if(!$default) $default = 'guest'; + foreach($grant_list as $grant) { + $name = $grant->attrs->name; + $default = $grant->attrs->default; + $title = $grant->title->body; + if(!$default) $default = 'guest'; - $output->grant->{$name}->title = $title; - $output->grant->{$name}->default = $default; + $output->grant->{$name}->title = $title; + $output->grant->{$name}->default = $default; + } } // actions 정리 - if(is_array($actions)) $action_list = $actions; - else $action_list[] = $actions; + if($actions) { + if(is_array($actions)) $action_list = $actions; + else $action_list[] = $actions; - foreach($action_list as $action) { - $name = $action->attrs->name; - $type = $action->attrs->type; - $grant = $action->attrs->grant; - if(!$grant) $grant = 'guest'; - $output->action->{$name}->type = $type; - $output->action->{$name}->grant = $grant; + foreach($action_list as $action) { + $name = $action->attrs->name; + $type = $action->attrs->type; + $grant = $action->attrs->grant; + if(!$grant) $grant = 'guest'; + $output->action->{$name}->type = $type; + $output->action->{$name}->grant = $grant; + } } return $output;
{$lang->introduce_title}