diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php index 39d2333e6..e8f759808 100644 --- a/classes/template/TemplateHandler.class.php +++ b/classes/template/TemplateHandler.class.php @@ -257,7 +257,7 @@ $__Context = &$GLOBALS['__Context__']; $__Context->tpl_path = $this->path; - if($_SESSION['is_logged']) $__Context->logged_info = $_SESSION['logged_info']; + if($_SESSION['is_logged']) $__Context->logged_info = Context::get('logged_info'); ob_start(); $eval_str = "?>".$this->buff; diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index e350b71a2..2ce37d4ad 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -150,7 +150,6 @@ if(Context::isInstalled()) return new Object(-1, 'msg_already_installed'); // Assign a temporary administrator when installing $logged_info->is_admin = 'Y'; - $_SESSION['logged_info'] = $logged_info; Context::set('logged_info', $logged_info); include $this->db_tmp_config_file; diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 7d5254f1c..e88e27f0a 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1435,9 +1435,9 @@ } */ // Information stored in the session login user - $_SESSION['logged_info'] = $this->memberInfo; Context::set('is_logged', true); Context::set('logged_info', $this->memberInfo); + // 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( 'dispMemberScrappedDocument', 'cmd_view_scrapped_document'); @@ -1455,7 +1455,6 @@ $logged_info->menu_list[$act] = Context::getLang($str); Context::set('logged_info', $logged_info); - $_SESSION['logged_info'] = $logged_info; } /** @@ -1701,9 +1700,6 @@ if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl); $logged_info = Context::get('logged_info'); - if($logged_info->member_srl == $member_srl) { - $_SESSION['logged_info'] = $this->memberInfo; - } $output->add('member_srl', $args->member_srl); return $output; diff --git a/modules/member/member.model.php b/modules/member/member.model.php index ed085353f..04755af78 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -120,7 +120,6 @@ if($_SESSION['is_logged']&&$_SESSION['ipaddress']==$_SERVER['REMOTE_ADDR']) return true; $_SESSION['is_logged'] = false; - $_SESSION['logged_info'] = ''; return false; } @@ -130,7 +129,7 @@ function getLoggedInfo() { // Return session info if session info is requested and the user is logged-in if($this->isLogged()) { - $logged_info = $_SESSION['logged_info']; + $logged_info = Context::get('logged_info'); // Admin/Group list defined depending on site_module_info $site_module_info = Context::get('site_module_info'); if($site_module_info->site_srl) { @@ -151,8 +150,7 @@ $logged_info->is_site_admin = false; } - - $_SESSION['logged_info'] = $logged_info; + Context::set('logged_info', $logged_info); return $logged_info; } @@ -267,7 +265,7 @@ **/ function getLoggedUserID() { if(!$this->isLogged()) return; - $logged_info = $_SESSION['logged_info']; + $logged_info = Context::get('logged_info'); return $logged_info->user_id; } diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index a81ce1a42..127eb7588 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -220,12 +220,12 @@
- +
diff --git a/modules/opage/opage.view.php b/modules/opage/opage.view.php index 061a1a53a..3bf4f9ac3 100644 --- a/modules/opage/opage.view.php +++ b/modules/opage/opage.view.php @@ -114,7 +114,6 @@ $__Context = &$GLOBALS['__Context__']; $__Context->tpl_path = $filepath; - if($_SESSION['is_logged']) $__Context->logged_info = $_SESSION['logged_info']; ob_start(); @include($cache_file); diff --git a/modules/page/page.view.php b/modules/page/page.view.php index cb33fffff..6a9ec03d3 100644 --- a/modules/page/page.view.php +++ b/modules/page/page.view.php @@ -167,7 +167,6 @@ $__Context = &$GLOBALS['__Context__']; $__Context->tpl_path = $filepath; - if($_SESSION['is_logged']) $__Context->logged_info = $_SESSION['logged_info']; ob_start(); @include($cache_file);