merge from 1.5.2

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

modules/point/conf/info.xml

@@ -50,7 +50,7 @@
         Но чтобы включить эти функции, Вам надо активировать аддоны, относящиеся к поинтам.
     </description>
     <description xml:lang="zh-TW">
-        可在發表/刪除評論時，付出相對應的點數。
+        可在發表、刪除文章及回覆時，付出相對應的點數。
         也能以點數設置等級，並在用戶名稱前顯示等級圖示。
         但是必須先啟用點數系統才能使用。
     </description>

modules/point/conf/module.xml

@@ -26,7 +26,7 @@
 			<title xml:lang="es">Point</title>
 			<title xml:lang="ru">Point</title>
 			<title xml:lang="fr">Point</title>
-			<title xml:lang="zh-TW">Point</title>
+			<title xml:lang="zh-TW">點數系統</title>
 			<title xml:lang="vi">Point</title>
 			<title xml:lang="mn">Point</title>
 			<title xml:lang="tr">Point</title>

modules/point/lang/lang.xml

@@ -507,7 +507,7 @@
 		<value xml:lang="vi"><![CDATA[Bạn không thể xem được bài viết vì điểm của bạn không đủ. (Điểm yêu cầu: %d, Điểm hiện tại: %d)]]></value>
 	</item>
 	<item name="point_recal_message">
-		<value xml:lang="ko"><![CDATA[포인트 적용중입니다. (%d / %d)]]></value>
+		<value xml:lang="ko"><![CDATA[포인트 적용 중입니다. (%d / %d)]]></value>
 		<value xml:lang="en"><![CDATA[Adjusting Point. (%d / %d)]]></value>
 		<value xml:lang="jp"><![CDATA[ポイントを適用しています。 (%d / %d)]]></value>
 		<value xml:lang="zh-CN"><![CDATA[计算并应用中(%d / %d)。]]></value>
@@ -530,12 +530,14 @@
 		<value xml:lang="vi"><![CDATA[Đã kết thúc việc tính toán lại điểm.]]></value>
 	</item>
 	<item name="point_update_desc">
-		<value xml:lang="ko"><![CDATA[포인트를 증가시키려면 +를 감소시키려면 -를 숫자앞에 표기한 후 업데이트 해 주세요. + 또는 - 표시가 없으면 입력한 값으로 설정됩니다.]]></value>
+		<value xml:lang="ko"><![CDATA[포인트를 증가시키려면 +를 감소시키려면 -를 숫자앞에 표기한 후 업데이트해 주세요. + 또는 - 표시가 없으면 입력한 값으로 설정됩니다.]]></value>
 		<value xml:lang="en"><![CDATA[Insert + in front of the number to increase the point or - to decrease, and update the point. If you don't insert + or -, the point will be set as the value you entered.]]></value>
 	　　<value xml:lang="jp"><![CDATA[ポイントを増加させるには+を、減少させるには-を、数字の前に表記した後、アップデートしてください。+、または-表示がなければ入力した値が設定されます。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Insert + in front of the number to increase the point or - to decrease, and update the point. If you don't insert + or -, the point will be set as the value you entered.]]></value>
 	</item>
 	<item name="give_point">
 		<value xml:lang="ko"><![CDATA[포인트 부여]]></value>
 		<value xml:lang="en"><![CDATA[Give the point]]></value>
+		<value xml:lang="zh-TW"><![CDATA[給予點數]]></value>
 	</item>
-</lang>
+</lang>

modules/point/point.admin.controller.php

@@ -47,14 +47,20 @@
             // Check if reading a document is not allowed
             if($args->disable_read_document == 'Y') $config->disable_read_document = 'Y';
             else $config->disable_read_document = 'N';
+
             // Per-level group configurations
-            foreach($args as $key => $val) {
-                if(substr($key, 0, strlen('point_group_')) != 'point_group_') continue;
-                $group_srl = substr($key, strlen('point_group_'));
-                $level = $val;
-                if(!$level) unset($config->point_group[$group_srl]);
-                else $config->point_group[$group_srl] = $level;
-            }
+			foreach($config->point_group as $group_srl=>$level)
+			{
+				if($args->{'point_group_'.$group_srl})
+				{
+					$config->point_group[$group_srl] = $args->{'point_group_'.$group_srl};
+				}
+				else
+				{
+					unset($config->point_group[$group_srl]);
+				}
+			}
+
             $config->group_reset = $args->group_reset;
             // Per-level point configurations
             unset($config->level_step);
@@ -190,6 +196,18 @@
             $module_config = $oModuleModel->getModulePartConfigs('point');
             // A variable to store member's points
             $member = array();
+			
+			// Get member infomation
+			$output = executeQueryArray('point.getMemberCount');
+			if(!$output->toBool()) return $output;
+			
+			if($output->data) {
+				foreach($output->data as $key => $val) {
+					if(!$val->member_srl) continue;
+					$member[$val->member_srl] = 0;
+				}
+			}
+
             // Get post information
             $output = executeQueryArray('point.getDocumentPoint');
             if(!$output->toBool()) return $output;
@@ -202,9 +220,10 @@
                     if(!$val->member_srl) continue;
                     $point = $insert_point * $val->count;
                     $member[$val->member_srl] += $point;
-                }
-            }
-            $output = null;
+				}
+			}
+
+			$output = null;
             // Get comments information
             $output = executeQueryArray('point.getCommentPoint');
             if(!$output->toBool()) return $output;

modules/point/point.admin.view.php

@@ -88,7 +88,12 @@
             $args->list_count = 20;
             $args->page = Context::get('page');
 
-			$columnList = array('member.member_srl', 'member.user_id', 'member.user_name', 'member.nick_name', 'point.point');
+			$oMemberModel = &getModel('member');
+			$memberConfig = $oMemberModel->getMemberConfig();
+
+			Context::set('identifier', $memberConfig->identifier);
+
+			$columnList = array('member.member_srl', 'member.user_id', 'member.email_address', 'member.nick_name', 'point.point');
             $output = $oPointModel->getMemberList($args, $columnList);
             // context::set for writing into a template 
             Context::set('total_count', $output->total_count);

modules/point/queries/getCommentPoint.xml

@@ -3,7 +3,8 @@
 		<table name="comments" />
 		<table name="documents" type="left outer join" >
 			<conditions>
-				<condition operation="equal" column="comments.document_srl" default="documents.document_srl" />
+				<condition operation="equal" column="comments.status" default="1" pipe="and" />
+				<condition operation="equal" column="comments.document_srl" default="documents.document_srl" pipe="and" />
 			</conditions>
 		</table>
 	</tables>

modules/point/queries/getCommentUsers.xml

@@ -7,7 +7,8 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
+		<condition operation="equal" column="status" default="1" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" pipe="and" />
         <condition operation="excess" column="member_srl" default="0" pipe="and" />
     </conditions>
     <groups>

modules/point/queries/getPoint.xml

@@ -6,6 +6,6 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="in" column="member_srl" var="member_srl" />
+        <condition operation="equal" column="member_srl" var="member_srl" />
     </conditions>
 </query>

modules/point/tpl/config.html

@@ -30,7 +30,7 @@
 					<label for="signup_point">{$lang->point_signup}</label>
 					<br />
 					<input type="text" value="{$config->login_point}" name="login_point" id="login_point" style="width:30px" /> :
-					<label for="login_point">{$lang->cmd_login}</label>
+					<label for="login_point">{$lang->cmd_login}...</label>
 					<br />
 					<input type="text" name="insert_document" value="{$config->insert_document}" id="insert_document" style="width:30px" /> :
 					<label for="insert_document">{$lang->point_insert_document}</label>
@@ -116,6 +116,7 @@
 		</div>
 	</fieldset>
 	<fieldset>
+{@$point_group = @array_flip($config->point_group)}
 		<h2 class="h2">{$lang->level_point}</h2>
 		<div class="table">
 			<table width="100%" border="1" cellspacing="0">
@@ -131,17 +132,37 @@
 					<th scope="col">{$lang->level}</th>
 					<th scope="col">{$lang->level_icon}</th>
 					<th scope="col">{$lang->point}</th>
+					<th scope="col">{$lang->member_group}</th>
 				</tr>
 				<tr>
 					<td>1</td>
 					<td><img src="{getUrl()}/modules/point/icons/{$config->level_icon}/1.gif" alt="" /></td>
 					<td><input type="text" name="level_step_1" value="{$config->level_step[1]}" style="width:40px;text-align:right" /> {$config->point_name}</td>
+{@$point_group_item = $point_group[1]}
+{@$title=array()}
+<!--@if($point_group_item)-->
+	<!--@if($config->group_reset != 'N')-->
+	{@$title[0] = $group_list[$point_group_item.'']->title}
+	<!--@else-->
+	{@$title[] = $group_list[$point_group_item.'']->title}
+	<!--@end-->
+<!--@end-->
+					<td>{implode(', ', $title)}</td>
 				</tr>
 				<!--@for($i=2;$i<=$config->max_level;$i++)-->
+{@$point_group_item = $point_group[$i]}
+<!--@if($point_group_item)-->
+	<!--@if($config->group_reset != 'N')-->
+	{@$title[0] = $group_list[$point_group_item.'']->title}
+	<!--@else-->
+	{@$title[] = $group_list[$point_group_item.'']->title}
+	<!--@end-->
+<!--@end-->
 				<tr class="row{(($i-1)%2+1)}">
 					<td>{$i}</td>
 					<td><img src="{getUrl()}/modules/point/icons/{$config->level_icon}/{$i}.gif" alt="" /></td>
 					<td><input type="text" id="level_step_{$i}" name="level_step_{$i}" value="{$config->level_step[$i]}" style="width:40px;text-align:right" /> {$config->point_name}</td>
+					<td>{implode(', ', $title)}</td>
 				</tr>
 				<!--@end-->
 			</table>

modules/point/tpl/member_list.html

@@ -10,8 +10,7 @@
 		<thead>
 			<tr>
 				<th scope="col">{$lang->no}</th>
-				<th scope="col">{$lang->user_id}</th>
-				<th scope="col">{$lang->user_name}</th>
+				<th scope="col">{Context::getLang($identifier)}</th>
 				<th scope="col">{$lang->nick_name}</th>
 				<th scope="col">{$lang->point}</th>
 				<th scope="col">{$lang->level}</th>
@@ -21,8 +20,8 @@
 			<!--@foreach($member_list as $no => $val)-->
 			<tr>
 				<td>{$no}</td>
-				<td>{$val->user_id}</td>
-				<td>{$val->user_name}</td>
+				<td cond="$identifier == 'user_id'">{$val->user_id}</td>
+				<td cond="$identifier != 'user_id'">{$val->email_address}</td>
 				<td><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td>
 				<td>
 					<form action="./" method="get">