From 8427657b642129ff2b5b99ca8791447043279d27 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Fri, 20 Jun 2014 19:32:40 +0200
Subject: [PATCH] playercount, better stats

---
 mojotrollz/api/autoload.inc.php                     |  3 ++-
 mojotrollz/api/database/database.php                |  7 +++++++
 mojotrollz/api/realm/realm.php                      |  2 +-
 mojotrollz/api/world/world.php                      |  2 +-
 mojotrollz/dbd/db/mangos_chars.php                  |  2 +-
 mojotrollz/dbd/qq/ONLINE_STATS.php                  |  6 ++++--
 mojotrollz/dbd/qq/PLAYER_ONLINE.php                 | 13 +++++++++++++
 mojotrollz/log/WOW_STATS_OFLINE.php                 |  2 --
 mojotrollz/log/WOW_STATS_ONLINE.php                 |  2 --
 mojotrollz/log/WOW_STATS_PLAYER.php                 |  6 ------
 mojotrollz/log/WOW_STATS_PLAYER_ONLINE.php          |  2 ++
 mojotrollz/log/WOW_STATS_REALM_OFFLINE.php          |  2 ++
 mojotrollz/log/WOW_STATS_REALM_ONLINE.php           |  2 ++
 mojotrollz/log/WOW_STATS_WORLD_OFFLINE.php          |  2 ++
 mojotrollz/log/WOW_STATS_WORLD_ONLINE.php           |  2 ++
 mojotrollz/page/default_page/default_page.php       |  1 +
 .../page/default_page/default_page_serverinfo.tpl   |  1 +
 17 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 mojotrollz/api/database/database.php
 create mode 100644 mojotrollz/dbd/qq/PLAYER_ONLINE.php
 delete mode 100644 mojotrollz/log/WOW_STATS_OFLINE.php
 delete mode 100644 mojotrollz/log/WOW_STATS_ONLINE.php
 delete mode 100644 mojotrollz/log/WOW_STATS_PLAYER.php
 create mode 100644 mojotrollz/log/WOW_STATS_PLAYER_ONLINE.php
 create mode 100644 mojotrollz/log/WOW_STATS_REALM_OFFLINE.php
 create mode 100644 mojotrollz/log/WOW_STATS_REALM_ONLINE.php
 create mode 100644 mojotrollz/log/WOW_STATS_WORLD_OFFLINE.php
 create mode 100644 mojotrollz/log/WOW_STATS_WORLD_ONLINE.php

diff --git a/mojotrollz/api/autoload.inc.php b/mojotrollz/api/autoload.inc.php
index fa2d14e..cfd6daf 100644
--- a/mojotrollz/api/autoload.inc.php
+++ b/mojotrollz/api/autoload.inc.php
@@ -1,4 +1,5 @@
 <?php
 SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/realm','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/world','');
\ No newline at end of file
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/world','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/database','');
\ No newline at end of file
diff --git a/mojotrollz/api/database/database.php b/mojotrollz/api/database/database.php
new file mode 100644
index 0000000..d009585
--- /dev/null
+++ b/mojotrollz/api/database/database.php
@@ -0,0 +1,7 @@
+<?php
+class database {
+    public static function player_online(){
+        //new \DBD\PLAYER_ONLINE($count);
+        $count = \DBD\PLAYER_ONLINE::Q1()['count'];
+        return $count;}
+}
diff --git a/mojotrollz/api/realm/realm.php b/mojotrollz/api/realm/realm.php
index 072cae1..587f552 100644
--- a/mojotrollz/api/realm/realm.php
+++ b/mojotrollz/api/realm/realm.php
@@ -2,6 +2,6 @@
 class realm {
     public static function status(){
         $res = shell_exec('/home/mojotrolls/mojo_zero/realm status 2>&1');
-        ($res == 1) ? new WOW_STATS_ONLINE() : new WOW_STATS_OFLINE();
+        ($res == 1) ? new WOW_STATS_REALM_ONLINE() : new WOW_STATS_REALM_OFFLINE();
         return ($res == 1) ? '<status>on</status>' : '<status>off</status>';}
 }
\ No newline at end of file
diff --git a/mojotrollz/api/world/world.php b/mojotrollz/api/world/world.php
index a972718..9b5ea3a 100644
--- a/mojotrollz/api/world/world.php
+++ b/mojotrollz/api/world/world.php
@@ -2,6 +2,6 @@
 class world {
     public static function status(){
         $res = shell_exec('/home/mojotrolls/mojo_zero/world status 2>&1');
-        ($res == 1) ? new WOW_STATS_ONLINE() : new WOW_STATS_OFLINE();
+        ($res == 1) ? new WOW_STATS_WORLD_ONLINE() : new WOW_STATS_WORLD_OFFLINE();
         return ($res == 1) ? '<status>on</status>' : '<status>off</status>';}
 }
diff --git a/mojotrollz/dbd/db/mangos_chars.php b/mojotrollz/dbd/db/mangos_chars.php
index e1e6b98..5ce9680 100644
--- a/mojotrollz/dbd/db/mangos_chars.php
+++ b/mojotrollz/dbd/db/mangos_chars.php
@@ -4,5 +4,5 @@ namespace DBD;
 class mangos_chars extends \SYSTEM\DB\DBInfoMYS {
 
     public function  __construct() {
-        parent::__construct('mangos_one_chars', 'mojotrolls_dev', 'dsjgfasudzfsvad', '127.0.0.1');}
+        parent::__construct('mangos_zero_chars', 'mojotrolls_dev', 'dsjgfasudzfsvad', '127.0.0.1');}
 }
diff --git a/mojotrollz/dbd/qq/ONLINE_STATS.php b/mojotrollz/dbd/qq/ONLINE_STATS.php
index 463ca88..8349f71 100644
--- a/mojotrollz/dbd/qq/ONLINE_STATS.php
+++ b/mojotrollz/dbd/qq/ONLINE_STATS.php
@@ -8,8 +8,10 @@ class ONLINE_STATS extends \SYSTEM\DB\QP {
 '',
 //mys
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
-    .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'WOW_STATS_ONLINE\' then 1 else 0 end) online,'
-    .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'WOW_STATS_OFLINE\' then 1 else 0 end) Ofline'
+    .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'WOW_STATS_REALM_ONLINE\' then 1 else 0 end) realm_on,'
+    .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'WOW_STATS_REALM_OFFLINE\' then 1 else 0 end) realm_off,'
+    .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'WOW_STATS_WORLD_OFFLINE\' then 1 else 0 end) world_off,'
+    .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'WOW_STATS_WORLD_ONLINE\' then 1 else 0 end) world_on'
 .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS
 .' GROUP BY day'
 .' ORDER BY day DESC'
diff --git a/mojotrollz/dbd/qq/PLAYER_ONLINE.php b/mojotrollz/dbd/qq/PLAYER_ONLINE.php
new file mode 100644
index 0000000..a26cdb5
--- /dev/null
+++ b/mojotrollz/dbd/qq/PLAYER_ONLINE.php
@@ -0,0 +1,13 @@
+<?php
+namespace DBD;
+
+class PLAYER_ONLINE extends \SYSTEM\DB\QQ {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'',
+//mys
+'SELECT count(*) as count FROM characters WHERE online="1"',
+new \DBD\mangos_chars()
+);}}
+
diff --git a/mojotrollz/log/WOW_STATS_OFLINE.php b/mojotrollz/log/WOW_STATS_OFLINE.php
deleted file mode 100644
index 45e6a77..0000000
--- a/mojotrollz/log/WOW_STATS_OFLINE.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-class WOW_STATS_OFLINE extends \SYSTEM\LOG\INFO {}
\ No newline at end of file
diff --git a/mojotrollz/log/WOW_STATS_ONLINE.php b/mojotrollz/log/WOW_STATS_ONLINE.php
deleted file mode 100644
index d0fb3ed..0000000
--- a/mojotrollz/log/WOW_STATS_ONLINE.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-class WOW_STATS_ONLINE extends \SYSTEM\LOG\INFO {}
\ No newline at end of file
diff --git a/mojotrollz/log/WOW_STATS_PLAYER.php b/mojotrollz/log/WOW_STATS_PLAYER.php
deleted file mode 100644
index 3acc31c..0000000
--- a/mojotrollz/log/WOW_STATS_PLAYER.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-class WOW_STATS_PLAYER extends \SYSTEM\LOG\INFO {
-    public function __construct($player_count){
-        parent::__construct($player_count);}
-}
-
diff --git a/mojotrollz/log/WOW_STATS_PLAYER_ONLINE.php b/mojotrollz/log/WOW_STATS_PLAYER_ONLINE.php
new file mode 100644
index 0000000..6c1847a
--- /dev/null
+++ b/mojotrollz/log/WOW_STATS_PLAYER_ONLINE.php
@@ -0,0 +1,2 @@
+<?php
+class WOW_STATS_PLAYER_ONLINE extends \SYSTEM\LOG\INFO {}
\ No newline at end of file
diff --git a/mojotrollz/log/WOW_STATS_REALM_OFFLINE.php b/mojotrollz/log/WOW_STATS_REALM_OFFLINE.php
new file mode 100644
index 0000000..3db110f
--- /dev/null
+++ b/mojotrollz/log/WOW_STATS_REALM_OFFLINE.php
@@ -0,0 +1,2 @@
+<?php
+class WOW_STATS_REALM_OFFLINE extends \SYSTEM\LOG\INFO {}
\ No newline at end of file
diff --git a/mojotrollz/log/WOW_STATS_REALM_ONLINE.php b/mojotrollz/log/WOW_STATS_REALM_ONLINE.php
new file mode 100644
index 0000000..f884b8c
--- /dev/null
+++ b/mojotrollz/log/WOW_STATS_REALM_ONLINE.php
@@ -0,0 +1,2 @@
+<?php
+class WOW_STATS_REALM_ONLINE extends \SYSTEM\LOG\INFO {}
\ No newline at end of file
diff --git a/mojotrollz/log/WOW_STATS_WORLD_OFFLINE.php b/mojotrollz/log/WOW_STATS_WORLD_OFFLINE.php
new file mode 100644
index 0000000..e646438
--- /dev/null
+++ b/mojotrollz/log/WOW_STATS_WORLD_OFFLINE.php
@@ -0,0 +1,2 @@
+<?php
+class WOW_STATS_WORLD_OFFLINE extends \SYSTEM\LOG\INFO {}
\ No newline at end of file
diff --git a/mojotrollz/log/WOW_STATS_WORLD_ONLINE.php b/mojotrollz/log/WOW_STATS_WORLD_ONLINE.php
new file mode 100644
index 0000000..9e4f685
--- /dev/null
+++ b/mojotrollz/log/WOW_STATS_WORLD_ONLINE.php
@@ -0,0 +1,2 @@
+<?php
+class WOW_STATS_WORLD_ONLINE extends \SYSTEM\LOG\INFO {}
\ No newline at end of file
diff --git a/mojotrollz/page/default_page/default_page.php b/mojotrollz/page/default_page/default_page.php
index c3e4fd0..146e38c 100644
--- a/mojotrollz/page/default_page/default_page.php
+++ b/mojotrollz/page/default_page/default_page.php
@@ -35,6 +35,7 @@ class default_page extends SYSTEM\PAGE\Page {
         $vars['inprint'] = '';
         $vars['realm_status'] = realm::status();
         $vars['world_status'] = world::status();
+        $vars['player_online'] = database::player_online();
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE),
                                     \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_SERVERINFO),
                                     \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_BASIC));
diff --git a/mojotrollz/page/default_page/default_page_serverinfo.tpl b/mojotrollz/page/default_page/default_page_serverinfo.tpl
index 1eb6359..db4d48a 100644
--- a/mojotrollz/page/default_page/default_page_serverinfo.tpl
+++ b/mojotrollz/page/default_page/default_page_serverinfo.tpl
@@ -8,6 +8,7 @@
 <font color="red" size="1">This Server is currently closed for the Public. Be gone.</font>
 <p>Realm Server: ${realm_status}</p>
 <p>World Server: ${world_status}</p>
+<p>Players Online: ${player_online}</p>
 
 <H3>Server Help</H3>
 <p><a href="${url_realmlistwtf}" target="_blank">Download realmlist.wtf</a></p>