issue 912 add public item option.

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

modules/member/lang/lang.xml

@@ -2420,6 +2420,9 @@ 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="jp"><![CDATA[ログインに使用するアカウントを選択してください。]]></value>
 		<value xml:lang="zh-TW"><![CDATA[請選擇帳號登入方式。]]></value>
 	</item>
+	<item name="about_public_item">
+		<value xml:lang="ko"><![CDATA[본인 외에 다른 회원에게도 노출될 정보인지 선택합니다.]]></value>
+	</item>
 	<item name="use_after_save">
 		<value xml:lang="ko"><![CDATA[저장 후 사용]]></value>
 		<value xml:lang="en"><![CDATA[Use after saved]]></value>

modules/member/member.admin.controller.php

@@ -180,6 +180,10 @@
 				if($args->signature!='Y') $args->signature = 'N';
 				$args->identifier = $all_args->identifier;
 
+				// set default
+				$all_args->is_nick_name_public = 'Y';
+				$all_args->is_find_account_question_public = 'N';
+
 				// signupForm
 				global $lang;
 				$signupForm = array();
@@ -199,6 +203,8 @@
 					$signupItem->required = ($all_args->{$key} == 'required') || $signupItem->mustRequired || $signupItem->isIdentifier;
 					$signupItem->isUse = in_array($key, $usable_list) || $signupItem->required;
 
+					$signupItem->isPublic = ($all_args->{'is_'.$key.'_public'} == 'Y' && $signupItem->isUse) ? 'Y' : 'N';
+
 					if ($signupItem->imageType){
 						$signupItem->max_width = $all_args->{$key.'_max_width'};
 						$signupItem->max_height = $all_args->{$key.'_max_height'};
@@ -273,6 +279,11 @@
 				$signupItem->imageType = (strpos($key, 'image') !== false);
 				$signupItem->required = in_array($key, $orgRequireds);
 				$signupItem->isUse = ($config->{$key} == 'Y') || in_array($key, $orgUse);
+				$signupItem->isPublic = ($signupItem->isUse) ? 'Y' : 'N';
+				if($key == 'find_account_question' || $key == 'password')
+				{
+					$signupItem->isPublic = 'N';
+				}
 				$signupItem->isIdentifier = ($key == $identifier);
 				if ($signupItem->imageType){
 					$signupItem->max_width = $config->{$key.'_max_width'};
@@ -293,6 +304,7 @@
 					$signupItem->mustRequired = in_array($key, $mustRequireds);
 					$signupItem->required = ($item_info->required == 'Y');
 					$signupItem->isUse = ($item_info->is_active == 'Y');
+					$signupItem->isPublic = ($signupItem->isUse) ? 'Y' : 'N';
 					$signupItem->description = $item_info->description;
 					if ($signupItem->imageType){
 						$signupItem->max_width = $config->{$key.'_max_width'};
@@ -511,6 +523,7 @@
 			$signupItem->required = ($args->required == 'Y');
 			$signupItem->isUse = ($args->is_active == 'Y');
 			$signupItem->description = $args->description;
+			$signupItem->isPublic = 'Y';
 
 			$oMemberModel = &getModel('member');
 			$config = $oMemberModel->getMemberConfig();

modules/member/member.model.php

@@ -31,6 +31,8 @@
 				foreach($config->signupForm AS $key=>$value)
 				{
 					$config->signupForm[$key]->title = Context::getLang($value->title);
+					if($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
+					if($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
 				}
 			}
 

modules/member/member.view.php

@@ -46,16 +46,7 @@
             }
 
             $oModuleModel = &getModel('module');
-            $member_config = $oModuleModel->getModuleConfig('member');
-			if(is_array($member_config->signupForm))
-			{
-				global $lang;
-				foreach($member_config->signupForm AS $key=>$value)
-				{
-					if($lang->{$value->title})
-						$member_config->signupForm[$key]->title = $lang->{$value->title};
-				}
-			}
+            $member_config = $oMemberModel->getMemberConfig();
             Context::set('member_config', $member_config);
 
             $site_module_info = Context::get('site_module_info');

modules/member/skins/default/member_info.html

@@ -37,7 +37,7 @@
 			<!--@end-->
 		<!--@end-->
 
-		<tr>
+		<tr cond="$memberInfo['member_srl'] == $logged_info->member_srl || $formInfo->isPublic == 'Y'">
 			<th scope="row" >{$title} <em cond="$formInfo->required || $formInfo->mustRequired">*</em></th>
 			<td class="text">{$value}</td>
 		</tr>

modules/member/tpl/js/member_admin_config.js

@@ -62,7 +62,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,10 +70,18 @@ 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');
 			}
 		});
 	});

modules/member/tpl/member_config.html

@@ -123,10 +123,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 +149,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>
@@ -167,6 +175,7 @@
 								<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>
 						</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 +195,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>