From add45c671092ef2b72bb4fab4225ee3f82b6672f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 16 Jun 2016 16:09:55 +0200
Subject: [PATCH] #3 system docu fixes

---
 lib/system                                           |  2 +-
 mojotrollz/cron/cron_calculate_votes.php             |  2 +-
 mojotrollz/cron/cron_players_online_classic.php      |  2 +-
 mojotrollz/cron/cron_players_online_tbc.php          |  2 +-
 mojotrollz/cron/cron_players_online_ts.php           |  2 +-
 mojotrollz/page/default_account/default_account.php  |  4 +++-
 mojotrollz/page/default_article/default_article.php  |  4 +++-
 mojotrollz/page/default_beta/default_beta.php        |  4 +++-
 mojotrollz/page/default_donate/default_donate.php    |  5 ++++-
 .../page/default_impressum/default_impressum.php     |  5 ++++-
 mojotrollz/page/default_page/default_page.php        |  6 +++---
 .../page/default_register/default_register.php       |  4 +++-
 .../page/default_serverlist/default_serverlist.php   | 12 +++++++-----
 mojotrollz/page/default_start/default_start.php      |  4 +++-
 14 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/lib/system b/lib/system
index 0a36d31..54aaf1a 160000
--- a/lib/system
+++ b/lib/system
@@ -1 +1 @@
-Subproject commit 0a36d3144fdc52bbd762b2dfdaa0f2b29446cec3
+Subproject commit 54aaf1a1d271300ab8a28fb46ccfa6f8b78ea20f
diff --git a/mojotrollz/cron/cron_calculate_votes.php b/mojotrollz/cron/cron_calculate_votes.php
index dd73589..997f678 100644
--- a/mojotrollz/cron/cron_calculate_votes.php
+++ b/mojotrollz/cron/cron_calculate_votes.php
@@ -1,5 +1,5 @@
 <?php
-class cron_calculate_votes extends \SYSTEM\CRON\cronjob{
+class cron_calculate_votes implements \SYSTEM\CRON\cronjob{
     public static function run(){
         \SQL\CRON_CALCULATE_VOTES::QI();
         \SQL\CRON_DELETE_VOTES::QI();
diff --git a/mojotrollz/cron/cron_players_online_classic.php b/mojotrollz/cron/cron_players_online_classic.php
index 77a0dfb..01b53da 100644
--- a/mojotrollz/cron/cron_players_online_classic.php
+++ b/mojotrollz/cron/cron_players_online_classic.php
@@ -1,5 +1,5 @@
 <?php
-class cron_players_online_classic extends \SYSTEM\CRON\cronjob{
+class cron_players_online_classic implements \SYSTEM\CRON\cronjob{
     public static function run(){ 
         new \LOG\PLAYER_COUNT_CLASSIC(\SAI\saimod_mojotrollz_server_handling::online_classic());
     }
diff --git a/mojotrollz/cron/cron_players_online_tbc.php b/mojotrollz/cron/cron_players_online_tbc.php
index 0286b22..52b60f6 100644
--- a/mojotrollz/cron/cron_players_online_tbc.php
+++ b/mojotrollz/cron/cron_players_online_tbc.php
@@ -1,5 +1,5 @@
 <?php
-class cron_players_online_tbc extends \SYSTEM\CRON\cronjob{
+class cron_players_online_tbc implements \SYSTEM\CRON\cronjob{
     public static function run(){ 
         new \LOG\PLAYER_COUNT_TBC(\SAI\saimod_mojotrollz_server_handling::online_tbc());
     }
diff --git a/mojotrollz/cron/cron_players_online_ts.php b/mojotrollz/cron/cron_players_online_ts.php
index 09b5275..820836f 100644
--- a/mojotrollz/cron/cron_players_online_ts.php
+++ b/mojotrollz/cron/cron_players_online_ts.php
@@ -1,5 +1,5 @@
 <?php
-class cron_players_online_ts extends \SYSTEM\CRON\cronjob{
+class cron_players_online_ts implements \SYSTEM\CRON\cronjob{
     public static function run(){
         \LIB\lib_ts3::php();
         $ts3 = TeamSpeak3::factory("serverquery://mojotrollztsquery:9aYllYkG@127.0.0.1:10011/");
diff --git a/mojotrollz/page/default_account/default_account.php b/mojotrollz/page/default_account/default_account.php
index 30e8cad..44aa36d 100644
--- a/mojotrollz/page/default_account/default_account.php
+++ b/mojotrollz/page/default_account/default_account.php
@@ -1,5 +1,5 @@
 <?php
-class default_account extends \SYSTEM\PAGE\Page {
+class default_account implements \SYSTEM\PAGE\Page {
     public static function title(){
         return \SYSTEM\PAGE\text::get('title_account');}
     public static function meta(){
@@ -23,4 +23,6 @@ class default_account extends \SYSTEM\PAGE\Page {
         $vars['wow_accounts_confirm'] = \SYSTEM\SECURITY\security::getUser()->email_confirmed ? '' : \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/wow_accounts_confirm.tpl'))->SERVERPATH());
         return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/loggedin.tpl'))->SERVERPATH(), $vars);
     }
+
+    public static function css() {return array();}
 }
\ No newline at end of file
diff --git a/mojotrollz/page/default_article/default_article.php b/mojotrollz/page/default_article/default_article.php
index 3395d8c..a5ba1cc 100644
--- a/mojotrollz/page/default_article/default_article.php
+++ b/mojotrollz/page/default_article/default_article.php
@@ -1,5 +1,5 @@
 <?php
-class default_article extends \SYSTEM\PAGE\Page {
+class default_article implements \SYSTEM\PAGE\Page {
     public static function title(){
         return \SYSTEM\PAGE\text::get('title_article');}
     public static function meta(){
@@ -15,4 +15,6 @@ class default_article extends \SYSTEM\PAGE\Page {
         $element = array_merge($element,\SYSTEM\PAGE\text::tag('time'));
         return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_article/tpl/article.tpl'))->SERVERPATH(), $element);
     }
+
+    public static function css(){return array();}
 }
\ No newline at end of file
diff --git a/mojotrollz/page/default_beta/default_beta.php b/mojotrollz/page/default_beta/default_beta.php
index 571f5c7..140e83d 100644
--- a/mojotrollz/page/default_beta/default_beta.php
+++ b/mojotrollz/page/default_beta/default_beta.php
@@ -1,5 +1,5 @@
 <?php
-class default_beta extends \SYSTEM\PAGE\Page {
+class default_beta implements \SYSTEM\PAGE\Page {
     public static function title(){
         return \SYSTEM\PAGE\text::get('title_beta');}
     public static function meta(){
@@ -25,4 +25,6 @@ class default_beta extends \SYSTEM\PAGE\Page {
     public static function js(){
         return array(   new PPAGE('default_beta/js/default_beta.js'),
                         \LIB\lib_jqbootstrapvalidation::js());}
+
+    public static function css() {return array();}
 }
\ No newline at end of file
diff --git a/mojotrollz/page/default_donate/default_donate.php b/mojotrollz/page/default_donate/default_donate.php
index 14f12eb..3299ccf 100644
--- a/mojotrollz/page/default_donate/default_donate.php
+++ b/mojotrollz/page/default_donate/default_donate.php
@@ -1,5 +1,5 @@
 <?php
-class default_donate extends \SYSTEM\PAGE\Page {
+class default_donate implements \SYSTEM\PAGE\Page {
     public static function title(){
         return \SYSTEM\PAGE\text::get('title_donate');}
     public static function meta(){
@@ -8,4 +8,7 @@ class default_donate extends \SYSTEM\PAGE\Page {
         $vars = \SYSTEM\PAGE\text::tag('mojotrollz');
         return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_donate/tpl/donate.tpl'))->SERVERPATH(), $vars);
     }
+
+    public static function css() {return array();}
+    public static function js() {return array();}
 }
\ No newline at end of file
diff --git a/mojotrollz/page/default_impressum/default_impressum.php b/mojotrollz/page/default_impressum/default_impressum.php
index c03f78b..d1cdd76 100644
--- a/mojotrollz/page/default_impressum/default_impressum.php
+++ b/mojotrollz/page/default_impressum/default_impressum.php
@@ -1,5 +1,5 @@
 <?php
-class default_impressum extends \SYSTEM\PAGE\Page {
+class default_impressum implements \SYSTEM\PAGE\Page {
     public static function title(){
         return \SYSTEM\PAGE\text::get('title_impressum');}
     public static function meta(){
@@ -8,4 +8,7 @@ class default_impressum extends \SYSTEM\PAGE\Page {
         $vars['impressum'] = \SYSTEM\PAGE\text::get('webcraft_impressum');
         return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_impressum/tpl/impressum.tpl'))->SERVERPATH(), $vars);
     }
+
+    public static function css() {return array();}
+    public static function js() {return array();}
 }
\ 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 44b1f1b..6162a38 100644
--- a/mojotrollz/page/default_page/default_page.php
+++ b/mojotrollz/page/default_page/default_page.php
@@ -1,6 +1,6 @@
 <?php
-class default_page extends \SYSTEM\PAGE\Page {
-    private static function js(){        
+class default_page implements \SYSTEM\PAGE\DefaultPage {
+    public static function js(){        
         return  \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()->WEBPATH()).
                 \SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()->WEBPATH()).
                 \SYSTEM\HTML\html::script(\LIB\lib_jqbootstrapvalidation::js()->WEBPATH()).
@@ -10,7 +10,7 @@ class default_page extends \SYSTEM\PAGE\Page {
                             new PPAGE('default_page/js/default_page.js'))));
     }
     
-    private static function css(){  
+    public static function css(){  
         return  \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false)).
                 \SYSTEM\HTML\html::link(\LIB\lib_font_awesome::css()->WEBPATH(false)).
                 \SYSTEM\HTML\html::link(\LIB\lib_animate::css()->WEBPATH()).
diff --git a/mojotrollz/page/default_register/default_register.php b/mojotrollz/page/default_register/default_register.php
index 54c0ca1..3589730 100644
--- a/mojotrollz/page/default_register/default_register.php
+++ b/mojotrollz/page/default_register/default_register.php
@@ -1,5 +1,5 @@
 <?php
-class default_register extends \SYSTEM\PAGE\Page {
+class default_register implements \SYSTEM\PAGE\Page {
     public static function title(){
         return \SYSTEM\PAGE\text::get('title_register');}
     public static function meta(){
@@ -14,4 +14,6 @@ class default_register extends \SYSTEM\PAGE\Page {
     public static function js(){
         return array(   new PPAGE('default_register/js/default_register.js'),
                         \LIB\lib_jqbootstrapvalidation::js());}
+
+    public static function css() {return array();}
 }
\ No newline at end of file
diff --git a/mojotrollz/page/default_serverlist/default_serverlist.php b/mojotrollz/page/default_serverlist/default_serverlist.php
index a8a508c..da70506 100644
--- a/mojotrollz/page/default_serverlist/default_serverlist.php
+++ b/mojotrollz/page/default_serverlist/default_serverlist.php
@@ -1,9 +1,9 @@
 <?php
-class default_serverlist extends \SYSTEM\PAGE\Page {
-    //public static function title(){
-    //    return \SYSTEM\PAGE\text::get('title_serverlist');}
-    //public static function meta(){
-    //    return \SYSTEM\PAGE\text::tag('meta_serverlist');}
+class default_serverlist implements \SYSTEM\PAGE\Page {
+    public static function title(){
+        return \SYSTEM\PAGE\text::get('title_serverlist');}
+    public static function meta(){
+        return \SYSTEM\PAGE\text::tag('meta_serverlist');}
     public static function js(){
         return array(   new PPAGE('default_serverlist/js/default_serverlist.js'));}
     public function html(){
@@ -41,4 +41,6 @@ class default_serverlist extends \SYSTEM\PAGE\Page {
                 return '';
         }
     }
+
+    public static function css(){return array();}
 }
diff --git a/mojotrollz/page/default_start/default_start.php b/mojotrollz/page/default_start/default_start.php
index 01adcfb..08a638a 100644
--- a/mojotrollz/page/default_start/default_start.php
+++ b/mojotrollz/page/default_start/default_start.php
@@ -1,5 +1,5 @@
 <?php
-class default_start extends \SYSTEM\PAGE\Page {
+class default_start implements \SYSTEM\PAGE\Page {
     public static function title(){
         return \SYSTEM\PAGE\text::get('title_start');}
     public static function meta(){
@@ -36,4 +36,6 @@ class default_start extends \SYSTEM\PAGE\Page {
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('mojotrollz'));
         return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_start/tpl/default_start.tpl'))->SERVERPATH(), $vars);
     }
+
+    public static function css() {return array();}
 }