diff --git a/modules/blog/blog.class.php b/modules/blog/blog.class.php
index c2c5293bd..bd13797d1 100644
--- a/modules/blog/blog.class.php
+++ b/modules/blog/blog.class.php
@@ -10,7 +10,7 @@
var $search_option = array('title','content','title_content','user_name','user_id','tag'); ///< 검색 옵션
var $skin = "default"; ///< 스킨 이름
- var $list_count = 20; ///< 한 페이지에 나타날 글의 수
+ var $list_count = 1; ///< 한 페이지에 나타날 글의 수
var $page_count = 10; ///< 페이지의 수
var $category_list = NULL; ///< 카테고리 목록
diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php
index 09aa7f8b2..8efcb871b 100644
--- a/modules/board/board.controller.php
+++ b/modules/board/board.controller.php
@@ -425,6 +425,19 @@
if(!$output->toBool()) return $output;
+ // 신규 입력일 경우 기본 권한 설정 (file upload, manager권한을 관리그룹으로 정함)
+ if($msg_code == 'success_registed') {
+ $oMemberModel = &getModel('member');
+ $admin_group = $oMemberModel->getAdminGroup();
+ $admin_group_srl = $admin_group->group_srl;
+
+ $module_srl = $output->get('module_srl');
+ $grants = serialize(array('fileupload'=>array($admin_group_srl), 'comment_fileupload'=>array($admin_group_srl), 'manager'=>array($admin_group_srl)));
+
+ $oModuleController = &getController('module');
+ $oModuleController->updateModuleGrant($module_srl, $grants);
+ }
+
$this->add('page',Context::get('page'));
$this->add('module_srl',$output->get('module_srl'));
$this->setMessage($msg_code);
diff --git a/modules/board/conf/module.xml b/modules/board/conf/module.xml
index c3949b50d..d912d239b 100644
--- a/modules/board/conf/module.xml
+++ b/modules/board/conf/module.xml
@@ -21,6 +21,10 @@
파일 첨부
file upload
+
+ 댓글 파일 첨부
+ comment file upload
+
관리
manager
diff --git a/modules/comment/comment.class.php b/modules/comment/comment.class.php
index 6e9159517..bac47ca5e 100644
--- a/modules/comment/comment.class.php
+++ b/modules/comment/comment.class.php
@@ -14,7 +14,6 @@
// action forward에 등록 (관리자 모드에서 사용하기 위함)
$oModuleController = &getController('module');
$oModuleController->insertActionForward('comment', 'view', 'dispCommentAdminList');
- //$oModuleController->insertActionForward('comment', 'controller', 'procCommentAdminDeleteChecked');
return new Object();
}
diff --git a/modules/document/document.class.php b/modules/document/document.class.php
index ac584034c..990d41828 100644
--- a/modules/document/document.class.php
+++ b/modules/document/document.class.php
@@ -20,7 +20,6 @@
// action forward에 등록 (관리자 모드에서 사용하기 위함)
$oModuleController = &getController('module');
$oModuleController->insertActionForward('document', 'view', 'dispDocumentAdminList');
- //$oModuleController->insertActionForward('document', 'controller', 'procDocumentAdminDeleteChecked');
return new Object();
}
diff --git a/modules/document/schemas/documents.xml b/modules/document/schemas/documents.xml
index 83b200df3..2326ab43b 100644
--- a/modules/document/schemas/documents.xml
+++ b/modules/document/schemas/documents.xml
@@ -5,6 +5,8 @@
+
+
@@ -21,6 +23,7 @@
+
diff --git a/modules/editor/editor.class.php b/modules/editor/editor.class.php
index 718ac7d41..359b8b71b 100644
--- a/modules/editor/editor.class.php
+++ b/modules/editor/editor.class.php
@@ -15,10 +15,6 @@
$oModuleController = &getController('module');
$oModuleController->insertActionForward('editor', 'view', 'dispEditorAdminIndex');
$oModuleController->insertActionForward('editor', 'view', 'dispEditorAdminSetupComponent');
- //$oModuleController->insertActionForward('editor', 'controller', 'procEditorAdminEnableComponent');
- //$oModuleController->insertActionForward('editor', 'controller', 'procEditorAdminDisableComponent');
- //$oModuleController->insertActionForward('editor', 'controller', 'procEditorAdminMoveListOrder');
- //$oModuleController->insertActionForward('editor', 'controller', 'procEditorAdminSetupComponent');
// 기본 에디터 컴포넌트를 추가
$oEditorController = &getController('editor');
diff --git a/modules/install/lang/ko.lang.php b/modules/install/lang/ko.lang.php
index 2775a0cf4..e92fc96c3 100644
--- a/modules/install/lang/ko.lang.php
+++ b/modules/install/lang/ko.lang.php
@@ -60,9 +60,6 @@
$lang->admin_title = '관리자정보';
- $lang->default_group_1 = "준회원";
- $lang->default_group_2 = "정회원";
-
$lang->about_database_file = 'Sqlite는 파일에 데이터를 저장합니다. 데이터베이스 파일의 위치를 웹에서 접근할 수 없는 곳으로 하셔야 합니다';
$lang->success_installed = '설치가 되었습니다';
diff --git a/modules/krzip/krzip.class.php b/modules/krzip/krzip.class.php
index 10f373761..503961d2d 100644
--- a/modules/krzip/krzip.class.php
+++ b/modules/krzip/krzip.class.php
@@ -18,7 +18,6 @@
// action forward에 등록 (관리자 모드에서 사용하기 위함)
$oModuleController = &getController('module');
$oModuleController->insertActionForward('krzip', 'view', 'dispKrzipAdminConfig');
- //$oModuleController->insertActionForward('krzip', 'controller', 'procKrzipAdminInsertConfig');
return new Object();
}
diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php
index a8ed7ac59..cc6a47666 100644
--- a/modules/member/lang/ko.lang.php
+++ b/modules/member/lang/ko.lang.php
@@ -8,6 +8,10 @@
$lang->member_default_info = '기본 정보';
$lang->member_extend_info = '추가 정보';
+ $lang->default_group_1 = "준회원";
+ $lang->default_group_2 = "정회원";
+ $lang->admin_group = "관리그룹";
+
$lang->remember_user_id = '아이디 저장';
$lang->already_logged = '이미 로그인되어 있습니다';
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index 3c3060379..d916ba63c 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -43,34 +43,6 @@
$oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteImageName');
$oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteImageMark');
- //$oModuleController->insertActionForward('member', 'model', 'getmemberMenu');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberLogin');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberLogout');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberInsert');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberModifyInfo');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberModifyPassword');
-
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberSendMessage');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteMessage');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteMessages');
-
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberAddFriend');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberMoveFriend');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteFriend');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberAddFriendGroup');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberRenameFriendGroup');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteFriendGroup');
-
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberAdminInsert');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberAdminDelete');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberAdminInsertConfig');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberAdminInsertGroup');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberAdminUpdateGroup');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberAdminInsertJoinForm');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberAdminUpdateJoinForm');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberAdminInsertDeniedID');
- //$oModuleController->insertActionForward('member', 'controller', 'procMemberAdminUpdateDeniedID');
-
// 기본 정보를 세팅
$args->enable_join = 'Y';
$args->image_name = 'Y';
@@ -84,13 +56,20 @@
// 멤버 컨트롤러 객체 생성
$oMemberController = &getController('member');
- // 그룹을 입력
+ // 관리자, 정회원, 준회원 그룹을 입력
+ $group_args->title = Context::getLang('admin_group');
+ $group_args->is_default = 'N';
+ $group_args->is_admin = 'Y';
+ $output = $oMemberController->insertGroup($group_args);
+
$group_args->title = Context::getLang('default_group_1');
$group_args->is_default = 'Y';
+ $group_args->is_admin = 'N';
$output = $oMemberController->insertGroup($group_args);
$group_args->title = Context::getLang('default_group_2');
$group_args->is_default = 'N';
+ $group_args->is_admin = 'N';
$oMemberController->insertGroup($group_args);
// 관리자 정보 세팅
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index dcd8024db..32f491cc0 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -832,7 +832,14 @@
* @brief 관리자를 추가한다
**/
function insertAdmin($args) {
+ // 관리자임을 설정
$args->is_admin = 'Y';
+
+ // 관리자 그룹을 구해와서 설정
+ $oMemberModel = &getModel('member');
+ $admin_group = $oMemberModel->getAdminGroup();
+ $args->group_srl_list = $admin_group->group_srl;
+
return $this->insertMember($args);
}
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 1d686fd5a..dff760dc9 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -278,6 +278,14 @@
return $output->data;
}
+ /**
+ * @brief 관리자 그룹을 가져옴
+ **/
+ function getAdminGroup() {
+ $output = executeQuery('member.getAdminGroup');
+ return $output->data;
+ }
+
/**
* @brief group_srl에 해당하는 그룹 정보 가져옴
**/
diff --git a/modules/member/queries/insertGroup.xml b/modules/member/queries/insertGroup.xml
index 2d53d2319..c864c60b8 100644
--- a/modules/member/queries/insertGroup.xml
+++ b/modules/member/queries/insertGroup.xml
@@ -6,6 +6,7 @@
+
diff --git a/modules/member/schemas/member_group.xml b/modules/member/schemas/member_group.xml
index 8cef9d99c..8f8316b11 100644
--- a/modules/member/schemas/member_group.xml
+++ b/modules/member/schemas/member_group.xml
@@ -3,5 +3,6 @@
+
diff --git a/modules/member/tpl/group_list.html b/modules/member/tpl/group_list.html
index fba29454b..6ee8e7cd7 100644
--- a/modules/member/tpl/group_list.html
+++ b/modules/member/tpl/group_list.html
@@ -36,7 +36,7 @@
{$group_info->is_default} |
{$lang->cmd_modify} |
-
+
{$lang->cmd_delete}
|
diff --git a/modules/member/tpl/group_update_form.html b/modules/member/tpl/group_update_form.html
index d9e725fe5..855c6688b 100644
--- a/modules/member/tpl/group_update_form.html
+++ b/modules/member/tpl/group_update_form.html
@@ -15,11 +15,11 @@
{$lang->group_title} :
-
+
{$lang->is_default} :
{$lang->description} :
-
+
diff --git a/modules/message/message.class.php b/modules/message/message.class.php
index 3967f0a84..303eb5978 100644
--- a/modules/message/message.class.php
+++ b/modules/message/message.class.php
@@ -15,7 +15,6 @@
$oModuleController = &getController('module');
$oModuleController->insertActionForward('message', 'view', 'dispMessage');
$oModuleController->insertActionForward('message', 'view', 'dispMessageAdminConfig');
- //$oModuleController->insertActionForward('message', 'controller', 'procMessageAdminInsertConfig');
return new Object();
}
diff --git a/modules/module/module.class.php b/modules/module/module.class.php
index 7e84ace01..5332d7531 100644
--- a/modules/module/module.class.php
+++ b/modules/module/module.class.php
@@ -17,8 +17,6 @@
$oModuleController->insertActionForward('module', 'view', 'dispModuleAdminList');
$oModuleController->insertActionForward('module', 'view', 'dispModuleAdminCategory');
$oModuleController->insertActionForward('module', 'view', 'dispModuleAdminInfo');
- //$oModuleController->insertActionForward('module', 'controller', 'procModuleAdminInsertCategory');
- //$oModuleController->insertActionForward('module', 'controller', 'procModuleAdminUpdateCategory');
// module 모듈에서 사용할 디렉토리 생성
FileHandler::makeDir('./files/cache/module_info');
diff --git a/modules/page/page.class.php b/modules/page/page.class.php
index 2ba9750ee..600ae4488 100644
--- a/modules/page/page.class.php
+++ b/modules/page/page.class.php
@@ -19,9 +19,6 @@
$oModuleController->insertActionForward('page', 'view', 'dispPageAdminInfo');
$oModuleController->insertActionForward('page', 'view', 'dispPageAdminInsert');
$oModuleController->insertActionForward('page', 'view', 'dispPageAdminDelete');
- //$oModuleController->insertActionForward('page', 'controller', 'procPageAdminInsert');
- //$oModuleController->insertActionForward('page', 'controller', 'procPageAdminDelete');
- //$oModuleController->insertActionForward('page', 'controller', 'procPageAdminInsertConfig');
// page 에서 사용할 cache디렉토리 생성
FileHandler::makeDir('./files/cache/page');
diff --git a/modules/plugin/plugin.class.php b/modules/plugin/plugin.class.php
index a16aff9d2..d6f883b4e 100644
--- a/modules/plugin/plugin.class.php
+++ b/modules/plugin/plugin.class.php
@@ -17,8 +17,6 @@
$oModuleController->insertActionForward('plugin', 'view', 'dispPluginGenerateCode');
$oModuleController->insertActionForward('plugin', 'view', 'dispPluginGenerateCodePage');
$oModuleController->insertActionForward('plugin', 'view', 'dispPluginAdminDownloadedList');
- //$oModuleController->insertActionForward('plugin', 'controller', 'procPluginGenerateCode');
- //$oModuleController->insertActionForward('plugin', 'controller', 'procPluginGetColorsetList');
// plugin 에서 사용할 cache디렉토리 생성
FileHandler::makeDir('./files/cache/plugin');
diff --git a/modules/spamfilter/spamfilter.class.php b/modules/spamfilter/spamfilter.class.php
index 480a7b64d..ad2bcefe7 100644
--- a/modules/spamfilter/spamfilter.class.php
+++ b/modules/spamfilter/spamfilter.class.php
@@ -16,11 +16,6 @@
$oModuleController->insertActionForward('spamfilter', 'view', 'dispSpamfilterAdminConfig');
$oModuleController->insertActionForward('spamfilter', 'view', 'dispSpamfilterAdminDeniedIPList');
$oModuleController->insertActionForward('spamfilter', 'view', 'dispSpamfilterAdminDeniedWordList');
- //$oModuleController->insertActionForward('spamfilter', 'controller', 'procSpamfilterAdminInsertConfig');
- //$oModuleController->insertActionForward('spamfilter', 'controller', 'procSpamfilterAdminInsertDeniedIP');
- //$oModuleController->insertActionForward('spamfilter', 'controller', 'procSpamfilterAdminDeleteDeniedIP');
- //$oModuleController->insertActionForward('spamfilter', 'controller', 'procSpamfilterAdminInsertDeniedWord');
- //$oModuleController->insertActionForward('spamfilter', 'controller', 'procSpamfilterAdminDeleteDeniedWord');
return new Object();
}
diff --git a/modules/trackback/trackback.class.php b/modules/trackback/trackback.class.php
index e5a4c29ee..d24dba6d6 100644
--- a/modules/trackback/trackback.class.php
+++ b/modules/trackback/trackback.class.php
@@ -15,7 +15,6 @@
$oModuleController = &getController('module');
$oModuleController->insertActionForward('trackback', 'controller', 'procTrackbackReceive');
$oModuleController->insertActionForward('trackback', 'view', 'dispTrackbackAdminList');
- //$oModuleController->insertActionForward('trackback', 'controller', 'procTrackbackAdminDeleteChecked');
return new Object();
}