fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-26 06:39:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge with 1.4.5 branch(1.4.5.10)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@9269 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-22 05:29:04 +00:00
parent 92332c8ebb
commit a0d57a320f
98 changed files with 970 additions and 432 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/member/conf/module.xml
View file

@ -78,6 +78,6 @@
<action name="procMemberAdminUpdateJoinForm" type="controller" standalone="true" />
<action name="procMemberAdminInsertDeniedID" type="controller" standalone="true" />
<action name="procMemberAdminUpdateDeniedID" type="controller" standalone="true" />
<action name="procMemberAdminGroupImageMarkUpdateOrder" type="controller" standalone="true" />
<action name="procMemberAdminUpdateGroupOrder" type="controller" standalone="true" />
</actions>
</module>

3
modules/member/lang/ko.lang.php
View file

@ -27,6 +27,8 @@
$lang->group = '소속 그룹';
$lang->group_title = '그룹제목';
$lang->group_srl = '그룹번호';
$lang->group_order = '그룹 우선순위';
$lang->group_order_change = '그룹 우선순위 변경';
$lang->signature = '서명';
$lang->profile_image = '프로필 사진';
$lang->profile_image_max_width = '가로 제한 길이';
@ -40,7 +42,6 @@
$lang->group_image_mark = '그룹 이미지 마크';
$lang->group_image_mark_max_width = '가로 제한 길이';
$lang->group_image_mark_max_height = '세로 제한 길이';
$lang->group_image_mark_order = '그룹 이미지 마크 순서';
$lang->signature_max_height = '서명 높이 제한';
$lang->enable_openid = 'OpenID 지원';
$lang->enable_join = '회원 가입 허가';

17
modules/member/member.admin.controller.php
View file

@ -365,6 +365,7 @@
if(!$output->toBool()) return $output;
}
if (!$args->group_srl) $args->group_srl = getNextSequence();
return executeQuery('member.insertGroup', $args);
}
@ -407,14 +408,16 @@
}
function procMemberAdminGroupImageMarkUpdateOrder() {
$oModuleModel = &getModel('module');
$oModuleControll = getController('module');
function procMemberAdminUpdateGroupOrder() {
$vars = Context::getRequestVars();
foreach($vars->group_srls as $key => $val){
$args->group_srl = $val;
$args->list_order = $key + 1;
executeQuery('member.updateMemberGroupListOrder', $args);
}
$config = $oModuleModel->getModuleConfig('member');
// $config->group_image_mark_order = Context::get('group_image_mark_order');
$oModuleControll->insertModuleConfig('member', $config);
header(sprintf('Location:%s', getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList')));
}
/**

1
modules/member/member.admin.model.php
View file

@ -45,6 +45,7 @@
case 'nick_name' :
if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
$args->s_nick_name = $search_keyword;
$args->html_nick_name = htmlspecialchars($search_keyword);
break;
case 'email_address' :
if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);

69
modules/member/member.admin.view.php
View file

@ -1,4 +1,4 @@
<?php
<?php
/**
* @class memberAdminView
* @author NHN (developers@xpressengine.com)
@ -28,6 +28,9 @@
$this->group_list = $oMemberModel->getGroups();
Context::set('group_list', $this->group_list);
$security = new Security();
$security->encodeHTML('group_list..');
$this->setTemplatePath($this->module_path.'tpl');
}
@ -46,14 +49,16 @@
$output->data[$key]->group_list = $oMemberModel->getMemberGroups($member->member_srl,0);
}
}
Context::set('total_count', $output->total_count);
Context::set('total_page', $output->total_page);
Context::set('page', $output->page);
Context::set('member_list', $output->data);
Context::set('page_navigation', $output->page_navigation);
$this->setTemplateFile('member_list');
$security = new Security();
$security->encodeHTML('member_list..user_name','member_list..group_list..');
$this->setTemplateFile('member_list');
}
/**
@ -86,6 +91,9 @@
$editor = $oEditorModel->getEditor(0, $option);
Context::set('editor', $editor);
$security = new Security();
$security->encodeHTML('config..');
$this->setTemplateFile('member_config');
}
@ -98,6 +106,12 @@
$member_config = $oModuleModel->getModuleConfig('member');
Context::set('member_config', $member_config);
Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->member_info));
$security = new Security();
$security->encodeHTML('member_config..');
$security->encodeHTML('member_info.user_name','member_info.description','member_info.group_list..');
$security->encodeHTML('extend_form_list...');
$this->setTemplateFile('member_info');
}
@ -127,39 +141,42 @@
$editor = $oEditorModel->getEditor($this->member_info->member_srl, $option);
Context::set('editor', $editor);
}
$security = new Security();
$security->encodeHTML('extend_form_list..');
$security->encodeHTML('extend_form_list..default_value.');
$this->setTemplateFile('insert_member');
}
/**
* @brief display member delete form
/** O
* @brief display member delete form
**/
function dispMemberAdminDeleteForm() {
if(!Context::get('member_srl')) return $this->dispMemberAdminList();
$this->setTemplateFile('delete_form');
}
/**
/** ->group_update_form
* @brief display group list
**/
function dispMemberAdminGroupList() {
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if($config->group_image_mark_order) $config->group_image_mark_order = explode(',', $config->group_image_mark_order);
Context::set('config', $config);
$group_srl = Context::get('group_srl');
if($group_srl && $this->group_list[$group_srl]) {
Context::set('selected_group', $this->group_list[$group_srl]);
$this->setTemplateFile('group_update_form');
$this->setTemplateFile('group_update_form');
} else {
$this->setTemplateFile('group_list');
}
}
}
/**
/** O
* @brief 회원 가입 폼 목록 출력
**/
function dispMemberAdminJoinFormList() {
@ -169,11 +186,13 @@
// 추가로 설정한 가입 항목 가져오기
$form_list = $oMemberModel->getJoinFormList();
Context::set('form_list', $form_list);
$security = new Security($form_list);
$security->encodeHTML('form_list..');
$this->setTemplateFile('join_form_list');
}
/**
/** O h, ck
* @brief 회원 가입 폼 관리 화면 출력
**/
function dispMemberAdminInsertJoinForm() {
@ -184,12 +203,17 @@
$join_form = $oMemberModel->getJoinForm($member_join_form_srl);
if(!$join_form) Context::set('member_join_form_srl','',true);
else Context::set('join_form', $join_form);
else {
Context::set('join_form', $join_form);
$security = new Security();
$security->encodeHTML('join_form..');
}
}
$this->setTemplateFile('insert_join_form');
}
/**
/** O
* @brief 금지 목록 아이디 출력
**/
function dispMemberAdminDeniedIDList() {
@ -204,7 +228,9 @@
Context::set('page', $output->page);
Context::set('member_list', $output->data);
Context::set('page_navigation', $output->page_navigation);
$security = new Security();
$security->encodeHTML('member_list..');
$this->setTemplateFile('denied_id_list');
}
@ -220,7 +246,10 @@
// 회원 그룹 목록을 구함
$oMemberModel = &getModel('member');
Context::set('member_groups', $oMemberModel->getGroups());
$security = new Security();
$security->encodeHTML('member_list..');
$this->setLayoutFile('popup_layout');
$this->setTemplateFile('manage_member_group');
}
@ -234,7 +263,7 @@
$output = executeQueryArray('member.getMembers', $args);
Context::set('member_list', $output->data);
$this->setLayoutFile('popup_layout');
$this->setLayoutFile('popup_layout');
$this->setTemplateFile('delete_members');
}
}

11
modules/member/member.class.php
View file

@ -143,6 +143,9 @@
if(!$oDB->isColumnExists("member_group", "site_srl")) return true;
if($oDB->isIndexExists("member_group","uni_member_group_title")) return true;
// Add a column for list_order (05/18/2011)
if(!$oDB->isColumnExists("member_group", "list_order")) return true;
// image_mark 추가 (2009. 02. 14)
if(!$oDB->isColumnExists("member_group", "image_mark")) return true;
@ -190,6 +193,13 @@
$oDB->dropIndex("member_group","uni_member_group_title",true);
}
// Add a column(list_order) to "member_group" table (05/18/2011)
if (!$oDB->isColumnExists("member_group", "list_order")) {
$oDB->addColumn("member_group", "list_order", "number", 11, '', true);
$oDB->addIndex("member_group","idx_list_order", "list_order",false);
$output = executeQuery('member.updateAllMemberGroupListOrder');
}
// image_mark 추가 (2009. 02. 14)
if(!$oDB->isColumnExists("member_group", "image_mark")) {
$oDB->addColumn("member_group", "image_mark", "text");
@ -216,7 +226,6 @@
executeQuery('member.updateMemberListOrderAll',$args);
executeQuery('member.updateMemberListOrderAll');
}
if(!$oDB->isIndexExists("member","idx_list_order")) {
$oDB->addIndex("member","idx_list_order", array("list_order"));
}

6
modules/member/member.controller.php
View file

@ -1633,6 +1633,9 @@
// DB에 입력
$args->member_srl = getNextSequence();
$args->list_order = -1 * $args->member_srl;
$args->nick_name = htmlspecialchars($args->nick_name);
$args->homepage = htmlspecialchars($args->homepage);
$args->blog = htmlspecialchars($args->blog);
if($args->password && !$password_is_hashed) $args->password = md5($args->password);
elseif(!$args->password) unset($args->password);
@ -1780,6 +1783,9 @@
if($args->password) $args->password = md5($args->password);
else $args->password = $member_info->password;
if(!$args->user_name) $args->user_name = $member_info->user_name;
$args->nick_name = htmlspecialchars($args->nick_name);
$args->homepage = htmlspecialchars($args->homepage);
$args->blog = htmlspecialchars($args->blog);
if(!$args->description) $args->description = '';
$output = executeQuery('member.updateMember', $args);

45
modules/member/member.model.php
View file

@ -354,6 +354,8 @@
function getGroups($site_srl = 0) {
if(!$GLOBALS['__group_info__'][$site_srl]) {
$args->site_srl = $site_srl;
$args->sort_index = 'list_order';
$args->order_type = 'asc';
$output = executeQuery('member.getGroups', $args);
if(!$output->data) return;
@ -602,27 +604,32 @@
* @brief group의 이미지마크 정보를 구함
**/
function getGroupImageMark($member_srl,$site_srl=0) {
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if($config->group_image_mark!='Y'){
return null;
}
$member_group = $this->getMemberGroups($member_srl,$site_srl);
if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl])) {
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if($config->group_image_mark!='Y'){
return null;
}
$member_group = $this->getMemberGroups($member_srl,$site_srl);
$groups_info = $this->getGroups($site_srl);
$image_mark_info = null;
$groups_info = $this->getGroups($site_srl);
$image_mark = null;
if(count($member_group) > 0 && is_array($member_group)){
$group_srl = array_keys($member_group);
$image_mark = $groups_info[$group_srl[0]]->image_mark;
}
if($image_mark){
// list($width, $height, $type, $attrs) = getimagesize($image_mark);
// $info->width = $width;
// $info->height = $height;
$info->src = $image_mark;
return $info;
foreach($groups_info as $key=>$val){
$target = $member_group[$key];
if (!empty($target) && !empty($val->image_mark))
{
$info->title = $val->title;
$info->description = $val->description;
$info->src = $val->image_mark;
$GLOBALS['__member_info__']['group_image_mark'][$member_srl] = $info;
break;
}
}
if (!$info) $GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';
}
if ($GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N') return null;
}else return false;
return $GLOBALS['__member_info__']['group_image_mark'][$member_srl];
}
/**

2
modules/member/queries/getGroups.xml
View file

@ -3,7 +3,7 @@
<table name="member_group" />
</tables>
<navigation>
<index var="sort_index" default="group_srl" order="desc" />
<index var="sort_index" default="list_order" order="order_type" />
</navigation>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" />

1
modules/member/queries/getMemberList.xml
View file

@ -12,6 +12,7 @@
<condition operation="like" column="user_id" var="s_user_id" />
<condition operation="like" column="user_name" var="s_user_name" pipe="or" />
<condition operation="like" column="nick_name" var="s_nick_name" pipe="or" />
<condition operation="like" column="nick_name" var="html_nick_name" pipe="or" />
<condition operation="like" column="email_address" var="s_email_address" pipe="or" />
<condition operation="like" column="extra_vars" var="s_extra_vars" pipe="or" />
<condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />

1
modules/member/queries/getMemberListWithinGroup.xml
View file

@ -15,6 +15,7 @@
<condition operation="like" column="member.user_id" var="s_user_id" />
<condition operation="like" column="member.user_name" var="s_user_name" pipe="or" />
<condition operation="like" column="member.nick_name" var="s_nick_name" pipe="or" />
<condition operation="like" column="member.nick_name" var="html_nick_name" pipe="or" />
<condition operation="like" column="member.email_address" var="s_email_address" pipe="or" />
<condition operation="like" column="extra_vars" var="s_extra_vars" pipe="or" />
<condition operation="like_prefix" column="member.regdate" var="s_regdate" pipe="or" />

3
modules/member/queries/insertGroup.xml
View file

@ -4,7 +4,8 @@
</tables>
<columns>
<column name="site_srl" var="site_srl" default="0" notnull="notnull" />
<column name="group_srl" var="group_srl" default="sequence()" notnull="notnull" />
<column name="group_srl" var="group_srl" notnull="notnull" />
<column name="list_order" var="group_srl" notnull="notnull" />
<column name="title" var="title" notnull="notnull" />
<column name="is_default" var="is_default" default="N" notnull="notnull" />
<column name="is_admin" var="is_admin" default="N" notnull="notnull" />

8
modules/member/queries/updateAllMemberGroupListOrder.xml Normal file
View file

@ -0,0 +1,8 @@
<query id="updateAllMemberGroupListOrder" action="update">
<tables>
<table name="member_group" />
</tables>
<columns>
<column name="list_order" default="group_srl" />
</columns>
</query>

11
modules/member/queries/updateMemberGroupListOrder.xml Normal file
View file

@ -0,0 +1,11 @@
<query id="updateMemberGroupListOrder" action="update">
<tables>
<table name="member_group" />
</tables>
<columns>
<column name="list_order" var="list_order" filter="number" notnull="notnull" />
</columns>
<conditions>
<condition operation="equal" column="group_srl" var="group_srl" notnull="notnull" filter="number" />
</conditions>
</query>

1
modules/member/schemas/member_group.xml
View file

@ -1,6 +1,7 @@
<table name="member_group">
<column name="site_srl" type="number" size="11" notnull="notnull" default="0" />
<column name="group_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
<column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
<column name="title" type="varchar" size="80" notnull="notnull" />
<column name="regdate" type="date" />
<column name="is_default" type="char" default="N" />

8
modules/member/skins/default/modify_info.html
View file

@ -44,7 +44,7 @@
</tr>
<tr>
<th><div>{$lang->nick_name} <span class="require">*</span></div></th>
<td><input type="text" name="nick_name" value="{htmlspecialchars($member_info->nick_name)}" /> <p>{$lang->about_nick_name}</p></td>
<td><input type="text" name="nick_name" value="{htmlspecialchars(htmlspecialchars_decode($member_info->nick_name))}" /> <p>{$lang->about_nick_name}</p></td>
</tr>
<tr>
<th><div>{$lang->email_address} <span class="require">*</span></div></th>
@ -124,11 +124,11 @@
<!--@end-->
<tr>
<th><div>{$lang->homepage}</div></th>
<td><input type="text" name="homepage" value="{htmlspecialchars($member_info->homepage)}" /> <p>{$lang->about_homepage}</p></td>
<td><input type="text" name="homepage" value="{htmlspecialchars(htmlspecialchars_decode($member_info->homepage))}" /> <p>{$lang->about_homepage}</p></td>
</tr>
<tr>
<th><div>{$lang->blog}</div></th>
<td><input type="text" name="blog" value="{htmlspecialchars($member_info->blog)}" /> <p>{$lang->about_blog_url}</p></td>
<td><input type="text" name="blog" value="{htmlspecialchars(htmlspecialchars_decode($member_info->blog))}" /> <p>{$lang->about_blog_url}</p></td>
</tr>
<tr>
<th><div>{$lang->birthday}</div></th>
@ -168,7 +168,7 @@
<!--// 홈페이지 주소 -->
<!--@elseif($val->column_type == 'homepage')-->
<input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="iText w400" />
<input type="text" name="{$val->column_name}" value="{htmlspecialchars(htmlspecialchars_decode($val->value))}" class="iText w400" />
<!--// Email 주소 -->
<!--@elseif($val->column_type == 'email_address')-->

17
modules/member/tpl/group_list.html
View file

@ -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>

6
modules/member/tpl/insert_join_form.html
View file

@ -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>

38
modules/member/tpl/insert_member.html
View file

@ -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-->

2
modules/member/tpl/join_form_list.html
View file

@ -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>

48
modules/member/tpl/js/member_admin.js
View file

@ -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()
});

28
modules/member/tpl/member_info.html
View file

@ -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">

10
modules/member/tpl/member_list.html
View file

@ -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>