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

#19705602 db select column specified in member module method paramter

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8357 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-05-06 06:03:35 +00:00
parent b5d2e05282
commit 914f4d7ef0
8 changed files with 165 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/lang/en.lang.php
View file

@ -318,4 +318,5 @@ $lang->filter->invalid_alpha_number = "The format of %s is invalid. Please input
$lang->filter->invalid_number = "The format of %s is invalid. Please input numbers only"; $lang->filter->invalid_number = "The format of %s is invalid. Please input numbers only";
$lang->security_warning_embed = "Due to security concern, administrators are not allowed to view embedded items.<BR /> To view them, please use another non-administrator ID."; $lang->security_warning_embed = "Due to security concern, administrators are not allowed to view embedded items.<BR /> To view them, please use another non-administrator ID.";
$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
?> ?>

1
common/lang/ko.lang.php
View file

@ -297,4 +297,5 @@
$lang->filter->invalid_alpha_number = '%s의 형식이 잘못되었습니다. 영문과 숫자로만 입력하셔야 합니다.'; $lang->filter->invalid_alpha_number = '%s의 형식이 잘못되었습니다. 영문과 숫자로만 입력하셔야 합니다.';
$lang->filter->invalid_number = '%s의 형식이 잘못되었습니다. 숫자로만 입력하셔야 합니다.'; $lang->filter->invalid_number = '%s의 형식이 잘못되었습니다. 숫자로만 입력하셔야 합니다.';
$lang->security_warning_embed = "보안 문제로 관리자 아이디로는 embed를 볼 수 없습니다. 확인하시려면 다른 아이디로 접속하세요"; $lang->security_warning_embed = "보안 문제로 관리자 아이디로는 embed를 볼 수 없습니다. 확인하시려면 다른 아이디로 접속하세요";
$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
?> ?>

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

@ -33,7 +33,8 @@
// Create a member model object // Create a member model object
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
// Get memebr profile // Get memebr profile
$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl); $columnList = array('member_srl');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl, 0, $columnList);
// If no original member exists, make a new one // If no original member exists, make a new one
if($member_info->member_srl != $args->member_srl) unset($args->member_srl); if($member_info->member_srl != $args->member_srl) unset($args->member_srl);
} }
@ -372,16 +373,18 @@
/** /**
* Delete a Group * Delete a Group
**/ **/
function deleteGroup($group_srl, $site_srl = null) { function deleteGroup($group_srl, $site_srl = 0) {
// Create a member model object // Create a member model object
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
// Check the group_srl (If is_default == 'Y', it cannot be deleted) // Check the group_srl (If is_default == 'Y', it cannot be deleted)
$group_info = $oMemberModel->getGroup($group_srl); $columnList = array('group_srl', 'is_default');
$group_info = $oMemberModel->getGroup($group_srl, $columnList);
if(!$group_info) return new Object(-1, 'lang->msg_not_founded'); if(!$group_info) return new Object(-1, 'lang->msg_not_founded');
if($group_info->is_default == 'Y') return new Object(-1, 'msg_not_delete_default'); if($group_info->is_default == 'Y') return new Object(-1, 'msg_not_delete_default');
// Get groups where is_default == 'Y' // Get groups where is_default == 'Y'
$default_group = $oMemberModel->getDefaultGroup($site_srl); $columnList = array('site_srl', 'group_srl');
$default_group = $oMemberModel->getDefaultGroup($site_srl, $columnList);
$default_group_srl = $default_group->group_srl; $default_group_srl = $default_group->group_srl;
// Change to default_group_srl // Change to default_group_srl
$this->changeGroup($group_srl, $default_group_srl); $this->changeGroup($group_srl, $default_group_srl);

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

@ -8,7 +8,7 @@
class memberAdminView extends member { class memberAdminView extends member {
var $group_list = NULL; ///< group list var $group_list = NULL; ///< group list
var $member_info = NULL; ///< selected member info var $memberInfo = NULL; ///< selected member info
/** /**
* @brief initialization * @brief initialization
@ -16,12 +16,12 @@
function init() { function init() {
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
// if member_srl exists, set member_info // if member_srl exists, set memberInfo
$member_srl = Context::get('member_srl'); $member_srl = Context::get('member_srl');
if($member_srl) { if($member_srl) {
$this->member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
if(!$this->member_info) Context::set('member_srl',''); if(!$this->memberInfo) Context::set('member_srl','');
else Context::set('member_info',$this->member_info); else Context::set('member_info',$this->memberInfo);
} }
// retrieve group list // retrieve group list
@ -97,7 +97,7 @@
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
$member_config = $oModuleModel->getModuleConfig('member'); $member_config = $oModuleModel->getModuleConfig('member');
Context::set('member_config', $member_config); Context::set('member_config', $member_config);
Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->member_info)); Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->memberInfo));
$this->setTemplateFile('member_info'); $this->setTemplateFile('member_info');
} }
@ -107,14 +107,14 @@
function dispMemberAdminInsert() { function dispMemberAdminInsert() {
// retrieve extend form // retrieve extend form
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->member_info)); Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->memberInfo));
$member_info = Context::get('member_info'); $memberInfo = Context::get('member_info');
$member_info->signature = $oMemberModel->getSignature($this->member_info->member_srl); $memberInfo->signature = $oMemberModel->getSignature($this->memberInfo->member_srl);
Context::set('member_info', $member_info); Context::set('member_info', $memberInfo);
// get an editor for the signature // get an editor for the signature
if($this->member_info->member_srl) { if($this->memberInfo->member_srl) {
$oEditorModel = &getModel('editor'); $oEditorModel = &getModel('editor');
$option->primary_key_name = 'member_srl'; $option->primary_key_name = 'member_srl';
$option->content_key_name = 'signature'; $option->content_key_name = 'signature';
@ -124,7 +124,7 @@
$option->enable_component = false; $option->enable_component = false;
$option->resizable = false; $option->resizable = false;
$option->height = 200; $option->height = 200;
$editor = $oEditorModel->getEditor($this->member_info->member_srl, $option); $editor = $oEditorModel->getEditor($this->memberInfo->member_srl, $option);
Context::set('editor', $editor); Context::set('editor', $editor);
} }

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

@ -6,6 +6,7 @@
**/ **/
class memberController extends member { class memberController extends member {
var $memberInfo;
/** /**
* @brief Initialization * @brief Initialization
@ -41,8 +42,8 @@
// Check if change_password_date is set // Check if change_password_date is set
if ($limit_date > 0) { if ($limit_date > 0) {
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
$member_info = $oMemberModel->getMemberInfoByUserID($user_id); //$member_info = $oMemberModel->getMemberInfoByUserID($user_id, $columnList);
if ($member_info->change_password_date < date ('YmdHis', strtotime ('-' . $limit_date . ' day'))) { if ($this->memberInfo->change_password_date < date ('YmdHis', strtotime ('-' . $limit_date . ' day'))) {
$this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword')); $this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword'));
} }
} }
@ -152,19 +153,19 @@
$store = new Auth_OpenID_XEStore(); $store = new Auth_OpenID_XEStore();
$consumer = new Auth_OpenID_Consumer($store); $consumer = new Auth_OpenID_Consumer($store);
$response = $consumer->complete($_GET); $response = $consumer->complete($_GET);
switch($response->status) { switch($response->status) {
case Auth_OpenID_CANCEL : case Auth_OpenID_CANCEL :
// Handle if user authentication is canceled // Handle if user authentication is canceled
return $this->stop('authorization_canceled'); return $this->stop('authorization_canceled');
case Auth_OpenID_FAILURE : case Auth_OpenID_FAILURE :
// Handle if user authentication is failed due to a certain problem (for example, openid doesn't exist) (there is no authentication required deunga openid ..) // Handle if user authentication is failed due to a certain problem (for example, openid doesn't exist) (there is no authentication required deunga openid ..)
return $this->stop('invalid_authorization'); return $this->stop('invalid_authorization');
case Auth_OpenID_SUCCESS : case Auth_OpenID_SUCCESS :
// Authentication success! // Authentication success!
break; break;
default: default:
return $this->stop('invalid_authorization'); return $this->stop('invalid_authorization');
} }
// Authentication success // Authentication success
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
// Get zeroboard ID which is corresponded to the openID ID. // Get zeroboard ID which is corresponded to the openID ID.
@ -176,7 +177,8 @@
if ($output->toBool() && $output->data && !is_array($output->data)) { if ($output->toBool() && $output->data && !is_array($output->data)) {
$member_srl = $output->data->member_srl; $member_srl = $output->data->member_srl;
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); $columnList = array('member_srl', 'user_id');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
if ($member_info) { if ($member_info) {
$assoc_member_info = $member_info; $assoc_member_info = $member_info;
} }
@ -543,7 +545,8 @@
// If a virtual site, join the site // If a virtual site, join the site
$site_module_info = Context::get('site_module_info'); $site_module_info = Context::get('site_module_info');
if($site_module_info->site_srl > 0) { if($site_module_info->site_srl > 0) {
$default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl); $columnList = array('site_srl', 'group_srl');
$default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl, $columnList);
if($default_group->group_srl) { if($default_group->group_srl) {
$this->addMemberToGroup($args->member_srl, $default_group->group_srl, $site_module_info->site_srl); $this->addMemberToGroup($args->member_srl, $default_group->group_srl, $site_module_info->site_srl);
} }
@ -598,12 +601,12 @@
$signature = Context::get('signature'); $signature = Context::get('signature');
$this->putSignature($args->member_srl, $signature); $this->putSignature($args->member_srl, $signature);
// Get user_id information // Get user_id information
$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl); $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
// Call a trigger after successfully log-in (after) // Call a trigger after successfully log-in (after)
$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $member_info); $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $this->memberInfo);
if(!$trigger_output->toBool()) return $trigger_output; if(!$trigger_output->toBool()) return $trigger_output;
$this->setSessionInfo($member_info); $this->setSessionInfo();
// Return result // Return result
$this->add('member_srl', $args->member_srl); $this->add('member_srl', $args->member_srl);
$this->setMessage('success_updated'); $this->setMessage('success_updated');
@ -623,7 +626,8 @@
// Create a member model object // Create a member model object
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
// Get information of member_srl // Get information of member_srl
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); $columnList = array('member_srl', 'password');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
// Verify the cuttent password // Verify the cuttent password
if(!$oMemberModel->isValidPassword($member_info->password, $current_password)) return new Object(-1, 'invalid_password'); if(!$oMemberModel->isValidPassword($member_info->password, $current_password)) return new Object(-1, 'invalid_password');
@ -653,9 +657,14 @@
// Create a member model object // Create a member model object
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
// Get information of member_srl // Get information of member_srl
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); if(!$this->memberInfo->password)
{
$columnList = array('member_srl', 'password');
$memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
$this->memberInfo->password = $memberInfo->password;
}
// Verify the cuttent password // Verify the cuttent password
if(!$oMemberModel->isValidPassword($member_info->password, $password)) return new Object(-1, 'invalid_password'); if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new Object(-1, 'invalid_password');
$output = $this->deleteMember($member_srl); $output = $this->deleteMember($member_srl);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
@ -893,7 +902,8 @@
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address); $member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
if(!$member_srl) return new Object(-1, 'msg_email_not_exists'); if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
// Get information of the member // Get information of the member
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); $columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
// Check if possible to find member's ID and password // Check if possible to find member's ID and password
if ($member_info->denied == 'Y') { if ($member_info->denied == 'Y') {
$chk_args->member_srl = $member_info->member_srl; $chk_args->member_srl = $member_info->member_srl;
@ -960,7 +970,8 @@
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address); $member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
if(!$member_srl) return new Object(-1, 'msg_email_not_exists'); if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
// Get information of the member // Get information of the member
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); $columnList = array('member_srl', 'find_account_question', 'find_account_answer');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
// Display a message if no answer is entered // Display a message if no answer is entered
if (!$member_info->find_account_question || !$member_info->find_account_answer) return new Object(-1, 'msg_question_not_exists'); if (!$member_info->find_account_question || !$member_info->find_account_answer) return new Object(-1, 'msg_question_not_exists');
@ -1089,22 +1100,23 @@
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
$args->email_address = $email_address; $args->email_address = $email_address;
$member_info = $oMemberModel->getMemberSrlByEmailAddress($email_address); $memberSrl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
if(!$member_info) return $this->stop('msg_not_exists_member'); if(!$memberSrl) return $this->stop('msg_not_exists_member');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_info); $columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address');
$memberInfo = $oMemberModel->getMemberInfoByMemberSrl($memberSrl, 0, $columnList);
// Check if a authentication mail has been sent previously // Check if a authentication mail has been sent previously
$chk_args->member_srl = $member_info->member_srl; $chk_args->member_srl = $memberInfo->member_srl;
$output = executeQuery('member.chkAuthMail', $chk_args); $output = executeQuery('member.chkAuthMail', $chk_args);
if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request'); if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
$auth_args->member_srl = $member_info->member_srl; $auth_args->member_srl = $memberInfo->member_srl;
$output = executeQueryArray('member.getAuthMailInfo', $auth_args); $output = executeQueryArray('member.getAuthMailInfo', $auth_args);
if(!$output->data || !$output->data[0]->auth_key) return new Object(-1, 'msg_invalid_request'); if(!$output->data || !$output->data[0]->auth_key) return new Object(-1, 'msg_invalid_request');
$auth_info = $output->data[0]; $auth_info = $output->data[0];
// Get content of the email to send a member // Get content of the email to send a member
Context::set('member_info', $member_info); Context::set('member_info', $memberInfo);
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
$member_config = $oModuleModel->getModuleConfig('member'); $member_config = $oModuleModel->getModuleConfig('member');
if(!$member_config->skin) $member_config->skin = "default"; if(!$member_config->skin) $member_config->skin = "default";
@ -1115,7 +1127,7 @@
$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin); $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default'); if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
$auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_info->auth_key); $auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$memberInfo->member_srl, 'auth_key',$auth_info->auth_key);
Context::set('auth_url', $auth_url); Context::set('auth_url', $auth_url);
$oTemplate = &TemplateHandler::getInstance(); $oTemplate = &TemplateHandler::getInstance();
@ -1144,7 +1156,8 @@
if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request'); if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
$default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl); $columnList = array('site_srl', 'group_srl', 'title');
$default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl, $columnList);
$this->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, $site_module_info->site_srl); $this->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, $site_module_info->site_srl);
$groups[$default_group->group_srl] = $default_group->title; $groups[$default_group->group_srl] = $default_group->title;
$logged_info->group_list = $groups; $logged_info->group_list = $groups;
@ -1307,7 +1320,8 @@
// Check if change_password_date is set // Check if change_password_date is set
if($limit_date > 0) { if($limit_date > 0) {
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
$member_info = $oMemberModel->getMemberInfoByUserID($user_id); $columnList = array('member_srl', 'change_password_date');
$member_info = $oMemberModel->getMemberInfoByUserID($user_id, $columnList);
if($member_info->change_password_date >= date('YmdHis', strtotime('-'.$limit_date.' day')) ){ if($member_info->change_password_date >= date('YmdHis', strtotime('-'.$limit_date.' day')) ){
$do_auto_login = true; $do_auto_login = true;
@ -1340,37 +1354,37 @@
// Create a member model object // Create a member model object
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
// Get user_id information // Get user_id information
$member_info = $oMemberModel->getMemberInfoByUserID($user_id); $this->memberInfo = $oMemberModel->getMemberInfoByUserID($user_id);
// Set an invalid user if no value returned // Set an invalid user if no value returned
if(!$user_id || strtolower($member_info->user_id) != strtolower($user_id)) return new Object(-1, 'invalid_user_id'); if(!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) return new Object(-1, 'invalid_user_id');
// Password Check // Password Check
if($password && !$oMemberModel->isValidPassword($member_info->password, $password)) return new Object(-1, 'invalid_password'); if($password && !$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new Object(-1, 'invalid_password');
// If denied == 'Y', notify // If denied == 'Y', notify
if($member_info->denied == 'Y') { if($this->memberInfo->denied == 'Y') {
$args->member_srl = $member_info->member_srl; $args->member_srl = $this->memberInfo->member_srl;
$output = executeQuery('member.chkAuthMail', $args); $output = executeQuery('member.chkAuthMail', $args);
if ($output->toBool() && $output->data->count != '0') return new Object(-1,'msg_user_not_confirmed'); if ($output->toBool() && $output->data->count != '0') return new Object(-1,'msg_user_not_confirmed');
return new Object(-1,'msg_user_denied'); return new Object(-1,'msg_user_denied');
} }
// Notify if denied_date is less than the current time // Notify if denied_date is less than the current time
if($member_info->limit_date && substr($member_info->limit_date,0,8) >= date("Ymd")) return new Object(-1,sprintf(Context::getLang('msg_user_limited'),zdate($member_info->limit_date,"Y-m-d"))); if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) return new Object(-1,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
// Update the latest login time // Update the latest login time
$args->member_srl = $member_info->member_srl; $args->member_srl = $this->memberInfo->member_srl;
$output = executeQuery('member.updateLastLogin', $args); $output = executeQuery('member.updateLastLogin', $args);
// Call a trigger after successfully log-in (after) // Call a trigger after successfully log-in (after)
$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $member_info); $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $this->memberInfo);
if(!$trigger_output->toBool()) return $trigger_output; if(!$trigger_output->toBool()) return $trigger_output;
// When user checked to use auto-login // When user checked to use auto-login
if($keep_signed) { if($keep_signed) {
// Key generate for auto login // Key generate for auto login
$autologin_args->autologin_key = md5(strtolower($user_id).$member_info->password.$_SERVER['REMOTE_ADDR']); $autologin_args->autologin_key = md5(strtolower($user_id).$this->memberInfo->password.$_SERVER['REMOTE_ADDR']);
$autologin_args->member_srl = $member_info->member_srl; $autologin_args->member_srl = $this->memberInfo->member_srl;
executeQuery('member.deleteAutologin', $autologin_args); executeQuery('member.deleteAutologin', $autologin_args);
$autologin_output = executeQuery('member.insertAutologin', $autologin_args); $autologin_output = executeQuery('member.insertAutologin', $autologin_args);
if($autologin_output->toBool()) setCookie('xeak',$autologin_args->autologin_key, time()+60*60*24*365, '/'); if($autologin_output->toBool()) setCookie('xeak',$autologin_args->autologin_key, time()+60*60*24*365, '/');
} }
$this->setSessionInfo($member_info); $this->setSessionInfo();
return $output; return $output;
} }
@ -1378,36 +1392,36 @@
/** /**
* @brief Update or create session information * @brief Update or create session information
**/ **/
function setSessionInfo($member_info = null) { function setSessionInfo() {
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
// If your information came through the current session information to extract information from the users // If your information came through the current session information to extract information from the users
if(!$member_info && $_SESSION['member_srl'] && $oMemberModel->isLogged() ) { if(!$this->memberInfo && $_SESSION['member_srl'] && $oMemberModel->isLogged() ) {
$member_info = $oMemberModel->getMemberInfoByMemberSrl($_SESSION['member_srl']); $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($_SESSION['member_srl']);
// If you do not destroy the session Profile // If you do not destroy the session Profile
if($member_info->member_srl != $_SESSION['member_srl']) { if($this->memberInfo->member_srl != $_SESSION['member_srl']) {
$this->destroySessionInfo(); $this->destroySessionInfo();
return; return;
} }
} }
// Stop using the session id is destroyed // Stop using the session id is destroyed
if($member_info->denied=='Y') { if($this->memberInfo->denied=='Y') {
$this->destroySessionInfo(); $this->destroySessionInfo();
return; return;
} }
// OpenID is a check (only for a determined identity types) // OpenID is a check (only for a determined identity types)
if(preg_match("/^([_0-9a-zA-Z]+)$/is", $member_info->user_id)) $member_info->is_openid = false; if(preg_match("/^([_0-9a-zA-Z]+)$/is", $this->memberInfo->user_id)) $this->memberInfo->is_openid = false;
else $member_info->is_openid = true; else $this->memberInfo->is_openid = true;
// Log in for treatment sessions set // Log in for treatment sessions set
$_SESSION['is_logged'] = true; $_SESSION['is_logged'] = true;
$_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR']; $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR'];
$_SESSION['member_srl'] = $member_info->member_srl; $_SESSION['member_srl'] = $this->memberInfo->member_srl;
$_SESSION['is_admin'] = ''; $_SESSION['is_admin'] = '';
// Do not save your password in the session jiwojum;; // Do not save your password in the session jiwojum;;
//unset($member_info->password); //unset($this->memberInfo->password);
// User Group Settings // User Group Settings
/* /*
if($member_info->group_list) { if($this->memberInfo->group_list) {
$group_srl_list = array_keys($member_info->group_list); $group_srl_list = array_keys($this->memberInfo->group_list);
$_SESSION['group_srls'] = $group_srl_list; $_SESSION['group_srls'] = $group_srl_list;
// If the group is designated as an administrator administrator // If the group is designated as an administrator administrator
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
@ -1416,9 +1430,9 @@
} }
*/ */
// Information stored in the session login user // Information stored in the session login user
$_SESSION['logged_info'] = $member_info; $_SESSION['logged_info'] = $this->memberInfo;
Context::set('is_logged', true); Context::set('is_logged', true);
Context::set('logged_info', $member_info); Context::set('logged_info', $this->memberInfo);
// Only the menu configuration of the user (such as an add-on to the menu can be changed) // Only the menu configuration of the user (such as an add-on to the menu can be changed)
$this->addMemberMenu( 'dispMemberInfo', 'cmd_view_member_info'); $this->addMemberMenu( 'dispMemberInfo', 'cmd_view_member_info');
$this->addMemberMenu( 'dispMemberScrappedDocument', 'cmd_view_scrapped_document'); $this->addMemberMenu( 'dispMemberScrappedDocument', 'cmd_view_scrapped_document');
@ -1515,7 +1529,8 @@
} }
// If no value is entered the default group, the value of group registration // If no value is entered the default group, the value of group registration
if(!$args->group_srl_list) { if(!$args->group_srl_list) {
$default_group = $oMemberModel->getDefaultGroup(0); $columnList = array('site_srl', 'group_srl');
$default_group = $oMemberModel->getDefaultGroup(0, $columnList);
// Add to the default group // Add to the default group
$output = $this->addMemberToGroup($args->member_srl,$default_group->group_srl); $output = $this->addMemberToGroup($args->member_srl,$default_group->group_srl);
if(!$output->toBool()) { if(!$output->toBool()) {
@ -1604,8 +1619,8 @@
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
// Get what you want to modify the original information // Get what you want to modify the original information
$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl); if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
if(!$args->user_id) $args->user_id = $member_info->user_id; if(!$args->user_id) $args->user_id = $this->memberInfo->user_id;
// Control of essential parameters // Control of essential parameters
if($args->allow_mailing!='Y') $args->allow_mailing = 'N'; if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
if($args->allow_message && !in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y'; if($args->allow_message && !in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
@ -1636,8 +1651,8 @@
$oDB->begin(); $oDB->begin();
// DB in the update // DB in the update
if($args->password) $args->password = md5($args->password); if($args->password) $args->password = md5($args->password);
else $args->password = $member_info->password; else $args->password = $this->memberInfo->password;
if(!$args->user_name) $args->user_name = $member_info->user_name; if(!$args->user_name) $args->user_name = $this->memberInfo->user_name;
if(!$args->description) $args->description = ''; if(!$args->description) $args->description = '';
$output = executeQuery('member.updateMember', $args); $output = executeQuery('member.updateMember', $args);
@ -1675,11 +1690,11 @@
$oDB->commit(); $oDB->commit();
// Save Session // Save Session
$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl); if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
if($logged_info->member_srl == $member_srl) { if($logged_info->member_srl == $member_srl) {
$_SESSION['logged_info'] = $member_info; $_SESSION['logged_info'] = $this->memberInfo;
} }
$output->add('member_srl', $args->member_srl); $output->add('member_srl', $args->member_srl);
@ -1706,10 +1721,13 @@
// Create a model object // Create a model object
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
// Bringing the user's information // Bringing the user's information
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); if(!$this->memberInfo) {
if(!$member_info) return new Object(-1, 'msg_not_exists_member'); $columnList = array('member_srl', 'is_admin');
$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
}
if(!$this->memberInfo) return new Object(-1, 'msg_not_exists_member');
// If managers can not be deleted // If managers can not be deleted
if($member_info->is_admin == 'Y') return new Object(-1, 'msg_cannot_delete_admin'); if($this->memberInfo->is_admin == 'Y') return new Object(-1, 'msg_cannot_delete_admin');
$oDB = &DB::getInstance(); $oDB = &DB::getInstance();
$oDB->begin(); $oDB->begin();

58
modules/member/member.mobile.php
View file

@ -2,10 +2,20 @@
class memberMobile extends member class memberMobile extends member
{ {
var $memberInfo;
function init() { function init() {
// Get the member configuration // Get the member configuration
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
$this->member_config = $oModuleModel->getModuleConfig('member'); $this->member_config = $oModuleModel->getModuleConfig('member');
// 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);
}
Context::set('member_config', $this->member_config); Context::set('member_config', $this->member_config);
@ -57,17 +67,21 @@ class memberMobile extends member
} }
$site_module_info = Context::get('site_module_info'); $site_module_info = Context::get('site_module_info');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, $site_module_info->site_srl); if(!$this->memberInfo)
unset($member_info->password); {
unset($member_info->email_id); $columnList = array('user_name', 'nick_name', 'homepage', 'blog', 'birthday', 'regdate', 'last_login');
unset($member_info->email_host); $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, $site_module_info->site_srl, $columnList);
unset($member_info->email_address); }
unset($this->memberInfo->password);
unset($this->memberInfo->email_id);
unset($this->memberInfo->email_host);
unset($this->memberInfo->email_address);
if(!$member_info->member_srl) return $this->dispMemberSignUpForm(); if(!$this->memberInfo->member_srl) return $this->dispMemberSignUpForm();
Context::set('member_info', $member_info); Context::set('member_info', $this->memberInfo);
Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info)); Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->memberInfo));
if ($member_info->member_srl == $logged_info->member_srl) if ($this->memberInfo->member_srl == $logged_info->member_srl)
Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl)); Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl));
$this->setTemplateFile('member_info_mobile'); $this->setTemplateFile('member_info_mobile');
} }
@ -86,17 +100,17 @@ class memberMobile extends member
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl; $member_srl = $logged_info->member_srl;
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
$member_info->signature = $oMemberModel->getSignature($member_srl); $this->memberInfo->signature = $oMemberModel->getSignature($member_srl);
Context::set('member_info',$member_info); Context::set('member_info',$this->memberInfo);
// Receive a member join form // Receive a member join form
Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info)); Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->memberInfo));
Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl)); Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl));
// Call getEditor of the editor module and set it for signiture // Call getEditor of the editor module and set it for signiture
if($member_info->member_srl) { if($this->memberInfo->member_srl) {
$oEditorModel = &getModel('editor'); $oEditorModel = &getModel('editor');
$option->primary_key_name = 'member_srl'; $option->primary_key_name = 'member_srl';
$option->content_key_name = 'signature'; $option->content_key_name = 'signature';
@ -109,7 +123,7 @@ class memberMobile extends member
$option->height = 200; $option->height = 200;
$option->skin = $this->member_config->editor_skin; $option->skin = $this->member_config->editor_skin;
$option->colorset = $this->member_config->editor_colorset; $option->colorset = $this->member_config->editor_colorset;
$editor = $oEditorModel->getEditor($member_info->member_srl, $option); $editor = $oEditorModel->getEditor($this->memberInfo->member_srl, $option);
Context::set('editor', $editor); Context::set('editor', $editor);
} }
@ -129,8 +143,11 @@ class memberMobile extends member
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl; $member_srl = $logged_info->member_srl;
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); if(!$this->memberInfo) {
Context::set('member_info',$member_info); $columnList = array('member_srl', 'user_id');
$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
}
Context::set('member_info',$this->memberInfo);
// Set a template file // Set a template file
$this->setTemplateFile('modify_password'); $this->setTemplateFile('modify_password');
@ -148,8 +165,11 @@ class memberMobile extends member
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl; $member_srl = $logged_info->member_srl;
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); if(!$this->memberInfo) {
Context::set('member_info',$member_info); $columnList = array('member_srl', 'user_id');
$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
}
Context::set('member_info',$this->memberInfo);
// Set a template file // Set a template file
$this->setTemplateFile('leave_form'); $this->setTemplateFile('leave_form');

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

@ -162,11 +162,11 @@
/** /**
* @brief Return member information with user_id * @brief Return member information with user_id
**/ **/
function getMemberInfoByUserID($user_id) { function getMemberInfoByUserID($user_id, $columnList = array()) {
if(!$user_id) return; if(!$user_id) return;
$args->user_id = $user_id; $args->user_id = $user_id;
$output = executeQuery('member.getMemberInfo', $args); $output = executeQuery('member.getMemberInfo', $args, $columnList);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
if(!$output->data) return; if(!$output->data) return;
@ -178,12 +178,14 @@
/** /**
* @brief Return member information with member_srl * @brief Return member information with member_srl
**/ **/
function getMemberInfoByMemberSrl($member_srl, $site_srl = 0) { function getMemberInfoByMemberSrl($member_srl, $site_srl = 0, $columnList = array()) {
if(!$member_srl) return; if(!$member_srl) return;
if(!$GLOBALS['__member_info__'][$member_srl]) { //columnList size zero... get full member info
if(!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0) {
//if(true) {
$args->member_srl = $member_srl; $args->member_srl = $member_srl;
$output = executeQuery('member.getMemberInfoByMemberSrl', $args); $output = executeQuery('member.getMemberInfoByMemberSrl', $args, $columnList);
if(!$output->data) return; if(!$output->data) return;
$this->arrangeMemberInfo($output->data, $site_srl); $this->arrangeMemberInfo($output->data, $site_srl);
@ -310,26 +312,26 @@
/** /**
* @brief Get a default group * @brief Get a default group
**/ **/
function getDefaultGroup($site_srl = 0) { function getDefaultGroup($site_srl = 0, $columnList = array()) {
$args->site_srl = $site_srl; $args->site_srl = $site_srl;
$output = executeQuery('member.getDefaultGroup', $args); $output = executeQuery('member.getDefaultGroup', $args, $columnList);
return $output->data; return $output->data;
} }
/** /**
* @brief Get an admin group * @brief Get an admin group
**/ **/
function getAdminGroup() { function getAdminGroup($columnList = array()) {
$output = executeQuery('member.getAdminGroup'); $output = executeQuery('member.getAdminGroup', $args, $columnList);
return $output->data; return $output->data;
} }
/** /**
* @brief Get group info corresponding to group_srl * @brief Get group info corresponding to group_srl
**/ **/
function getGroup($group_srl) { function getGroup($group_srl, $columnList = array()) {
$args->group_srl = $group_srl; $args->group_srl = $group_srl;
$output = executeQuery('member.getGroup', $args); $output = executeQuery('member.getGroup', $args, $columnList);
return $output->data; return $output->data;
} }

9
modules/member/member.view.php
View file

@ -46,7 +46,8 @@
} }
$site_module_info = Context::get('site_module_info'); $site_module_info = Context::get('site_module_info');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, $site_module_info->site_srl); $columnList = array('member_srl', 'user_name', 'nick_name', 'homepage', 'blog', 'birthday', 'regdate', 'last_login');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, $site_module_info->site_srl, $columnList);
unset($member_info->password); unset($member_info->password);
unset($member_info->email_id); unset($member_info->email_id);
unset($member_info->email_host); unset($member_info->email_host);
@ -95,7 +96,8 @@
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl; $member_srl = $logged_info->member_srl;
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); $columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address', 'find_account_answer', 'homepage', 'blog', 'birthday', 'allow_mailing');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
$member_info->signature = $oMemberModel->getSignature($member_srl); $member_info->signature = $oMemberModel->getSignature($member_srl);
Context::set('member_info',$member_info); Context::set('member_info',$member_info);
// Get a list of extend join form // Get a list of extend join form
@ -218,7 +220,8 @@
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl; $member_srl = $logged_info->member_srl;
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); $columnList = array('member_srl', 'user_id');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
Context::set('member_info',$member_info); Context::set('member_info',$member_info);
// Set a template file // Set a template file
$this->setTemplateFile('modify_password'); $this->setTemplateFile('modify_password');