From e92ed5fa7734e42b366c05c465147d3ee93aa22e Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 10 Jul 2007 07:13:23 +0000 Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=97=90=EA=B2=8C=20?= =?UTF-8?q?=EC=B5=9C=EA=B3=A0=EA=B4=80=EB=A6=AC=EC=9E=90=20=EA=B6=8C?= =?UTF-8?q?=ED=95=9C=20=EB=B6=80=EC=97=AC=ED=9B=84=20=EB=8B=A4=EC=8B=9C=20?= =?UTF-8?q?=ED=95=B4=EC=A0=9C=ED=95=A0=EB=95=8C=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0=20=EB=B0=8F=20=EB=B3=B4=EC=95=88=EC=83=81=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EA=B8=88=EC=A7=80/=EC=B5=9C=EA=B3=A0=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EA=B6=8C=ED=95=9C=EC=97=90=20=EB=8C=80=ED=95=B4=20?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EC=B2=B4=ED=81=AC=20=EB=A3=A8=ED=8B=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/trunk@1893 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/install/install.controller.php | 5 +++++ modules/member/member.controller.php | 26 ++++++++++++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 739ad7aaa..425d61b2f 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -23,6 +23,11 @@ // 설치가 되어 있는지에 대한 체크 if(Context::isInstalled()) return new Object(-1, 'msg_already_installed'); + // 설치시 임시로 최고관리자로 지정 + $logged_info->is_admin = 'Y'; + $_SESSION['logged_info'] = $logged_info; + Context::set('logged_info', $logged_info); + // DB와 관련된 변수를 받음 $db_info = Context::gets('db_type','db_port','db_hostname','db_userid','db_password','db_database','db_table_prefix','time_zone','use_rewrite'); if($db_info->use_rewrite!='Y') $db_info->use_rewrite = 'N'; diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 377ca7d05..565dbcd35 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -861,14 +861,23 @@ $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('member'); + $logged_info = Context::get('logged_info'); + // 임시 제한 일자가 있을 경우 제한 일자에 내용 추가 if($config->limit_day) $args->limit_date = date("YmdHis", time()+$config->limit_day*60*60*24); // 필수 변수들의 조절 if($args->allow_mailing!='Y') $args->allow_mailing = 'N'; if(!in_array($args->allow_message, array('Y','N','F'))) $args->allow_message= 'Y'; - if($args->denied!='Y') $args->denied = 'N'; - if($args->is_admin!='Y') $args->is_admin = 'N'; + + if($logged_info->is_admin == 'Y') { + if($args->denied!='Y') $args->denied = 'N'; + if($args->is_admin!='Y') $args->is_admin = 'N'; + } else { + unset($args->is_admin); + unset($args->denied); + } + list($args->email_id, $args->email_host) = explode('@', $args->email_address); // 홈페이지, 블로그의 주소 검사 @@ -942,14 +951,23 @@ // 모델 객체 생성 $oMemberModel = &getModel('member'); + $logged_info = Context::get('logged_info'); + // 수정하려는 대상의 원래 정보 가져오기 $member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl); // 필수 변수들의 조절 if($args->allow_mailing!='Y') $args->allow_mailing = 'N'; if(!in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y'; - if(!$args->denied) unset($args->denied); - if(!$args->is_admin) unset($args->is_admin); + + if($logged_info->is_admin == 'Y') { + if($args->denied!='Y') $args->denied = 'N'; + if($args->is_admin!='Y') $args->is_admin = 'N'; + } else { + unset($args->is_admin); + unset($args->denied); + } + list($args->email_id, $args->email_host) = explode('@', $args->email_address); // 홈페이지, 블로그의 주소 검사