fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-23 21:29:58 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge 1.4.5.10

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9272 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-22 08:23:36 +00:00
commit 105e3f4843
66 changed files with 4864 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -88,7 +88,7 @@
<menus>
<menu name="userList">
<title xml:lang="en">Member List</title>
<title xml:lang="ko">회원 목록</title>
<title xml:lang="ko">회원 목록</title>
<title xml:lang="zh-CN">Member List</title>
<title xml:lang="jp">Member List</title>
<title xml:lang="es">Member List</title>
@ -101,7 +101,7 @@
</menu>
<menu name="userGroup">
<title xml:lang="en">Member Group</title>
<title xml:lang="ko">회원 그룹</title>
<title xml:lang="ko">회원 그룹</title>
<title xml:lang="zh-CN">Member Group</title>
<title xml:lang="jp">Member Group</title>
<title xml:lang="es">Member Group</title>
@ -114,7 +114,7 @@
</menu>
<menu name="userSetting">
<title xml:lang="en">Member Setting</title>
<title xml:lang="ko">회원 설정</title>
<title xml:lang="ko">회원 설정</title>
<title xml:lang="zh-CN">Member Setting</title>
<title xml:lang="jp">Member Setting</title>
<title xml:lang="es">Member Setting</title>

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

@ -674,6 +674,7 @@
if (!$args->group_srl) $args->group_srl = getNextSequence();
if (!$args->group_srl) $args->group_srl = getNextSequence();
return executeQuery('member.insertGroup', $args);
}

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

@ -1,3 +1,4 @@
<<<<<<< .working
<?php
/**
* @class memberAdminModel
@ -207,3 +208,147 @@
}
}
?>
=======
<?php
/**
* @class memberAdminModel
* @author NHN (developers@xpressengine.com)
* @brief member module의 admin model class
**/
class memberAdminModel extends member {
/**
* @brief 자주 호출될거라 예상되는 데이터는 내부적으로 가지고 있자...
**/
var $member_info = NULL;
var $member_groups = NULL;
var $join_form_list = NULL;
/**
* @brief 초기화
**/
function init() {
}
/**
* @brief 회원 목록을 구함
**/
function getMemberList() {
// 검색 옵션 정리
$args->is_admin = Context::get('is_admin')=='Y'?'Y':'';
$args->is_denied = Context::get('is_denied')=='Y'?'Y':'';
$args->selected_group_srl = Context::get('selected_group_srl');
$search_target = trim(Context::get('search_target'));
$search_keyword = trim(Context::get('search_keyword'));
if($search_target && $search_keyword) {
switch($search_target) {
case 'user_id' :
if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
$args->s_user_id = $search_keyword;
break;
case 'user_name' :
if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
$args->s_user_name = $search_keyword;
break;
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);
$args->s_email_address = $search_keyword;
break;
case 'regdate' :
$args->s_regdate = preg_replace("/[^0-9]/","",$search_keyword);
break;
case 'regdate_more' :
$args->s_regdate_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
break;
case 'regdate_less' :
$args->s_regdate_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
break;
case 'last_login' :
$args->s_last_login = $search_keyword;
break;
case 'last_login_more' :
$args->s_last_login_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
break;
case 'last_login_less' :
$args->s_last_login_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
break;
case 'extra_vars' :
$args->s_extra_vars = ereg_replace("[^0-9]","",$search_keyword);
break;
}
}
// selected_group_srl이 있으면 query id를 변경 (table join때문에)
$sort_order = Context::get('sort_order');
$sort_index = Context::get('sort_index');
if($sort_index != 'last_login') {
$sort_index = "list_order";
}else{
$sort_order = 'desc';
}
if($args->selected_group_srl) {
$query_id = 'member.getMemberListWithinGroup';
$args->sort_index = "member.".$sort_index;
} else {
$query_id = 'member.getMemberList';
$args->sort_index = $sort_index;
}
if($sort_order != "desc") $sort_order = "asc";
$args->sort_order = $sort_order;
Context::set('sort_order', $sort_order);
// 기타 변수들 정리
$args->page = Context::get('page');
$args->list_count = 40;
$args->page_count = 10;
$output = executeQuery($query_id, $args);
return $output;
}
/**
* @brief 사이트별 회원 목록을 구함
**/
function getSiteMemberList($site_srl, $page = 1) {
$args->site_srl = $site_srl;
$args->page = $page;
$args->list_count = 40;
$args->page_count = 10;
$query_id = 'member.getSiteMemberList';
$output = executeQueryArray($query_id, $args);
return $output;
}
/**
* @brief 회원 모듈의 특정 스킨에 속한 컬러셋 목록을 return
**/
function getMemberAdminColorset() {
$skin = Context::get('skin');
if(!$skin) $tpl = "";
else {
$oModuleModel = &getModel('module');
$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
Context::set('skin_info', $skin_info);
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if(!$config->colorset) $config->colorset = "white";
Context::set('config', $config);
$oTemplate = &TemplateHandler::getInstance();
$tpl = $oTemplate->compile($this->module_path.'tpl', 'colorset_list');
}
$this->add('tpl', $tpl);
}
}
?>
>>>>>>> .merge-right.r9269

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

@ -1,4 +1,4 @@
<?php
<?php
/**
* @class memberAdminView
* @author NHN (developers@xpressengine.com)
@ -7,90 +7,59 @@
class memberAdminView extends member {
var $group_list = NULL; ///< group list
var $memberInfo = NULL; ///< selected member info
var $group_list = NULL; ///< group list var $memberInfo = NULL; ///< selected member info
/**
* @brief initialization
**/
* @brief initialization **/
function init() {
$oMemberModel = &getModel('member');
// if member_srl exists, set memberInfo
$member_srl = Context::get('member_srl');
// if member_srl exists, set memberInfo $member_srl = Context::get('member_srl');
if($member_srl) {
$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
if(!$this->memberInfo) Context::set('member_srl','');
else Context::set('member_info',$this->memberInfo);
}
$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl); if(!$this->memberInfo) Context::set('member_srl',''); else Context::set('member_info',$this->memberInfo); }
// retrieve group list
$this->group_list = $oMemberModel->getGroups();
// retrieve group list $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');
}
/**
* @brief display member list
**/
* @brief display member list **/
function dispMemberAdminList() {
$oMemberAdminModel = &getAdminModel('member');
$oMemberModel = &getModel('member');
$output = $oMemberAdminModel->getMemberList();
$filter = Context::get('filter_type');
global $lang;
switch($filter){
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
$filter = Context::get('filter_type'); global $lang; switch($filter){ 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
if($output->data) {
foreach($output->data as $key => $member) {
$output->data[$key]->group_list = $oMemberModel->getMemberGroups($member->member_srl,0);
}
}
$config = $oMemberModel->getMemberConfig();
$memberIdentifiers = array('user_id'=>'user_id', 'user_name'=>'user_name', 'nick_name'=>'nick_name');
$usedIdentifiers = array();
foreach($config->signupForm as $signupItem){
if (!count($memberIdentifiers)) break;
if(in_array($signupItem->name, $memberIdentifiers) && ($signupItem->required || $signupItem->isUse)){
unset($memberIdentifiers[$signupItem->name]);
$usedIdentifiers[$signupItem->name] = $lang->{$signupItem->name};
}
}
Context::set('total_count', $output->total_count);
$config = $oMemberModel->getMemberConfig(); $memberIdentifiers = array('user_id'=>'user_id', 'user_name'=>'user_name', 'nick_name'=>'nick_name'); $usedIdentifiers = array(); foreach($config->signupForm as $signupItem){ if (!count($memberIdentifiers)) break; if(in_array($signupItem->name, $memberIdentifiers) && ($signupItem->required || $signupItem->isUse)){ unset($memberIdentifiers[$signupItem->name]); $usedIdentifiers[$signupItem->name] = $lang->{$signupItem->name}; } } 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('usedIdentifiers', $usedIdentifiers);
Context::set('page_navigation', $output->page_navigation);
$this->setTemplateFile('member_list');
Context::set('usedIdentifiers', $usedIdentifiers); Context::set('page_navigation', $output->page_navigation);
$security = new Security();
$security->encodeHTML('member_list..user_name','member_list..group_list..');
$this->setTemplateFile('member_list');
}
/**
* @brief default configuration for member management
**/
function dispMemberAdminConfig() {
global $lang;
// retrieve configuration via module model instance
global $lang; // retrieve configuration via module model instance
$oModuleModel = &getModel('module');
$oMemberModel = &getModel('member');
$config = $oMemberModel->getMemberConfig();
// Get join form list which is additionally set
$extendItems = $oMemberModel->getJoinFormList();
Context::set('config',$config);
// Get join form list which is additionally set $extendItems = $oMemberModel->getJoinFormList(); Context::set('config',$config);
// list of skins for member module
$skin_list = $oModuleModel->getSkins($this->module_path);
@ -116,6 +85,9 @@
$denied_list = $oMemberModel->getDeniedIDs();
Context::set('deniedIDs', $denied_list);
$security = new Security();
$security->encodeHTML('config..');
$this->setTemplateFile('member_config');
}
@ -127,14 +99,12 @@
$oModuleModel = &getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
Context::set('member_config', $member_config);
$extendForm = $oMemberModel->getCombineJoinForm($this->memberInfo);
Context::set('extend_form_list', $extendForm);
$memberInfo = get_object_vars(Context::get('member_info'));
Context::set('memberInfo', $memberInfo);
$disableColumns = array('password', 'find_account_question');
Context::set('disableColumns', $disableColumns);
$extendForm = $oMemberModel->getCombineJoinForm($this->memberInfo); Context::set('extend_form_list', $extendForm); $memberInfo = get_object_vars(Context::get('member_info')); Context::set('memberInfo', $memberInfo); $disableColumns = array('password', 'find_account_question'); Context::set('disableColumns', $disableColumns);
$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');
}
@ -145,13 +115,9 @@
// retrieve extend form
$oMemberModel = &getModel('member');
$memberInfo = Context::get('member_info');
$memberInfo->signature = $oMemberModel->getSignature($this->memberInfo->member_srl);
Context::set('member_info', $memberInfo);
$memberInfo = Context::get('member_info'); $memberInfo->signature = $oMemberModel->getSignature($this->memberInfo->member_srl); Context::set('member_info', $memberInfo);
// get an editor for the signature
if($memberInfo->member_srl) {
$oEditorModel = &getModel('editor');
if($memberInfo->member_srl) { $oEditorModel = &getModel('editor');
$option->primary_key_name = 'member_srl';
$option->content_key_name = 'signature';
$option->allow_fileupload = false;
@ -160,21 +126,14 @@
$option->enable_component = false;
$option->resizable = false;
$option->height = 200;
$editor = $oEditorModel->getEditor($this->memberInfo->member_srl, $option);
Context::set('editor', $editor);
$editor = $oEditorModel->getEditor($this->memberInfo->member_srl, $option); Context::set('editor', $editor);
}
$formTags = $this->_getMemberInputTag($memberInfo);
Context::set('formTags', $formTags);
$member_config = $oMemberModel->getMemberConfig();
global $lang;
if (!$member_config->identifier) $member_config->identifier = 'user_id';
$identifierForm->title = $lang->{$member_config->identifier};
$identifierForm->name = $member_config->identifier;
$identifierForm->value = $memberInfo->{$member_config->identifier};
Context::set('identifierForm', $identifierForm);
$this->setTemplateFile('insert_member');
$security = new Security();
$security->encodeHTML('extend_form_list..');
$security->encodeHTML('extend_form_list..default_value.');
$formTags = $this->_getMemberInputTag($memberInfo); Context::set('formTags', $formTags); $member_config = $oMemberModel->getMemberConfig(); global $lang; if (!$member_config->identifier) $member_config->identifier = 'user_id'; $identifierForm->title = $lang->{$member_config->identifier}; $identifierForm->name = $member_config->identifier; $identifierForm->value = $memberInfo->{$member_config->identifier}; Context::set('identifierForm', $identifierForm); $this->setTemplateFile('insert_member');
}
function _getMemberInputTag($memberInfo){
@ -355,7 +314,7 @@ EOD;
$this->setTemplateFile('delete_form');
}
/**
/** ->group_update_form
* @brief display group list
**/
function dispMemberAdminGroupList() {
@ -365,91 +324,87 @@ EOD;
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');
}
}
$output = $oModuleModel->getModuleFileBoxList(); Context::set('fileBoxList', $output->data); }
$output = $oModuleModel->getModuleFileBoxList();
Context::set('fileBoxList', $output->data);
}
/**
* @brief Display a list of member join form
**/
/** O
* @brief Display a list of member join form **/
function dispMemberAdminJoinFormList() {
// Create a member model object
$oMemberModel = &getModel('member');
// Get join form list which is additionally set
$form_list = $oMemberModel->getJoinFormList();
// Create a member model object $oMemberModel = &getModel('member');
// Get join form list which is additionally set $form_list = $oMemberModel->getJoinFormList();
Context::set('form_list', $form_list);
$security = new Security($form_list);
$security->encodeHTML('form_list..');
$this->setTemplateFile('join_form_list');
}
/**
* @brief Display an admin page for memebr join forms
**/
/** O h, ck
* @brief Display an admin page for memebr join forms **/
function dispMemberAdminInsertJoinForm() {
// Get the value of join_form
$member_join_form_srl = Context::get('member_join_form_srl');
// Get the value of join_form $member_join_form_srl = Context::get('member_join_form_srl');
if($member_join_form_srl) {
$oMemberModel = &getModel('member');
$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');
}
/**
* @brief Display denied ID list
**/
/** O
* @brief Display denied ID list **/
function dispMemberAdminDeniedIDList() {
// Create a member model object
$oMemberModel = &getModel('member');
// Get a denied ID list
$output = $oMemberModel->getDeniedIDList();
// Create a member model object $oMemberModel = &getModel('member');
// Get a denied ID list $output = $oMemberModel->getDeniedIDList();
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);
$security = new Security();
$security->encodeHTML('member_list..');
$this->setTemplateFile('denied_id_list');
}
/**
* @brief Update all the member groups
**/
* @brief Update all the member groups **/
function dispMemberAdminManageGroup() {
// Get a list of the selected member
$args->member_srl = trim(Context::get('member_srls'));
// Get a list of the selected member $args->member_srl = trim(Context::get('member_srls'));
$output = executeQueryArray('member.getMembers', $args);
Context::set('member_list', $output->data);
// Get a list of the selected member
$oMemberModel = &getModel('member');
// Get a list of the selected member $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');
}
/**
* @brief Delete all members
**/
* @brief Delete all members **/
function dispMemberAdminDeleteMembers() {
// Get a list of the selected member
$args->member_srl = trim(Context::get('member_srls'));
// Get a list of the selected member $args->member_srl = trim(Context::get('member_srls'));
$output = executeQueryArray('member.getMembers', $args);
Context::set('member_list', $output->data);
$this->setLayoutFile('popup_layout');
$this->setLayoutFile('popup_layout');
$this->setTemplateFile('delete_members');
}
}

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

File diff suppressed because it is too large Load diff

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

@ -13,6 +13,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

@ -16,6 +16,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" />

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

@ -131,4 +131,4 @@
<a href="{getUrl('', 'module','admin', 'act', 'dispModuleAdminFileBox')}" target="_blank">{$lang->link_file_box}</a>
</div>
</div>
</div>
</div>

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>