mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-03 16:51:40 +09:00
Remove trailing whitespace in member module
This commit is contained in:
Kijin Sung
parent
f05d3b4ab6
commit
8a6039b829
9 changed files with 354 additions and 354 deletions
|
|
@ -6,9 +6,9 @@ class Device extends \Member
|
|||
{
|
||||
/**
|
||||
* Automatically recognize device token from header or cookie and register it.
|
||||
*
|
||||
*
|
||||
* If the device is already registered, just update its last active date.
|
||||
*
|
||||
*
|
||||
* @return \BaseObject
|
||||
*/
|
||||
public function autoRegisterDevice(int $member_srl): \BaseObject
|
||||
|
|
@ -33,10 +33,10 @@ class Device extends \Member
|
|||
}
|
||||
return new \BaseObject;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Automatically recognize device token from header or cookie and unregister it.
|
||||
*
|
||||
*
|
||||
* @return \BaseObject
|
||||
*/
|
||||
public function autoUnregisterDevice(int $member_srl): \BaseObject
|
||||
|
|
@ -115,7 +115,7 @@ class Device extends \Member
|
|||
{
|
||||
return new \BaseObject(-1, 'INVALID_DEVICE_TOKEN');
|
||||
}
|
||||
|
||||
|
||||
if ($member_srl)
|
||||
{
|
||||
$member_srl = intval($member_srl);
|
||||
|
|
@ -150,7 +150,7 @@ class Device extends \Member
|
|||
$args->device_type = $device_type;
|
||||
$args->device_version = $device_version;
|
||||
$args->device_model = $device_model;
|
||||
|
||||
|
||||
// Call trigger (before)
|
||||
$trigger_output = \ModuleHandler::triggerCall('member.insertMemberDevice', 'before', $args);
|
||||
if(!$trigger_output->toBool()) return $trigger_output;
|
||||
|
|
@ -158,10 +158,10 @@ class Device extends \Member
|
|||
// Start transaction
|
||||
$oDB = \DB::getInstance();
|
||||
$oDB->begin();
|
||||
|
||||
|
||||
// Remove duplicated token key
|
||||
executeQuery('member.deleteMemberDevice', ['device_token' => $device_token]);
|
||||
|
||||
|
||||
// Create member_device
|
||||
$output = executeQuery('member.insertMemberDevice', $args);
|
||||
if(!$output->toBool())
|
||||
|
|
@ -169,10 +169,10 @@ class Device extends \Member
|
|||
$oDB->rollback();
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
||||
// Call trigger (after)
|
||||
\ModuleHandler::triggerCall('member.insertMemberDevice', 'after', $args);
|
||||
|
||||
|
||||
$oDB->commit();
|
||||
|
||||
// Set parameters
|
||||
|
|
@ -242,7 +242,7 @@ class Device extends \Member
|
|||
{
|
||||
if(isset($member_info->phone_number))
|
||||
{
|
||||
$user_id = $member_info->phone_number;
|
||||
$user_id = $member_info->phone_number;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -259,26 +259,26 @@ class Device extends \Member
|
|||
{
|
||||
$member_info = null;
|
||||
}
|
||||
|
||||
|
||||
// Update last active date
|
||||
executeQuery('member.updateMemberDeviceLastActiveDate', ['device_token' => $device_token]);
|
||||
|
||||
|
||||
$this->add('member_srl', $member_srl);
|
||||
$this->add('user_id', $member_info ? $member_info->user_id : null);
|
||||
$this->add('user_name', $member_info ? $member_info->user_name : null);
|
||||
$this->add('nick_name', $member_info ? $member_info->nick_name : null);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Unregister a registered device.
|
||||
*
|
||||
*
|
||||
* This action requires a device token and matching device key.
|
||||
* It is intended to be called by mobile applications.
|
||||
*/
|
||||
public function procMemberUnregisterDevice()
|
||||
{
|
||||
\Context::setResponseMethod('JSON');
|
||||
|
||||
|
||||
// Check member_srl, device_token, device_key
|
||||
$allow_guest_device = config('push.allow_guest_device');
|
||||
$member_srl = abs(\Context::get('member_srl'));
|
||||
|
|
@ -298,7 +298,7 @@ class Device extends \Member
|
|||
{
|
||||
return new \BaseObject(-1, 'NULL_DEVICE_KEY');
|
||||
}
|
||||
|
||||
|
||||
// Check the device token and key.
|
||||
$args = new \stdClass;
|
||||
$args->member_srl = $member_srl;
|
||||
|
|
@ -313,7 +313,7 @@ class Device extends \Member
|
|||
{
|
||||
return new \BaseObject(-1, 'UNREGISTERED_DEVICE');
|
||||
}
|
||||
|
||||
|
||||
// Delete the device.
|
||||
$args = new \stdClass;
|
||||
$args->device_token = $device_token;
|
||||
|
|
@ -323,10 +323,10 @@ class Device extends \Member
|
|||
return new \BaseObject(-1, 'DELETE_FAILED');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Delete a registered device.
|
||||
*
|
||||
*
|
||||
* This action requires only the device_srl, but it must belong to the currently logged in member.
|
||||
* It is intended to be called from the web frontend.
|
||||
*/
|
||||
|
|
@ -338,13 +338,13 @@ class Device extends \Member
|
|||
{
|
||||
throw new \Rhymix\Framework\Exceptions\InvalidRequest;
|
||||
}
|
||||
|
||||
|
||||
$member_srl = $this->user->member_srl;
|
||||
if (!$member_srl)
|
||||
{
|
||||
throw new \Rhymix\Framework\Exceptions\NotPermitted;
|
||||
}
|
||||
|
||||
|
||||
// Check that the device_srl matches the member.
|
||||
$args = new \stdClass;
|
||||
$args->device_srl = $device_srl;
|
||||
|
|
@ -354,17 +354,17 @@ class Device extends \Member
|
|||
{
|
||||
throw new \Rhymix\Framework\Exceptions\TargetNotFound;
|
||||
}
|
||||
|
||||
|
||||
// Delete the device.
|
||||
$args = new \stdClass;
|
||||
$args->device_token = $output->data->device_token;
|
||||
$output = executeQuery('member.deleteMemberDevice', $args);
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get device token from POST parameter, HTTP header or cookie
|
||||
*
|
||||
*
|
||||
* @return string|null
|
||||
*/
|
||||
protected function _getDeviceToken()
|
||||
|
|
@ -375,14 +375,14 @@ class Device extends \Member
|
|||
{
|
||||
return $device_token;
|
||||
}
|
||||
|
||||
|
||||
// HTTP header named X-Device-Token
|
||||
$device_token = $_SERVER['HTTP_X_DEVICE_TOKEN'] ?? null;
|
||||
if ($device_token)
|
||||
{
|
||||
return $device_token;
|
||||
}
|
||||
|
||||
|
||||
// Cookie named device_token
|
||||
$device_token = $_COOKIE['device_token'] ?? null;
|
||||
if ($device_token)
|
||||
|
|
@ -390,10 +390,10 @@ class Device extends \Member
|
|||
return $device_token;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set device key via header or cookie
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function _setDeviceKey()
|
||||
|
|
@ -404,7 +404,7 @@ class Device extends \Member
|
|||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// Set header if header was given, or cookie otherwise
|
||||
if (isset($_SERVER['HTTP_X_DEVICE_TOKEN']))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ class MemberAdminController extends Member
|
|||
{
|
||||
$extra_vars = new stdClass;
|
||||
}
|
||||
|
||||
|
||||
// Get list of extra vars
|
||||
$all_args = Context::getRequestVars();
|
||||
foreach($config->signupForm as $formInfo)
|
||||
|
|
@ -114,7 +114,7 @@ class MemberAdminController extends Member
|
|||
{
|
||||
$args->limit_date = '';
|
||||
}
|
||||
|
||||
|
||||
// remove whitespace
|
||||
$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
|
||||
foreach($checkInfos as $val)
|
||||
|
|
@ -130,7 +130,7 @@ class MemberAdminController extends Member
|
|||
{
|
||||
$args->description = '';
|
||||
}
|
||||
|
||||
|
||||
$oMemberController = getController('member');
|
||||
// Execute insert or update depending on the value of member_srl
|
||||
if(!$args->member_srl)
|
||||
|
|
@ -146,7 +146,7 @@ class MemberAdminController extends Member
|
|||
}
|
||||
|
||||
if(!$output->toBool()) return $output;
|
||||
|
||||
|
||||
// Invalidate sessions if denied or limited
|
||||
if ($args->denied === 'Y' || $args->limited >= date('Ymd'))
|
||||
{
|
||||
|
|
@ -155,13 +155,13 @@ class MemberAdminController extends Member
|
|||
Rhymix\Framework\Session::setValidityInfo($args->member_srl, $validity_info);
|
||||
executeQuery('member.deleteAutologin', ['member_srl' => $args->member_srl]);
|
||||
}
|
||||
|
||||
|
||||
// Invalidate auth mail if denied or limited
|
||||
if ($args->denied === 'Y' || $args->limited >= date('Ymd'))
|
||||
{
|
||||
executeQuery('member.deleteAuthMail', ['member_srl' => $args->member_srl]);
|
||||
}
|
||||
|
||||
|
||||
// Save Signature
|
||||
$signature = Context::get('signature');
|
||||
$oMemberController->putSignature($args->member_srl, $signature);
|
||||
|
|
@ -193,7 +193,7 @@ class MemberAdminController extends Member
|
|||
|
||||
// Clear cache
|
||||
MemberController::clearMemberCache($args->member_srl);
|
||||
|
||||
|
||||
// Return result
|
||||
$this->add('member_srl', $args->member_srl);
|
||||
$this->setMessage($msg_code);
|
||||
|
|
@ -238,7 +238,7 @@ class MemberAdminController extends Member
|
|||
'allow_duplicate_nickname',
|
||||
'member_profile_view'
|
||||
);
|
||||
|
||||
|
||||
if ($args->enable_join === 'KEY')
|
||||
{
|
||||
$args->enable_join = 'N';
|
||||
|
|
@ -259,12 +259,12 @@ class MemberAdminController extends Member
|
|||
{
|
||||
$args->authmail_expires_unit = 86400;
|
||||
}
|
||||
|
||||
|
||||
if(!array_key_exists($args->password_hashing_algorithm, Rhymix\Framework\Password::getSupportedAlgorithms()))
|
||||
{
|
||||
$args->password_hashing_algorithm = 'md5';
|
||||
}
|
||||
|
||||
|
||||
$args->password_hashing_work_factor = intval($args->password_hashing_work_factor, 10);
|
||||
if($args->password_hashing_work_factor < 4)
|
||||
{
|
||||
|
|
@ -278,7 +278,7 @@ class MemberAdminController extends Member
|
|||
{
|
||||
$args->password_hashing_auto_upgrade = 'N';
|
||||
}
|
||||
|
||||
|
||||
if(!in_array($args->nickname_symbols, ['Y', 'N', 'LIST']))
|
||||
{
|
||||
$args->nickname_symbols = 'Y';
|
||||
|
|
@ -299,7 +299,7 @@ class MemberAdminController extends Member
|
|||
{
|
||||
$config = new stdClass;
|
||||
$config->features = array();
|
||||
|
||||
|
||||
$args = Context::gets(
|
||||
'scrapped_documents',
|
||||
'saved_documents',
|
||||
|
|
@ -312,7 +312,7 @@ class MemberAdminController extends Member
|
|||
{
|
||||
$config->features[$key] = toBool($value);
|
||||
}
|
||||
|
||||
|
||||
$oModuleController = getController('module');
|
||||
$output = $oModuleController->updateModuleConfig('member', $config);
|
||||
|
||||
|
|
@ -328,7 +328,7 @@ class MemberAdminController extends Member
|
|||
$config = new stdClass;
|
||||
$config->agreements = array();
|
||||
$config->agreement = null;
|
||||
|
||||
|
||||
$args = Context::getRequestVars();
|
||||
for ($i = 1; $i < 20; $i++)
|
||||
{
|
||||
|
|
@ -347,14 +347,14 @@ class MemberAdminController extends Member
|
|||
$config->agreements[$i] = $agreement;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$oModuleController = getController('module');
|
||||
$output = $oModuleController->updateModuleConfig('member', $config);
|
||||
if (!$output->toBool())
|
||||
{
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
||||
// Delete old agreement files.
|
||||
foreach (Context::loadLangSupported() as $key => $val)
|
||||
{
|
||||
|
|
@ -371,12 +371,12 @@ class MemberAdminController extends Member
|
|||
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminAgreementsConfig');
|
||||
$this->setRedirectUrl($returnUrl);
|
||||
}
|
||||
|
||||
|
||||
public function procMemberAdminInsertSignupConfig()
|
||||
{
|
||||
$oMemberModel = getModel('member');
|
||||
$config = $oMemberModel->getMemberConfig();
|
||||
|
||||
|
||||
$oModuleController = getController('module');
|
||||
|
||||
$args = Context::gets(
|
||||
|
|
@ -433,7 +433,7 @@ class MemberAdminController extends Member
|
|||
{
|
||||
return new BaseObject('-1', 'msg_need_default_country');
|
||||
}
|
||||
|
||||
|
||||
// set default
|
||||
$all_args->is_nick_name_public = 'Y';
|
||||
|
||||
|
|
@ -474,7 +474,7 @@ class MemberAdminController extends Member
|
|||
$signupItem->required = ($all_args->{$key} == 'required') || $signupItem->mustRequired;
|
||||
$signupItem->isUse = in_array($key, $usable_list) || $signupItem->required;
|
||||
$signupItem->isPublic = ($all_args->{'is_'.$key.'_public'} == 'Y' && $signupItem->isUse) ? 'Y' : 'N';
|
||||
|
||||
|
||||
if(in_array($key, ['signature', 'profile_image', 'image_name', 'image_mark']))
|
||||
{
|
||||
$args->$key = $signupItem->isPublic;
|
||||
|
|
@ -538,7 +538,7 @@ class MemberAdminController extends Member
|
|||
'after_login_url',
|
||||
'after_logout_url'
|
||||
);
|
||||
|
||||
|
||||
if(!count($args->identifiers))
|
||||
{
|
||||
return new BaseObject(-1, 'msg_need_identifier');
|
||||
|
|
@ -565,7 +565,7 @@ class MemberAdminController extends Member
|
|||
}
|
||||
$args->signupForm = $config->signupForm;
|
||||
$args->identifier = array_first($args->identifiers);
|
||||
|
||||
|
||||
if(!$args->change_password_date)
|
||||
{
|
||||
$args->change_password_date = 0;
|
||||
|
|
@ -630,7 +630,7 @@ class MemberAdminController extends Member
|
|||
{
|
||||
global $lang;
|
||||
$oMemberModel = getModel('member');
|
||||
|
||||
|
||||
// Get join form list which is additionally set
|
||||
$extendItems = $oMemberModel->getJoinFormList();
|
||||
|
||||
|
|
@ -700,7 +700,7 @@ class MemberAdminController extends Member
|
|||
*/
|
||||
function _createSignupRuleset($signupForm)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -710,7 +710,7 @@ class MemberAdminController extends Member
|
|||
*/
|
||||
function _createLoginRuleset($identifier)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -720,7 +720,7 @@ class MemberAdminController extends Member
|
|||
*/
|
||||
function _createFindAccountByQuestion($identifier)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -984,7 +984,7 @@ class MemberAdminController extends Member
|
|||
}
|
||||
$this->setMessage('success_updated');
|
||||
break;
|
||||
}
|
||||
}
|
||||
case 'delete':
|
||||
{
|
||||
$oMemberController->memberInfo = null;
|
||||
|
|
@ -1017,7 +1017,7 @@ class MemberAdminController extends Member
|
|||
}
|
||||
|
||||
$oDB->commit();
|
||||
|
||||
|
||||
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList');
|
||||
$this->setRedirectUrl($returnUrl);
|
||||
}
|
||||
|
|
@ -1313,7 +1313,7 @@ class MemberAdminController extends Member
|
|||
|
||||
// Call trigger (after)
|
||||
ModuleHandler::triggerCall('member.insertGroup', 'after', $args);
|
||||
|
||||
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
|
@ -1325,7 +1325,7 @@ class MemberAdminController extends Member
|
|||
function updateGroup($args)
|
||||
{
|
||||
if(!$args->group_srl) throw new Rhymix\Framework\Exceptions\TargetNotFound;
|
||||
|
||||
|
||||
// Call trigger (before)
|
||||
$trigger_output = ModuleHandler::triggerCall('member.updateGroup', 'before', $args);
|
||||
if(!$trigger_output->toBool())
|
||||
|
|
@ -1346,10 +1346,10 @@ class MemberAdminController extends Member
|
|||
|
||||
$output = executeQuery('member.updateGroup', $args);
|
||||
$this->_deleteMemberGroupCache();
|
||||
|
||||
|
||||
// Call trigger (after)
|
||||
ModuleHandler::triggerCall('member.updateGroup', 'after', $args);
|
||||
|
||||
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
|
@ -1369,7 +1369,7 @@ class MemberAdminController extends Member
|
|||
|
||||
if(!$group_info) throw new Rhymix\Framework\Exceptions\TargetNotFound;
|
||||
if($group_info->is_default == 'Y') throw new Rhymix\Framework\Exception('msg_not_delete_default');
|
||||
|
||||
|
||||
// Call trigger (before)
|
||||
$trigger_output = ModuleHandler::triggerCall('member.deleteGroup', 'before', $group_info);
|
||||
if(!$trigger_output->toBool())
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ class MemberAdminModel extends Member
|
|||
|
||||
/**
|
||||
* Get a member list
|
||||
*
|
||||
*
|
||||
* @return object|array (object : when member count is 1, array : when member count is more than 1)
|
||||
*/
|
||||
function getMemberList()
|
||||
|
|
@ -143,7 +143,7 @@ class MemberAdminModel extends Member
|
|||
else
|
||||
{
|
||||
$query_id = 'member.getMemberList';
|
||||
$args->sort_index = $sort_index;
|
||||
$args->sort_index = $sort_index;
|
||||
}
|
||||
|
||||
$args->sort_order = $sort_order;
|
||||
|
|
@ -159,7 +159,7 @@ class MemberAdminModel extends Member
|
|||
|
||||
/**
|
||||
* Get a memebr list for each site
|
||||
*
|
||||
*
|
||||
* @param int $site_srl
|
||||
* @param int $page
|
||||
*
|
||||
|
|
@ -178,8 +178,8 @@ class MemberAdminModel extends Member
|
|||
|
||||
/**
|
||||
* Get member_srls lists about site admins
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
function getSiteAdminMemberSrls()
|
||||
{
|
||||
|
|
@ -197,8 +197,8 @@ class MemberAdminModel extends Member
|
|||
|
||||
/**
|
||||
* Return colorset list of a skin in the member module
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
function getMemberAdminColorset()
|
||||
{
|
||||
|
|
@ -225,7 +225,7 @@ class MemberAdminModel extends Member
|
|||
|
||||
/**
|
||||
* Return member count with date
|
||||
*
|
||||
*
|
||||
* @param string $date
|
||||
*
|
||||
* @return int
|
||||
|
|
@ -292,7 +292,7 @@ class MemberAdminModel extends Member
|
|||
|
||||
$oMemberModel = getModel('member');
|
||||
$config = $oMemberModel->getMemberConfig();
|
||||
foreach($config->signupForm as $item)
|
||||
foreach($config->signupForm as $item)
|
||||
{
|
||||
$list[] = $item->name;
|
||||
}
|
||||
|
|
@ -307,7 +307,7 @@ class MemberAdminModel extends Member
|
|||
}
|
||||
|
||||
/**
|
||||
* check allowed target ip address when login for admin.
|
||||
* check allowed target ip address when login for admin.
|
||||
*
|
||||
* @return boolean (true : allowed, false : refuse)
|
||||
*/
|
||||
|
|
@ -317,12 +317,12 @@ class MemberAdminModel extends Member
|
|||
{
|
||||
return Rhymix\Framework\Filters\IpFilter::inRanges(RX_CLIENT_IP, $allow_list);
|
||||
}
|
||||
|
||||
|
||||
if ($deny_list = ($deny_list === null) ? config('admin.deny') : $deny_list)
|
||||
{
|
||||
return !Rhymix\Framework\Filters\IpFilter::inRanges(RX_CLIENT_IP, $deny_list);
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?php
|
||||
<?php
|
||||
/* Copyright (C) NAVER <http://www.navercorp.com> */
|
||||
/**
|
||||
* @class memberAdminView
|
||||
|
|
@ -102,7 +102,7 @@ class MemberAdminView extends Member
|
|||
'user_name' => 'user_name',
|
||||
'nick_name' => 'nick_name'
|
||||
);
|
||||
$usedIdentifiers = array();
|
||||
$usedIdentifiers = array();
|
||||
|
||||
if(is_array($config->signupForm))
|
||||
{
|
||||
|
|
@ -116,7 +116,7 @@ class MemberAdminView extends Member
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Get list of new members who have not completed email auth
|
||||
$check_list = array();
|
||||
foreach ($output->data as $member)
|
||||
|
|
@ -181,7 +181,7 @@ class MemberAdminView extends Member
|
|||
$password_algos['sha256'] = false;
|
||||
}
|
||||
Context::set('password_hashing_algos', $password_algos);
|
||||
|
||||
|
||||
$this->setTemplateFile('default_config');
|
||||
}
|
||||
|
||||
|
|
@ -242,7 +242,7 @@ class MemberAdminView extends Member
|
|||
$option->height = 300;
|
||||
$option->editor_toolbar_hide = 'Y';
|
||||
Context::set('editor', $oEditorModel->getEditor(0, $option));
|
||||
|
||||
|
||||
$signupForm = $config->signupForm;
|
||||
foreach($signupForm as $val)
|
||||
{
|
||||
|
|
@ -272,7 +272,7 @@ class MemberAdminView extends Member
|
|||
$managedEmailHost = $oMemberModel->getManagedEmailHosts();
|
||||
Context::set('managedEmailHost', $managedEmailHost);
|
||||
$oSecurity->encodeHTML('managedEmailHost..email_host');
|
||||
|
||||
|
||||
// Get country calling code list
|
||||
$country_list = Rhymix\Framework\i18n::listCountries(Context::get('lang_type') === 'ko' ? Rhymix\Framework\i18n::SORT_NAME_KOREAN : Rhymix\Framework\i18n::SORT_NAME_ENGLISH);
|
||||
Context::set('country_list', $country_list);
|
||||
|
|
@ -400,7 +400,7 @@ class MemberAdminView extends Member
|
|||
Context::set('member_config', $member_config);
|
||||
$extendForm = $oMemberModel->getCombineJoinForm($this->memberInfo);
|
||||
Context::set('extend_form_list', $extendForm);
|
||||
|
||||
|
||||
$memberInfo = Context::get('member_info');
|
||||
if(!is_object($memberInfo) || !$memberInfo->member_srl)
|
||||
{
|
||||
|
|
@ -433,7 +433,7 @@ class MemberAdminView extends Member
|
|||
{
|
||||
$oMemberModel = getModel('member');
|
||||
$member_config = $this->memberConfig;
|
||||
|
||||
|
||||
if($member_info = Context::get('member_info'))
|
||||
{
|
||||
$member_info->signature = $oMemberModel->getSignature($this->memberInfo->member_srl);
|
||||
|
|
@ -442,12 +442,12 @@ class MemberAdminView extends Member
|
|||
{
|
||||
$member_info = new stdClass;
|
||||
}
|
||||
|
||||
|
||||
Context::set('member_info', $member_info);
|
||||
|
||||
|
||||
$formTags = $this->_getMemberInputTag($member_info, true);
|
||||
Context::set('formTags', $formTags);
|
||||
|
||||
|
||||
// Editor of the module set for signing by calling getEditor
|
||||
foreach($formTags as $formTag)
|
||||
{
|
||||
|
|
@ -468,22 +468,22 @@ class MemberAdminView extends Member
|
|||
$option->editor_toolbar_hide = 'Y';
|
||||
$option->editor_skin = $member_config->signature_editor_skin;
|
||||
$option->sel_editor_colorset = $member_config->sel_editor_colorset;
|
||||
|
||||
|
||||
Context::set('editor', getModel('editor')->getEditor($member_info->member_srl, $option));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$identifierForm = new stdClass;
|
||||
$identifierForm->title = lang($member_config->identifier);
|
||||
$identifierForm->name = $member_config->identifier;
|
||||
$identifierForm->value = $member_info->{$member_config->identifier};
|
||||
Context::set('identifierForm', $identifierForm);
|
||||
|
||||
|
||||
if ($member_info->limit_date < date('Ymd'))
|
||||
{
|
||||
$member_info->limit_date = '';
|
||||
}
|
||||
|
||||
|
||||
$member_unauthenticated = false;
|
||||
if ($member_info->member_srl && $member_info->denied !== 'N')
|
||||
{
|
||||
|
|
@ -499,7 +499,7 @@ class MemberAdminView extends Member
|
|||
}
|
||||
}
|
||||
Context::set('member_unauthenticated', $member_unauthenticated);
|
||||
|
||||
|
||||
$this->setTemplateFile('insert_member');
|
||||
}
|
||||
|
||||
|
|
@ -518,7 +518,7 @@ class MemberAdminView extends Member
|
|||
$extend_form_list = $oMemberModel->getCombineJoinForm($memberInfo);
|
||||
$security = new Security($extend_form_list);
|
||||
$security->encodeHTML('..column_title', '..description', '..default_value.');
|
||||
|
||||
|
||||
if ($memberInfo)
|
||||
{
|
||||
$memberInfo = get_object_vars($memberInfo);
|
||||
|
|
@ -533,17 +533,17 @@ class MemberAdminView extends Member
|
|||
{
|
||||
$member_config = $this->memberConfig = $oMemberModel->getMemberConfig();
|
||||
}
|
||||
|
||||
|
||||
global $lang;
|
||||
$formTags = array();
|
||||
|
||||
|
||||
foreach($member_config->signupForm as $no=>$formInfo)
|
||||
{
|
||||
if(!$formInfo->isUse || $formInfo->name == $member_config->identifier || $formInfo->name == 'password')
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
$formTag = new stdClass();
|
||||
$inputTag = '';
|
||||
$formTag->title = $formInfo->title;
|
||||
|
|
@ -593,7 +593,7 @@ class MemberAdminView extends Member
|
|||
{
|
||||
$inputTag = sprintf('<input type="hidden" name="__%s_exist" value="false" />', $formInfo->name);
|
||||
}
|
||||
|
||||
|
||||
$max_filesize = min(FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size')));
|
||||
if (isset($member_config->{$formInfo->name.'_max_filesize'}))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ class Member extends ModuleObject
|
|||
*/
|
||||
public $admin_extra_vars = ['refused_reason', 'limited_reason'];
|
||||
public $nouse_extra_vars = ['error_return_url', 'success_return_url', '_rx_ajax_compat', '_rx_csrf_token', 'ruleset', 'captchaType', 'use_editor', 'use_html'];
|
||||
|
||||
|
||||
/**
|
||||
* constructor
|
||||
*
|
||||
|
|
@ -32,14 +32,14 @@ class Member extends ModuleObject
|
|||
{
|
||||
$oModuleController = getController('module');
|
||||
$config = ModuleModel::getModuleConfig('member');
|
||||
|
||||
|
||||
// Set default config
|
||||
if(!$config)
|
||||
{
|
||||
$config = MemberModel::getMemberConfig();
|
||||
$oModuleController->insertModuleConfig('member', $config);
|
||||
}
|
||||
|
||||
|
||||
$oMemberModel = getModel('member');
|
||||
$oMemberController = getController('member');
|
||||
$oMemberAdminController = getAdminController('member');
|
||||
|
|
@ -127,36 +127,36 @@ class Member extends ModuleObject
|
|||
if(!$oDB->isIndexExists("member","idx_phone_country")) return true;
|
||||
if(!$oDB->isColumnExists("member", "phone_type")) return true;
|
||||
if(!$oDB->isIndexExists("member","idx_phone_type")) return true;
|
||||
|
||||
|
||||
// Add columns for IP address
|
||||
if(!$oDB->isColumnExists("member", "ipaddress")) return true;
|
||||
if(!$oDB->isIndexExists("member","idx_ipaddress")) return true;
|
||||
if(!$oDB->isColumnExists("member", "last_login_ipaddress")) return true;
|
||||
if(!$oDB->isIndexExists("member","idx_last_login_ipaddress")) return true;
|
||||
|
||||
|
||||
// Add column for list order
|
||||
if(!$oDB->isColumnExists("member", "list_order")) return true;
|
||||
if(!$oDB->isIndexExists("member","idx_list_order")) return true;
|
||||
|
||||
|
||||
// Check autologin table
|
||||
if(!$oDB->isColumnExists("member_autologin", "security_key")) return true;
|
||||
|
||||
|
||||
// Check scrap folder table
|
||||
if(!$oDB->isColumnExists("member_scrap", "folder_srl")) return true;
|
||||
|
||||
if(!$oDB->isIndexExists('member_nickname_log', 'idx_before_nick_name')) return true;
|
||||
if(!$oDB->isIndexExists('member_nickname_log', 'idx_after_nick_name')) return true;
|
||||
if(!$oDB->isIndexExists('member_nickname_log', 'idx_user_id')) return true;
|
||||
|
||||
|
||||
// Check individual indexes for member_group_member table
|
||||
if(!$oDB->isIndexExists('member_group_member', 'idx_member_srl')) return true;
|
||||
|
||||
|
||||
// Add device token type and last active date 2020.10.28
|
||||
if(!$oDB->isColumnExists('member_devices', 'device_token_type')) return true;
|
||||
if(!$oDB->isColumnExists('member_devices', 'last_active_date')) return true;
|
||||
|
||||
|
||||
$config = ModuleModel::getModuleConfig('member');
|
||||
|
||||
|
||||
// Check members with phone country in old format
|
||||
if ($config->phone_number_default_country && !preg_match('/^[A-Z]{3}$/', $config->phone_number_default_country))
|
||||
{
|
||||
|
|
@ -167,7 +167,7 @@ class Member extends ModuleObject
|
|||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
// Check signup form
|
||||
if(!$config->signupForm || !is_array($config->signupForm)) return true;
|
||||
$phone_found = false;
|
||||
|
|
@ -190,7 +190,7 @@ class Member extends ModuleObject
|
|||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
// Check agreements
|
||||
if(!$config->agreements)
|
||||
{
|
||||
|
|
@ -225,7 +225,7 @@ class Member extends ModuleObject
|
|||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -238,13 +238,13 @@ class Member extends ModuleObject
|
|||
{
|
||||
$oDB = DB::getInstance();
|
||||
$oModuleController = getController('module');
|
||||
|
||||
|
||||
// Check member directory
|
||||
FileHandler::makeDir('./files/member_extra_info/image_name');
|
||||
FileHandler::makeDir('./files/member_extra_info/image_mark');
|
||||
FileHandler::makeDir('./files/member_extra_info/signature');
|
||||
FileHandler::makeDir('./files/member_extra_info/profile_image');
|
||||
|
||||
|
||||
// Add columns for phone number
|
||||
if(!$oDB->isColumnExists("member", "phone_number"))
|
||||
{
|
||||
|
|
@ -270,7 +270,7 @@ class Member extends ModuleObject
|
|||
{
|
||||
$oDB->addIndex("member","idx_phone_type", array("phone_type"));
|
||||
}
|
||||
|
||||
|
||||
// Add columns for IP address
|
||||
if(!$oDB->isColumnExists("member", "ipaddress"))
|
||||
{
|
||||
|
|
@ -303,7 +303,7 @@ class Member extends ModuleObject
|
|||
{
|
||||
$oDB->addIndex("member","idx_list_order", array("list_order"));
|
||||
}
|
||||
|
||||
|
||||
// Check autologin table
|
||||
if(!$oDB->isColumnExists("member_autologin", "security_key"))
|
||||
{
|
||||
|
|
@ -317,7 +317,7 @@ class Member extends ModuleObject
|
|||
$oDB->addColumn("member_scrap", "folder_srl", "number", 11);
|
||||
$oDB->addIndex("member_scrap","idx_folder_srl", array("folder_srl"));
|
||||
}
|
||||
|
||||
|
||||
// Add to index in member nickname log table. 2020. 07 .20 @BJRambo
|
||||
if(!$oDB->isIndexExists('member_nickname_log', 'idx_before_nick_name'))
|
||||
{
|
||||
|
|
@ -325,13 +325,13 @@ class Member extends ModuleObject
|
|||
$oDB->addIndex('member_nickname_log', 'idx_after_nick_name', array('after_nick_name'));
|
||||
$oDB->addIndex('member_nickname_log', 'idx_user_id', array('user_id'));
|
||||
}
|
||||
|
||||
|
||||
// Check index for member_group_member table
|
||||
if(!$oDB->isIndexExists('member_group_member', 'idx_member_srl'))
|
||||
{
|
||||
$oDB->addIndex('member_group_member', 'idx_member_srl', array('member_srl'));
|
||||
}
|
||||
|
||||
|
||||
// Add device token type and last active date 2020.10.28
|
||||
if(!$oDB->isColumnExists('member_devices', 'device_token_type'))
|
||||
{
|
||||
|
|
@ -346,10 +346,10 @@ class Member extends ModuleObject
|
|||
$oDB->addIndex('member_devices', 'idx_last_active_date', array('last_active_date'));
|
||||
$oDB->query("UPDATE member_devices SET last_active_date = regdate WHERE last_active_date = ''");
|
||||
}
|
||||
|
||||
|
||||
$config = ModuleModel::getModuleConfig('member') ?: new stdClass;
|
||||
$changed = false;
|
||||
|
||||
|
||||
// Check members with phone country in old format
|
||||
if ($config->phone_number_default_country && !preg_match('/^[A-Z]{3}$/', $config->phone_number_default_country))
|
||||
{
|
||||
|
|
@ -364,7 +364,7 @@ class Member extends ModuleObject
|
|||
'new_phone_country' => 'KOR',
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
// Check signup form
|
||||
$oModuleController = getController('module');
|
||||
$oMemberAdminController = getAdminController('member');
|
||||
|
|
@ -422,7 +422,7 @@ class Member extends ModuleObject
|
|||
$config->signupForm = $newForm;
|
||||
$changed = true;
|
||||
}
|
||||
|
||||
|
||||
// Check agreements
|
||||
if(!$config->agreements)
|
||||
{
|
||||
|
|
@ -441,7 +441,7 @@ class Member extends ModuleObject
|
|||
{
|
||||
$output = $oModuleController->updateModuleConfig('member', $config);
|
||||
}
|
||||
|
||||
|
||||
// Check skin
|
||||
if($config->skin)
|
||||
{
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -4,7 +4,7 @@
|
|||
class MemberMobile extends MemberView
|
||||
{
|
||||
/**
|
||||
* Support method are
|
||||
* Support method are
|
||||
* dispMemberInfo, dispMemberSignUpForm, dispMemberFindAccount, dispMemberGetTempPassword, dispMemberModifyInfo, dispMemberModifyInfoBefore
|
||||
*/
|
||||
var $memberInfo;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class MemberModel extends Member
|
|||
*/
|
||||
public function init()
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -32,9 +32,9 @@ class MemberModel extends Member
|
|||
{
|
||||
return self::$_member_config;
|
||||
}
|
||||
|
||||
|
||||
$config = ModuleModel::getModuleConfig('member') ?: new stdClass;
|
||||
|
||||
|
||||
// Set default config
|
||||
$config->enable_join = $config->enable_join ?? 'Y';
|
||||
$config->enable_confirm = $config->enable_confirm ?? 'N';
|
||||
|
|
@ -49,7 +49,7 @@ class MemberModel extends Member
|
|||
$config->password_hashing_work_factor = $config->password_hashing_work_factor ?? 10;
|
||||
$config->password_hashing_auto_upgrade = $config->password_hashing_auto_upgrade ?? 'Y';
|
||||
$config->password_change_invalidate_other_sessions = $config->password_change_invalidate_other_sessions ?? 'N';
|
||||
|
||||
|
||||
// Set features config
|
||||
if(!isset($config->features)) $config->features = array();
|
||||
$config->features['scrapped_documents'] = $config->features['scrapped_documents'] ?? true;
|
||||
|
|
@ -58,7 +58,7 @@ class MemberModel extends Member
|
|||
$config->features['my_comments'] = $config->features['my_comments'] ?? true;
|
||||
$config->features['active_logins'] = $config->features['active_logins'] ?? true;
|
||||
$config->features['nickname_log'] = $config->features['nickname_log'] ?? true;
|
||||
|
||||
|
||||
// Set agreements config
|
||||
if(!isset($config->agreements) || !is_array($config->agreements))
|
||||
{
|
||||
|
|
@ -69,7 +69,7 @@ class MemberModel extends Member
|
|||
$config->agreements[1]->type = !empty($config->agreements[1]->content) ? 'required' : 'disabled';
|
||||
}
|
||||
unset($config->agreement);
|
||||
|
||||
|
||||
// Set signup config
|
||||
$config->limit_day = $config->limit_day ?? 0;
|
||||
$config->emailhost_check = $config->emailhost_check ?? 'allowed';
|
||||
|
|
@ -103,7 +103,7 @@ class MemberModel extends Member
|
|||
{
|
||||
$config->signature_editor_skin = 'ckeditor';
|
||||
}
|
||||
|
||||
|
||||
// Set login config
|
||||
$config->identifier = $config->identifier ?? 'user_id';
|
||||
$config->identifiers = $config->identifiers ?? array('user_id', 'email_address');
|
||||
|
|
@ -114,17 +114,17 @@ class MemberModel extends Member
|
|||
$config->login_invalidate_other_sessions = $config->login_invalidate_other_sessions ?? 'N';
|
||||
$config->after_login_url = $config->after_login_url ?? null;
|
||||
$config->after_logout_url = $config->after_logout_url ?? null;
|
||||
|
||||
|
||||
// Set design config
|
||||
$config->layout_srl = $config->layout_srl ?? 0;
|
||||
$config->skin = $config->skin ?? 'default';
|
||||
$config->colorset = $config->colorset ?? 'white';
|
||||
$config->mlayout_srl = $config->mlayout_srl ?? 0;
|
||||
$config->mskin = $config->mskin ?? 'default';
|
||||
|
||||
|
||||
// Set group image config
|
||||
$config->group_image_mark = $config->group_image_mark ?? 'N';
|
||||
|
||||
|
||||
// Set signup form
|
||||
if(!isset($config->signupForm) || !is_array($config->signupForm))
|
||||
{
|
||||
|
|
@ -138,13 +138,13 @@ class MemberModel extends Member
|
|||
}
|
||||
$config->signupForm[$key]->isPublic = $config->signupForm[$key]->isPublic ?? 'Y';
|
||||
}
|
||||
|
||||
|
||||
return self::$_member_config = $config;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get member agreement from old version
|
||||
*
|
||||
*
|
||||
* @deprecated
|
||||
*/
|
||||
protected static function _getAgreement()
|
||||
|
|
@ -188,11 +188,11 @@ class MemberModel extends Member
|
|||
$this->add('errorDetail', 'ERR_CSRF_INVALID_ORIGIN');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// Add CORS restriction
|
||||
header('Access-Control-Allow-Origin: ' . rtrim(Rhymix\Framework\Url::getCurrentDomainURL(), '/'));
|
||||
header('Cross-Origin-Resource-Policy: same-origin');
|
||||
|
||||
|
||||
// Return login status and CSRF token
|
||||
Context::setResponseMethod('JSON');
|
||||
$this->add('status', Rhymix\Framework\Session::getLoginStatus());
|
||||
|
|
@ -211,12 +211,12 @@ class MemberModel extends Member
|
|||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$mid = Context::get('cur_mid');
|
||||
$logged_info = Context::get('logged_info');
|
||||
$module_config = self::getMemberConfig();
|
||||
$icon_path = '';
|
||||
|
||||
|
||||
// Get requested member info
|
||||
if($member_srl == $logged_info->member_srl)
|
||||
{
|
||||
|
|
@ -237,7 +237,7 @@ class MemberModel extends Member
|
|||
ModuleHandler::triggerCall('member.getMemberMenu', 'before', $member_info);
|
||||
|
||||
$oMemberController = MemberController::getInstance();
|
||||
|
||||
|
||||
// Display member information (Don't display to non-logged user)
|
||||
if($logged_info->member_srl)
|
||||
{
|
||||
|
|
@ -269,7 +269,7 @@ class MemberModel extends Member
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Check if homepage and blog are public
|
||||
$homepage_is_public = false;
|
||||
$blog_is_public = false;
|
||||
|
|
@ -292,19 +292,19 @@ class MemberModel extends Member
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// View homepage info
|
||||
if($member_info->homepage && $homepage_is_public)
|
||||
{
|
||||
$oMemberController->addMemberPopupMenu(escape($member_info->homepage, false), 'homepage', '', '_blank', 'homepage');
|
||||
}
|
||||
|
||||
|
||||
// View blog info
|
||||
if($member_info->blog && $blog_is_public)
|
||||
{
|
||||
$oMemberController->addMemberPopupMenu(escape($member_info->blog, false), 'blog', '', '_blank', 'blog');
|
||||
}
|
||||
|
||||
|
||||
// Call a trigger (after)
|
||||
ModuleHandler::triggerCall('member.getMemberMenu', 'after', $member_info);
|
||||
// Display a menu for editting member info to a top administrator
|
||||
|
|
@ -315,7 +315,7 @@ class MemberModel extends Member
|
|||
|
||||
$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',0);
|
||||
$oMemberController->addMemberPopupMenu($url,'cmd_spammer',$icon_path,'popup');
|
||||
|
||||
|
||||
$url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','member_srl','search_keyword',$member_srl);
|
||||
$oMemberController->addMemberPopupMenu($url,'cmd_trace_document',$icon_path,'TraceMemberDocument');
|
||||
|
||||
|
|
@ -351,7 +351,7 @@ class MemberModel extends Member
|
|||
|
||||
/**
|
||||
* @brief Return member information with user_id
|
||||
*
|
||||
*
|
||||
* @return object|null
|
||||
*/
|
||||
public static function getMemberInfoByUserID($user_id)
|
||||
|
|
@ -371,7 +371,7 @@ class MemberModel extends Member
|
|||
|
||||
/**
|
||||
* @brief Return member information with email_address
|
||||
*
|
||||
*
|
||||
* @return object|null
|
||||
*/
|
||||
public static function getMemberInfoByEmailAddress($email_address)
|
||||
|
|
@ -390,7 +390,7 @@ class MemberModel extends Member
|
|||
|
||||
/**
|
||||
* @brief Return member information with phone number
|
||||
*
|
||||
*
|
||||
* @return object|null
|
||||
*/
|
||||
public static function getMemberInfoByPhoneNumber($phone_number, $phone_country = null)
|
||||
|
|
@ -407,7 +407,7 @@ class MemberModel extends Member
|
|||
$phone_country = array(preg_replace('/[^0-9]/', '', $phone_country), Rhymix\Framework\i18n::getCountryCodeByCallingCode($phone_country));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$args = new stdClass();
|
||||
$args->phone_number = $phone_number;
|
||||
$args->phone_country = $phone_country;
|
||||
|
|
@ -421,7 +421,7 @@ class MemberModel extends Member
|
|||
|
||||
/**
|
||||
* @brief Return member information with member_srl
|
||||
*
|
||||
*
|
||||
* @return object
|
||||
*/
|
||||
public static function getMemberInfoByMemberSrl($member_srl)
|
||||
|
|
@ -459,7 +459,7 @@ class MemberModel extends Member
|
|||
|
||||
/**
|
||||
* @brief Shortcut to getMemberInfoByMemberSrl()
|
||||
*
|
||||
*
|
||||
* @param int $member_srl
|
||||
* @return object
|
||||
*/
|
||||
|
|
@ -1190,7 +1190,7 @@ class MemberModel extends Member
|
|||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
$info = null;
|
||||
$member_group = self::getMemberGroups($member_srl);
|
||||
$groups_info = self::getGroups();
|
||||
|
|
@ -1226,7 +1226,7 @@ class MemberModel extends Member
|
|||
$GLOBALS['__member_info__']['group_image_mark'][$member_srl] = '';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return $GLOBALS['__member_info__']['group_image_mark'][$member_srl];
|
||||
}
|
||||
|
||||
|
|
@ -1249,7 +1249,7 @@ class MemberModel extends Member
|
|||
if(file_exists($filename))
|
||||
{
|
||||
$signature = preg_replace('/<\?.*\?>/', '', FileHandler::readFile($filename));
|
||||
|
||||
|
||||
// retroact
|
||||
$config = self::getMemberConfig();
|
||||
if($config->signature_html_retroact == 'Y' && $config->signature_html == 'N' && preg_match('/<[^br]+>/i', $signature))
|
||||
|
|
@ -1257,7 +1257,7 @@ class MemberModel extends Member
|
|||
$signature = preg_replace('/(\r?\n)+/', "\n", $signature);
|
||||
return MemberController::getInstance()->putSignature($member_srl, $signature);
|
||||
}
|
||||
|
||||
|
||||
$GLOBALS['__member_info__']['signature'][$member_srl] = $signature;
|
||||
}
|
||||
else
|
||||
|
|
@ -1265,7 +1265,7 @@ class MemberModel extends Member
|
|||
$GLOBALS['__member_info__']['signature'][$member_srl] = '';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return $GLOBALS['__member_info__']['signature'][$member_srl];
|
||||
}
|
||||
|
||||
|
|
@ -1283,7 +1283,7 @@ class MemberModel extends Member
|
|||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// Check the password
|
||||
$password_match = false;
|
||||
$current_algorithm = false;
|
||||
|
|
@ -1301,7 +1301,7 @@ class MemberModel extends Member
|
|||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// Update the encryption method if necessary
|
||||
$config = self::getMemberConfig();
|
||||
if($member_srl > 0 && $config->password_hashing_auto_upgrade != 'N')
|
||||
|
|
@ -1324,7 +1324,7 @@ class MemberModel extends Member
|
|||
$need_upgrade = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ($need_upgrade)
|
||||
{
|
||||
$args = new stdClass();
|
||||
|
|
@ -1333,10 +1333,10 @@ class MemberModel extends Member
|
|||
MemberController::getInstance()->updateMemberPassword($args);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @brief Create a hash of plain text password
|
||||
* @param string $password_text The password to hash
|
||||
|
|
@ -1347,37 +1347,37 @@ class MemberModel extends Member
|
|||
{
|
||||
return Rhymix\Framework\Password::hashPassword($password_text, $algorithm);
|
||||
}
|
||||
|
||||
|
||||
public static function checkPasswordStrength($password, $strength)
|
||||
{
|
||||
$logged_info = Context::get('logged_info');
|
||||
if($logged_info->is_admin == 'Y') return true;
|
||||
|
||||
|
||||
if($strength == NULL)
|
||||
{
|
||||
$config = self::getMemberConfig();
|
||||
$strength = $config->password_strength?$config->password_strength:'normal';
|
||||
}
|
||||
|
||||
|
||||
$length = strlen($password);
|
||||
|
||||
|
||||
switch ($strength) {
|
||||
case 'high':
|
||||
if($length < 8 || !preg_match('/[^a-zA-Z0-9]/', $password)) return false;
|
||||
/* no break */
|
||||
|
||||
|
||||
case 'normal':
|
||||
if($length < 6 || !preg_match('/[a-zA-Z]/', $password) || !preg_match('/[0-9]/', $password)) return false;
|
||||
break;
|
||||
|
||||
|
||||
case 'low':
|
||||
if($length < 4) return false;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
public static function getAdminGroupSrl()
|
||||
{
|
||||
$groupSrl = 0;
|
||||
|
|
@ -1395,12 +1395,12 @@ class MemberModel extends Member
|
|||
}
|
||||
return $groupSrl;
|
||||
}
|
||||
|
||||
|
||||
public static function getMemberModifyNicknameLog($page = 1, $member_srl = null)
|
||||
{
|
||||
$search_keyword = Context::get('search_keyword');
|
||||
$search_target = Context::get('search_target');
|
||||
|
||||
|
||||
// $this->user 에 재대로 된 회원 정보가 들어 가지 않음.
|
||||
$logged_info = Context::get('logged_info');
|
||||
|
||||
|
|
@ -1429,14 +1429,14 @@ class MemberModel extends Member
|
|||
break;
|
||||
}
|
||||
$output = executeQuery('member.getMemberModifyNickName', $args);
|
||||
|
||||
|
||||
return $output;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$args->member_srl = $member_srl;
|
||||
$output = executeQuery('member.getMemberModifyNickName', $args);
|
||||
|
||||
|
||||
return $output;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ class MemberView extends Member
|
|||
|
||||
// Get the member information if logged-in
|
||||
if($this->user->member_srl) throw new Rhymix\Framework\Exception('msg_already_logged');
|
||||
// call a trigger (before)
|
||||
// call a trigger (before)
|
||||
$trigger_output = ModuleHandler::triggerCall('member.dispMemberSignUpForm', 'before', $member_config);
|
||||
if(!$trigger_output->toBool()) return $trigger_output;
|
||||
|
||||
|
|
@ -233,11 +233,11 @@ class MemberView extends Member
|
|||
throw new Rhymix\Framework\Exceptions\FeatureDisabled('msg_signup_disabled');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$formTags = getAdminView('member')->_getMemberInputTag();
|
||||
Context::set('formTags', $formTags);
|
||||
Context::set('email_confirmation_required', $member_config->enable_confirm);
|
||||
|
||||
|
||||
// Editor of the module set for signing by calling getEditor
|
||||
foreach($formTags as $formTag)
|
||||
{
|
||||
|
|
@ -262,21 +262,21 @@ class MemberView extends Member
|
|||
{
|
||||
$option->editor_skin = 'textarea';
|
||||
}
|
||||
|
||||
|
||||
Context::set('editor', getModel('editor')->getEditor(0, $option));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$identifierForm = new stdClass;
|
||||
$identifierForm->title = lang($member_config->identifier);
|
||||
$identifierForm->name = $member_config->identifier;
|
||||
Context::set('identifierForm', $identifierForm);
|
||||
|
||||
|
||||
$this->addExtraFormValidatorMessage();
|
||||
|
||||
|
||||
// Set a copy of the agreement for compatibility with old skins
|
||||
$member_config->agreement = $member_config->agreements[1]->content ?? '';
|
||||
|
||||
|
||||
// Set a template file
|
||||
$this->setTemplateFile('signup_form');
|
||||
}
|
||||
|
|
@ -301,7 +301,7 @@ class MemberView extends Member
|
|||
if ($this->member_config->identifier == 'email_address')
|
||||
{
|
||||
Context::set('identifierTitle', lang('email_address'));
|
||||
Context::set('identifierValue', $logged_info->email_address);
|
||||
Context::set('identifierValue', $logged_info->email_address);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -315,7 +315,7 @@ class MemberView extends Member
|
|||
/**
|
||||
* @brief Modify member information
|
||||
*/
|
||||
function dispMemberModifyInfo()
|
||||
function dispMemberModifyInfo()
|
||||
{
|
||||
if($_SESSION['rechecked_password_step'] != 'VALIDATE_PASSWORD' && $_SESSION['rechecked_password_step'] != 'INPUT_DATA')
|
||||
{
|
||||
|
|
@ -337,10 +337,10 @@ class MemberView extends Member
|
|||
$member_info = MemberModel::getMemberInfoByMemberSrl($member_srl, 0, $columnList);
|
||||
$member_info->signature = MemberModel::getSignature($member_srl);
|
||||
Context::set('member_info', $member_info);
|
||||
|
||||
|
||||
$formTags = getAdminView('member')->_getMemberInputTag($member_info);
|
||||
Context::set('formTags', $formTags);
|
||||
|
||||
|
||||
// Editor of the module set for signing by calling getEditor
|
||||
foreach($formTags as $formTag)
|
||||
{
|
||||
|
|
@ -365,19 +365,19 @@ class MemberView extends Member
|
|||
{
|
||||
$option->editor_skin = 'textarea';
|
||||
}
|
||||
|
||||
|
||||
Context::set('editor', getModel('editor')->getEditor($member_info->member_srl, $option));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$identifierForm = new stdClass;
|
||||
$identifierForm->title = lang($member_config->identifier);
|
||||
$identifierForm->name = $member_config->identifier;
|
||||
$identifierForm->value = $member_info->{$member_config->identifier};
|
||||
Context::set('identifierForm', $identifierForm);
|
||||
|
||||
|
||||
$this->addExtraFormValidatorMessage();
|
||||
|
||||
|
||||
// Set a template file
|
||||
$this->setTemplateFile('modify_info');
|
||||
}
|
||||
|
|
@ -411,7 +411,7 @@ class MemberView extends Member
|
|||
$args->module_srl = intval(Context::get('selected_module_srl')) ?: null;
|
||||
$args->sort_index = 'list_order';
|
||||
$args->statusList = array('PUBLIC', 'SECRET');
|
||||
|
||||
|
||||
$columnList = array('document_srl', 'module_srl', 'category_srl', 'member_srl', 'title', 'nick_name', 'comment_count', 'trackback_count', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status');
|
||||
$output = DocumentModel::getDocumentList($args, false, false, $columnList);
|
||||
Context::set('total_count', $output->total_count);
|
||||
|
|
@ -454,7 +454,7 @@ class MemberView extends Member
|
|||
$args->member_srl = array($this->user->member_srl, $this->user->member_srl * -1);
|
||||
$args->module_srl = intval(Context::get('selected_module_srl')) ?: null;
|
||||
$args->sort_index = 'list_order';
|
||||
|
||||
|
||||
$output = CommentModel::getTotalCommentList($args);
|
||||
Context::set('total_count', $output->total_count);
|
||||
Context::set('total_page', $output->total_page);
|
||||
|
|
@ -485,7 +485,7 @@ class MemberView extends Member
|
|||
}
|
||||
|
||||
$logged_info = Context::get('logged_info');
|
||||
|
||||
|
||||
// Check folders
|
||||
$args = new stdClass;
|
||||
$args->member_srl = $logged_info->member_srl;
|
||||
|
|
@ -498,11 +498,11 @@ class MemberView extends Member
|
|||
{
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
||||
$output = executeQueryArray('member.getScrapFolderList', $args);
|
||||
$folders = $output->data;
|
||||
}
|
||||
|
||||
|
||||
// Get default folder if no folder is selected
|
||||
$folder_srl = (int)Context::get('folder_srl');
|
||||
if($folder_srl && !array_filter($folders, function($folder) use($folder_srl) { return $folder->folder_srl == $folder_srl; }))
|
||||
|
|
@ -513,7 +513,7 @@ class MemberView extends Member
|
|||
{
|
||||
$folder_srl = array_first($folders)->folder_srl;
|
||||
}
|
||||
|
||||
|
||||
// Get folder info
|
||||
$folder_info = new stdClass;
|
||||
foreach($folders as $folder)
|
||||
|
|
@ -547,7 +547,7 @@ class MemberView extends Member
|
|||
break;
|
||||
}
|
||||
$output = executeQueryArray('member.getScrapDocumentList', $args);
|
||||
|
||||
|
||||
Context::set('total_count', $output->total_count);
|
||||
Context::set('total_page', $output->total_page);
|
||||
Context::set('page', $output->page);
|
||||
|
|
@ -577,7 +577,7 @@ class MemberView extends Member
|
|||
$logged_info = Context::get('logged_info');
|
||||
if(!$logged_info->member_srl) throw new Rhymix\Framework\Exceptions\MustLogin;
|
||||
// Get the saved document(module_srl is set to member_srl instead)
|
||||
|
||||
|
||||
$args = new stdClass();
|
||||
$args->member_srl = $logged_info->member_srl;
|
||||
$args->page = Context::get('page');
|
||||
|
|
@ -607,7 +607,7 @@ class MemberView extends Member
|
|||
{
|
||||
throw new Rhymix\Framework\Exceptions\MustLogin;
|
||||
}
|
||||
|
||||
|
||||
$args = new stdClass();
|
||||
$args->member_srl = $logged_info->member_srl;
|
||||
$args->page = Context::get('page');
|
||||
|
|
@ -617,7 +617,7 @@ class MemberView extends Member
|
|||
Context::set('page', $output->page);
|
||||
Context::set('active_logins', $output->data);
|
||||
Context::set('page_navigation', $output->page_navigation);
|
||||
|
||||
|
||||
$args = new stdClass();
|
||||
$args->member_srl = $logged_info->member_srl;
|
||||
$output = executeQueryArray('member.getMemberDevice', $args);
|
||||
|
|
@ -625,9 +625,9 @@ class MemberView extends Member
|
|||
|
||||
$this->setTemplateFile('active_logins');
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @brief Display the login form
|
||||
* @brief Display the login form
|
||||
*/
|
||||
function dispMemberLoginForm()
|
||||
{
|
||||
|
|
@ -638,7 +638,7 @@ class MemberView extends Member
|
|||
$referer_url = getNotEncodedUrl('act', '');
|
||||
}
|
||||
Context::set('referer_url', $referer_url);
|
||||
|
||||
|
||||
// Return to previous screen if already logged in.
|
||||
if(Context::get('is_logged'))
|
||||
{
|
||||
|
|
@ -734,7 +734,7 @@ class MemberView extends Member
|
|||
$this->setRedirectUrl(getNotEncodedUrl('act', ''));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$output = MemberController::getInstance()->procMemberLogout();
|
||||
$this->setRedirectUrl(isset($output->redirect_url) ? $output->redirect_url : getNotEncodedUrl('act', ''));
|
||||
}
|
||||
|
|
@ -808,7 +808,7 @@ class MemberView extends Member
|
|||
$js_code[] = 'if(!validator) return false;';
|
||||
|
||||
$errorLang = array();
|
||||
foreach($extraList as $val)
|
||||
foreach($extraList as $val)
|
||||
{
|
||||
$title = str_ireplace(array('<script', '</script'), array('<scr"+"ipt', '</scr"+"ipt'), addslashes($val->column_title));
|
||||
if($val->column_type == 'kr_zip' || $val->column_type == 'tel')
|
||||
|
|
@ -832,7 +832,7 @@ class MemberView extends Member
|
|||
|
||||
/**
|
||||
* Spammer manage popup
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
**/
|
||||
function dispMemberSpammer()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue