merge from 1.5.3.2 (~r11225)

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

modules/member/tpl/insert_join_form.html

@@ -2,8 +2,9 @@
 	<h2 class="h2">{$lang->cmd_input_extend_form}</h2>
 	<ul>
 		<li>
-			<p class="q"><label for="column_name">{$lang->column_name} *</label></p>
-			<p class="a"><input type="text" id="column_name" name="column_name" value="{$formInfo->column_name}" /></p>
+			<p class="q"><label for="column_id">{$lang->column_id} *</label></p>
+			<p class="a"><input type="text" id="column_id" name="column_id" value="{$formInfo->column_name}" /></p>
+			<p class="description">{$lang->about_column_id}</p>
 		</li>
 		<li>
 			<p class="q"><label for="column_title">{$lang->column_title} *</label></p>

modules/member/tpl/js/member_admin_config.js

@@ -41,6 +41,25 @@ function doUpdateDeniedID(user_id, mode, message) {
 	);
 }
 
+/* prohibited nick name functions */
+function doUpdateDeniedNickName(nick_name, mode, message) 
+{
+    if(typeof(message)!='undefined' && !confirm(message)) return;
+
+    exec_xml(
+		'member',
+		'procMemberAdminUpdateDeniedNickName',
+		{nick_name:nick_name, mode:mode},
+		function(){
+			if (mode == 'delete'){
+				jQuery('#denied_'+nick_name).remove();
+				jQuery('._deniedNickNameCount').html(jQuery('#deniedNickNameList li').length);
+			}
+		},
+		['error','message','tpl']
+	);
+}
+
 jQuery(function($){
 	// hide form if enable_join is setted "No" 
 	var suSetting = $('fieldset.suSetting'); // 회원가입 설정
@@ -62,7 +81,7 @@ jQuery(function($){
 			suForm.slideUp(200);
 		}
 	});
-	suForm.find(':checkbox').each(function(){
+	suForm.find(':checkbox[name="usable_list[]"]').each(function(){
 		var $i = $(this);
 		$i.change(function(){
 			if($i.is(':checked')){
@@ -70,28 +89,23 @@ jQuery(function($){
 							   .find(':radio, :text')
 									.removeAttr('disabled')
 									.end()
-							   .find(':radio[value=option]').attr('checked', 'checked');
+							   .find(':radio[value=option]').attr('checked', 'checked')
+							   		.end()
+							   .next('td')
+							   .find(':input[value=Y]').removeAttr('disabled').attr('checked', 'checked');
 				
 			} else {
-				$i.parent('td').next('td').find(':radio, :text').attr('disabled','disabled').removeAttr('checked').next('label').css('fontWeight','normal');
+				$i.parent('td').next('td')
+							   .find(':radio, :text').attr('disabled','disabled').removeAttr('checked')
+							   		.next('label').css('fontWeight','normal').end()
+									.end()
+							   .next('td')
+								.find(':input[value=Y]').removeAttr('checked').attr('disabled', 'disabled');
 			}
 		});
 	});
 
-	suForm.find('._imageType')
-		.find('input:checkbox:not(:checked)').closest('tr')
-			.find('._subItem').hide().end()
-			.end()
-		.end()
-		.find('input:checkbox')
-			.change(function(){
-				var $subItem = $(this).closest('tr').find('._subItem');
-				if($(this).is(':checked')) $subItem.show();
-				else $subItem.hide();
-			})
-		.end();
-
-		$('a.modalAnchor._extendFormEdit').bind('before-open.mw', function(event){
+	$('a.modalAnchor._extendFormEdit').bind('before-open.mw', function(event){
 		var memberFormSrl = $(event.target).parent().attr('id');
 		var checked = $(event.target).closest('tr').find('input:radio:checked').val();
 
@@ -141,7 +155,9 @@ jQuery(function($){
 
 		var tag;
 		function on_complete(data){
-			var uids = data.user_ids.split(',');
+			var userIds = $.trim(data.user_ids);
+			if(userIds == '') return;
+			var uids = userIds.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));
@@ -155,6 +171,38 @@ jQuery(function($){
 
 	});
 
+	$('button._addDeniedNickName').click(function(){
+		var ids = $('#prohibited_nick_name').val();
+		if(ids == ''){ 
+			alert(xe.lang.msg_null_prohibited_nick_name);
+			$('#prohibited_nick_name').focus();
+			return;
+		}
+		
+
+		ids = ids.replace(/\n/g, ',');
+
+		var tag;
+		function on_complete(data)
+		{
+			$('#prohibited_nick_name').val('');
+
+			var nickNames = $.trim(data.nick_names);
+			if(nickNames == '') return;
+			var uids = nickNames.split(',');
+			for (var i=0; i<uids.length; i++)
+			{
+				tag = '<li id="denied_'+uids[i]+'">'+uids[i]+' <a href="#" class="side" onclick="doUpdateDeniedNickName(\''+uids[i]+'\', \'delete\', \''+xe.lang.confirm_delete+'\');return false;">'+xe.lang.cmd_delete+'</a></li>';
+				$('#deniedNickNameList').append($(tag));
+			}
+
+			$('._deniedNickNameCount').html($('#deniedNickNameList li').length);
+		}
+
+		jQuery.exec_json('member.procMemberAdminUpdateDeniedNickName', {'nick_name': ids}, on_complete);
+
+	});
+
 	$('input[name=identifier]').change(function(){
 		var $checkedTR = $('input[name=identifier]:checked').closest('tr');
 		var $notCheckedTR = $('input[name=identifier]:not(:checked)').closest('tr');
@@ -184,4 +232,13 @@ jQuery(function($){
 		}
 	});
 
+	$('.__sync').click(function (){
+		exec_xml(
+			'importer', // module
+			'procImporterAdminSync', // act
+			null,
+			function(ret){if(ret && (!ret.error || ret.error == '0'))alert(ret.message);}, // callback
+			resp = ['error','message'] // response tags
+		);
+	});
 });

modules/member/tpl/member_config.html

@@ -1,13 +1,16 @@
 <load target="js/member_admin_config.js" usecdn="true" />
+<load target="../../editor/tpl/js/editor_module_config.js" usecdn="true" />
 <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}';
+	xe.lang.msg_null_prohibited_nick_name = '{$lang->msg_null_prohibited_nick_name}';
 </script>
 <div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
+
 <form action="./" class="form" ruleset="insertConfig" method="post">
 <input type="hidden" name="module" value="member" />
 <input type="hidden" name="act" value="procMemberAdminInsertConfig" />
@@ -81,6 +84,14 @@
 					<input type="text" id="redirect_url" name="redirect_url" value="{$config->redirect_url}" /></p>
 				<p class="desc">{$lang->about_redirect_url}</p>
 			</li>
+			<li>
+				<p class="q"><label for="skin">{$lang->layout}</label></p>
+				<p class="a">
+				<select name="layout_srl">
+					<option loop="$layout_list => $key,$val" value="{$val->layout_srl}" selected="selected"|cond="$val->layout_srl == $config->layout_srl">{$val->title} ({$val->layout})</option>
+				</select>
+				</p>
+			</li>
 			<li>
 				<p class="q"><label for="skin">{$lang->skin}</label></p>
 				<p class="a">
@@ -94,7 +105,20 @@
 				<p class="a"><div id="member_colorset"></div></p>
 			</li>
 			<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>
+				<p class="q"><label for="prohibited_nick_name">{$lang->cmd_manage_nick_name}({sprintf($lang->count_manage_nick_name, count($deniedNickNames))})</label></p>
+				<div class="a">
+					<ul class="textList" id="deniedNickNameList">
+						<li loop="$deniedNickNames=>$nicknameInfo" id="denied_{$nicknameInfo->nick_name}">{$nicknameInfo->nick_name} <a href="#" class="side" onclick="doUpdateDeniedNickName('{$nicknameInfo->nick_name}','delete','{$lang->confirm_delete}');return false;">{$lang->delete}</a></li>
+					</ul>
+				</div>
+				<div class="a">
+					<textarea rows="8" cols="42" id="prohibited_nick_name" title="{$lang->add_prohibited_id}"></textarea>
+					<span class="btn"><button type="button" class="_addDeniedNickName">{$lang->add}</button></span>
+					<span class="desc">{$lang->multi_line_input}</span>
+				</div>
+			</li>
+			<li cond="$useUserID">
+				<p class="q"><label for="prohibited_id">{$lang->cmd_manage_id}({sprintf($lang->count_manage_id, count($deniedIDs))})</label></p>
 				<div class="a">
 					<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>
@@ -123,10 +147,17 @@
 					</th>
 					<th scope="col">{$lang->use}</th>
 					<th scope="col">{$lang->cmd_required}/{$lang->cmd_optional}</th>
+					<th scope="col">{$lang->public}
+						[<a href="#helpPublic" class="tgAnchor">?</a>]
+						<div class="tgContent layer" id="helpPublic" style="right:0">
+							<p>{$lang->about_public_item}</p>
+						</div>
+					</th>
 					<th scope="col" class="text">{$lang->description}</th>
 					<th scope="col">{$lang->cmd_edit}</th>
 				</thead>
 				<tbody class="uDrag">
+{@$fixed_public_list = array('nick_name', 'find_account_question', 'password')}
 					<!--@foreach($config->signupForm as $item)-->
 					<!--@if($item->isIdentifier)-->
 					<tr class="sticky">
@@ -142,6 +173,7 @@
 							<input type="radio" id="{$item->name}_re" name="{$item->name}" value="requierd" checked="checked" disabled="disabled" /> <label for="{$item->name}_re">{$lang->cmd_required}</label>
 							<input type="radio" id="{$item->name}_op" name="{$item->name}" value="option" disabled="disabled" /> <label for="{$item->name}_op">{$lang->cmd_optional}</label>
 						</td>
+						<td><input type="checkbox" name="is_{$item->name}_public" value="Y" checked="checked"|cond="$item->isPublic == 'Y'"/></td>
 						<td class="text">&nbsp;</td>
 						<td>&nbsp;</td>
 					</tr>
@@ -166,7 +198,20 @@
 								/
 								<label for="{$item->name}_max_height">{$lang->cmd_image_max_height}</label><input type="text" name="{$item->name}_max_height" id="{$item->name}_max_height" value="{$item->max_height}" style="width:30px" /> px
 							</div>
+							<div cond="$item->name == 'signature'" style="padding-top:10px">
+								<select id="signature_editor" name="signature_editor_skin" onchange="getEditorSkinColorList(this.value)">
+								<!--@foreach($editor_skin_list as $editor_skin)-->
+								<option value="{$editor_skin}" selected="selected"|cond="$editor_skin==$config->signature_editor_skin">{$editor_skin}</option>
+								<!--@end-->
+								</select>
+								<select name="sel_editor_colorset" id="sel_editor_colorset" style="display:none">
+								</select>
+								<script type="text/javascript">//<![CDATA[
+									getEditorSkinColorList('{$config->signature_editor_skin}','{$config->sel_editor_colorset}');
+								//]]></script>
+							</div>
 						</td>
+						<td><input type="checkbox" name="is_{$item->name}_public" value="Y" checked="checked"|cond="$item->isPublic == 'Y'" disabled="disabled"|cond="in_array($item->name, $fixed_public_list) || !$item->isUse" /></td>
 						<td class="text">&nbsp;</td>
 						<td>&nbsp;</td>
 					</tr>
@@ -186,6 +231,7 @@
 							<input type="radio" id="{$item->name}_re" name="{$item->name}" value="required" checked="checked"|cond="$item->required" disabled="disabled"|cond="!$item->isUse"/> <label for="{$item->name}_re">{$lang->cmd_required}</label>
 							<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><input type="checkbox" name="is_{$item->name}_public" value="Y" checked="checked"|cond="$item->isPublic == 'Y'" disabled="disabled"|cond="!$item->isUse" /></td>
 						<td class="text">{$item->description}</td>
 						<td id="{$item->member_join_form_srl}" class="nowr"><a href="#userDefine" class="modalAnchor _extendFormEdit">{$lang->cmd_edit}</a> | <a href="#" class="_extendFormDelete">{$lang->cmd_delete}</a></td>
 					</tr>
@@ -202,6 +248,12 @@
 		<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
 	</div>
 </form>
+<h2 class="h2">{$lang->cmd_member_sync}</h2>
+<div class="form">
+	<span class="btn small"><input type="button" value="{$lang->cmd_member_sync}" class="__sync" /></span>
+	<p class="description">{$lang->about_member_sync}</p>
+</div>
+
 <div class="modal" id="userDefine">
 	<form action="./" class="fg form" ruleset="insertJoinForm" method="post">
 		<input type="hidden" name="module" value="member" />

modules/member/tpl/member_info_mobile.html

@@ -34,14 +34,6 @@
 			<!--@if($member_info->member_srl == $logged_info->member_srl || $logged_info->is_admin == 'Y' )-->
 			<li><label for="llogin" class="db fb al">{$lang->last_login}</label><div>{zdate($member_info->last_login,"Y-m-d H:i")}</div></li>
 			<!--@end-->
-			<!--@if($member_config->enable_openid=="Y")-->
-			<!--@if(sizeof($openids) > 0)-->
-			<li><label for="openid" class="db fb al">{$lang->openid} </label>
-			<!--@foreach($openids as $openid)-->
-			<div id="openid">{$openid->openid}</div></li>
-			<!--@end-->
-			<!--@end-->
-			<!--@end-->
 		</ul>
 	</fieldset>
 	<!--@if($extend_form_list)-->
@@ -78,13 +70,9 @@
 			<li>
 				<!--@if($member_info->member_srl == $logged_info->member_srl)-->
 				<a href="{getUrl('act','dispMemberModifyInfo','member_srl','')}" class="bn"><span>{$lang->cmd_modify_member_info}</span></a>
-				<!--@if($logged_info->is_openid)-->
-				<a href="{getUrl('act','dispMemberOpenIDLeave','member_srl','')}" class="bn"><span>{$lang->cmd_leave}</span></a>
-				<!--@else-->
 				<a href="{getUrl('act','dispMemberModifyPassword','member_srl','')}" class="bn"><span>{$lang->cmd_modify_member_password}</span></a>
 				<a href="{getUrl('act','dispMemberLeave','member_srl','')}" class="bn"><span>{$lang->cmd_leave}</span></a>
 				<!--@end-->
-				<!--@end-->
 				<a href="{getUrl('act','','member_srl','')}" class="bn"><span>{$lang->cmd_back}</span></a>
 			</li>
 		</div>

modules/member/tpl/modify_info_mobile.html

@@ -22,10 +22,6 @@
     <!--%import("../skins/default/filter/delete_image_mark.xml")-->
 <!--@end-->
 
-<!--@if($member_config->enable_openid=="Y")-->
-    <!--%import("../skins/default/filter/add_openid_to_member.xml")-->
-    <!--%import("../skins/default/filter/delete_openid_from_member.xml")-->
-<!--@end-->
 <div class="bd">
 	<h2 class="h2">{$lang->msg_update_member}</h2>
 	<h3 class="h3">{$lang->member_default_info}</h3>
@@ -181,22 +177,6 @@
 		</ul>
 	</fieldset>
 	<!--@end-->
-	<!--@if($member_config->enable_openid=="Y")-->
-	<h3 class="h3">{$lang->openid}</h3>
-	<fieldset class="sn">
-		<ul>
-			<!--@foreach($openids as $openid)-->
-				<li><a href="{$openid->bookmarklet}">{$openid->openid}</a> <a onclick="doDeleteOpenIDFromMember('{$openid->openid}')" class="bn"><span>{$lang->cmd_delete}</span></a></li>
-			<!--@end-->
-
-				<li>
-					<input name="openid" type="text" class="itx" />
-					<input name="openid_to_delete" type="hidden" />
-					<a onclick="doAddOpenIDToMember()" class="bn"><span>{$lang->cmd_insert}</span></a>
-				</li>
-		</ul>
-	</fieldset>
-	<!--@end-->
 	<div class="cm">
 		<input type="submit" value="{$lang->cmd_registration}" class="bn"/>
 		<a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="bn"><span>{$lang->cmd_cancel}</span></a>