diff --git a/mojotrollz/page/autoload.inc b/mojotrollz/page/autoload.inc index 15c5816..a7a7ef3 100644 --- a/mojotrollz/page/autoload.inc +++ b/mojotrollz/page/autoload.inc @@ -4,4 +4,5 @@ require_once dirname(__FILE__).'/default_page/autoload.inc'; require_once dirname(__FILE__).'/default_start/autoload.inc'; require_once dirname(__FILE__).'/default_impressum/autoload.inc'; require_once dirname(__FILE__).'/default_login/autoload.inc'; -require_once dirname(__FILE__).'/default_serverlist/autoload.inc'; \ No newline at end of file +require_once dirname(__FILE__).'/default_serverlist/autoload.inc'; +require_once dirname(__FILE__).'/default_beta/autoload.inc'; \ No newline at end of file diff --git a/mojotrollz/page/default_beta/autoload.inc b/mojotrollz/page/default_beta/autoload.inc new file mode 100644 index 0000000..8fd92c5 --- /dev/null +++ b/mojotrollz/page/default_beta/autoload.inc @@ -0,0 +1,2 @@ +key=$key;} + public function html(){ + if(\SQL\BETA_CHECK_CODE::Q1(array($this->key))['count'] == 0){ + $vars = \SYSTEM\PAGE\text::tag('mojotrollz'); + $vars['invalid_key'] = $this->key ? '

Your key is invalid or already in use!

' : ''; + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_beta/tpl/beta.tpl'), $vars); + } + $vars = \SYSTEM\PAGE\text::tag('basic'); + $vars['key'] = $this->key; + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_beta/tpl/beta_register.tpl'), $vars); + } + public static function js(){ + return array( \SYSTEM\WEBPATH(new PPAGE(),'default_beta/js/default_beta.js'), + \LIB\lib_jqbootstrapvalidation::js());} +} \ No newline at end of file diff --git a/mojotrollz/page/default_beta/js/default_beta.js b/mojotrollz/page/default_beta/js/default_beta.js new file mode 100644 index 0000000..812db92 --- /dev/null +++ b/mojotrollz/page/default_beta/js/default_beta.js @@ -0,0 +1,31 @@ +function init_beta(){ + $("#btn_beta").click(function(){ + system.load('beta;key.'+$('#input_beta_key').val()); + }); + + //jqBootstrapValidation + $("#register_user_form input").not("[type=submit]").jqBootstrapValidation({ + preventSubmit: true, + submitError: function (form, event, errors) {}, + submitSuccess: function($form, event){ + var username = document.getElementById('register_username').value; + var email = document.getElementById('register_email').value; + var password = document.getElementById('user_register_password2').value; + + $.ajax({ + dataType: "json", + url: './api.php?call=beta&action=register&username='+username+'&password='+$.sha1(password)+'&email='+email, + data: null, + success: function (dataCreate) { + if(dataCreate === 1){ // reload -> user will be loged in + location.reload(); + }else{ // show errors + alert('Not successfull: '+dataCreate); + } + } + }); + + event.preventDefault(); + } + }); +} \ No newline at end of file diff --git a/mojotrollz/page/default_beta/tpl/beta.tpl b/mojotrollz/page/default_beta/tpl/beta.tpl new file mode 100644 index 0000000..6403da5 --- /dev/null +++ b/mojotrollz/page/default_beta/tpl/beta.tpl @@ -0,0 +1,26 @@ +
+
+
+
+

Mojotrollz Beta

+ ${invalid_key} +
+
+

Join the Beta Here

+
+
+ On this page you will find Information about our progressive Beta Content. +
+ You require a Beta-Key to register. +
+
+ +

+ +
+
+ +
+ ${mojotrollz_progressive} +
+
\ No newline at end of file diff --git a/mojotrollz/page/default_beta/tpl/beta_register.tpl b/mojotrollz/page/default_beta/tpl/beta_register.tpl new file mode 100644 index 0000000..5b96aff --- /dev/null +++ b/mojotrollz/page/default_beta/tpl/beta_register.tpl @@ -0,0 +1,76 @@ +
+
+

Mojotrollz Beta Register Form

+

Your Beta Key is: ${key}

+

+
+
+ + + + + + + + + + + + + + + +
${basic_username} +
+ +
+
+
E-Mail +
+ +
+
+
${basic_password} +
+
+ +
+
+
+ +
+
+
+
+ +

+
+
+
+
\ No newline at end of file diff --git a/mojotrollz/page/default_impressum/tpl/impressum.tpl b/mojotrollz/page/default_impressum/tpl/impressum.tpl index f74a775..b91726a 100644 --- a/mojotrollz/page/default_impressum/tpl/impressum.tpl +++ b/mojotrollz/page/default_impressum/tpl/impressum.tpl @@ -1,5 +1,5 @@
-
+

Impressum

${impressum}
diff --git a/mojotrollz/page/default_login/tpl/login.tpl b/mojotrollz/page/default_login/tpl/login.tpl index 2de9d12..b56b03f 100644 --- a/mojotrollz/page/default_login/tpl/login.tpl +++ b/mojotrollz/page/default_login/tpl/login.tpl @@ -1,5 +1,5 @@
-
+

${basic_login}

diff --git a/mojotrollz/page/default_page/css/default_page.css b/mojotrollz/page/default_page/css/default_page.css index 8458c3d..31c3f40 100644 --- a/mojotrollz/page/default_page/css/default_page.css +++ b/mojotrollz/page/default_page/css/default_page.css @@ -73,7 +73,7 @@ mojotrollz_download_first{ #content_teamspeak{ } -#content_servers, #content_tshirts, #content_addons, #content_impressum, #content_login{ +.mojotrollz_col_content{ padding-left: 50px; padding-right: 50px; padding-bottom: 15px; diff --git a/mojotrollz/page/default_page/tpl/default_page.tpl b/mojotrollz/page/default_page/tpl/default_page.tpl index d8963cd..e44875f 100644 --- a/mojotrollz/page/default_page/tpl/default_page.tpl +++ b/mojotrollz/page/default_page/tpl/default_page.tpl @@ -47,7 +47,8 @@
diff --git a/mojotrollz/page/default_start/tpl/content_addons.tpl b/mojotrollz/page/default_start/tpl/content_addons.tpl index 0fa7a91..492c70a 100644 --- a/mojotrollz/page/default_start/tpl/content_addons.tpl +++ b/mojotrollz/page/default_start/tpl/content_addons.tpl @@ -1,5 +1,5 @@
-
+

${mojotrollz_addons}

diff --git a/mojotrollz/page/default_start/tpl/content_server.tpl b/mojotrollz/page/default_start/tpl/content_server.tpl index c2922a3..9fabf3c 100644 --- a/mojotrollz/page/default_start/tpl/content_server.tpl +++ b/mojotrollz/page/default_start/tpl/content_server.tpl @@ -1,3 +1,3 @@
-
+
\ No newline at end of file diff --git a/mojotrollz/page/default_start/tpl/content_tshirt.tpl b/mojotrollz/page/default_start/tpl/content_tshirt.tpl index 15b36fc..b05b8a0 100644 --- a/mojotrollz/page/default_start/tpl/content_tshirt.tpl +++ b/mojotrollz/page/default_start/tpl/content_tshirt.tpl @@ -1,5 +1,5 @@
-
+

${mojotrollz_tshirts}

diff --git a/mojotrollz/page/page_mojotrollz.php b/mojotrollz/page/page_mojotrollz.php index 676a359..dedf4fb 100644 --- a/mojotrollz/page/page_mojotrollz.php +++ b/mojotrollz/page/page_mojotrollz.php @@ -21,4 +21,7 @@ class page_mojotrollz extends \SYSTEM\API\api_default { public static function page_serverlist(){ return (new default_serverlist())->html();} + + public static function page_beta($key=null){ + return (new default_beta($key))->html();} } \ No newline at end of file diff --git a/mojotrollz/sql/mysql/system_api.sql b/mojotrollz/sql/mysql/system_api.sql index 153994b..fdfa8ea 100644 --- a/mojotrollz/sql/mysql/system_api.sql +++ b/mojotrollz/sql/mysql/system_api.sql @@ -1,2 +1,4 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (200, 0, 2, 11, 'newserver', 'address', 'STRING'); -INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (205, 0, 2, 11, 'vote', 'server', 'INT'); \ No newline at end of file +INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (205, 0, 2, 11, 'vote', 'server', 'INT'); + +INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (210, 1, 3, 1, 'beta', 'key', 'STRING'); \ No newline at end of file diff --git a/mojotrollz/sql/mysql/system_page.sql b/mojotrollz/sql/mysql/system_page.sql index 9c03591..523c7cd 100644 --- a/mojotrollz/sql/mysql/system_page.sql +++ b/mojotrollz/sql/mysql/system_page.sql @@ -4,3 +4,5 @@ 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'); + +INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (25, 1, 'beta', 'beta', -1, 0, 0, '#content', './?page=beta&key=${key}', 'init_beta', 'default_beta');