From 209ae767a6c8c70e50296debef618fb825d47af6 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 29 May 2016 02:19:23 +0200 Subject: [PATCH] #123 show main wow account --- mojotrollz/page/default_beta/default_beta.php | 13 ++++++++++--- .../page/default_beta/tpl/beta_loggedin.tpl | 11 +++++++++++ mojotrollz/page/default_login/autoload.inc | 3 ++- mojotrollz/page/default_login/default_login.php | 14 +++++++++++--- .../qq/MOJO_ACCOUNT_MAIN_ACCOUNT.php | 11 +++++++++++ mojotrollz/page/default_login/tpl/loggedin.tpl | 17 ++++++++++++++++- .../page/default_login/tpl/wow_account.tpl | 5 +++++ .../page/default_page/tpl/default_page.tpl | 3 +-- 8 files changed, 67 insertions(+), 10 deletions(-) create mode 100644 mojotrollz/page/default_login/qq/MOJO_ACCOUNT_MAIN_ACCOUNT.php create mode 100644 mojotrollz/page/default_login/tpl/wow_account.tpl diff --git a/mojotrollz/page/default_beta/default_beta.php b/mojotrollz/page/default_beta/default_beta.php index beb8fda..a3dc342 100644 --- a/mojotrollz/page/default_beta/default_beta.php +++ b/mojotrollz/page/default_beta/default_beta.php @@ -6,9 +6,16 @@ class default_beta extends \SYSTEM\PAGE\Page { return \SYSTEM\PAGE\text::tag('meta_beta');} public function html(){ $vars = array(); - $vars['beta_area'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? - \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta_loggedin.tpl'))->SERVERPATH(), array('email' => \SYSTEM\SECURITY\Security::getUser()->email,'username' => \SYSTEM\SECURITY\Security::getUser()->username)) : - \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta_loggedout.tpl'))->SERVERPATH()); + if(\SYSTEM\SECURITY\Security::isLoggedIn()){ + $vars['email'] = \SYSTEM\SECURITY\Security::getUser()->email; + $vars['username'] = \SYSTEM\SECURITY\Security::getUser()->username; + + $res = \SQL\MOJO_ACCOUNT_MAIN_ACCOUNT::Q1(array($vars['username'],$vars['email'])); + $res['online'] = $res['online'] == 1 ? 'online' : 'offline'; + $vars['wow_accounts'] = \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_login/tpl/wow_account.tpl'))->SERVERPATH(), $res); + $vars['beta_area'] = \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta_loggedin.tpl'))->SERVERPATH(), $vars); + } else { + $vars['beta_area'] = \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta_loggedout.tpl'))->SERVERPATH());} $vars = array_merge($vars,\SYSTEM\PAGE\text::tag('mojotrollz')); return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta.tpl'))->SERVERPATH(), $vars); } diff --git a/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl b/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl index 7d7d191..5f98e6b 100644 --- a/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl +++ b/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl @@ -12,6 +12,17 @@

+
+

WoW Account

+
+
+
Username
+
Chars
+
Online
+
+ ${wow_accounts} +
+
diff --git a/mojotrollz/page/default_login/autoload.inc b/mojotrollz/page/default_login/autoload.inc index 8fd92c5..d438772 100644 --- a/mojotrollz/page/default_login/autoload.inc +++ b/mojotrollz/page/default_login/autoload.inc @@ -1,2 +1,3 @@ SERVERPATH(), array_merge($vars,array('email' => \SYSTEM\SECURITY\Security::getUser()->email,'username' => \SYSTEM\SECURITY\Security::getUser()->username))) - : \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_login/tpl/loggedout.tpl'))->SERVERPATH(), $vars); + if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ + return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_login/tpl/loggedout.tpl'))->SERVERPATH(), $vars);} + + $vars['email'] = \SYSTEM\SECURITY\Security::getUser()->email; + $vars['username'] = \SYSTEM\SECURITY\Security::getUser()->username; + + $res = \SQL\MOJO_ACCOUNT_MAIN_ACCOUNT::Q1(array($vars['username'],$vars['email'])); + $res['online'] = $res['online'] == 1 ? 'online' : 'offline'; + $vars['wow_accounts'] = \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_login/tpl/wow_account.tpl'))->SERVERPATH(), $res); + + return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_login/tpl/loggedin.tpl'))->SERVERPATH(), $vars); } } \ No newline at end of file diff --git a/mojotrollz/page/default_login/qq/MOJO_ACCOUNT_MAIN_ACCOUNT.php b/mojotrollz/page/default_login/qq/MOJO_ACCOUNT_MAIN_ACCOUNT.php new file mode 100644 index 0000000..8cee4de --- /dev/null +++ b/mojotrollz/page/default_login/qq/MOJO_ACCOUNT_MAIN_ACCOUNT.php @@ -0,0 +1,11 @@ +
+
+
+
+

WoW Account

+
+
+
Username
+
Chars
+
Online
+
+ ${wow_accounts} +
+
+
+
@@ -17,7 +32,7 @@
- +
diff --git a/mojotrollz/page/default_login/tpl/wow_account.tpl b/mojotrollz/page/default_login/tpl/wow_account.tpl new file mode 100644 index 0000000..073d346 --- /dev/null +++ b/mojotrollz/page/default_login/tpl/wow_account.tpl @@ -0,0 +1,5 @@ +
+
${username}
+
${count}
+
${online}
+
\ No newline at end of file diff --git a/mojotrollz/page/default_page/tpl/default_page.tpl b/mojotrollz/page/default_page/tpl/default_page.tpl index 55f5982..6257dda 100644 --- a/mojotrollz/page/default_page/tpl/default_page.tpl +++ b/mojotrollz/page/default_page/tpl/default_page.tpl @@ -92,8 +92,7 @@