updated system reference, google hook, saimod, slides

2015-09-25 22:35:34 +02:00 · 2015-09-25 22:35:34 +02:00 · a78afb8ecb
commit a78afb8ecb
parent 987a21fdc7
20 changed files with 141 additions and 14 deletions
--- a/google7a9bf6fa7efb5394.html
+++ b/google7a9bf6fa7efb5394.html
@ -0,0 +1 @@
+google-site-verification: google7a9bf6fa7efb5394.html
--- a/lib/system
+++ b/lib/system
@ -1 +1 @@
-Subproject commit f179eef5e981a92f47d8ab96c1c4e8cfb6000835
+Subproject commit 973038d2bc58c06b0a3c5fdf3bcec563fc9b8d4e
--- a/mojotrollz/autoload.inc
+++ b/mojotrollz/autoload.inc
@ -3,4 +3,5 @@ require_once dirname(__FILE__).'/path/autoload.inc';
 require_once dirname(__FILE__).'/page/autoload.inc';
 require_once dirname(__FILE__).'/files/autoload.inc';
 require_once dirname(__FILE__).'/api/autoload.inc';
-require_once dirname(__FILE__).'/sql/autoload.inc';
+require_once dirname(__FILE__).'/sql/autoload.inc';
+require_once dirname(__FILE__).'/sai/autoload.inc';
--- a/mojotrollz/files/content/slider_image_04.png
+++ b/mojotrollz/files/content/slider_image_04.png
--- a/mojotrollz/files/content/slider_image_05.png
+++ b/mojotrollz/files/content/slider_image_05.png
--- a/mojotrollz/files/content/slider_image_06.jpg
+++ b/mojotrollz/files/content/slider_image_06.jpg
--- a/mojotrollz/files/content/slider_image_07.jpg
+++ b/mojotrollz/files/content/slider_image_07.jpg
--- a/mojotrollz/files/content/slider_image_08.png
+++ b/mojotrollz/files/content/slider_image_08.png
--- a/mojotrollz/page/default_page/js/default_page.js
+++ b/mojotrollz/page/default_page/js/default_page.js
@ -1,5 +1,6 @@
 $(document).ready(function() {
    new SYSTEM('./api.php',1,'start');
+    //SYSTEM.back();
    
    $('.flexslider').flexslider({
        animation: "slide",
--- a/mojotrollz/page/default_page/tpl/default_page.tpl
+++ b/mojotrollz/page/default_page/tpl/default_page.tpl
@ -47,7 +47,7 @@
                    <ul class="nav navbar-nav navbar-left">
                        <li class="active"><a href="#content_home">${mojotrollz_mojotrollz}</a></li>
                        <li><a href="#content_servers" onClick="">${mojotrollz_servers}</a></li>
-                        <li><a href="#content_tshirts" onClick="">${mojotrollz_tshirts}</a></li>
+                        <!--<li><a href="#content_tshirts" onClick="">${mojotrollz_tshirts}</a></li>-->
                        <!--<li><a href="#content_addons">${mojotrollz_addons}</a></li>-->
                    </ul>
                    <ul class="nav navbar-nav navbar-right">
@ -65,7 +65,12 @@
                        <ul class="slides">
                            <li><img alt="slider_image_01.jpg" src="./api.php?call=files&cat=content&id=slider_image_01.jpg" width="100%"></li>
                            <li style="display: none"><img alt="slider_image_02.jpg" src="./api.php?call=files&cat=content&id=slider_image_02.jpg" width="100%"></li>
-                            <li style="display: none"><img alt="slider_image_03.jpg" src="./api.php?call=files&cat=content&id=slider_image_03.jpg" width="100%"></li>
+                            <!--<li style="display: none"><img alt="slider_image_03.jpg" src="./api.php?call=files&cat=content&id=slider_image_03.jpg" width="100%"></li>-->
+                            <li style="display: none"><img alt="slider_image_03.jpg" src="./api.php?call=files&cat=content&id=slider_image_04.png" width="100%"></li>
+                            <li style="display: none"><img alt="slider_image_03.jpg" src="./api.php?call=files&cat=content&id=slider_image_05.png" width="100%"></li>
+                            <li style="display: none"><img alt="slider_image_03.jpg" src="./api.php?call=files&cat=content&id=slider_image_06.jpg" width="100%"></li>
+                            <li style="display: none"><img alt="slider_image_03.jpg" src="./api.php?call=files&cat=content&id=slider_image_07.jpg" width="100%"></li>
+                            <li style="display: none"><img alt="slider_image_03.jpg" src="./api.php?call=files&cat=content&id=slider_image_08.png" width="100%"></li>
                        </ul>
                    </div>
                </div>
@ -78,7 +83,7 @@
                    <div class="col-md-4">
                        <a href="#content_home">${mojotrollz_mojotrollz}</a><br><br>
                        <a href="#content_servers">${mojotrollz_servers}</a><br><br>
-                        <a href="#content_tshirts">${mojotrollz_tshirts}</a><br><br>
+                        <!--<a href="#content_tshirts">${mojotrollz_tshirts}</a><br><br>-->
                        <!--<a href="#content_addons">${mojotrollz_addons}</a><br><br>-->
                    </div>
                    <div class="col-md-4">
--- a/mojotrollz/page/default_start/default_start.php
+++ b/mojotrollz/page/default_start/default_start.php
@ -8,7 +8,7 @@ class default_start extends \SYSTEM\PAGE\Page {
        
        $vars['content_client'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_client.tpl'));
        $vars['content_server'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_server.tpl'));
-        $vars['content_tshirt'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_tshirt.tpl'));
+        $vars['content_tshirt'] = '';//\SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_tshirt.tpl'));
        $vars['content_addons'] = '';//\SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_addons.tpl'));
            
        \LIB\lib_ts3::php();
--- a/mojotrollz/page/default_start/tpl/content_client.tpl
+++ b/mojotrollz/page/default_start/tpl/content_client.tpl
@ -38,13 +38,26 @@
        </div>
    </div>
    <div id="content_teamspeak" class="col-md-12 mojotrollz_col">
-        <h3>
-            ${mojotrollz_players_online} <b>${ts_players}</b>
-            <br><br>
-            <button type="submit" class="btn-lg btn btn-success" onClick="location.href='ts3server://mojotrollz.eu'">
-                <span class="glyphicon glyphicon-globe" aria-hidden="true"></span>
-                &nbsp;&nbsp;${basic_connect}
-            </button>
-        </h3>
+        <div id="content_teamspeak" style="padding-top: 25px;" class="col-md-9">
+            <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+            <!-- mojotrollz -->
+            <ins class="adsbygoogle"
+                 style="display:inline-block;width:728px;height:90px"
+                 data-ad-client="ca-pub-3504070649672819"
+                 data-ad-slot="2848666885"></ins>
+            <script>
+            (adsbygoogle = window.adsbygoogle || []).push({});
+            </script>
+        </div>
+        <div id="content_teamspeak" class="col-md-3">
+            <h3>
+                ${mojotrollz_players_online} <b>${ts_players}</b>
+                <br><br>
+                <button type="submit" class="btn-lg btn btn-success" onClick="location.href='ts3server://mojotrollz.eu'">
+                    <span class="glyphicon glyphicon-globe" aria-hidden="true"></span>
+                    &nbsp;&nbsp;${basic_connect}
+                </button>
+            </h3>
+        </div>
    </div>
 </div>
--- a/mojotrollz/sai/autoload.inc
+++ b/mojotrollz/sai/autoload.inc
@ -0,0 +1,2 @@
+<?php
+require_once dirname(__FILE__).'/saimod_mojotrollz_servers/autoload.inc';
--- a/mojotrollz/sai/saimod_mojotrollz_servers/autoload.inc
+++ b/mojotrollz/sai/saimod_mojotrollz_servers/autoload.inc
@ -0,0 +1,4 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SAI');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq/','SQL');
+\SYSTEM\SAI\sai::register('\SAI\saimod_mojotrollz_servers');
--- a/mojotrollz/sai/saimod_mojotrollz_servers/js/saimod_mojotrollz_servers.js
+++ b/mojotrollz/sai/saimod_mojotrollz_servers/js/saimod_mojotrollz_servers.js
@ -0,0 +1,3 @@
+function init_saimod_mojotrollz_servers() {
+ 
+};
--- a/mojotrollz/sai/saimod_mojotrollz_servers/qq/MOJOTROLLZ_SERVER_LIST_ALL.php
+++ b/mojotrollz/sai/saimod_mojotrollz_servers/qq/MOJOTROLLZ_SERVER_LIST_ALL.php
@ -0,0 +1,8 @@
+<?php
+namespace SQL;
+class MOJOTROLLZ_SERVER_LIST_ALL extends \SYSTEM\DB\QQ {
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'SELECT mojotrollz_server.* FROM mojotrollz_server';
+    }
+}
--- a/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php
+++ b/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php
@ -0,0 +1,26 @@
+<?php
+namespace SAI;
+
+class saimod_mojotrollz_servers extends \SYSTEM\SAI\SaiModule {    
+    public static function sai_mod__SAI_saimod_mojotrollz_servers(){
+        $vars = array();
+        $vars['content'] = '';
+        $vars['last_visit'] = \SYSTEM\time::time_ago_string(\SYSTEM\CRON\cron::last('\SYSTEM\CRON\cron_log2sqlite'));
+        $res = \SQL\MOJOTROLLZ_SERVER_LIST_ALL::QQ();
+        $i = 0;
+        while($r = $res->next()){
+            $r['selected_0'] = $r['selected_1'] = '';
+            $r['selected_'.$r['visible']] = 'selected';
+            $r['i'] = $i++;
+            $vars['content'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_mojotrollz_servers/tpl/list_entry.tpl'), $r);}
+        $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_TIME));
+        return \SYSTEM\PAGE\replace::replaceFile(   \SYSTEM\WEBPATH(new \PSAI(),'saimod_mojotrollz_servers/tpl/saimod_mojotrollz_servers.tpl'),$vars);}
+    public static function html_li_menu(){return '<li class=""><a id="menu_mojotrollz_servers" data-toggle="tooltip" data-placement="bottom" title="Servers" href="#!mojotrollz_servers"><span class="glyphicon glyphicon-home" aria-hidden="true"></span></a></li>';}
+    public static function right_public(){return false;}    
+    public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
+    
+    /*public static function css(){
+        return array(   \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/css/saistart_sys_sai.css'));}*/
+    public static function js(){
+        return array(   \SYSTEM\WEBPATH(new \PSAI(),'saimod_mojotrollz_servers/js/saimod_mojotrollz_servers.js'));}
+}
--- a/mojotrollz/sai/saimod_mojotrollz_servers/tpl/list_entry.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_servers/tpl/list_entry.tpl
@ -0,0 +1,23 @@
+<tr class="${tr_class} cron_entries" cls="${class}">
+    <td>${id}</td>
+    <td>${name}</td>
+    <td>${url}</td>
+    <td>${version}</td>
+    <td>${description}</td>
+    <td>${score}</td>
+    <td>
+        <select class="form-control" id="select_status_${i}">
+            <option ${selected_0} value="0">INVISIBLE</option>
+            <option ${selected_1} value="1">VISIBLE</option>
+        </select>
+    </td>
+    <td>
+        <button type="button" class="btn-sm btn btn-warning btn_cron_status" _i="${i}"><span class="glyphicon glyphicon-repeat" aria-hidden="true"></span></button>
+    </td>
+    <td>
+        <button type="button" class="btn-sm btn btn-success btn_cron_edit" _class="${class}" _min="${min}" _hour="${hour}" _day="${day}" _day_week="${day_week}" _month="${month}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></button>
+    </td>
+    <td>
+        <button type="button" class="btn-sm btn btn-danger btn_cron_del" _class="${class}"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></button>
+    </td>
+</tr>
--- a/mojotrollz/sai/saimod_mojotrollz_servers/tpl/saimod_mojotrollz_servers.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_servers/tpl/saimod_mojotrollz_servers.tpl
@ -0,0 +1,37 @@
+<h4>${sai_cron_title}</h4>
+<hr>
+Last Visit: ${last_visit}<br/>
+<a href="./sai.php?call=cron" target="_blank">Start Cron</a>
+<div id="cron_content">
+    <table class="table table-hover table-condensed sai_table tablesorter" id="sai_mod_cron_table" style="overflow: auto;">
+        <thead>
+            <tr>
+                <th>id</th>
+                <th>name</th>
+                <th>url</th>
+                <th>version</th>
+                <th>description</th>
+                <th>score</th>
+                <th>visible</th>
+                <th></th>
+                <th>action</th>
+                <th></th>
+            </tr>
+        </thead>   
+        <tbody>
+            ${content}
+        </tbody>    
+        <tr>
+            <td>ID</td>
+            <td><input class="form-control" type="text" id="input_cron_min" placeholder="name" value="0" style="width: 40px;"></td>
+            <td><input class="form-control" type="text" id="input_cron_hour" placeholder="url" value="0" style="width: 40px;"></td>
+            <td><input class="form-control" type="text" id="input_cron_day" placeholder="version" value="0" style="width: 40px;"></td>
+            <td><input class="form-control" type="text" id="input_cron_day_week" placeholder="description" value="0" style="width: 40px;"></td>
+            <td>VISIBLE</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td><button type="button" class="btn-sm btn btn-success" id="btn_servers_add"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_edit}</button></td>
+        </tr> 
+    </table>
+</div>
--- a/mojotrollz/sql/mysql/system_page.sql
+++ b/mojotrollz/sql/mysql/system_page.sql
@ -4,3 +4,6 @@ INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`,
 INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (15, 1, 'impressum', 'impressum', -1, 0, 0, '#content', './?page=impressum', 'init_impressum', 'default_impressum');

 INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (20, 1, 'login', 'login', -1, 0, 0, '#content', './?page=login', 'init_login', 'default_login');
+
+-- Saimod
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (500, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_config', 'action', NULL);
				`@ -0,0 +1 @@`
				`google-site-verification: google7a9bf6fa7efb5394.html`