From 52418632da255a7ae22d38855e2983a35f12e59b Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 30 May 2016 00:17:26 +0200 Subject: [PATCH] #127 email check on account create, updated system reference --- lib/system | 2 +- mojotrollz/api/api_mojotrollz.php | 4 ++-- mojotrollz/sql/mysql/system_text.sql | 18 +++++++++++++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/lib/system b/lib/system index 88a19b1..4e56e23 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 88a19b1b98c69a7b66dfb20f703bb9aef1dcaf16 +Subproject commit 4e56e2399f035e122ea7861e024829b8e4927f9c diff --git a/mojotrollz/api/api_mojotrollz.php b/mojotrollz/api/api_mojotrollz.php index a0071bd..16691ce 100644 --- a/mojotrollz/api/api_mojotrollz.php +++ b/mojotrollz/api/api_mojotrollz.php @@ -12,8 +12,8 @@ class api_mojotrollz extends \SYSTEM\API\api_system { } 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::available($username,$email) || !self::wow_username_available($username)){ + throw new \SYSTEM\LOG\ERROR('EMail is already in use or 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)){ diff --git a/mojotrollz/sql/mysql/system_text.sql b/mojotrollz/sql/mysql/system_text.sql index 687b5dc..260c109 100644 --- a/mojotrollz/sql/mysql/system_text.sql +++ b/mojotrollz/sql/mysql/system_text.sql @@ -110,6 +110,22 @@ REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('meta_start_keywords', 'met REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('meta_start_keywords', 'meta_start'); REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('meta_start_keywords', 'mojotrollz'); +REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('title_article', 'enUS', 'Mojotrollz - Wisdom', 10, 10, '2016-05-28 01:09:53', '2016-05-28 01:09:53'); +REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('title_beta', 'enUS', 'Mojotrollz - Beta', 10, 10, '2016-05-28 01:10:14', '2016-05-28 01:10:14'); +REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('title_donate', 'enUS', 'Mojotrollz - Donate', 10, 10, '2016-05-28 01:09:05', '2016-05-28 01:09:05'); +REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('title_impessum', 'enUS', 'Mojotrollz - Impressum', 10, 10, '2016-05-28 01:10:44', '2016-05-28 01:10:44'); +REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('title_login', 'enUS', 'Mojotrollz - Login', 10, 10, '2016-05-27 23:37:37', '2016-05-27 23:37:37'); +REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('title_register', 'enUS', 'Mojotrollz - Register', 10, 10, '2016-05-28 01:11:22', '2016-05-28 01:11:22'); +REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('title_start', 'enUS', 'MojotrollZ - Your Online Gaming Community', 10, 10, '2016-05-28 01:19:05', '2016-05-28 01:19:05'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('title_article', 'title'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('title_beta', 'title'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('title_donate', 'title'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('title_impessum', 'title'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('title_login', 'title'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('title_register', 'title'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('title_start', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('title_start', 'title'); + REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('mojotrollz_address_server', 'enUS', 'Address of your Server', 10, 10, '2015-09-18 00:50:04', '2015-09-18 00:50:04'); REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('mojotrollz_address_server', 'mojotrollz'); REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('mojotrollz_connect_ts', 'enUS', 'Connect to ts3:mojotrollz.eu', 10, 10, '2015-09-18 00:05:21', '2015-09-18 00:05:21'); @@ -160,7 +176,7 @@ REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('mojotrollz_servers_text', 'mojotrollz'); INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('mojotrollz_donate', 'enUS', '

Donate to Mojotrollz.eu

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

Why Bitcoin you ask? Because its Anonymous. We value your and our Anonymity - therefore Bitcoin!

', 10, 10, '2016-05-28 01:05:50', '2016-05-28 01:05:50'); -INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('mojotrollz_donate', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('mojotrollz_donate', 'mojotrollz'); -- insert to protect this text INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('mojotrollz_progressive', 'enUS', '

mojotrollz.eu TBC Progressive Realm

your original World of Warcraft - The Burning Crusade experience!

Concept

mojotrollz.eu is a progressive Realm. This means that parts of the final content get patched in as we go towards the Endgame. Dungeons like Zul\'Aman and Magister\'s Terrace are accessible at later stages of the servers progress. A lot of other changes and implements come along with that, for example Vendors, Arena Seasons and Reputation requirements just to name some.
The Chronology of the patches is leaned to the original Blizzard patch history. Some simplyfications and adjustments had to be made though, because our players have to use the World of Warcraft 2.4.3 client, which makes certain changes impossible, for example with Terrain.

Timeframe

The speed of the progress is determined by two factors: Time and Threshhold.
We will announce certain timeframes of each episode to come, but if a defined Threshhold is reached before the time elapses, the new progress will come earlier. The Threshhold will contain factors like player numbers, dungeon progress and similar variables.

Custom

Even though mojotrollz.eu is a blizzlike Server, there is custom content existing on the server. For example for utility reasons, such as the "mojocamp" in Shattrath. 

BETA

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

Patch 0 - Beta

Arena Season 1

Arena Season 1 will be used in the closed and open BETA Phase. 






Patch 1 - Skettis

Opening Skettis Daily Quest Area

 The Faction Sha\'tari Skyguards located in the southeast of the Terokkar Forest provides players with multiple daylie Quests for Gold and Reputation. If you become exalted, you can buy an epic riding Mount, the Netherray!






Arena Season 2










Patch 2 - Big Boy


Heroics keys can be purchased with honored reputation

Farming Badges of Justice gets easier. The keys are the only item that sinks in reputation requirements.

Opening The Eye and SSC

The 25man Raid Dungeons Tempest Keep and Serpent Shrine get accessible. To gain access, you have to do a pre-Quest for each of them. The Dungeonbosses drop T5 Gear, and the final bosses Lady Vashj and Prince Kael\'thas are key to the pre-Quest for Caverns of Time 3 - Mount Hyjal. This Patch is key to the Black Temple.









 


Opening Ogri\'la

The Daily Quest Region in Blades Edge Mountains is becoming accessible. You can earn Gold and geld Epix with Reputation.

 







Arena Season 3








Patch 3 - kara pre relief

Karazhan relief

Kara doesn\'t require every Raid Member to possess a key.
 You can enter the 10man Raid Dungeon by opening the gate in front of the Dungeon Portal, and let your mates in.

 






Netherwing faction

The Orcs on the remote flying Mountain in Shadowmoon valley, called "Nethershard", become Questgivers. Their daily Quests reward you with Gold and Reputation. If you get exalted, you can buy a Netherdrake Riding Mount in Lower City in Shattrath. 

 






Arena Season 4


 





Patch 4 - zul\'aman

Opening Zul\'Aman

The Troll Temple of Zul\'Aman opens it\'s gates to the Heroes of the Mojotrollz Tribe! G\'eras in Shattrath sells new Badge of Justice rewards, and all Zul\'Aman related Quests and Items become available. 

Cenarion Hypogryph Reputation Reward

The Cenarion Expedition in Zangar Marsh now sells the Cenarion Warhypogryph to players with Exalted Reputation.

 


Arena Season 5








Patch 5 - the island

Sunwell

At the last stage of the Island Event, the Sunwell will open to the Players. This is the last stage of the original High Level content. 








Arena Season 6

', 10, 11, '2016-01-03 18:11:09', '2016-01-03 18:11:09');