diff --git a/api.php b/api.php index d03d31f..79bc426 100644 --- a/api.php +++ b/api.php @@ -16,5 +16,5 @@ if(!$json){ //Construct the api with the dasense specific ApiVerfy Class and the call handler for da-sense api-calls ApiClass //ApiClass contains all stuff you would seek in the index -> look there -echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'api_mojotrollz',$json); +echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'api_mojotrollz_beta',$json); new \SYSTEM\LOG\COUNTER("API was called sucessfully."); \ No newline at end of file diff --git a/mojotrollz/api/api_mojotrollz.sql b/mojotrollz/api/api_mojotrollz.sql index 378ecff..24da714 100644 --- a/mojotrollz/api/api_mojotrollz.sql +++ b/mojotrollz/api/api_mojotrollz.sql @@ -9,6 +9,7 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (25, 0, 2, 11, 'create', 'password_sha', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (26, 0, 2, 11, 'create', 'email', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (27, 0, 2, 11, 'create', 'locale', 'LANG'); + INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (30, 0, 2, 10, 'files', 'cat', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (31, 0, 3, 10, 'files', 'id', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (40, 0, 2, 10, 'text', 'request', 'STRING'); diff --git a/mojotrollz/api/autoload.inc b/mojotrollz/api/autoload.inc index 2248791..6a5694c 100644 --- a/mojotrollz/api/autoload.inc +++ b/mojotrollz/api/autoload.inc @@ -5,6 +5,7 @@ require_once dirname(__FILE__).'/realm/autoload.inc'; require_once dirname(__FILE__).'/world/autoload.inc'; require_once dirname(__FILE__).'/database/autoload.inc'; require_once dirname(__FILE__).'/map/autoload.inc'; +SYSTEM\autoload::registerFolder(dirname(__FILE__).'/beta',''); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/char',''); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/char/qq','DBD'); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/client',''); \ No newline at end of file diff --git a/mojotrollz/api/beta/Security.php b/mojotrollz/api/beta/Security.php new file mode 100644 index 0000000..4aa8d73 --- /dev/null +++ b/mojotrollz/api/beta/Security.php @@ -0,0 +1,49 @@ +id; + + //WoW Account + $result = \DBD\ACCOUNT_CREATE::QI(array($username,$wow_password,$email)); + + if(!$result){ + throw new ERROR("WoW Account creation fail!");} + $user_wow = \DBD\ACCOUNT_GET_ID::Q1(array($username))['id']; + + //mojotrollz_user + $result = \DBD\ACCOUNT_CREATE_MOJOTROLLZ::QI(array($user_system,$user_wow)); + if(!$result){ + throw new ERROR("System-Account - WoW-Account creation fail");} + + //Character + //if(!charcreation::save($user_wow)){ + // throw new ERROR("Character creation fail!");} + + //Update BetaCode + saimod_mojotrollz_beta::code_use($betacode, $user_system); + + //std system result + return JsonResult::toString(\SYSTEM\DBD\SYS_SECURITY_LOGIN_SHA1::Q1(array($username, $password),array($username, $username, $password))); + } +} diff --git a/mojotrollz/api/beta/api_mojotrollz_beta.php b/mojotrollz/api/beta/api_mojotrollz_beta.php new file mode 100644 index 0000000..a9d2772 --- /dev/null +++ b/mojotrollz/api/beta/api_mojotrollz_beta.php @@ -0,0 +1,5 @@ + self::DEFAULT_CHAR_NAME, 'char_gender' => self::DEFAULT_CHAR_GENDER, diff --git a/mojotrollz/api/char/charcreation_validator.php b/mojotrollz/api/char/charcreation_validator.php index e2fb778..d673baf 100644 --- a/mojotrollz/api/char/charcreation_validator.php +++ b/mojotrollz/api/char/charcreation_validator.php @@ -99,7 +99,7 @@ class charcreation_validator { } public static function is_char_equip($value){ - return false;} + return true;} public static function char_equip($value){} public static function is_char_guild($value){ diff --git a/mojotrollz/api/char/qq/CHAR_CREATE.php b/mojotrollz/api/char/qq/CHAR_CREATE.php new file mode 100644 index 0000000..a27c36a --- /dev/null +++ b/mojotrollz/api/char/qq/CHAR_CREATE.php @@ -0,0 +1,28 @@ + user will be loged in + window.location.href = location.href; + }else{ // show errors + alert('Not successfull: '+data.result.message); + } + } + }); + } + }); } \ No newline at end of file diff --git a/mojotrollz/page/wizard_register/tpl/register.tpl b/mojotrollz/page/wizard_register/tpl/register.tpl index 310afe8..b819407 100644 --- a/mojotrollz/page/wizard_register/tpl/register.tpl +++ b/mojotrollz/page/wizard_register/tpl/register.tpl @@ -1,59 +1,65 @@
-

${register_title}

-
+

Register 'ur Mojotrollz Account

+
and create your Character
+
+ id="register_username" + placeholder="${basic_username}" + minlength="3" data-validation-minlength-message="${sai_error_username_short}" + maxlength="16" data-validation-maxlength-message="${sai_error_username_long}" + required data-validation-required-message="${sai_error_username_miss}"/>
+ id="register_email" + placeholder="${basic_email}" + data-validation-email-message="${sai_error_email_wrong}" + required data-validation-required-message="${sai_error_email_miss}"/>
-
- -
-
- +
+
+ +
+
+
+ +
+
-
+
+ id="register_betacode" + placeholder="BetaCode" + minlength="12" data-validation-minlength-message="Incorrect Beta Code!" + maxlength="12" data-validation-maxlength-message="Incorrect Beta Code!" + required data-validation-required-message="A Beta Code is required!"/>
-
+
+
+
diff --git a/mojotrollz/page/wizard_register/wizard_register.php b/mojotrollz/page/wizard_register/wizard_register.php index 77012fe..1292c77 100644 --- a/mojotrollz/page/wizard_register/wizard_register.php +++ b/mojotrollz/page/wizard_register/wizard_register.php @@ -11,7 +11,8 @@ class wizard_register extends SYSTEM\PAGE\Page { $vars['BG'] = \SYSTEM\FILES\files::getURL('backgrounds'); $vars['BUTTONS'] = \SYSTEM\FILES\files::getURL('buttons'); $vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons'); - $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); + $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_BASIC)); + $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_SYSTEM_SAI_ERROR)); $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT)); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_register/tpl/register.tpl'), $vars); } diff --git a/mojotrollz/page/wizard_start/wizard_start.php b/mojotrollz/page/wizard_start/wizard_start.php index beec22e..ec84d9b 100644 --- a/mojotrollz/page/wizard_start/wizard_start.php +++ b/mojotrollz/page/wizard_start/wizard_start.php @@ -17,7 +17,7 @@ class wizard_start extends SYSTEM\PAGE\Page { $vars['realm_status'] = realm::status(); $vars['world_status'] = world::status(); $vars['player_online'] = database::player_online(); - $vars['project_perc'] = \SYSTEM\SAI\saimod_sys_todo::statistics()['project_perc']; + $vars['project_perc'] = \SYSTEM\SAI\saimod_sys_todo::statistics()['project']; $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE), \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_SERVERINFO), diff --git a/mojotrollz/sai/autoload.inc b/mojotrollz/sai/autoload.inc index c04970a..d8fe720 100644 --- a/mojotrollz/sai/autoload.inc +++ b/mojotrollz/sai/autoload.inc @@ -1,14 +1,16 @@ = 0 ? true : false;} + + public static function code_use($code,$user_new){ + return \DBD\BETA_USE_CODE::QI(array($user_new,$code));} + + public static function sai_mod_saimod_mojotrollz_beta_action_del($code){ + \DBD\BETA_DELETE_CODE::QI(array($code)); + return JsonResult::ok();} + public static function sai_mod_saimod_mojotrollz_beta($generate = false){ + $vars = array(); + $vars['entries'] = $vars['beta_code'] = ''; + + if($generate){ + $vars['beta_code'] = substr(sha1(rand(1, 99999)), 1, 12); + if(!\DBD\BETA_INSERT_CODE::QI(array($vars['beta_code'], \SYSTEM\SECURITY\Security::getUser()->id))){ + $vars['beta_code'] = 'generate code failed. Retry!';} + } + + $res = \DBD\BETA_GET_CODE::QQ(); + while($code = $res->next()){ + $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_beta/tpl/beta_entry.tpl'), $code);} + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_beta/tpl/beta.tpl'), $vars);} + + public static function html_li_menu(){return '
  • Beta
  • ';} + public static function right_public(){return false;} + public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} + public static function sai_mod_saimod_mojotrollz_beta_flag_js(){return \SYSTEM\LOG\JsonResult::toString(array( + \SYSTEM\WEBPATH(new PSAI(),'saimod_mojotrollz_beta/js/saimod_mojotrollz_beta.js')));} + public static function sai_mod_saimod_mojotrollz_beta_flag_css(){return \SYSTEM\LOG\JsonResult::toString(array());} +} \ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_beta/tpl/beta.tpl b/mojotrollz/sai/saimod_mojotrollz_beta/tpl/beta.tpl new file mode 100644 index 0000000..b41caad --- /dev/null +++ b/mojotrollz/sai/saimod_mojotrollz_beta/tpl/beta.tpl @@ -0,0 +1,14 @@ +
    + ${beta_code} + +
    +
    + + + + + + + + ${entries} +
    Codeuseruser_newAction
    \ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_beta/tpl/beta_entry.tpl b/mojotrollz/sai/saimod_mojotrollz_beta/tpl/beta_entry.tpl new file mode 100644 index 0000000..52793e0 --- /dev/null +++ b/mojotrollz/sai/saimod_mojotrollz_beta/tpl/beta_entry.tpl @@ -0,0 +1,6 @@ + + ${code} + ${name_user} + ${name_user_new} + + \ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_db_account/autoload.inc b/mojotrollz/sai/saimod_mojotrollz_db_account/autoload.inc new file mode 100644 index 0000000..851a7fa --- /dev/null +++ b/mojotrollz/sai/saimod_mojotrollz_db_account/autoload.inc @@ -0,0 +1,4 @@ +next()){ + $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_account/tpl/account_entry.tpl'), $acc);} + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_account/tpl/account.tpl'), $vars);} + + public static function html_li_menu(){return '
  • DB:Accounts
  • ';} + public static function right_public(){return false;} + public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} + public static function sai_mod_saimod_mojotrollz_db_account_flag_js(){return \SYSTEM\LOG\JsonResult::toString(array( + \SYSTEM\WEBPATH(new PSAI(),'saimod_mojotrollz_db_account/js/saimod_mojotrollz_db_account.js')));} + public static function sai_mod_saimod_mojotrollz_db_account_flag_css(){return \SYSTEM\LOG\JsonResult::toString(array());} +} \ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_db_account/tpl/account.tpl b/mojotrollz/sai/saimod_mojotrollz_db_account/tpl/account.tpl new file mode 100644 index 0000000..1ca4acf --- /dev/null +++ b/mojotrollz/sai/saimod_mojotrollz_db_account/tpl/account.tpl @@ -0,0 +1,11 @@ +

    Accounts

    +Count: ${count} + + + + + + + + ${entries} +
    IDusernameemailAction
    \ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_db_account/tpl/account_entry.tpl b/mojotrollz/sai/saimod_mojotrollz_db_account/tpl/account_entry.tpl new file mode 100644 index 0000000..7a95920 --- /dev/null +++ b/mojotrollz/sai/saimod_mojotrollz_db_account/tpl/account_entry.tpl @@ -0,0 +1,6 @@ + + ${id} + ${username} + ${email} + + \ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_db_character/autoload.inc b/mojotrollz/sai/saimod_mojotrollz_db_character/autoload.inc new file mode 100644 index 0000000..23ff917 --- /dev/null +++ b/mojotrollz/sai/saimod_mojotrollz_db_character/autoload.inc @@ -0,0 +1,3 @@ +query('SELECT * FROM characters WHERE deleteInfos_Account IS NULL LIMIT 100;'); $vars = array(); $elements = ''; while($row = $res->next()){ $row['name'] = utf8_encode($row['name']); - $elements .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_player/tpl/player.tpl'), $row);} + $elements .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_character/tpl/character.tpl'), $row);} $vars['elements'] = $elements; $vars['map'] = map::generate(6); - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_player/tpl/players.tpl'), $vars); + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_character/tpl/characters.tpl'), $vars); } - public static function html_li_menu(){return '
  • DB:Players
  • ';} + public static function html_li_menu(){return '
  • DB:Characters
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} - public static function sai_mod_saimod_mojotrollz_db_player_flag_js(){return \SYSTEM\LOG\JsonResult::toString(array( + public static function sai_mod_saimod_mojotrollz_db_character_flag_js(){return \SYSTEM\LOG\JsonResult::toString(array( \SYSTEM\WEBPATH(new PAPI(),'database/js/wow.js'), \SYSTEM\WEBPATH(new PAPI(),'map/js/map.js'), - \SYSTEM\WEBPATH(new PSAI(),'saimod_mojotrollz_db_player/js/saimod_mojotrollz_db_player.js') + \SYSTEM\WEBPATH(new PSAI(),'saimod_mojotrollz_db_character/js/saimod_mojotrollz_db_character.js') ));} - public static function sai_mod_saimod_mojotrollz_db_player_flag_css(){return \SYSTEM\LOG\JsonResult::toString(array( + public static function sai_mod_saimod_mojotrollz_db_character_flag_css(){return \SYSTEM\LOG\JsonResult::toString(array( \SYSTEM\WEBPATH(new PAPI(),'map/css/map.css') ));} diff --git a/mojotrollz/sai/saimod_mojotrollz_db_player/tpl/player.tpl b/mojotrollz/sai/saimod_mojotrollz_db_character/tpl/character.tpl similarity index 100% rename from mojotrollz/sai/saimod_mojotrollz_db_player/tpl/player.tpl rename to mojotrollz/sai/saimod_mojotrollz_db_character/tpl/character.tpl diff --git a/mojotrollz/sai/saimod_mojotrollz_db_player/tpl/players.tpl b/mojotrollz/sai/saimod_mojotrollz_db_character/tpl/characters.tpl similarity index 100% rename from mojotrollz/sai/saimod_mojotrollz_db_player/tpl/players.tpl rename to mojotrollz/sai/saimod_mojotrollz_db_character/tpl/characters.tpl diff --git a/mojotrollz/sai/saimod_mojotrollz_db_creature/saimod_mojotrollz_db_creature.php b/mojotrollz/sai/saimod_mojotrollz_db_creature/saimod_mojotrollz_db_creature.php index 75e516e..d173501 100644 --- a/mojotrollz/sai/saimod_mojotrollz_db_creature/saimod_mojotrollz_db_creature.php +++ b/mojotrollz/sai/saimod_mojotrollz_db_creature/saimod_mojotrollz_db_creature.php @@ -7,7 +7,8 @@ class saimod_mojotrollz_db_creature extends \SYSTEM\SAI\SaiModule { $tags = json_decode($tags,true); foreach ($tags as $type=>$value){ if($value == -2){ - tags::del(tags::TAG_TABLE_CREATURE, $id, $type);} + tags::del(tags::TAG_TABLE_CREATURE, $id, $type); + continue;} tags::set(tags::TAG_TABLE_CREATURE, $id, $type, $value);} return JsonResult::ok(); } diff --git a/mojotrollz/sai/saimod_mojotrollz_db_item/saimod_mojotrollz_db_item.php b/mojotrollz/sai/saimod_mojotrollz_db_item/saimod_mojotrollz_db_item.php index 958f402..616f6c2 100644 --- a/mojotrollz/sai/saimod_mojotrollz_db_item/saimod_mojotrollz_db_item.php +++ b/mojotrollz/sai/saimod_mojotrollz_db_item/saimod_mojotrollz_db_item.php @@ -7,7 +7,8 @@ class saimod_mojotrollz_db_item extends \SYSTEM\SAI\SaiModule { $tags = json_decode($tags,true); foreach ($tags as $type=>$value){ if($value == -2){ - tags::del(tags::TAG_TABLE_ITEM, $id, $type);} + tags::del(tags::TAG_TABLE_ITEM, $id, $type); + continue;} tags::set(tags::TAG_TABLE_ITEM, $id, $type, $value);} return JsonResult::ok(); } diff --git a/mojotrollz/sai/saimod_mojotrollz_db_object/saimod_mojotrollz_db_object.php b/mojotrollz/sai/saimod_mojotrollz_db_object/saimod_mojotrollz_db_object.php index 5d9b85f..3ea0b7a 100644 --- a/mojotrollz/sai/saimod_mojotrollz_db_object/saimod_mojotrollz_db_object.php +++ b/mojotrollz/sai/saimod_mojotrollz_db_object/saimod_mojotrollz_db_object.php @@ -7,7 +7,8 @@ class saimod_mojotrollz_db_object extends \SYSTEM\SAI\SaiModule { $tags = json_decode($tags,true); foreach ($tags as $type=>$value){ if($value == -2){ - tags::del(tags::TAG_TABLE_OBJECT, $id, $type);} + tags::del(tags::TAG_TABLE_OBJECT, $id, $type); + continue;} tags::set(tags::TAG_TABLE_OBJECT, $id, $type, $value);} return JsonResult::ok(); } diff --git a/mojotrollz/sai/saimod_mojotrollz_db_player/autoload.inc b/mojotrollz/sai/saimod_mojotrollz_db_player/autoload.inc deleted file mode 100644 index b99f8fe..0000000 --- a/mojotrollz/sai/saimod_mojotrollz_db_player/autoload.inc +++ /dev/null @@ -1,3 +0,0 @@ -$value){ if($value == -2){ - tags::del(tags::TAG_TABLE_QUEST, $id, $type);} + tags::del(tags::TAG_TABLE_QUEST, $id, $type); + continue;} tags::set(tags::TAG_TABLE_QUEST, $id, $type, $value);} return JsonResult::ok(); } diff --git a/mojotrollz/sai/saimod_mojotrollz_db_tags/autoload.inc b/mojotrollz/sai/saimod_mojotrollz_db_tags/autoload.inc index 0513b4d..7ca45cc 100644 --- a/mojotrollz/sai/saimod_mojotrollz_db_tags/autoload.inc +++ b/mojotrollz/sai/saimod_mojotrollz_db_tags/autoload.inc @@ -1,4 +1,5 @@ next()){ - $row['statistics'] = tags::statistics($table,$row['id']); + $row['statistics'] = round(tags::statistics($table,$row['id']),2).'%'; $elements .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_tags/tpl/type_list_element.tpl'),$row);} return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_tags/tpl/type_list.tpl'),array('table' => $table, 'elements' => $elements));} diff --git a/system b/system index 1c02883..5449139 160000 --- a/system +++ b/system @@ -1 +1 @@ -Subproject commit 1c02883a3eacb7fa9e50787597b5aff1f6add490 +Subproject commit 54491390805ded4ca366f355f746c2ee84ae4cbf