From 5a394c058862b33f231d7b5a3b1b63fd77943be4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 16 Sep 2015 02:09:14 +0200
Subject: [PATCH] Add new Server functionality, some cleanups, spelling &
 desing

---
 mojotrollz/api/api_mojotrollz.php                 |  8 +++++++-
 mojotrollz/api/autoload.inc                       |  3 ++-
 mojotrollz/api/qq/MOJOTROLLZ_SERVER_INSERT.php    |  8 ++++++++
 mojotrollz/page/default_start/js/default_start.js | 15 +++++++++++++++
 .../page/default_start/tpl/content_client.tpl     |  6 +++---
 .../page/default_start/tpl/content_more.tpl       |  4 ++--
 .../page/default_start/tpl/content_server.tpl     |  4 ++--
 .../page/default_start/tpl/serverlist_tr.tpl      |  6 +++---
 mojotrollz/sql/DATA_MOJOTROLLZ.php                |  3 ++-
 ...lz_server.sql => schema_mojotrollz_server.sql} |  3 +++
 mojotrollz/sql/mysql/system_api.sql               |  1 +
 11 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 mojotrollz/api/qq/MOJOTROLLZ_SERVER_INSERT.php
 rename mojotrollz/sql/mysql/{meta_mojotrollz_server.sql => schema_mojotrollz_server.sql} (75%)
 create mode 100644 mojotrollz/sql/mysql/system_api.sql

diff --git a/mojotrollz/api/api_mojotrollz.php b/mojotrollz/api/api_mojotrollz.php
index ef680ef..1442200 100644
--- a/mojotrollz/api/api_mojotrollz.php
+++ b/mojotrollz/api/api_mojotrollz.php
@@ -1,2 +1,8 @@
 <?php
-class api_mojotrollz extends \SYSTEM\API\api_system {}
\ No newline at end of file
+class api_mojotrollz extends \SYSTEM\API\api_system {
+    public static function call_mojo_action_newserver($address){
+        return  \SQL\MOJOTROLLZ_SERVER_INSERT::QI(array($address,$address)) ?
+                \SYSTEM\LOG\JsonResult::ok() :
+                \SYSTEM\LOG\JsonResult::fail();
+    }
+}
\ No newline at end of file
diff --git a/mojotrollz/api/autoload.inc b/mojotrollz/api/autoload.inc
index d94a324..1169da8 100644
--- a/mojotrollz/api/autoload.inc
+++ b/mojotrollz/api/autoload.inc
@@ -1,2 +1,3 @@
 <?php
-SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
\ No newline at end of file
+SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SQL');
\ No newline at end of file
diff --git a/mojotrollz/api/qq/MOJOTROLLZ_SERVER_INSERT.php b/mojotrollz/api/qq/MOJOTROLLZ_SERVER_INSERT.php
new file mode 100644
index 0000000..b0c9aa3
--- /dev/null
+++ b/mojotrollz/api/qq/MOJOTROLLZ_SERVER_INSERT.php
@@ -0,0 +1,8 @@
+<?php
+namespace SQL;
+class MOJOTROLLZ_SERVER_INSERT extends \SYSTEM\DB\QP {
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'INSERT INTO mojotrollz_server (`name`,`url`) VALUES(?,?);';
+    }
+}
\ No newline at end of file
diff --git a/mojotrollz/page/default_start/js/default_start.js b/mojotrollz/page/default_start/js/default_start.js
index 2ca5344..fb861d2 100644
--- a/mojotrollz/page/default_start/js/default_start.js
+++ b/mojotrollz/page/default_start/js/default_start.js
@@ -10,4 +10,19 @@ function init_start(){
             $(this).removeClass('active');});
         $(this).parent().addClass('active');
     });
+    
+    $("#newserver_form input").not("[type=submit]").jqBootstrapValidation({
+        preventSubmit: true,
+        submitError: function($form, event, errors) {},
+        submitSuccess: function($form, event){            
+            $.getJSON('./api.php?call=mojo&action=newserver&address='+encodeURIComponent($('#input_server_address').val()), function (data) {
+                if(data.status){
+                    $('.help-block').html("Registered new Server successfully. Wait for its approval!");
+                } else {
+                    $('.help-block').html("An Error occurred. Could not register new Server.");
+                }
+            });
+            event.preventDefault();
+        }
+    });
 }
\ No newline at end of file
diff --git a/mojotrollz/page/default_start/tpl/content_client.tpl b/mojotrollz/page/default_start/tpl/content_client.tpl
index a5eb030..ed05321 100644
--- a/mojotrollz/page/default_start/tpl/content_client.tpl
+++ b/mojotrollz/page/default_start/tpl/content_client.tpl
@@ -13,7 +13,7 @@
                 <div style="padding-top:20px; padding-left: 75px; font-size: 16px;">
                     <img style="float:right; margin-right:20px;" data-pyroimage="true" src="./api.php?call=files&cat=content&id=wow_normal.png" alt="Windows" height="48" width="48">
                     <div><a href="${magnet_clssic}">WoW 1.12.1</a></div>
-                    <div style="font-size: 10px;">Open this file with <a href="http://www.qbittorrent.org/download.php" target="blank">qBittorrent</a></div>
+                    <div style="font-size: 10px;">Download this file with <a href="http://www.qbittorrent.org/download.php" target="blank">qBittorrent</a></div>
                 </div>
                 </a>
             </div>
@@ -22,7 +22,7 @@
                     <div style="padding-top:20px; padding-left: 75px; font-size: 16px;">
                         <img style="float:right; margin-right:20px;" data-pyroimage="true" src="./api.php?call=files&cat=content&id=wow_bc_normal.png" alt="Windows" height="48" width="48">
                         <div><a href="${magnet_bc}">WoW 2.4.3</a></div>
-                        <div style="font-size: 10px;">Open this file with <a href="http://www.qbittorrent.org/download.php" target="blank">qBittorrent</a></div>
+                        <div style="font-size: 10px;">Download this file with <a href="http://www.qbittorrent.org/download.php" target="blank">qBittorrent</a></div>
                     </div>
                 </a>
             </div>
@@ -31,7 +31,7 @@
                     <div style="padding-top:20px; padding-left: 75px; font-size: 16px;">
                         <img style="float:right; margin-right:20px;" data-pyroimage="true" src="./api.php?call=files&cat=content&id=wow_wotlk_normal.png" alt="Windows" height="48" width="48">
                         <div><a href="${magnet_wotlk}">WoW 3.3.5a</a></div>
-                        <div style="font-size: 10px;">Open this file with <a href="http://www.qbittorrent.org/download.php" target="blank">qBittorrent</a></div>
+                        <div style="font-size: 10px;">Download this file with <a href="http://www.qbittorrent.org/download.php" target="blank">qBittorrent</a></div>
                     </div>
                 </a>
             </div>
diff --git a/mojotrollz/page/default_start/tpl/content_more.tpl b/mojotrollz/page/default_start/tpl/content_more.tpl
index 834cbc4..53c5ae1 100644
--- a/mojotrollz/page/default_start/tpl/content_more.tpl
+++ b/mojotrollz/page/default_start/tpl/content_more.tpl
@@ -8,9 +8,9 @@
         </div>
         <div class="col-md-4">
             <a href="#!login">LOGIN</a><br><br>
-            <a href="#!login(register)">REGISTER</a><br><br>
+            <!--<a href="#!login(register)">REGISTER</a><br><br>
             <a href="#!guild">GUILD PAGES</a><br><br>
-            <a href="#!gshirt">GUILD SHIRTS</a><br><br>
+            <a href="#!gshirt">GUILD SHIRTS</a><br><br>-->
         </div>
         <div class="col-md-4">
             <a href="#!impressum">IMPRESSUM</a><br><br>
diff --git a/mojotrollz/page/default_start/tpl/content_server.tpl b/mojotrollz/page/default_start/tpl/content_server.tpl
index 9f78f15..b77c226 100644
--- a/mojotrollz/page/default_start/tpl/content_server.tpl
+++ b/mojotrollz/page/default_start/tpl/content_server.tpl
@@ -11,13 +11,13 @@
             </tr>
             ${server_list}
         </table>
-        <form class="textbox trojan" style="padding:10px" id="contact_form">
+        <form class="textbox trojan" style="padding:10px" id="newserver_form">
             <div class="help-block"></div>
             <div class="control-group">
                 <div class="controls" style="float: left; width: 450px;">
                     <input class="form-control text_width"
                            type="text"
-                           id="input_contact_name"
+                           id="input_server_address"
                            placeholder="Address of the new Server "
                            required data-validation-required-message="Please tell us the Server's Address ;-).">
                 </div>&nbsp;
diff --git a/mojotrollz/page/default_start/tpl/serverlist_tr.tpl b/mojotrollz/page/default_start/tpl/serverlist_tr.tpl
index e97a5a4..cf1e71f 100644
--- a/mojotrollz/page/default_start/tpl/serverlist_tr.tpl
+++ b/mojotrollz/page/default_start/tpl/serverlist_tr.tpl
@@ -1,8 +1,8 @@
 <tr>
     <td><a href="${url}" target="blank">${name}</a></td>
     <td>
-        <img style="" data-pyroimage="true" src="./api.php?call=files&cat=content&id=${version}" alt="Windows" height="48" width="48">
+        <img style="" data-pyroimage="true" src="./api.php?call=files&cat=content&id=${version}" alt="WoW" height="48" width="48">
     </td>
-    <td>Score</td>
-    <td>Vote</td>
+    <td>${score}</td>
+    <td>${vote}</td>
 </tr>
\ No newline at end of file
diff --git a/mojotrollz/sql/DATA_MOJOTROLLZ.php b/mojotrollz/sql/DATA_MOJOTROLLZ.php
index 1028ccf..6d39edb 100644
--- a/mojotrollz/sql/DATA_MOJOTROLLZ.php
+++ b/mojotrollz/sql/DATA_MOJOTROLLZ.php
@@ -4,6 +4,7 @@ class DATA_MOJOTROLLZ extends \SYSTEM\DB\QI {
     public static function get_class(){return \get_class();}
     public static function files_mysql(){
         return array(   \SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_page.sql'),
-                        \SYSTEM\SERVERPATH(new \PSQL(),'/mysql/meta_mojotrollz_server.sql'));
+                        \SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_api.sql'),
+                        \SYSTEM\SERVERPATH(new \PSQL(),'/mysql/schema_mojotrollz_server.sql'));
     }    
 }
\ No newline at end of file
diff --git a/mojotrollz/sql/mysql/meta_mojotrollz_server.sql b/mojotrollz/sql/mysql/schema_mojotrollz_server.sql
similarity index 75%
rename from mojotrollz/sql/mysql/meta_mojotrollz_server.sql
rename to mojotrollz/sql/mysql/schema_mojotrollz_server.sql
index da22206..c8e64df 100644
--- a/mojotrollz/sql/mysql/meta_mojotrollz_server.sql
+++ b/mojotrollz/sql/mysql/schema_mojotrollz_server.sql
@@ -4,7 +4,10 @@ CREATE TABLE `mojotrollz_server` (
 	`url` CHAR(50) NOT NULL,
 	`version` INT(11) NULL DEFAULT NULL,
 	`visible` INT(11) NULL DEFAULT NULL,
+	`score` INT(11) NOT NULL DEFAULT '0',
 	PRIMARY KEY (`id`)
 )
+COLLATE='utf8_general_ci'
 ENGINE=InnoDB
+AUTO_INCREMENT=2
 ;
diff --git a/mojotrollz/sql/mysql/system_api.sql b/mojotrollz/sql/mysql/system_api.sql
new file mode 100644
index 0000000..aaa7e4e
--- /dev/null
+++ b/mojotrollz/sql/mysql/system_api.sql
@@ -0,0 +1 @@
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (200, 0, 2, 11, 'newserver', 'address', 'STRING');
\ No newline at end of file