merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -2,15 +2,29 @@
/**
* @class memberAdminView
* @author NHN (developers@xpressengine.com)
* @brief member module's admin view class
* member module's admin view class
**/
class memberAdminView extends member {
var $group_list = NULL; ///< group list
var $memberInfo = NULL; ///< selected member info
/**
* Group list
*
* @var array
**/
var $group_list = NULL;
/**
* Selected member info
*
* @var array
**/
var $memberInfo = NULL;
/**
* @brief initialization
* initialization
*
* @return void
**/
function init() {
$oMemberModel = &getModel('member');
@ -31,7 +45,9 @@
}
/**
* @brief display member list
* display member list
*
* @return void
**/
function dispMemberAdminList() {
$oMemberAdminModel = &getAdminModel('member');
@ -81,7 +97,9 @@
}
/**
* @brief default configuration for member management
* default configuration for member management
*
* @return void
**/
function dispMemberAdminConfig() {
global $lang; // retrieve configuration via module model instance
@ -124,7 +142,9 @@
}
/**
* @brief display member information
* display member information
*
* @return void
**/
function dispMemberAdminInfo() {
$oMemberModel = &getModel('member');
@ -148,7 +168,9 @@
}
/**
* @brief display member insert form
* display member insert form
*
* @return void
**/
function dispMemberAdminInsert() {
// retrieve extend form
@ -189,6 +211,14 @@
$this->setTemplateFile('insert_member');
}
/**
* Get tags by the member info type
*
* @param object $memberInfo
* @param boolean $isAdmin (true : admin, false : not admin)
*
* @return array
**/
function _getMemberInputTag($memberInfo, $isAdmin = false){
$oMemberModel = &getModel('member');
$extend_form_list = $oMemberModel->getCombineJoinForm($memberInfo);
@ -239,7 +269,7 @@
}else{
$inputTag = sprintf('<input type="hidden" name="__%s_exist" value="false" />', $formInfo->name);
}
$inputTag .= sprintf('<p class="a"><input type="file" name="%s" id="%s" value="" /> <span class="desc">%s : %dpx, %s : %dpx</span></p>'
$inputTag .= sprintf('<p class="a"><input type="file" name="%s" id="%s" value="" /></p><p><span class="desc">%s : %dpx, %s : %dpx</span></p>'
,$formInfo->name
,$formInfo->name
,$lang->{$formInfo->name.'_max_width'}
@ -253,7 +283,7 @@
,zdate($memberInfo['birthday'], 'Y-m-d', false)
,$lang->cmd_delete);
}elseif($formInfo->name == 'find_account_question'){
$inputTag = '<select name="find_account_question" style="width:290px">%s</select><br />';
$inputTag = '<select name="find_account_question" style="width:290px; display:block;">%s</select>';
$optionTag = array();
foreach($lang->find_account_question_items as $key=>$val){
if($key == $memberInfo['find_account_question']) $selected = 'selected="selected"';
@ -264,9 +294,9 @@
,$val);
}
$inputTag = sprintf($inputTag, implode('', $optionTag));
$inputTag .= '<input type="text" name="find_account_answer" value="'.$memberInfo['find_account_answer'].'" />';
$inputTag .= '<input type="text" name="find_account_answer" title="'.Context::getLang('find_account_answer').'" value="'.$memberInfo['find_account_answer'].'" class="inputText long tall" />';
}else{
$inputTag = sprintf('<input type="text" name="%s" value="%s" />'
$inputTag = sprintf('<input type="text" name="%s" value="%s" class="inputText long tall" />'
,$formInfo->name
,$memberInfo[$formInfo->name]);
}
@ -372,7 +402,9 @@ EOD;
}
/**
* @brief display member delete form
* display member delete form
*
* @return void
**/
function dispMemberAdminDeleteForm() {
if(!Context::get('member_srl')) return $this->dispMemberAdminList();
@ -380,7 +412,9 @@ EOD;
}
/**
* @brief display group list
* display group list
*
* @return void
**/
function dispMemberAdminGroupList() {
$oModuleModel = &getModel('module');
@ -401,7 +435,9 @@ EOD;
}
/**
* @brief Display a list of member join form
* Display a list of member join form
*
* @return void
**/
function dispMemberAdminJoinFormList() {
// Create a member model object
@ -416,7 +452,9 @@ EOD;
}
/**
* @brief Display an admin page for memebr join forms
* Display an admin page for memebr join forms
*
* @return void
**/
function dispMemberAdminInsertJoinForm() {
// Get the value of join_form
@ -437,7 +475,9 @@ EOD;
}
/**
* @brief Display denied ID list
* Display denied ID list
*
* @return void
**/
function dispMemberAdminDeniedIDList() {
// Create a member model object
@ -457,7 +497,9 @@ EOD;
}
/**
* @brief Update all the member groups
* Update all the member groups
*
* @return void
**/
function dispMemberAdminManageGroup() {
// Get a list of the selected member
@ -476,7 +518,9 @@ EOD;
}
/**
* @brief Delete all members
* Delete members
*
* @return void
**/
function dispMemberAdminDeleteMembers() {
// Get a list of the selected member