diff --git a/lib/system b/lib/system index b9416d5..88a19b1 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit b9416d5b91da71eee8f1e27792478f0b42760d39 +Subproject commit 88a19b1b98c69a7b66dfb20f703bb9aef1dcaf16 diff --git a/mojotrollz/api/api_mojotrollz.php b/mojotrollz/api/api_mojotrollz.php index db4ed4c..a0071bd 100644 --- a/mojotrollz/api/api_mojotrollz.php +++ b/mojotrollz/api/api_mojotrollz.php @@ -11,17 +11,14 @@ class api_mojotrollz extends \SYSTEM\API\api_system { \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.');} + public static function call_mojo_action_register($username, $password, $email, $wowpassword){ 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(); } diff --git a/mojotrollz/page/default_donate/tpl/donate.tpl b/mojotrollz/page/default_donate/tpl/donate.tpl index adf1f53..671271e 100644 --- a/mojotrollz/page/default_donate/tpl/donate.tpl +++ b/mojotrollz/page/default_donate/tpl/donate.tpl @@ -1,16 +1,6 @@
We accept Bitcoin-Donations for Mojotrollz.eu
-Feel free to donate any amount you like us to receive. We will use those Donations to keep the Server Up and running. - There is no Reward for donating yet - but you can be assured you have our deepest respect and be considered a Founder. - If there will be Rewards for Donating in the Future you previous Donations will give you a special something so everyone - can see how generous you are. -
-Why Bitcoin you ask? Because its Anonymous. If we use Bitcoin there is bigger Chance to not get in Trouble even if larger - Amounts of Payments are received. We value our and your Anonymity - therefore Bitcoin! -
+ ${mojotrollz_donate}