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

merge from 1.5.3.2 (~r11225)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,11 +143,13 @@
'after_login_url',
'after_logout_url',
'redirect_url',
'layout_srl',
'skin',
'colorset',
'profile_image', 'profile_image_max_width', 'profile_image_max_height',
'image_name', 'image_name_max_width', 'image_name_max_height',
'image_mark', 'image_mark_max_width', 'image_mark_max_height'
'image_mark', 'image_mark_max_width', 'image_mark_max_height',
'signature_editor_skin', 'sel_editor_colorset'
);
$list_order = Context::get('list_order');
@ -166,7 +168,12 @@
if($args->enable_confirm !='Y') $args->enable_confirm = 'N';
$args->limit_day = (int)$args->limit_day;
if(!$args->change_password_date) $args->change_password_date = 0;
if(!trim(strip_tags($args->agreement))) $args->agreement = null;
if(!trim(strip_tags($args->agreement)))
{
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
FileHandler::removeFile($agreement_file);
$args->agreement = null;
}
if(!trim(strip_tags($args->after_login_url))) $args->after_login_url = null;
if(!trim(strip_tags($args->after_logout_url))) $args->after_logout_url = null;
if(!trim(strip_tags($args->redirect_url))) $args->redirect_url = null;
@ -180,6 +187,10 @@
if($args->signature!='Y') $args->signature = 'N';
$args->identifier = $all_args->identifier;
// set default
$all_args->is_nick_name_public = 'Y';
$all_args->is_find_account_question_public = 'N';
// signupForm
global $lang;
$signupForm = array();
@ -199,6 +210,8 @@
$signupItem->required = ($all_args->{$key} == 'required') || $signupItem->mustRequired || $signupItem->isIdentifier;
$signupItem->isUse = in_array($key, $usable_list) || $signupItem->required;
$signupItem->isPublic = ($all_args->{'is_'.$key.'_public'} == 'Y' && $signupItem->isUse) ? 'Y' : 'N';
if ($signupItem->imageType){
$signupItem->max_width = $all_args->{$key.'_max_width'};
$signupItem->max_height = $all_args->{$key.'_max_height'};
@ -236,7 +249,7 @@
// check agreement value exist
if($args->agreement)
{
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
$output = FileHandler::writeFile($agreement_file, $args->agreement);
unset($args->agreement);
@ -250,6 +263,67 @@
$this->setRedirectUrl($returnUrl);
}
function createSignupForm($identifier)
{
global $lang;
$oMemberModel = &getModel('member');
// Get join form list which is additionally set
$extendItems = $oMemberModel->getJoinFormList();
$items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'find_account_question', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark');
$mustRequireds = array('email_address', 'nick_name','password', 'find_account_question');
$orgRequireds = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name');
$orgUse = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name', 'homepage', 'blog', 'birthday');
$list_order = array();
foreach($items as $key){
unset($signupItem);
$signupItem->isDefaultForm = true;
$signupItem->name = $key;
$signupItem->title = $key;
$signupItem->mustRequired = in_array($key, $mustRequireds);
$signupItem->imageType = (strpos($key, 'image') !== false);
$signupItem->required = in_array($key, $orgRequireds);
$signupItem->isUse = ($config->{$key} == 'Y') || in_array($key, $orgUse);
$signupItem->isPublic = ($signupItem->isUse) ? 'Y' : 'N';
if($key == 'find_account_question' || $key == 'password')
{
$signupItem->isPublic = 'N';
}
$signupItem->isIdentifier = ($key == $identifier);
if ($signupItem->imageType){
$signupItem->max_width = $config->{$key.'_max_width'};
$signupItem->max_height = $config->{$key.'_max_height'};
}
if ($signupItem->isIdentifier)
array_unshift($list_order, $signupItem);
else
$list_order[] = $signupItem;
}
if (is_array($extendItems)){
foreach($extendItems as $form_srl=>$item_info){
unset($signupItem);
$signupItem->name = $item_info->column_name;
$signupItem->title = $item_info->column_title;
$signupItem->type = $item_info->column_type;
$signupItem->member_join_form_srl = $form_srl;
$signupItem->mustRequired = in_array($key, $mustRequireds);
$signupItem->required = ($item_info->required == 'Y');
$signupItem->isUse = ($item_info->is_active == 'Y');
$signupItem->isPublic = ($signupItem->isUse) ? 'Y' : 'N';
$signupItem->description = $item_info->description;
if ($signupItem->imageType){
$signupItem->max_width = $config->{$key.'_max_width'};
$signupItem->max_height = $config->{$key.'_max_height'};
}
$list_order[] = $signupItem;
}
}
return $list_order;
}
/**
* Create ruleset file of signup
* @param object $signupForm (user define signup form)
@ -423,7 +497,7 @@
$args->member_join_form_srl = Context::get('member_join_form_srl');
$args->column_type = Context::get('column_type');
$args->column_name = strtolower(Context::get('column_name'));
$args->column_name = strtolower(Context::get('column_id'));
$args->column_title = Context::get('column_title');
$args->default_value = explode("\n", str_replace("\r", '', Context::get('default_value')));
$args->required = Context::get('required');
@ -456,6 +530,7 @@
$signupItem->required = ($args->required == 'Y');
$signupItem->isUse = ($args->is_active == 'Y');
$signupItem->description = $args->description;
$signupItem->isPublic = 'Y';
$oMemberModel = &getModel('member');
$config = $oMemberModel->getMemberConfig();
@ -703,6 +778,42 @@
$this->setRedirectUrl($returnUrl);
}
/**
* Add a denied nick name
* @return void
**/
function procMemberAdminUpdateDeniedNickName()
{
$nick_name = Context::get('nick_name');
$mode = Context::get('mode');
$mode = $mode ? $mode : 'insert';
if($mode == 'delete')
{
$output = $this->deleteDeniedNickName($nick_name);
if(!$output->toBool())
{
return $output;
}
$msg_code = 'success_deleted';
$this->setMessage($msg_code);
}
else
{
$nick_names = explode(',',$nick_name);
$success_nick_names = array();
foreach($nick_names as $val)
{
$output = $this->insertDeniedNickName($val, '');
if($output->toBool()) $success_nick_names[] = $val;
}
$this->add('nick_names', implode(',',$success_nick_names));
}
}
/**
* Update denied ID
* @return void|Object (void : success, Object : fail)
@ -884,16 +995,35 @@
return executeQuery('member.insertDeniedID', $args);
}
function insertDeniedNickName($nick_name, $description = '')
{
$args->nick_name = $nick_name;
$args->description = $description;
return executeQuery('member.insertDeniedNickName', $args);
}
/**
* Delete a denied ID
* delete a denied id
* @param string $user_id
* @return Object
* @return object
**/
function deleteDeniedID($user_id) {
$args->user_id = $user_id;
return executeQuery('member.deleteDeniedID', $args);
}
/**
* delete a denied nick name
* @param string $nick_name
* @return object
**/
function deleteDeniedNickName($nick_name)
{
$args->nick_name = $nick_name;
return executeQuery('member.deleteDeniedNickName', $args);
}
/**
* Delete a join form
* @param int $member_join_form_srl