git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9054 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/member/lang/lang.xml

@@ -2248,7 +2248,7 @@ Bạn có thể quản lý thành viên bằng cách tạo những nhóm mới,
 		<value xml:lang="en"><![CDATA[Separated by line breaks.]]></value>
 	</item>
 	<item name="count_manage_id">
-		<value xml:lang="ko"><![CDATA[<strong>%s</strong>개의 금지아이디가 있습니다.]]></value>
+		<value xml:lang="ko"><![CDATA[<span class="_deniedIDCount">%s</span>개의 금지아이디가 있습니다.]]></value>
 		<value xml:lang="en"><![CDATA[There are <strong>%s</strong> prohibited ID.]]></value>
 	</item>
 	<item name="user_list">
@@ -2310,4 +2310,10 @@ Bạn có thể quản lý thành viên bằng cách tạo những nhóm mới,
 		<value xml:lang="ko"><![CDATA[여러 항목은 줄을 바꾸어 입력하세요.]]></value>
 		<value xml:lang="en"><![CDATA[To enter multiple entries, please change the line input.]]></value>
 	</item>
+	<item name="add_extend_form">
+		<value xml:lang="ko"><![CDATA[사용자 정의 항목 추가]]></value>
+	</item>
+	<item name="msg_null_prohibited_id">
+		<value xml:lang="ko"><![CDATA[추가할 금지 아이디를 입력해주세요.]]></value>
+	</item>
 </lang>

modules/member/member.admin.controller.php

@@ -114,7 +114,6 @@
 
 			$list_order = Context::get('list_order');
 			$usable_list = Context::get('usable_list');
-			$denied_id = Context::get('denied_id');
 			$all_args = Context::getRequestVars();
 
 			$oModuleController = &getController('module');
@@ -189,39 +188,6 @@
 
 				// create Ruleset
 				$this->_createSignupRuleset($signupForm);
-
-				if ($denied_id){
-					$denied_id = explode("\r\n", $denied_id);
-					$denied_list = $oMemberModel->getDeniedIDs();                                                                                                                                                  
-					$deniedIDs = array();
-					foreach($denied_list as $denied_info){
-						$deniedIDs[] = $denied_info->user_id;
-					}
-
-					$add_list = array_diff($denied_id, $deniedIDs);
-					$delete_list = array_diff($deniedIDs, $denied_id);
-
-					$oDB = &DB::getInstance();
-					$oDB->begin();
-
-					foreach($add_list as $user_id){
-						$output = $this->insertDeniedID($user_id, '');
-						if(!$output->toBool()){
-							$oDB->rollback();
-							return $output;
-						}
-					}
-
-					foreach($delete_list as $user_id){
-						$output = $this->deleteDeniedID($user_id);
-						if(!$output->toBool()){
-							$oDB->rollback();
-							return $output;
-						}
-					}
-					$oDB->commit();
-
-				}
 			}
 			$output = $oModuleController->updateModuleConfig('member', $args);
 			// default setting end
@@ -252,50 +218,6 @@
             FileHandler::writeFile($xml_file, $xml_buff);
 		}
 
-        /**
-         * @brief Add information for member administration
-         **/
-        function _procMemberAdminInsertConfig() {
-            // Get the basic information
-            $args = Context::gets(
-                'webmaster_name', 'webmaster_email',
-                'skin', 'colorset',
-                'editor_skin', 'editor_colorset',
-                'enable_openid', 'enable_join', 'enable_confirm', 'limit_day',
-                'after_login_url', 'after_logout_url', 'redirect_url', 'agreement',
-                'profile_image', 'profile_image_max_width', 'profile_image_max_height',
-                'image_name', 'image_name_max_width', 'image_name_max_height',
-                'image_mark', 'image_mark_max_width', 'image_mark_max_height',
-                'group_image_mark', 'group_image_mark_max_width', 'group_image_mark_max_height',
-                'signature','signature_max_height','change_password_date'
-            );
-
-            if(!$args->skin) $args->skin = "default";
-            if(!$args->colorset) $args->colorset = "white";
-            if(!$args->editor_skin) $args->editor_skin= "xpresseditor";
-            if(!$args->editor_colorset) $args->editor_colorset = "white";
-            if($args->enable_join!='Y') $args->enable_join = 'N';
-            if($args->enable_openid!='Y') $args->enable_openid= 'N';
-            if($args->profile_image !='Y') $args->profile_image = 'N';
-            if($args->image_name!='Y') $args->image_name = 'N';
-            if($args->image_mark!='Y') $args->image_mark = 'N';
-            if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
-            if($args->signature!='Y') $args->signature = 'N';
-            if(!trim(strip_tags($args->agreement))) $args->agreement = null;
-            $args->limit_day = (int)$args->limit_day;
-            if(!$args->change_password_date) $args->change_password_date = 0; 
-
-            $oMemberController = &getController('member');
-            $output = $oMemberController->setMemberConfig($args);
-
-			if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
-				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminConfig');
-				header('location:'.$returnUrl);
-				return;
-			}
-            return $output;
-        }
-
         /**
          * @brief Add a user group
          **/
@@ -615,15 +537,17 @@
          * @brief Add a denied ID
          **/
         function procMemberAdminInsertDeniedID() {
-            $user_id = Context::get('user_id');
-            $description = Context::get('description');
+            $user_ids = Context::get('user_id');
 
-            $output = $this->insertDeniedID($user_id, $description);
-            if(!$output->toBool()) return $output;
+			$user_ids = explode(',',$user_ids);
+			$success_ids = array();
 
-            $this->add('group_srl','');
-            $this->add('page',Context::get('page'));
-            $this->setMessage('success_registed');
+			foreach($user_ids as $val){
+				$output = $this->insertDeniedID($val, '');
+				if($output->toBool()) $success_ids[] = $val;
+			}
+
+			$this->add('user_ids', implode(',',$success_ids));
 
 			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
 				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminDeniedIDList');

modules/member/member.admin.view.php

@@ -114,11 +114,7 @@
 
 			// get denied ID list
             $denied_list = $oMemberModel->getDeniedIDs();
-			$deniedIDs = array();
-			foreach($denied_list as $denied_info){
-				$deniedIDs[] = $denied_info->user_id;
-			}
-			Context::set('deniedIDs', $deniedIDs);
+			Context::set('deniedIDs', $denied_list);
 
             $this->setTemplateFile('member_config');
         }

modules/member/tpl/js/member_admin.js

@@ -67,16 +67,6 @@ function completeInsertDeniedID(ret_obj) {
     location.href = url;
 }
 
-/* 금지아이디 관련 작업들 */
-function doUpdateDeniedID(user_id, mode, message) {
-    if(typeof(message)!='undefined'&&!confirm(message)) return;
-
-    var fo_obj = get_by_id('fo_denied_id_info');
-    fo_obj.user_id.value = user_id;
-    fo_obj.mode.value = mode;
-    procFilter(fo_obj, update_denied_id);
-}
-
 /* 가입폼 관련 작업들 */
 function doUpdateJoinForm(member_join_form_srl, mode, message) {
     if(typeof(message)!='undefined'&&!confirm(message)) return;

modules/member/tpl/js/member_admin_config.js

@@ -23,6 +23,24 @@ function doGetSkinColorset(skin) {
 	);
 }
 
+/* 금지아이디 관련 작업들 */
+function doUpdateDeniedID(user_id, mode, message) {
+    if(typeof(message)!='undefined'&&!confirm(message)) return;
+
+    exec_xml(
+		'member',
+		'procMemberAdminUpdateDeniedID',
+		{user_id:user_id, mode:mode},
+		function(){
+			if (mode == 'delete'){
+				jQuery('#denied_'+user_id).remove();
+				jQuery('._deniedIDCount').html(jQuery('#deniedList li').length);
+			}
+		},
+		['error','message','tpl']
+	);
+}
+
 jQuery(function($){
 	// hide form if enable_join is setted "No" 
 	var suSetting = $('fieldset.suSetting'); // 회원가입 설정
@@ -98,7 +116,6 @@ jQuery(function($){
 		var memberFormSrl = $(event.target).parent().attr('id');
 		var targetTR = $(event.target).closest('tr'); 
 
-
 		exec_xml(
 			'member',
 			'procMemberAdminDeleteJoinForm',
@@ -109,4 +126,39 @@ jQuery(function($){
 			['error','message','tpl']
 		);
 	});
+
+	$('button._addDeniedID').click(function(){
+		var ids = $('#prohibited_id').val();
+		if(ids == ''){ 
+			alert(xe.lang.msg_null_prohibited_id);
+			$('#prohibited_id').focus();
+			return;
+		}
+		
+
+		ids = ids.replace(/\n/g, ',');
+
+		var tag;
+		function on_complete(data){
+			var uids = data.user_ids.split(',');
+			for (var i=0; i<uids.length; i++){
+				tag = '<li id="denied_'+uids[i]+'">'+uids[i]+' <a href="#" class="side" onclick="doUpdateDeniedID(\''+uids[i]+'\', \'delete\', \''+xe.lang.confirm_delete+'\');return false;">'+xe.lang.cmd_delete+'</a></li>';
+				$('#deniedList').append($(tag));
+			}
+			$('#prohibited_id').val('');
+
+			$('._deniedIDCount').html($('#deniedList li').length);
+		}
+
+		jQuery.exec_json('member.procMemberAdminInsertDeniedID', {'user_id': ids}, on_complete);
+
+	});
+
+	$('a.modalAnchor._preview').bind('before-open.mw', function(){
+		var $inputList = $('input[name="usable_list[]"]:checked');
+		var title = '';
+		for(var i=0; i<$inputList.length; i++){
+			title = $($inputList[i]).closest('tr').find('.wrap ._title').html();
+		}
+	});
 });

modules/member/tpl/js/member_admin_group.js

@@ -41,7 +41,6 @@ jQuery(function ($){
 		var $target = $(event.target).closest('tr');
 		var group_srl = $(event.target).attr('href').substr(1); 
 		if(!confirm(xe.lang.groupDeleteMessage)) return;
-		console.log(group_srl);
 
 		if (group_srl.indexOf("new") > 0){
 			$target.remove();

modules/member/tpl/member_config.html

@@ -1,6 +1,9 @@
 <load target="js/member_admin_config.js" />
 <script type="text/javascript">
 	xe.lang.msg_delete_extend_form = '{$lang->msg_delete_extend_form}';
+	xe.lang.confirm_delete = '{$lang->confirm_delete}';
+	xe.lang.cmd_delete = '{$lang->cmd_delete}';
+	xe.lang.msg_null_prohibited_id = '{$lang->msg_null_prohibited_id}';
 </script>
 <div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
@@ -90,23 +93,15 @@
 				<li>
 					<p class="q"><label for="prohibited_id">{$lang->cmd_manage_id}({$lang->about_manage_id} {sprintf($lang->count_manage_id, count($deniedIDs))})</label></p>
 					<div class="a">
-						<ul class="textList">
-							<li>admin <a href="#" class="side">{$lang->delete}</a></li>
-							<li>administrator <a href="#" class="side">{$lang->delete}</a></li>
-							<li>master <a href="#" class="side">{$lang->delete}</a></li>
-							<li>webmaster <a href="#" class="side">{$lang->delete}</a></li>
+						<ul class="textList" id="deniedList">
+							<li loop="$deniedIDs=>$denied_info" id="denied_{$denied_info->user_id}">{$denied_info->user_id} <a href="#" class="side" onclick="doUpdateDeniedID('{$denied_info->user_id}','delete','{$lang->confirm_delete}');return false;">{$lang->delete}</a></li>
 						</ul>
 					</div>
 					<div class="a">
-						<textarea rows="4" cols="42" id="prohibited_id" name="denied_id" title="{$lang->add_prohibited_id}"></textarea>
-						<span class="btn"><button type="button">{$lang->add}</button></span>
+						<textarea rows="4" cols="42" id="prohibited_id" title="{$lang->add_prohibited_id}"></textarea>
+						<span class="btn"><button type="button" class="_addDeniedID">{$lang->add}</button></span>
 						<span class="desc">{$lang->multi_line_input}</span>
 					</div>
-<!--
-<textarea cols="42" rows="5" name="denied_id">
-{implode("\r\n", $deniedIDs)}
-</textarea>
--->
 				</li>
 			</ul>
 		</fieldset>
@@ -130,7 +125,7 @@
 							<th scope="row">
 								<div class="wrap">
 									<button type="button" class="dragBtn">Move to</button>
-									{$item->title}	
+									<span class="_title">{$item->title}</span>
 								</div>
 							</th>
 							<input type="hidden" name="usable_list[]" value="{$item->name}" cond="$item->mustRequired"/>
@@ -155,7 +150,7 @@
 							<th scope="row">
 								<div class="wrap">
 									<button type="button" class="dragBtn">Move to</button>
-									{$item->title}	
+									<span class="_title">{$item->title}</span>
 								</div>
 							</th>
 							<td><input type="checkbox" name="usable_list[]" value="{$item->name}" title="{$lang->use}" checked="checked"|cond="$item->isUse" /></td>
@@ -164,7 +159,7 @@
 								<input type="radio" id="{$item->name}_op" name="{$item->name}" value="option" checked="checked"|cond="$item->isUse && !$item->required" disabled="disabled"|cond="!$item->isUse" /> <label for="{$item->name}_op">{$lang->cmd_optional}</label>
 							</td>
 							<td class="text">{$item->description}</td>
-							<td id="{$item->member_join_form_srl}"><a href="#userDefine" class="modalAnchor _extendFormEdit">{$lang->cmd_edit}</a> | <a href="#" class="_extendFormDelete">삭제</a></td>
+							<td id="{$item->member_join_form_srl}"><a href="#userDefine" class="modalAnchor _extendFormEdit">{$lang->cmd_edit}</a> | <a href="#" class="_extendFormDelete">{$lang->cmd_delete}</a></td>
 						</tr>
 						<!--@end-->
 						<!--@end-->
@@ -172,8 +167,7 @@
 				</table>
 			</div>
 			<p class="btnArea">
-				<span class="btn small"><a href="#userDefine" class="modalAnchor _extendFormEdit">사용자 정의 항목 추가...</a></span>
-				<span class="btn small"><a href="#previewForm" class="modalAnchor">Preview</a></span>
+				<span class="btn small"><a href="#userDefine" class="modalAnchor _extendFormEdit">{$lang->add_extend_form}...</a></span>
 			</p>
 		</fieldset>
 		<div class="btnArea">
@@ -188,20 +182,4 @@
 			</div>
 		</form>
 	</div>
-	<div class="modal" id="previewForm">
-		<form action="" class="fg form" method="post">
-			<h2 class="h2">회원가입 양식 미리보기</h2>
-			<ul>
-				<li>
-					<p class="q"><label for="email">Email</label></p>
-					<p class="a"><input type="text" id="email" value=""></p>
-				</li>
-				<li>
-					<p class="q"><label for="password">Password</label></p>
-					<p class="a"><input type="text" id="password" value=""></p>
-				</li>
-				<li>...</li>
-			</ul>
-		</form>
-	</div>
 </div>