From 96838bceb8277a81a47168c60383e5c6f6e3c608 Mon Sep 17 00:00:00 2001
From: ChanMyeong <dece24@gmail.com>
Date: Mon, 17 Dec 2012 02:11:43 +0000
Subject: [PATCH] Member module. Status, Limit day option removed.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12399 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/lang/lang.xml          | 36 ---------------------------
 modules/member/member.admin.view.php  |  2 --
 modules/member/tpl/insert_member.html | 16 ------------
 modules/member/tpl/member_info.html   |  8 ------
 modules/member/tpl/member_list.html   | 17 ++-----------
 modules/point/tpl/member_list.html    |  8 ------
 6 files changed, 2 insertions(+), 85 deletions(-)

diff --git a/modules/member/lang/lang.xml b/modules/member/lang/lang.xml
index 33d3babb9..c08de504d 100644
--- a/modules/member/lang/lang.xml
+++ b/modules/member/lang/lang.xml
@@ -496,18 +496,6 @@
 		<value xml:lang="tr"><![CDATA[Geçici Zaman Sınırı]]></value>
 		<value xml:lang="vi"><![CDATA[Hạn sử dụng]]></value>
 	</item>
-	<item name="limit_date">
-		<value xml:lang="ko"><![CDATA[제한일]]></value>
-		<value xml:lang="en"><![CDATA[Limit Date]]></value>
-		<value xml:lang="jp"><![CDATA[制限日]]></value>
-		<value xml:lang="zh-CN"><![CDATA[限制日期]]></value>
-		<value xml:lang="zh-TW"><![CDATA[限制日期]]></value>
-		<value xml:lang="fr"><![CDATA[Jour de Limite]]></value>
-		<value xml:lang="ru"><![CDATA[Дата лимита]]></value>
-		<value xml:lang="es"><![CDATA[Límite de fecha]]></value>
-		<value xml:lang="tr"><![CDATA[Zaman Sınırı]]></value>
-		<value xml:lang="vi"><![CDATA[Ngày giới hạn]]></value>
-	</item>
 	<item name="after_login_url">
 		<value xml:lang="ko"><![CDATA[로그인 후 이동할 주소(URL)]]></value>
 		<value xml:lang="en"><![CDATA[URL to redirect after Sign in]]></value>
@@ -1885,18 +1873,6 @@
 		<value xml:lang="tr"><![CDATA[Kayıttan sonraki hesap etkinleştirme süresini kısıtlayabilirsiniz]]></value>
 		<value xml:lang="vi"><![CDATA[Bạn có thể giới hạn ngày xác nhận sau khi đăng kí.]]></value>
 	</item>
-	<item name="about_limit_date">
-		<value xml:lang="ko"><![CDATA[지정한 날짜까지 로그인을 할 수 없습니다.]]></value>
-		<value xml:lang="en"><![CDATA[Users cannot sign in until the specified date]]></value>
-		<value xml:lang="jp"><![CDATA[指定された期間まで該当ユーザーはログインできなくします。]]></value>
-		<value xml:lang="zh-CN"><![CDATA[直到指定日期该用户不能登录。]]></value>
-		<value xml:lang="zh-TW"><![CDATA[直到指定日期，否則該帳號都無法登入。]]></value>
-		<value xml:lang="fr"><![CDATA[Utilisateur ne peut pas ouverir la connexion jusqu'au jour assigné]]></value>
-		<value xml:lang="ru"><![CDATA[Пользователь не может войти до указанной даты]]></value>
-		<value xml:lang="es"><![CDATA[Usuario no podra conectarse hasta la fecha indicada]]></value>
-		<value xml:lang="tr"><![CDATA[Üyeler, belirlenen tarihe kadar kayıt yapamazlar]]></value>
-		<value xml:lang="vi"><![CDATA[Thành viên không thể đăng nhập nếu quá hạn xác nhận đăng kí.]]></value>
-	</item>
 	<item name="about_after_login_url">
 		<value xml:lang="ko"><![CDATA[로그인 후 이동할 URL을 정할 수 있습니다. 입력 URL이 없는 경우 해당 페이지가 유지됩니다.]]></value>
 		<value xml:lang="en"><![CDATA[You can set a URL after login. Blank means the current page.]]></value>
@@ -2356,18 +2332,6 @@
 		<value xml:lang="jp"><![CDATA[サイト管理者]]></value>
 		<value xml:lang="zh-TW"><![CDATA[網站管理員]]></value>
 	</item>
-	<item name="approval">
-		<value xml:lang="ko"><![CDATA[승인]]></value>
-		<value xml:lang="en"><![CDATA[Approval]]></value>
-		<value xml:lang="jp"><![CDATA[承認]]></value>
-		<value xml:lang="zh-TW"><![CDATA[承認]]></value>
-	</item>
-	<item name="denied">
-		<value xml:lang="ko"><![CDATA[거부]]></value>
-		<value xml:lang="en"><![CDATA[Denied]]></value>
-		<value xml:lang="jp"><![CDATA[拒否]]></value>
-		<value xml:lang="zh-TW"><![CDATA[拒絕]]></value>
-	</item>
 	<item name="use_group_image_mark">
 		<value xml:lang="ko"><![CDATA[그룹 이미지 마크 사용]]></value>
 		<value xml:lang="en"><![CDATA[Use group image mark]]></value>
diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index bf4c486bf..e275d3b53 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -80,8 +80,6 @@ class memberAdminView extends member
 		{
 			case 'super_admin' : Context::set('filter_type_title', $lang->cmd_show_super_admin_member);break;
 			case 'site_admin' : Context::set('filter_type_title', $lang->cmd_show_site_admin_member);break;
-			case 'enable' :  Context::set('filter_type_title', $lang->approval);break;
-			case 'disable' : Context::set('filter_type_title', $lang->denied);break;
 			default : Context::set('filter_type_title', $lang->cmd_show_all_member);break;
 		}
 		// retrieve list of groups for each member
diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html
index 2823453a5..5b00381ea 100644
--- a/modules/member/tpl/insert_member.html
+++ b/modules/member/tpl/insert_member.html
@@ -65,22 +65,6 @@
 			</block>
 		</div>
 	</div>
-	<div class="x_control-group">
-		<label class="x_control-label">{$lang->status}</label>
-		<div class="x_controls">
-			<label class="x_inline" for="appoval"><input type="radio" name="denied" id="appoval" value="N" checked="checked"|cond="$member_info->denied != 'Y'" > {$lang->approval}</label>
-			<label class="x_inline" for="deny"><input type="radio" name="denied" id="deny" value="Y" checked="checked"|cond="$member_info->denied == 'Y'" > {$lang->denied}</label>
-		</div>
-	</div>
-	<div class="x_control-group">
-		<label class="x_control-label" for="until">{$lang->limit_date}</label>
-		<div class="x_controls">
-			<input type="hidden" name="limit_date" id="date_limit_date" value="{$member_info->limit_date}" />
-			<input type="date" placeholder="YYYY-MM-DD" class="inputDate" id="until" value="{zdate($member_info->limit_date,'Y-m-d',false)}" />
-			<input type="button" value="{$lang->cmd_delete}" class="x_btn dateRemover" />
-			<span class="x_help-inline">{$lang->about_limit_date}</span>
-		</div>
-	</div>
 	<div class="x_control-group">
 		<label class="x_control-label">{$lang->is_admin}</label>
 		<div class="x_controls">
diff --git a/modules/member/tpl/member_info.html b/modules/member/tpl/member_info.html
index 3fab97501..fe32fdc02 100644
--- a/modules/member/tpl/member_info.html
+++ b/modules/member/tpl/member_info.html
@@ -26,14 +26,6 @@
 		<th scope="row">{$lang->allow_message}</th>
 		<td class="text">{$lang->allow_message_type[$memberInfo['allow_message']]}</td>
 	</tr>
-	<tr>
-		<th scope="row">{$lang->denied}</th>
-		<td class="text"><!--@if($memberInfo['denied'] == 'N')-->{$lang->cmd_no}<!--@else-->{$lang->cmd_yes}<!--@end--></td>
-	</tr>
-	<tr cond="$memberInfo['limit_date']">
-		<th scope="row">{$lang->limit_date}</th>
-		<td class="text">{zdate($memberInfo['limit_date'],"Y-m-d H:i")}</td>
-	</tr>
 	<tr cond="$memberInfo['is_admin'] == 'Y'">
 		<th scope="row">{$lang->is_admin}</th>
 		<td class="text">{$lang->cmd_yes}</td>
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index 12ba900df..a8a04e81d 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -15,10 +15,6 @@
 			<a href="{getUrl('filter_type', '', 'page', '')}" class="active"|cond="$filter_type==''">{$lang->cmd_show_all_member}<block cond="$filter_type==''">({$total_count})</block></a>
 			<i>|</i>
 			<a href="{getUrl('filter_type', 'super_admin', 'page', '')}" class="active"|cond="$filter_type==super_admin">{$lang->cmd_show_super_admin_member}<block cond="$filter_type==super_admin">({$total_count})</block></a>
-			<i>|</i>
-			<a href="{getUrl('filter_type', 'enable', 'page', '')}" class="active"|cond="$filter_type==enable">{$lang->approval}<block cond="$filter_type==enable">({$total_count})</block></a>
-			<i>|</i>
-			<a href="{getUrl('filter_type', 'disable', 'page', '')}" class="active"|cond="$filter_type==disable">{$lang->denied}<block cond="$filter_type==disable">({$total_count})</block></a>
 			<div class="x_pull-right x_btn-group">
 				<a class="x_btn x_btn-inverse" href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert')}">{$lang->cmd_make}</a>
 				<a href="#listManager" class="modalAnchor _member x_btn">{$lang->cmd_selected_user_manage}...</a>
@@ -31,7 +27,6 @@
 				<th scope="col" class="nowr"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'regdate', 'sort_order', ($sort_order == 'asc') ? 'desc' : 'asc')}">{$lang->signup_date}<block cond="$sort_index == 'regdate'"> <em cond="$sort_order=='asc'">▲</em><em cond="$sort_order != 'asc'">▼</em></block></a></th>
 				<th scope="col" class="nowr"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'last_login', 'sort_order',  ($sort_order == 'asc') ? 'desc' : 'asc')}">{$lang->last_login}<block cond="$sort_index == 'last_login'"> <em cond="$sort_order=='asc'">▲</em><em cond="$sort_order != 'asc'">▼</em></block></a></th>
 				<th scope="col">{$lang->member_group}</th>
-				<th scope="col" class="nowr">{$lang->status}</th>
 				<th scope="col" class="nowr">{$lang->cmd_view}</th>
 				<th scope="col" class="nowr">{$lang->cmd_modify}...</th>
 				<th scope="col">
@@ -46,8 +41,7 @@
 				<th scope="col" class="nowr"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'regdate', 'sort_order', ($sort_order == 'asc') ? 'desc' : 'asc')}">{$lang->signup_date}<block cond="$sort_index == 'regdate'"> <em cond="$sort_order=='asc'">▲</em><em cond="$sort_order != 'asc'">▼</em></block></a></th>
 				<th scope="col" class="nowr"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'last_login', 'sort_order',  ($sort_order == 'asc') ? 'desc' : 'asc')}">{$lang->last_login}<block cond="$sort_index == 'last_login'"> <em cond="$sort_order=='asc'">▲</em><em cond="$sort_order != 'asc'">▼</em></block></a></th>
 				<th scope="col">{$lang->member_group}</th>
-				<th scope="col" class="nowr">{$lang->status}</th>
-				<th scope="col class="nowr"">{$lang->cmd_view}</th>
+				<th scope="col" class="nowr">{$lang->cmd_view}</th>
 				<th scope="col" class="nowr">{$lang->cmd_modify}...</th>
 				<th scope="col">
 					<input type="checkbox" title="Check All" data-name="user" />
@@ -66,8 +60,6 @@
 				<td class="nowr">{zdate($member_info['regdate'], 'Y-m-d')}</td>
 				<td class="nowr">{zdate($member_info['last_login'], 'Y-m-d')}</td>
 				<td>{$member_info['group_list']}&nbsp;</td>
-				{@ $lang_denied = ($member_info['denied'] == 'N')?$lang->approval:$lang->denied}
-				<td class="nowr">{$lang_denied}</td>
 				<td class="nowr">
 					<a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInfo', 'member_srl', $member_info['member_srl'])}">{$lang->cmd_view}</a>
 				</td>
@@ -163,17 +155,12 @@
 						<th scope="col">{$lang->email_address}</th>
 						<th scope="col" loop="$usedIdentifiers=>$name,$title">{$title}</th>
 						<th scope="col" class="text">{$lang->member_group}</th>
-						<th scope="col">{$lang->status}</th>
+						<th scope="col">&nbsp;</th>
 					</tr>
 				</thead>
 				<tbody id="popupBody">
 				</tbody>
 			</table>
-			<div class="x_control-group">
-				<h3>{$lang->status}</h3>
-				<label class="x_inline" ><input type="radio" name="denied" id="approval" value="N" > {$lang->approval}</label> 
-				<label class="x_inline" ><input type="radio" name="denied" id="deny" value="Y" > {$lang->denied}</label> 
-			</div>
 			<div class="x_control-group">
 				<h3>{$lang->member_group}</h3>
 				<label loop="$group_list => $key,$val" for="g{$val->group_srl}" class="x_inline"><input type="checkbox" name="groups[]" id="g{$val->group_srl}" value="{$val->group_srl}"/> {$val->title}</label>
diff --git a/modules/point/tpl/member_list.html b/modules/point/tpl/member_list.html
index 2612bb97e..890d0714d 100644
--- a/modules/point/tpl/member_list.html
+++ b/modules/point/tpl/member_list.html
@@ -17,10 +17,6 @@
 					<option value="" <!--@if($is_admin!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
 					<option value="Y" <!--@if($is_admin=='Y')-->selected="selected"<!--@end-->>{$lang->is_admin}</option>
 				</select>
-				<select name="is_denied" style="width:auto;margin:0">
-					<option value="" <!--@if($is_denied!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
-					<option value="Y" <!--@if($is_denied=='Y')-->selected="selected"<!--@end-->>{$lang->denied}</option>
-				</select>
 				<select name="selected_group_srl" style="width:auto;margin:0" title="{$lang->member_group}">
 					<option value="0">{$lang->member_group}</option>
 					<!--@foreach($group_list as $key => $val)-->
@@ -127,10 +123,6 @@
 				<option value="" <!--@if($is_admin!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
 				<option value="Y" <!--@if($is_admin=='Y')-->selected="selected"<!--@end-->>{$lang->is_admin}</option>
 			</select>
-			<select name="is_denied" style="width:auto;margin:0">
-				<option value="" <!--@if($is_denied!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
-				<option value="Y" <!--@if($is_denied=='Y')-->selected="selected"<!--@end-->>{$lang->denied}</option>
-			</select>
 			<select name="selected_group_srl" style="width:auto;margin:0" title="{$lang->member_group}">
 				<!--@foreach($group_list as $key => $val)-->
 				<option value="{$val->group_srl}" <!--@if($selected_group_srl==$val->group_srl)-->selected="selected"<!--@end-->>{$val->title}</option>