diff --git a/config/config.inc.php b/config/config.inc.php index 5df74186b..ebb849cc9 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -18,7 +18,7 @@ /** * @brief debug mode = true 일때 files/_debug_message.php 에 디버그 내용이 쌓임 **/ - define('__DEBUG__', false); + define('__DEBUG__', true); if(__DEBUG__) { // php5이상이면 error handling을 handleError() 로 set diff --git a/config/func.inc.php b/config/func.inc.php index 145dc458e..53a7502bf 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -126,6 +126,7 @@ * @return string **/ function zdate($str, $format = "Y-m-d H:i:s") { + if(!$str) return; return date($format, mktime(substr($str,8,2), substr($str,10,2), substr($str,12,2), substr($str,4,2), substr($str,6,2), substr($str,0,4))); } diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php index 097071cd5..f14b2d7f7 100644 --- a/modules/member/lang/ko.lang.php +++ b/modules/member/lang/ko.lang.php @@ -107,6 +107,9 @@ $lang->about_password = '비밀번호는 6~20자로 되어야 합니다'; $lang->about_user_name = '이름은 2~20자 이내여야 합니다'; $lang->about_nick_name = '닉네임은 2~20자 이내여야 합니다'; + $lang->about_homepage = '홈페이지가 있을 경우 입력해주세요'; + $lang->about_blog = '운영하는 블로그가 있을 경우 입력해주세요'; + $lang->about_birthday = '생년월일을 입력해주세요'; $lang->about_allow_mailing = '메일링 가입이 체크되지 않으면 단체메일 발송시 메일을 받지 않습니다'; $lang->about_denied = '체크시 아이디를 사용할 수 없도록 합니다'; $lang->about_is_admin = '체크시 최고 관리자 권한을 가지게 됩니다'; diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 9523de390..a247cd546 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -375,7 +375,7 @@ **/ function procMemberAdminInsert() { // 필수 정보들을 미리 추출 - $args = Context::gets('member_srl','user_id','user_name','nick_name','email_address','password','allow_mailing','denied','is_admin','description','group_srl_list'); + $args = Context::gets('member_srl','user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing','denied','is_admin','description','group_srl_list'); // 넘어온 모든 변수중에서 몇가지 불필요한 것들 삭제 $all_args = Context::getRequestVars(); @@ -595,7 +595,7 @@ if($config->enable_join != 'Y') return $this->stop('msg_signup_disabled'); // 필수 정보들을 미리 추출 - $args = Context::gets('user_id','user_name','nick_name','email_address','password','allow_mailing'); + $args = Context::gets('user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing'); $args->member_srl = getNextSequence(); // 넘어온 모든 변수중에서 몇가지 불필요한 것들 삭제 @@ -629,7 +629,7 @@ if(!Context::get('is_logged')) return $this->stop('msg_not_logged'); // 필수 정보들을 미리 추출 - $args = Context::gets('nick_name','email_address','allow_mailing'); + $args = Context::gets('nick_name','homepage','blog','birthday','email_address','allow_mailing'); // 로그인 정보 $logged_info = Context::get('logged_info'); @@ -866,6 +866,10 @@ if($args->is_admin!='Y') $args->is_admin = 'N'; list($args->email_id, $args->email_host) = explode('@', $args->email_address); + // 홈페이지, 블로그의 주소 검사 + if($args->homepage && !eregi("^http:\/\/",$args->homepage)) $args->homepage = 'http://'.$args->homepage; + if($args->blog && !eregi("^http:\/\/",$args->blog)) $args->blog = 'http://'.$args->blog; + // 모델 객체 생성 $oMemberModel = &getModel('member'); @@ -928,6 +932,9 @@ if(!$args->is_admin) unset($args->is_admin); list($args->email_id, $args->email_host) = explode('@', $args->email_address); + // 홈페이지, 블로그의 주소 검사 + if($args->homepage && !eregi("^http:\/\/",$args->homepage)) $args->homepage = 'http://'.$args->homepage; + if($args->blog && !eregi("^http:\/\/",$args->blog)) $args->blog = 'http://'.$args->blog; // 아이디, 닉네임, email address 의 중복 체크 $member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id); diff --git a/modules/member/queries/insertMember.xml b/modules/member/queries/insertMember.xml index 765887a53..737a15c9b 100644 --- a/modules/member/queries/insertMember.xml +++ b/modules/member/queries/insertMember.xml @@ -11,6 +11,9 @@ + + + diff --git a/modules/member/queries/updateMember.xml b/modules/member/queries/updateMember.xml index 9d02ab131..6531a60c1 100644 --- a/modules/member/queries/updateMember.xml +++ b/modules/member/queries/updateMember.xml @@ -9,6 +9,9 @@ + + + diff --git a/modules/member/skins/default/filter/modify_info.xml b/modules/member/skins/default/filter/modify_info.xml index 385911a9e..f6539d889 100644 --- a/modules/member/skins/default/filter/modify_info.xml +++ b/modules/member/skins/default/filter/modify_info.xml @@ -6,6 +6,9 @@ + + + diff --git a/modules/member/skins/default/filter/signup.xml b/modules/member/skins/default/filter/signup.xml index 7f2603f76..427bc78d2 100644 --- a/modules/member/skins/default/filter/signup.xml +++ b/modules/member/skins/default/filter/signup.xml @@ -14,6 +14,9 @@ + + + diff --git a/modules/member/skins/default/member_info.html b/modules/member/skins/default/member_info.html index 3a94eea07..9acc69688 100644 --- a/modules/member/skins/default/member_info.html +++ b/modules/member/skins/default/member_info.html @@ -29,6 +29,18 @@ image_mark + + {$lang->homepage} + {$member_info->homepage} + + + {$lang->blog} + {$member_info->blog} + + + {$lang->birthday} + {zdate($member_info->birthday,"Y-m-d")} + {$lang->signature} diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html index 2c6551e2a..867bde026 100644 --- a/modules/member/skins/default/modify_info.html +++ b/modules/member/skins/default/modify_info.html @@ -77,6 +77,33 @@ + + {$lang->homepage} + + + + + + {$lang->about_homepage} + + + {$lang->blog} + + + + + + {$lang->about_blog} + + + {$lang->birthday} + + + + + + {$lang->about_birthday} + {$lang->allow_mailing} allow_mailing!='N')-->checked="true"/> diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html index 11cc97dba..e6dfbfeb5 100644 --- a/modules/member/skins/default/signup_form.html +++ b/modules/member/skins/default/signup_form.html @@ -77,6 +77,33 @@ + + {$lang->homepage} + + + + + + {$lang->about_homepage} + + + {$lang->blog} + + + + + + {$lang->about_blog} + + + {$lang->birthday} + + + + + + {$lang->about_birthday} + {$lang->allow_mailing} diff --git a/modules/member/tpl/filter/insert.xml b/modules/member/tpl/filter/insert.xml index 505eeed63..c6a27134f 100644 --- a/modules/member/tpl/filter/insert.xml +++ b/modules/member/tpl/filter/insert.xml @@ -12,6 +12,9 @@ + + + diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index bbb0de35a..4430b5226 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -64,6 +64,33 @@ + + {$lang->homepage} + + + + + + {$lang->about_homepage} + + + {$lang->blog} + + + + + + {$lang->about_blog} + + + {$lang->birthday} + + + + + + {$lang->about_birthday} + {$lang->allow_mailing} allow_mailing!='N')-->checked="true"/> diff --git a/modules/member/tpl/member_info.html b/modules/member/tpl/member_info.html index e27a4b391..0b290035e 100644 --- a/modules/member/tpl/member_info.html +++ b/modules/member/tpl/member_info.html @@ -64,6 +64,18 @@ {$lang->email_address} {$member_info->email_address} + + {$lang->homepage} + {$member_info->homepage} + + + {$lang->blog} + {$member_info->blog} + + + {$lang->birthday} + {zdate($member_info->birthday,'Y-m-d')} + {$lang->allow_mailing} {$member_info->allow_mailing}