Avoid globals where possible

$logged => logged()
$account_logged => accountLogged()

system/pages/account/base.php

@@ -10,7 +10,7 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-if(!$logged)
+if(!logged())
 {
 	$title = 'Login';
 

system/pages/account/change-email.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Change E-Mail';
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/change-info.php

@@ -16,7 +16,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Change Info';
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/change-password.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Change Password';
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/characters/change-comment.php

@@ -16,7 +16,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Change Comment';
 require PAGES . 'account/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/characters/change-name.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Change Name';
 require PAGES . 'account/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/characters/change-sex.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Change Sex';
 require PAGES . 'account/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/characters/create.php

@@ -16,7 +16,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Create Character';
 require PAGES . 'account/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/characters/delete.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Delete Character';
 require PAGES . 'account/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/create.php

@@ -17,8 +17,7 @@ $title = 'Create Account';
 if (setting('core.account_country'))
 	require SYSTEM . 'countries.conf.php';
 
-if($logged)
-{
+if(logged()) {
 	echo 'Please logout before attempting to create a new account.';
 	return;
 }

system/pages/account/login.php

@@ -29,6 +29,7 @@ if(!empty($login_account) && !empty($login_password))
 	$limiter->enabled = setting('core.account_login_ipban_protection');
 	$limiter->load();
 
+	global $logged, $account_logged, $logged_flags;
 	$account_logged = new OTS_Account();
 	if (config('account_login_by_email')) {
 		$account_logged->findByEMail($login_account);
@@ -69,6 +70,9 @@ if(!empty($login_account) && !empty($login_password))
 				$account_logged->setCustomField('web_lastlogin', time());
 			}
 
+			app()->setLoggedIn($logged);
+			app()->setAccountLogged($account_logged);
+
 			$hooks->trigger(HOOK_LOGIN, array('account' => $account_logged, 'password' => $login_password, 'remember_me' => $remember_me));
 		}
 

system/pages/account/logout.php

@@ -13,7 +13,7 @@ $title = 'Logout';
 
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/manage.php

@@ -14,7 +14,7 @@ $title = 'Account Management';
 require __DIR__ . '/login.php';
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/register-new.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Register Account';
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/register.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Register Account';
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }