From 457081d910517ecd62913f38822c90feb219c2d2 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 4 Jun 2007 06:31:03 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1545
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/addon/addon.class.php              |  1 +
 modules/admin/admin.class.php              |  2 +-
 modules/install/install.controller.php     |  1 +
 modules/member/member.admin.controller.php |  3 ++-
 modules/member/member.class.php            | 23 +++++++++++-----------
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/modules/addon/addon.class.php b/modules/addon/addon.class.php
index 049dbf07a..647598d21 100644
--- a/modules/addon/addon.class.php
+++ b/modules/addon/addon.class.php
@@ -23,6 +23,7 @@
             $oAddonController->doActivate('message');
             $oAddonController->doActivate('member_extra_info');
             $oAddonController->doActivate('counter');
+            $oAddonController->doActivate('blogapi');
             $oAddonController->procAddonAdminToggleActivate();
             return new Object();
         }
diff --git a/modules/admin/admin.class.php b/modules/admin/admin.class.php
index c0f8d0d17..4622f534b 100644
--- a/modules/admin/admin.class.php
+++ b/modules/admin/admin.class.php
@@ -12,7 +12,7 @@
          **/
         function moduleInstall() {
             // 게시판, 회원관리, 레이아웃관리등 자주 사용될 module을 admin_shortcut에 등록
-            $oAdminController = &getController('admin');
+            $oAdminController = &getAdminController('admin');
 
             $oAdminController->insertShortCut('board');
             $oAdminController->insertShortCut('blog');
diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index aad900be6..22c6fb5cc 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -119,6 +119,7 @@
 
             // 각 모듈의 schemas/*.xml 파일을 모두 찾아서 table 생성
             $module_list = FileHandler::readDir('./modules/', NULL, false, true);
+            debugPrint($module_list);
             foreach($module_list as $module_path) {
                 // 모듈 이름을 구함
                 $tmp_arr = explode('/',$module_path);
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 463aeaf73..cd44be729 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -244,7 +244,8 @@
             $admin_group = $oMemberModel->getAdminGroup();
             $args->group_srl_list = $admin_group->group_srl;
 
-            return $this->insertMember($args);
+            $oMemberController = &getController('member');
+            return $oMemberController->insertMember($args);
         }
 
         /**
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index a1ef46df1..c9e2218a7 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -55,28 +55,29 @@
 
             // 멤버 컨트롤러 객체 생성
             $oMemberController = &getController('member');
+            $oMemberAdminController = &getAdminController('member');
 
             // 관리자, 정회원, 준회원 그룹을 입력
             $group_args->title = Context::getLang('admin_group');
             $group_args->is_default = 'N';
             $group_args->is_admin = 'Y';
-            $output = $oMemberController->insertGroup($group_args);
+            $output = $oMemberAdminController->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);
+            $output = $oMemberAdminController->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);
+            $oMemberAdminController->insertGroup($group_args);
 
             // 관리자 정보 세팅
             $admin_info = Context::gets('user_id','password','nick_name','user_name', 'email_address');
             if($admin_info->user_id) {
                 // 관리자 정보 입력
-                $oMemberController->insertAdmin($admin_info);
+                $oMemberAdminController->insertAdmin($admin_info);
 
                 // 로그인 처리시킴
                 $output = $oMemberController->doLogin($admin_info->user_id);
@@ -86,14 +87,14 @@
             $oModuleModel = &getModel('module');
             $module_list = $oModuleModel->getModuleList();
             foreach($module_list as $key => $val) {
-                $oMemberController->insertDeniedID($val->module,'');
+                $oMemberAdminController->insertDeniedID($val->module,'');
             }
-            $oMemberController->insertDeniedID('www','');
-            $oMemberController->insertDeniedID('root','');
-            $oMemberController->insertDeniedID('administrator','');
-            $oMemberController->insertDeniedID('telnet','');
-            $oMemberController->insertDeniedID('ftp','');
-            $oMemberController->insertDeniedID('http','');
+            $oMemberAdminController->insertDeniedID('www','');
+            $oMemberAdminController->insertDeniedID('root','');
+            $oMemberAdminController->insertDeniedID('administrator','');
+            $oMemberAdminController->insertDeniedID('telnet','');
+            $oMemberAdminController->insertDeniedID('ftp','');
+            $oMemberAdminController->insertDeniedID('http','');
 
             // member 에서 사용할 cache디렉토리 생성
             FileHandler::makeDir('./files/member_extra_info/attach/image_name');