diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php index 0facd5ad8..62d782137 100644 --- a/modules/communication/communication.controller.php +++ b/modules/communication/communication.controller.php @@ -43,7 +43,7 @@ class communicationController extends communication return $output; } - getController('member')->_clearMemberCache($args->member_srl); + MemberController::clearMemberCache($args->member_srl); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationMessages', 'message_type', Context::get('message_type')); diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index b40733a89..bd7c11e9b 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -182,7 +182,7 @@ class memberAdminController extends member } // Clear cache - $oMemberController->_clearMemberCache($args->member_srl); + MemberController::clearMemberCache($args->member_srl); // Return result $this->add('member_srl', $args->member_srl); @@ -1029,7 +1029,7 @@ class memberAdminController extends member $this->setMessage('success_deleted'); } } - $oMemberController->_clearMemberCache($args->member_srl); + MemberController::clearMemberCache($args->member_srl); } $message = $var->message; diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index e34e6c758..5bf8612a8 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -279,7 +279,7 @@ class memberController extends member // Destroy session information Rhymix\Framework\Session::logout(); - $this->_clearMemberCache($logged_info->member_srl); + self::clearMemberCache($logged_info->member_srl); // Call a trigger after log-out (after) ModuleHandler::triggerCall('member.doLogout', 'after', $logged_info); @@ -1038,7 +1038,7 @@ class memberController extends member } } - $this->_clearMemberCache($args->member_srl, $site_module_info->site_srl); + self::clearMemberCache($args->member_srl, $site_module_info->site_srl); $this->setRedirectUrl($returnUrl); } @@ -1293,7 +1293,7 @@ class memberController extends member $this->setMessage('success_updated'); $site_module_info = Context::get('site_module_info'); - $this->_clearMemberCache($args->member_srl, $site_module_info->site_srl); + self::clearMemberCache($args->member_srl, $site_module_info->site_srl); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo'); $this->setRedirectUrl($returnUrl); @@ -1596,7 +1596,7 @@ class memberController extends member $profile_image = MemberModel::getProfileImage($member_srl); FileHandler::removeFile($profile_image->file); Rhymix\Framework\Storage::deleteEmptyDirectory(dirname(FileHandler::getRealPath($profile_image->file)), true); - $this->_clearMemberCache($member_srl); + self::clearMemberCache($member_srl); } return new BaseObject(0,'success'); } @@ -1921,7 +1921,7 @@ class memberController extends member // https://github.com/rhymix/rhymix/issues/1232 // executeQuery('member.deleteAuthMail', $args); - $this->_clearMemberCache($args->member_srl); + self::clearMemberCache($args->member_srl); // Call a trigger (after) $trigger_obj->is_register = $is_register; @@ -2126,7 +2126,7 @@ class memberController extends member $output = executeQuery('member.deleteMembersGroup', $args); if(!$output->toBool()) return $output; $this->setMessage('success_deleted'); - $this->_clearMemberCache($args->member_srl, $site_module_info->site_srl); + self::clearMemberCache($args->member_srl, $site_module_info->site_srl); } /** @@ -2232,7 +2232,7 @@ class memberController extends member $output = executeQuery('member.addMemberToGroup',$args); ModuleHandler::triggerCall('member.addMemberToGroup', 'after', $args); - $this->_clearMemberCache($member_srl, $site_srl); + self::clearMemberCache($member_srl, $site_srl); return $output; } @@ -2272,7 +2272,7 @@ class memberController extends member $output = executeQuery('member.addMemberToGroup', $obj); if(!$output->toBool()) return $output; - $this->_clearMemberCache($obj->member_srl, $args->site_srl); + self::clearMemberCache($obj->member_srl, $args->site_srl); } return new BaseObject(); @@ -2336,7 +2336,7 @@ class memberController extends member // Update the last login time. executeQuery('member.updateLastLogin', (object)['member_srl' => $output->data->member_srl]); - $this->_clearMemberCache($output->data->member_srl); + self::clearMemberCache($output->data->member_srl); // Return the member_srl. return intval($output->data->member_srl); @@ -2487,7 +2487,7 @@ class memberController extends member $output = executeQuery('member.updateLastLogin', $args); $site_module_info = Context::get('site_module_info'); - $this->_clearMemberCache($args->member_srl, $site_module_info->site_srl); + self::clearMemberCache($args->member_srl, $site_module_info->site_srl); // Check if there is recoding table. $oDB = &DB::getInstance(); @@ -3215,7 +3215,7 @@ class memberController extends member // Remove from cache unset($GLOBALS['__member_info__'][$args->member_srl]); - $this->_clearMemberCache($args->member_srl, $args->site_srl); + self::clearMemberCache($args->member_srl, $args->site_srl); $output->add('member_srl', $args->member_srl); return $output; @@ -3250,7 +3250,7 @@ class memberController extends member } unset($GLOBALS['__member_info__'][$member_srl]); - $this->_clearMemberCache($member_srl); + self::clearMemberCache($member_srl); return $output; } @@ -3285,7 +3285,7 @@ class memberController extends member } unset($GLOBALS['__member_info__'][$args->member_srl]); - $this->_clearMemberCache($args->member_srl); + self::clearMemberCache($args->member_srl); return $output; } @@ -3363,7 +3363,7 @@ class memberController extends member $this->procMemberDeleteImageMark($member_srl); $this->procMemberDeleteProfileImage($member_srl); $this->delSignature($member_srl); - $this->_clearMemberCache($member_srl); + self::clearMemberCache($member_srl); // Delete all remaining extra info $dirs = Rhymix\Framework\Storage::readDirectory(RX_BASEDIR . 'files/member_extra_info', true, true, false); @@ -3524,7 +3524,7 @@ class memberController extends member // Remove all values having the member_srl and new_password equal to 'XE_change_emaill_address' from authentication table executeQuery('member.deleteAuthChangeEmailAddress',$args); - $this->_clearMemberCache($args->member_srl); + self::clearMemberCache($args->member_srl); // Call a trigger (after) $trigger_obj = new stdClass; @@ -3795,7 +3795,7 @@ class memberController extends member $output = $this->updateMember($args, true); - $this->_clearMemberCache($args->member_srl); + self::clearMemberCache($args->member_srl); return $output; } @@ -3842,16 +3842,18 @@ class memberController extends member return array(); } - function _clearMemberCache($member_srl, $site_srl = 0) + public static function _clearMemberCache($member_srl) + { + return self::clearMemberCache($member_srl); + } + + public static function clearMemberCache($member_srl) { $member_srl = intval($member_srl); Rhymix\Framework\Cache::delete("member:member_info:$member_srl"); - Rhymix\Framework\Cache::delete("member:member_groups:$member_srl:site:$site_srl"); + Rhymix\Framework\Cache::delete("member:member_groups:$member_srl:site:0"); Rhymix\Framework\Cache::delete("site_and_module:accessible_modules:$member_srl"); - if ($site_srl != 0) - { - Rhymix\Framework\Cache::delete("member:member_groups:$member_srl:site:0"); - } + unset($GLOBALS['__member_info__'][$member_srl]); } } /* End of file member.controller.php */ diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 947802938..69f9adf49 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -839,7 +839,7 @@ class pointController extends point Rhymix\Framework\Storage::write($cache_filename, $point); } - getController('member')->_clearMemberCache($member_srl); + MemberController::clearMemberCache($member_srl); unset(parent::$_member_point_cache[$member_srl]); return $output;