diff --git a/lib/system b/lib/system index 2d9d242..d9e3857 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 2d9d242a297bab7aa0f16a5e726f37892776d924 +Subproject commit d9e385714bbdc868a6f504d9eb3bf76c452d42e9 diff --git a/mojotrollz/api/api_mojotrollz.php b/mojotrollz/api/api_mojotrollz.php index 397c02d..95cb3ec 100644 --- a/mojotrollz/api/api_mojotrollz.php +++ b/mojotrollz/api/api_mojotrollz.php @@ -10,4 +10,23 @@ class api_mojotrollz extends \SYSTEM\API\api_system { \SYSTEM\LOG\JsonResult::ok() : \SYSTEM\LOG\JsonResult::fail(); } + + public static function call_mojo_action_register($username, $password, $email, $wowpassword, $betakey = null){ + if(!$betakey || !\SAI\saimod_mojotrollz_beta::code_check($betakey)){ + throw new \SYSTEM\LOG\ERROR('Beta Key invalid.');} + if(!\SYSTEM\SECURITY\Security::available($username) || !self::wow_username_available($username)){ + throw new \SYSTEM\LOG\ERROR('Username is not available.');} + + if( !\SYSTEM\SECURITY\Security::create($username, $password, $email, \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG)) || + !self::wow_account_register($username,$email,$wowpassword)){ + throw new ERROR("Account creation failed. Retry later.");} + + \SAI\saimod_mojotrollz_beta::code_use($betakey, \SYSTEM\SECURITY\Security::getUser()->id); + return JsonResult::ok(); + } + + private static function wow_username_available($username){ + return \SQL\MOJO_ACCOUNT_AVAILABLE::Q1(array($username), new \SQL\mangos_realm())['count'] == 0;} + private static function wow_account_register($username,$email,$password){ + return \SQL\MOJO_ACCOUNT_REGISTER::QI(array($username,$email,$password), new \SQL\mangos_realm());} } \ No newline at end of file diff --git a/mojotrollz/api/qq/MOJO_ACCOUNT_AVAILABLE.php b/mojotrollz/api/qq/MOJO_ACCOUNT_AVAILABLE.php new file mode 100644 index 0000000..bc6ebed --- /dev/null +++ b/mojotrollz/api/qq/MOJO_ACCOUNT_AVAILABLE.php @@ -0,0 +1,8 @@ +key=$key;} public function html(){ - if(\SQL\BETA_CHECK_CODE::Q1(array($this->key))['count'] == 0){ + if(!\SAI\saimod_mojotrollz_beta::code_check($this->key)){ $vars = \SYSTEM\PAGE\text::tag('mojotrollz'); $vars['invalid_key'] = $this->key ? '

Your key is invalid or already in use!

' : ''; + $vars['beta_area'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? + \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_beta/tpl/beta_loggedin.tpl'), array('email' => \SYSTEM\SECURITY\Security::getUser()->email)) : + \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_beta/tpl/beta_loggedout.tpl')); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_beta/tpl/beta.tpl'), $vars); } $vars = \SYSTEM\PAGE\text::tag('basic'); diff --git a/mojotrollz/page/default_beta/js/default_beta.js b/mojotrollz/page/default_beta/js/default_beta.js index 812db92..6218e58 100644 --- a/mojotrollz/page/default_beta/js/default_beta.js +++ b/mojotrollz/page/default_beta/js/default_beta.js @@ -8,19 +8,26 @@ function init_beta(){ 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; - + var username = $('#register_username').val(); + var password = $('#user_register_password2').val(); + var register_data = { + call: 'mojo', + action: 'register', + username: username, + password: $.sha1(password), + email: $('#register_email').val(), + wowpassword: $.sha1(username.toUpperCase()+':'+password.toUpperCase()), + betakey: $('#beta_key').val() + } $.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 + url: './api.php', + data: register_data, + success: function (data) { + if(data.status){ // reload -> user will be loged in location.reload(); }else{ // show errors - alert('Not successfull: '+dataCreate); + $('.help-block').html(data.result.message); } } }); diff --git a/mojotrollz/page/default_beta/tpl/beta.tpl b/mojotrollz/page/default_beta/tpl/beta.tpl index 6403da5..b3d526f 100644 --- a/mojotrollz/page/default_beta/tpl/beta.tpl +++ b/mojotrollz/page/default_beta/tpl/beta.tpl @@ -13,11 +13,7 @@
You require a Beta-Key to register. -
- -

- -
+ ${beta_area}
diff --git a/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl b/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl new file mode 100644 index 0000000..20fd5b9 --- /dev/null +++ b/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl @@ -0,0 +1,3 @@ +
+ You are logged in as ${email} +
\ No newline at end of file diff --git a/mojotrollz/page/default_beta/tpl/beta_loggedout.tpl b/mojotrollz/page/default_beta/tpl/beta_loggedout.tpl new file mode 100644 index 0000000..3767ea2 --- /dev/null +++ b/mojotrollz/page/default_beta/tpl/beta_loggedout.tpl @@ -0,0 +1,5 @@ +
+ +

+ +
\ 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 index 5b96aff..140cb3f 100644 --- a/mojotrollz/page/default_beta/tpl/beta_register.tpl +++ b/mojotrollz/page/default_beta/tpl/beta_register.tpl @@ -17,7 +17,7 @@ id="register_username" placeholder="peter" minlength="3" data-validation-minlength-message="${sai_error_username_short}" - required data-validation-required-message="${sai_error_username_miss}"/> + required data-validation-required-message="Username required"/>
@@ -32,7 +32,7 @@ id="register_email" placeholder="${basic_placeholder_email}" data-validation-email-message="${sai_error_email_wrong}" - required data-validation-required-message="${sai_error_email_miss}"/> + required data-validation-required-message="EMail required"/>
@@ -49,7 +49,7 @@ name="user_register_password1" placeholder="${basic_placeholder_password}" minlength="5" data-validation-minlength-message="${sai_error_password_short}" - required data-validation-required-message="${sai_error_password_miss}"/> + required data-validation-required-message="Password required"/>
@@ -60,7 +60,7 @@ name="user_register_password2" placeholder="${basic_placeholder_password}" data-validation-matches-match="user_register_password1" - data-validation-matches-message="${sai_error_password_match}"/> + data-validation-matches-message="Password missmatch"/>
@@ -68,8 +68,9 @@ - +

+ diff --git a/mojotrollz/page/default_page/css/default_page.css b/mojotrollz/page/default_page/css/default_page.css index 31c3f40..133c270 100644 --- a/mojotrollz/page/default_page/css/default_page.css +++ b/mojotrollz/page/default_page/css/default_page.css @@ -77,4 +77,8 @@ mojotrollz_download_first{ padding-left: 50px; padding-right: 50px; padding-bottom: 15px; +} + +.ontop{ + z-index: 3; } \ No newline at end of file diff --git a/mojotrollz/page/default_page/tpl/default_page.tpl b/mojotrollz/page/default_page/tpl/default_page.tpl index e44875f..d7dcc14 100644 --- a/mojotrollz/page/default_page/tpl/default_page.tpl +++ b/mojotrollz/page/default_page/tpl/default_page.tpl @@ -5,6 +5,7 @@ + ${meta_title} @@ -46,33 +47,29 @@
-

${mojotrollz_heading}

+

${mojotrollz_heading}

    -
  • slider_image_01.jpg
    • -
  • slider_image_02.jpg
    • - -
  • slider_image_03.jpg
    • -
  • slider_image_03.jpg
    • - +
  • WoW Classic Vanilla Banner
    • +
  • WoW The Burning Crusade Banner
    • +
  • World of Warcraft Pandaria Banner
    • +
  • The Struggle of our Community Banner
diff --git a/mojotrollz/sai/saimod_mojotrollz_beta/saimod_mojotrollz_beta.php b/mojotrollz/sai/saimod_mojotrollz_beta/saimod_mojotrollz_beta.php index 2c50b9a..5363514 100644 --- a/mojotrollz/sai/saimod_mojotrollz_beta/saimod_mojotrollz_beta.php +++ b/mojotrollz/sai/saimod_mojotrollz_beta/saimod_mojotrollz_beta.php @@ -2,7 +2,7 @@ namespace SAI; class saimod_mojotrollz_beta extends \SYSTEM\SAI\SaiModule { public static function code_check($code){ - return \SQL\BETA_CHECK_CODE::Q1(array($code))['count'] >= 0 ? true : false;} + return \SQL\BETA_CHECK_CODE::Q1(array($code))['count'] > 0;} public static function code_use($code,$user_new){ return \SQL\BETA_USE_CODE::QI(array($user_new,$code));} diff --git a/mojotrollz/sql/mangos_realm.php b/mojotrollz/sql/mangos_realm.php new file mode 100644 index 0000000..a55feab --- /dev/null +++ b/mojotrollz/sql/mangos_realm.php @@ -0,0 +1,8 @@ +ts3:mojotrollz.eu', 10, 10, '2015-09-18 00:05:21', '2015-09-18 00:05:21'); REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('mojotrollz_download_qbittorrent', 'enUS', 'Download this file with qBittorrent', 10, 10, '2015-09-17 23:57:31', '2015-09-17 23:57:31'); @@ -90,4 +91,9 @@ REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('webcraft_impressum', 'webc REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_login', 'mojotrollz'); REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_username', 'mojotrollz'); -REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_password', 'mojotrollz'); \ No newline at end of file +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_password', 'mojotrollz'); + +REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('mojotrollz_progressive', 'enUS', '

Patch 0 - Beta


Patch 1 - Skettis



Patch 2 - Big Boy





Patch 3 - kara pre relief





Patch 4 - zul\'aman





Patch 5 - the island



Content Not Available from Start


', 10, 10, '2015-12-26 04:36:14', '2015-12-26 04:36:14'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('meta_keywords', 'meta'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('meta_keywords', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('mojotrollz_progressive', 'mojotrollz'); \ No newline at end of file