merge with 1.4.5 branch(1.4.5.10)

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

modules/member/tpl/group_list.html

@@ -13,13 +13,17 @@
 <input type="hidden" name="mode" value="" />
 </form>
 
+<form id="fo_group_order" action="./" method="get">
+<input type="hidden" name="act" value="procMemberAdminUpdateGroupOrder" />
 <table cellspacing="0" class="rowTable">
 <thead>
     <tr>
+        <th scope="col"><div>{$lang->group_order}</div></th>
         <th scope="col" class="half_wide"><div>{$lang->group_title}</div></th>
         <th scope="col" class="half_wide"><div>{$lang->description}</div></th>
         <th scope="col"><div>{$lang->regdate}</div></th>
         <th scope="col"><div>{$lang->is_default}</div></th>
+        <th scope="col" class="half_wide"><div>{$lang->group_order_change}</div></th>
         <th scope="col" colspan="2"><div>&nbsp;</div></th>
     </tr>
 </thead>
@@ -29,12 +33,16 @@
         <td colspan="7">{$lang->msg_group_is_null}</td>
     </tr>
     <!--@end-->
+{@$__i=1}
     <!--@foreach($group_list as $group_srl => $group_info)-->
     <tr class="row{$cycle_idx}">
+		<input type="hidden" name="group_srls[]" value="{$group_info->group_srl}" />
+		<td>{$__i++}</td>
         <td><!--@if($config->group_image_mark=='Y' && $group_info->image_mark)--><img src="{$group_info->image_mark}" style="vertical-align: middle; margin-right: 3px;" /><!--@endif-->{$group_info->title}</td>
         <td>{nl2br($group_info->description)}&nbsp;</td>
         <td>{zdate($group_info->regdate,"Y-m-d H:i:s")}</td>
         <td><!--@if($group_info->is_default=='Y')-->Y<!--@else-->&nbsp;<!--@end--></td>
+		<td><a href="#" class="_up">위로</a> <a href="#" class="_down"><span>아래로</span></a></td>
         <td><a href="{getUrl('group_srl',$group_info->group_srl)}" title="{$lang->cmd_modify}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a></td>
         <td>
             <!--@if($group_info->is_default!='Y' && $group_info->is_admin !='Y')-->
@@ -45,9 +53,14 @@
         </td>
     </tr>
     <!--@end-->
+    <tr>
+        <th colspan="8" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
+        </th>
+    </tr>
 </tbody>
 </table>
-
+</form>
 
 <!-- 그룹 추가 -->
 <form action="./" method="get" onsubmit="return procFilter(this, insert_group)">
@@ -84,4 +97,4 @@
         </th>
     </tr>
     </table>
-</form>
+</form>

modules/member/tpl/insert_join_form.html

@@ -44,14 +44,14 @@
     <tr>
         <th scope="row"><div>{$lang->column_name}</div></th>
         <td>
-            <input type="text" name="column_name" value="{htmlspecialchars($join_form->column_name)}" class="inputTypeText w400" />
+            <input type="text" name="column_name" value="{$join_form->column_name}" class="inputTypeText w400" />
             <p>{$lang->about_column_name}</p>
         </td>
     </tr>
     <tr class="row2">
         <th scope="row"><div>{$lang->column_title}</div></th>
         <td>
-            <input type="text" name="column_title" value="{htmlspecialchars($join_form->column_title)}" class="inputTypeText w400" />
+            <input type="text" name="column_title" value="{$join_form->column_title}" class="inputTypeText w400" />
             <p>{$lang->about_column_title}</p>
         </td>
     </tr>
@@ -72,7 +72,7 @@
     <tr>
         <th scope="row"><div>{$lang->description}</div></th>
         <td>
-            <textarea name="description" class="inputTypeTextArea w400">{htmlspecialchars($join_form->description)}</textarea>
+            <textarea name="description" class="inputTypeTextArea w400">{$join_form->description}</textarea>
             <p>{$lang->about_form_description}</p>
         </td>
     </tr>

modules/member/tpl/insert_member.html

@@ -15,7 +15,7 @@
     <input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
     <input type="hidden" name="signature" value="{htmlspecialchars($member_info->signature)}" />
     <!--@if($member_info->member_srl)-->
-    <input type="hidden" name="user_id" value="{htmlspecialchars($member_info->user_id)}" />
+    <input type="hidden" name="user_id" value="{$member_info->user_id}" />
     <!--@end-->
 
 
@@ -25,7 +25,7 @@
         <th scope="row"><div>{$lang->user_id}</div></th>
         <td class="wide">
             <!--@if($member_info->member_srl)-->
-            {htmlspecialchars($member_info->user_id)}
+            {$member_info->user_id}
             <!--@else-->
             <input type="text" name="user_id" value="" class="inputTypeText" />
             <p>{$lang->about_user_id}</p>
@@ -41,34 +41,34 @@
     <tr>
         <th scope="row"><div>{$lang->user_name}</div></th>
         <td>
-            <input type="text" name="user_name" value="{htmlspecialchars($member_info->user_name)}" class="inputTypeText" />
+            <input type="text" name="user_name" value="{$member_info->user_name}" class="inputTypeText" />
             <p>{$lang->about_user_name}</p>
         </td>
     </tr>
     <tr class="row2">
         <th scope="row"><div>{$lang->nick_name}</div></th>
         <td>
-            <input type="text" name="nick_name" value="{htmlspecialchars($member_info->nick_name)}" class="inputTypeText" />
+            <input type="text" name="nick_name" value="{$member_info->nick_name}" class="inputTypeText" />
             <p>{$lang->about_nick_name}</p>
         </td>
     </tr>
     <tr>
         <th scope="row"><div>{$lang->email_address}</div></th>
         <td>
-            <input type="text" name="email_address" value="{htmlspecialchars($member_info->email_address)}" class="inputTypeText" />
+            <input type="text" name="email_address" value="{$member_info->email_address}" class="inputTypeText" />
         </td>
     </tr>
     <tr class="row2">
         <th scope="row"><div>{$lang->homepage}</div></th>
         <td>
-            <input type="text" name="homepage" value="{htmlspecialchars($member_info->homepage)}" class="inputTypeText"/>
+            <input type="text" name="homepage" value="{$member_info->homepage}" class="inputTypeText"/>
             <p>{$lang->about_homepage}</p>
         </td>
     </tr>
     <tr>
         <th scope="row"><div>{$lang->blog}</div></th>
         <td>
-            <input type="text" name="blog" value="{htmlspecialchars($member_info->blog)}" class="inputTypeText" />
+            <input type="text" name="blog" value="{$member_info->blog}" class="inputTypeText" />
         </td>
     </tr>
     <tr class="row2">
@@ -131,7 +131,7 @@
     <tr>
         <th scope="row"><div>{$lang->description}</div></th>
         <td>
-            <textarea name="description" class="inputTypeTextArea fullWidth">{htmlspecialchars($member_info->description)}</textarea>
+            <textarea name="description" class="inputTypeTextArea fullWidth">{$member_info->description}</textarea>
             <p>{$lang->about_member_description}</p>
         </td>
     </tr>
@@ -155,7 +155,7 @@
         <!--@if($val->is_active=='Y')-->
     <tr class="row{$cycle_idx}">
         <th scope="row"><div>
-            {htmlspecialchars($val->column_title)}
+            {$val->column_title}
             <!--@if($val->required=='Y')-->*<!--@end-->
             <div class="publicItem">
                 <input type="checkbox" class="checkbox" name="open_{$val->column_name}" <!--@if($val->is_opened)-->checked="checked"<!--@end--> value="Y" id="open_{$val->column_name}" />
@@ -165,31 +165,31 @@
         <td class="wide">
             <!--// 일반 text -->
             <!--@if($val->column_type == 'text')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
+                <input type="text" name="{$val->column_name}" value="{$val->value}" class="inputTypeText w400" />
 
             <!--// 홈페이지 주소 -->
             <!--@elseif($val->column_type == 'homepage')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
+                <input type="text" name="{$val->column_name}" value="{$val->value}" class="inputTypeText w400" />
 
             <!--// Email 주소 -->
             <!--@elseif($val->column_type == 'email_address')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
+                <input type="text" name="{$val->column_name}" value="{$val->value}" class="inputTypeText w400" />
 
             <!--// 전화번호 -->
             <!--@elseif($val->column_type == 'tel')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[0])}" size="4" class="inputTypeText" />-
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[1])}" size="4" class="inputTypeText" />-
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[2])}" size="4" class="inputTypeText" />
+                <input type="text" name="{$val->column_name}" value="{$val->value[0]}" size="4" class="inputTypeText" />-
+                <input type="text" name="{$val->column_name}" value="{$val->value[1]}" size="4" class="inputTypeText" />-
+                <input type="text" name="{$val->column_name}" value="{$val->value[2]}" size="4" class="inputTypeText" />
 
             <!--// textarea -->
             <!--@elseif($val->column_type == 'textarea')-->
-                <textarea name="{$val->column_name}" class="inputTypeTextArea w400">{htmlspecialchars($val->value)}</textarea>
+                <textarea name="{$val->column_name}" class="inputTypeTextArea w400">{$val->value}</textarea>
 
             <!--// 다중 선택 -->
             <!--@elseif($val->column_type == 'checkbox')-->
                 <!--@if($val->default_value)-->
                     <!--@foreach($val->default_value as $v)-->
-                        <input type="checkbox" name="{$val->column_name}" value="{htmlspecialchars($v)}" <!--@if(is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end-->/>    {$v}
+                        <input type="checkbox" name="{$val->column_name}" value="{$v}" <!--@if(is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end-->/>    {$v}
                     <!--@end-->
                 <!--@end-->
 
@@ -227,7 +227,7 @@
                     </div>
                     <div class="item address2">
 						<label for="krzip_address2_{$val->column_name}" class="iLabel">{$lang->msg_kr_address_etc}</label>
-                        <input type="text" name="{$val->column_name}" id="krzip_address2_{$val->column_name}" value="{htmlspecialchars($val->value[1])}" class="iText w400" />
+                        <input type="text" name="{$val->column_name}" id="krzip_address2_{$val->column_name}" value="{$val->value[1]}" class="iText w400" />
                     </div>
                 </div>
 				<load target="js/krzip_search.js" type="body" />
@@ -243,7 +243,7 @@
 
 
             <!--@end-->
-            <!--@if($val->description)--><p class="clear">{htmlspecialchars($val->description)}</p><!--@end-->
+            <!--@if($val->description)--><p class="clear">{$val->description}</p><!--@end-->
         </td>
     </tr>
         <!--@end-->

modules/member/tpl/join_form_list.html

@@ -23,7 +23,7 @@
 <tbody>
     <!--@foreach($form_list as $no => $val)-->
     <tr class="row{$cycle_idx}">
-        <td>{htmlspecialchars($val->column_title)}</td>
+        <td>{$val->column_title}</td>
         <td>{$val->column_name}</td>
         <td>{$lang->column_type_list[$val->column_type]}</td>
         <td>{$val->is_active}</td>

modules/member/tpl/js/member_admin.js

@@ -339,27 +339,31 @@ function completeDeleteMembers(ret_obj) {
     window.close();
 }
 
-
-function doGorupImageMarkUpdateOrder(id) {
-    var sort   = jQuery('#'+id).sortable('toArray');
-    var params = { group_image_mark_order : [] };
-	
-    jQuery.each(sort, function(i, val) {
-        params['group_image_mark_order'].push(val.replace('group_srl_', ''));
-    });
-
-    var response_tags = ['error','message'];
-    exec_xml('member', 'procMemberAdminGroupImageMarkUpdateOrder', params, completeGroupImageMarkUpdateOrder, response_tags);
-}
-
-function completeGroupImageMarkUpdateOrder(ret_obj) {
-    alert(ret_obj['message']);
-}
-
 jQuery(function($) {
-    $("#group_image_mark_order")
-        .sortable({
-            cursor: 'move',
-            cancel: '.inactive'
-        });
+	$("#fo_group_order > table")
+		.find("a._up")
+			.click(function(e){
+				var $tr = $(this).parent().parent();
+				var $prev = $tr.prev("tr");
+				if($prev.length) 
+				{
+					$prev.before($tr);
+					$tr.parent().find("tr").removeClass("bg1").filter(":odd").addClass("bg1");
+				}
+				e.preventDefault();
+			})
+		.end()
+		.find("a._down")
+			.click(function(){
+				var $tr = $(this).parent().parent();
+				var $next = $tr.next("tr");
+				if($next.length)
+				{
+					$next.after($tr);
+					$tr.parent().find("tr").removeClass("bg1").filter(":odd").addClass("bg1");
+				}
+				e.preventDefault();
+			})
+		.end()
+			
 });

modules/member/tpl/member_info.html

@@ -11,15 +11,15 @@
 <table cellspacing="0" class="rowTable">
 <tr class="row2">
     <th scope="row"><div>{$lang->user_id}</div></th>
-    <td>{htmlspecialchars($member_info->user_id)}</td>
+    <td>{$member_info->user_id}</td>
 </tr>
 <tr>
     <th scope="row"><div>{$lang->user_name}</div></th>
-    <td>{htmlspecialchars($member_info->user_name)}</td>
+    <td>{$member_info->user_name}</td>
 </tr>
 <tr class="row2">
     <th scope="row"><div>{$lang->nick_name}</div></th>
-    <td>{htmlspecialchars($member_info->nick_name)}</td>
+    <td>{$member_info->nick_name}</td>
 </tr>
 <tr>
     <th scope="row" rowspan="2"><div>{$lang->profile_image}</div></th>
@@ -92,15 +92,15 @@
 </tr>
 <tr>
     <th scope="row"><div>{$lang->email_address}</div></th>
-    <td>{htmlspecialchars($member_info->email_address)}</td>
+    <td>{$member_info->email_address}</td>
 </tr>
 <tr class="row2">
     <th scope="row"><div>{$lang->homepage}</div></th>
-    <td><!--@if($member_info->homepage)--><a href="{$member_info->homepage}" onclick="winopen(this.href); return false;">{htmlspecialchars($member_info->homepage)}</a><!--@end-->&nbsp;</td>
+    <td><!--@if($member_info->homepage)--><a href="{$member_info->homepage}" onclick="winopen(this.href); return false;">{$member_info->homepage}</a><!--@end-->&nbsp;</td>
 </tr>
 <tr>
     <th scope="row"><div>{$lang->blog}</div></th>
-    <td><!--@if($member_info->blog)--><a href="{$member_info->blog}" onclick="windopen(this.href); return false;">{htmlspecialchars($member_info->blog)}</a><!--@end-->&nbsp;</td>
+    <td><!--@if($member_info->blog)--><a href="{$member_info->blog}" onclick="windopen(this.href); return false;">{$member_info->blog}</a><!--@end-->&nbsp;</td>
 </tr>
 <tr class="row2">
     <th scope="row"><div>{$lang->birthday}</div></th>
@@ -146,22 +146,22 @@
 <!--@if($extend_form_list)-->
 <!--@foreach($extend_form_list as $key => $val)-->
 <tr class="row{$cycle_idx}">
-    <th scope="row"><div>{htmlspecialchars($val->column_title)}<!--@if($val->is_opened)--> <span class="publicItem">({$lang->public})</span><!--@end--></div></th>
+    <th scope="row"><div>{$val->column_title}<!--@if($val->is_opened)--> <span class="publicItem">({$lang->public})</span><!--@end--></div></th>
     <td>
         <!--@if($val->column_type=='tel')-->
-            {htmlspecialchars($val->value[0])}
+            {$val->value[0]}
                 <!--@if($val->value[1])-->-<!--@end-->
-            {htmlspecialchars($val->value[1])}
+            {$val->value[1]}
                 <!--@if($val->value[2])-->-<!--@end-->
-            {htmlspecialchars($val->value[2])}
+            {$val->value[2]}
         <!--@elseif($val->column_type=='kr_zip')-->
-            {htmlspecialchars($val->value[0])}<!--@if($val->value[1]&&$val->value[0])--><br /><!--@end-->{htmlspecialchars($val->value[1])}
+            {$val->value[0]}<!--@if($val->value[1]&&$val->value[0])--><br /><!--@end-->{$val->value[1]}
         <!--@elseif($val->column_type=='checkbox' && is_array($val->value))-->
-            {htmlspecialchars(implode(", ",$val->value))}
+            {implode(", ",$val->value)}
         <!--@elseif($val->column_type=='date')-->
             {zdate($val->value, "Y-m-d")}
         <!--@else-->
-            {nl2br(htmlspecialchars($val->value))}
+            {nl2br($val->value)}
         <!--@end-->
         &nbsp;
     </td>
@@ -170,7 +170,7 @@
 <!--@end-->
 <tr>
     <th scope="row"><div>{$lang->description}</div></th>
-    <td>{htmlspecialchars($member_info->description)}&nbsp;</td>
+    <td>{$member_info->description}&nbsp;</td>
 </tr>
 <tr class="row2">
     <th colspan="2" class="button">

modules/member/tpl/member_list.html

@@ -56,14 +56,14 @@
         <tr class="row{$cycle_idx}">
             <td rowspan="2">{$no}</td>
             <td rowspan="2"><input type="checkbox" name="cart" value="{$val->member_srl}"/></td>
-            <td><a href="{getUrl('act','dispMemberAdminInfo','member_srl',$val->member_srl)}">{htmlspecialchars($val->user_id)}</a></td>
-            <td>{htmlspecialchars($val->user_name)}</td>
-            <td><span class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</span></td>
+            <td><a href="{getUrl('act','dispMemberAdminInfo','member_srl',$val->member_srl)}">{$val->user_id}</a></td>
+            <td>{$val->user_name}</td>
+            <td><span class="member_{$val->member_srl}">{$val->nick_name}</span></td>
             <td>{zdate($val->regdate,"Y-m-d H:i:s")}</td>
             <td>{zdate($val->last_login,"Y-m-d H:i:s")}</td>
             <td class="nowrap">
-                <!--@if($val->homepage)--><a href="{$val->homepage}" class="homepage" onclick="window.open(this.href);return false;"><img src="./images/icon_homepage.gif" title="{$lang->homepage}" alt="{$lang->homepage}" /></a> <!--@end-->
-                <!--@if($val->blog)--><a href="{$val->blog}" class="blog" onclick="window.open(this.href);return false;"><img src="./images/icon_blog.gif" title="{$lang->blog}" alt="{$lang->blog}" /></a> <!--@end-->&nbsp;
+                <!--@if($val->homepage)--><a href="{htmlspecialchars($val->homepage)}" class="homepage" onclick="window.open(this.href);return false;"><img src="./images/icon_homepage.gif" title="{$lang->homepage}" alt="{$lang->homepage}" /></a> <!--@end-->
+                <!--@if($val->blog)--><a href="{htmlspecialchars($val->blog)}" class="blog" onclick="window.open(this.href);return false;"><img src="./images/icon_blog.gif" title="{$lang->blog}" alt="{$lang->blog}" /></a> <!--@end-->&nbsp;
             </td>
             <td><!--@if($val->is_admin != 'Y')--><a href="{getUrl('act','dispMemberAdminDeleteForm','member_srl', $val->member_srl)}" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a><!--@else--><img src="./images/icon_management.gif" title="{$lang->is_admin}" alt="{$lang->is_admin}" /><!--@end--></td>
         </tr>