From 283dd853b554032b195c92170a3a977c32e9cded Mon Sep 17 00:00:00 2001 From: rylon Date: Thu, 20 Nov 2014 15:31:02 +0100 Subject: [PATCH] summary and validation of char params, toolbar, --- mojotrollz/api/char/charcreation.php | 30 +++++++++- .../api/char/charcreation_validator.php | 56 +++++++++++++++--- mojotrollz/api/database/player_races.php | 28 ++++++++- mojotrollz/api/database/player_spawns.php | 26 +++++++- mojotrollz/files/wowicons/fail.png | Bin 0 -> 616 bytes mojotrollz/files/wowicons/ok.png | Bin 0 -> 744 bytes mojotrollz/files/wowicons/ok_summary.png | Bin 0 -> 7126 bytes .../page/wizard_summary/tpl/summary.tpl | 33 +++++------ .../page/wizard_summary/wizard_summary.php | 10 +++- .../wizard_toolbar/tpl/wizard_toolbar.tpl | 2 +- .../page/wizard_toolbar/wizard_toolbar.php | 1 + 11 files changed, 149 insertions(+), 37 deletions(-) create mode 100644 mojotrollz/files/wowicons/fail.png create mode 100644 mojotrollz/files/wowicons/ok.png create mode 100644 mojotrollz/files/wowicons/ok_summary.png diff --git a/mojotrollz/api/char/charcreation.php b/mojotrollz/api/char/charcreation.php index c5ed73a..7d79274 100644 --- a/mojotrollz/api/char/charcreation.php +++ b/mojotrollz/api/char/charcreation.php @@ -1,11 +1,12 @@ $value){ + if(method_exists('charcreation_validator','is_'.$key)){ + $result[$key.'_ok'] = call_user_func('charcreation_validator::is_'.$key,$value);} + } + + return $result; + } + private static function session_default(){ return array( 'char_name' => self::DEFAULT_CHAR_NAME, 'char_gender' => self::DEFAULT_CHAR_GENDER, @@ -34,7 +58,7 @@ class charcreation { 'char_skill_tree' => 0, 'char_equip' => 0, 'char_guild' => 0, - 'char_spawn' => 0);} + 'char_spawn' => self::DEFAULT_CHAR_SPAWN);} public static function checkClassRace($class,$race){ switch($race){ diff --git a/mojotrollz/api/char/charcreation_validator.php b/mojotrollz/api/char/charcreation_validator.php index 08c5ebe..e705bea 100644 --- a/mojotrollz/api/char/charcreation_validator.php +++ b/mojotrollz/api/char/charcreation_validator.php @@ -1,72 +1,110 @@ 2) && !preg_match('/[^A-Za-z]/',$value);} public static function char_name($value){ $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); - if( strlen($value) > 12 || //strlen($value) < 2 || - preg_match('/[^A-Za-z]/',$value)){ - $data['char_name'] = charcreation::DEFAULT_CHAR_NAME; - } else { - $data['char_name'] = $value;} + $data['char_name'] = self::is_char_name($value) ? $value : charcreation::DEFAULT_CHAR_NAME; \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); } + public static function is_char_gender($value){ + return ($value == ('female' || 'male'));} public static function char_gender($value){ $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); - $data['char_gender'] = ($value == ('female' || 'male')) ? $value : charcreation::DEFAULT_CHAR_GENDER; + $data['char_gender'] = self::is_char_gender($value) ? $value : charcreation::DEFAULT_CHAR_GENDER; \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); } + + public static function is_char_race($value){ + return player_races::is($value);} public static function char_race($value){ $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); $data['char_race'] = $value; - if(!charcreation::checkClassRace($data['char_class'], $data['char_race'])){ + if(!is_char_race($value) || !charcreation::checkClassRace($data['char_class'], $data['char_race'])){ $data['char_class'] = charcreation::DEFAULT_CHAR_CLASS;} \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); } + + public static function is_char_class($value){ + return player_classes::is($value);} public static function char_class($value){ $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); $data['char_class'] = $value; - if(!charcreation::checkClassRace($data['char_class'], $data['char_race'])){ + if(!self::is_char_class($value) || !charcreation::checkClassRace($data['char_class'], $data['char_race'])){ $data['char_race'] = charcreation::DEFAULT_CHAR_RACE;} \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); } + public static function is_char_skin_color($value){ + return true;} public static function char_skin_color($value){ $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); $data['char_skin_color'] = $value; \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); } + + public static function is_char_hair($value){ + return true;} public static function char_hair($value){ $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); $data['char_hair'] = $value; \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); } + + public static function is_char_hair_color($value){ + return true;} public static function char_hair_color($value){ $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); $data['char_hair_color'] = $value; \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); } + public static function is_char_face($value){ + return true;} public static function char_face($value){ $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); $data['char_face'] = $value; \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); } + + public static function is_char_facial_hair($value){ + return true;} public static function char_facial_hair($value){ $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); $data['char_facial_hair'] = $value; \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); } + + public static function is_char_facial_hair_color($value){ + return true;} public static function char_facial_hair_color($value){ $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); $data['char_facial_hair_color'] = $value; \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); } + public static function is_char_skill_tree($value){ + return false;} public static function char_skill_tree($value){} + + public static function is_char_equip($value){ + return false;} public static function char_equip($value){} + + public static function is_char_guild($value){ + return false;} public static function char_guild($value){} + + public static function is_char_spawn($value){ + return player_spawns::is($value);} public static function char_spawn($value){ $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); - $data['char_spawn'] = $value; + if((player_races::is_horde($data['char_race']) && player_spawns::is_horde($value)) || + (player_races::is_alliance($data['char_race']) && player_spawns::is_alliance($value)) ){ + $data['char_spawn'] = $value; + } else { + $data['char_spawn'] = charcreation::DEFAULT_CHAR_SPAWN; + } \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); } } \ No newline at end of file diff --git a/mojotrollz/api/database/player_races.php b/mojotrollz/api/database/player_races.php index bbce732..cf715e7 100644 --- a/mojotrollz/api/database/player_races.php +++ b/mojotrollz/api/database/player_races.php @@ -47,8 +47,8 @@ class player_races { } } - public static function is($class){ - switch($class){ + public static function is($race){ + switch($race){ case self::HUMAN: case self::ORC: case self::DWARF: @@ -62,4 +62,28 @@ class player_races { return false; } } + + public static function is_horde($race){ + switch($race){ + case self::ORC: + case self::SCOURGE: + case self::TAUREN: + case self::TROLL: + return true; + default: + return false; + } + } + + public static function is_alliance($race){ + switch($race){ + case self::HUMAN: + case self::DWARF: + case self::NIGHTELF: + case self::GNOME: + return true; + default: + return false; + } + } } \ No newline at end of file diff --git a/mojotrollz/api/database/player_spawns.php b/mojotrollz/api/database/player_spawns.php index 97ede34..dcf5956 100644 --- a/mojotrollz/api/database/player_spawns.php +++ b/mojotrollz/api/database/player_spawns.php @@ -41,10 +41,32 @@ class player_spawns { switch($city){ case self::UNDERCITY: case self::IRONFORGE: - case self::STROMWIND: + case self::STORMWIND: case self::DARNASSUS: case self::ORGRIMMAR: - case self::THUNDERBLUF: + case self::THUNDERBLUFF: + return true; + default: + return false; + } + } + + public static function is_horde($city){ + switch($city){ + case self::UNDERCITY: + case self::ORGRIMMAR: + case self::THUNDERBLUFF: + return true; + default: + return false; + } + } + + public static function is_alliance($city){ + switch($city){ + case self::IRONFORGE: + case self::STORMWIND: + case self::DARNASSUS: return true; default: return false; diff --git a/mojotrollz/files/wowicons/fail.png b/mojotrollz/files/wowicons/fail.png new file mode 100644 index 0000000000000000000000000000000000000000..307090a43bf45bfd010a2473ef8e94f19394617d GIT binary patch literal 616 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47>xpaLR^8|f6+o;gG9as34aR` z`4TAnC0OL2pYV5(h{(4+t1v^IOl0d0R6ATi5TCEQAH zpO?&wK=GL_%28IjN4=%jc_c=3_4?!ZiwpwL&nzLP$R=O)K zcUPL?qFQXL`6Wo?b)Z<|M5{T#P*W)h@(X6*OIvkvWh!s-ySEA5zkatf{{Ef7@>Vcy z`HAI8uetxkv@mkAT6>v%1*$*j>Eak7At`&%(EEsi%&~{xzvm|vW#k50W&9G9Idbyi z`nRv1)pR#2aoyA@YB?}#%6sE$ zE{i_&ig6;E1gsMbzSk6UjA8Ub(dG|`n^K)b8^4>S-zFhw`Li+UeagvoNg8p my=14M!>hTBOxo*i|7D!Lz+Ah#$=ML-83s>RKbLh*2~7aS^z^O( literal 0 HcmV?d00001 diff --git a/mojotrollz/files/wowicons/ok.png b/mojotrollz/files/wowicons/ok.png new file mode 100644 index 0000000000000000000000000000000000000000..e5c63fa556168ac75a434d195ceb6574d5068f15 GIT binary patch literal 744 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 z -

Summary

+

Summary

- - + - + - + - + - + - + - + - + - + - + - + - + - +
Name ${char_name}${char_name_ok}
Gender ${char_gender_ok}
Race ${char_race_ok}
Class ${char_class_ok}
Skin Color ${char_skin_color}${char_skin_color_ok}
Hair ${char_hair}${char_hair_ok}
Hair Color ${char_hair_color}${char_hair_color_ok}
Face ${char_face}${char_face_ok}
Facial Hair ${char_facial_hair}${char_facial_hair_ok}
Facial Hair Color ${char_facial_hair_color}${char_facial_hair_color_ok}
Skill Tree ${char_skill_tree}${char_skill_tree_ok}
Guild ${char_guild}${char_guild_ok}
Spawn ${char_spawn_ok}
\ No newline at end of file diff --git a/mojotrollz/page/wizard_summary/wizard_summary.php b/mojotrollz/page/wizard_summary/wizard_summary.php index dfe464e..c6ff08a 100644 --- a/mojotrollz/page/wizard_summary/wizard_summary.php +++ b/mojotrollz/page/wizard_summary/wizard_summary.php @@ -2,7 +2,14 @@ class wizard_summary extends SYSTEM\PAGE\Page { public function html(){ - $vars = charcreation::data(NULL,false); + $vars = charcreation::check(); + foreach($vars as $key=>$value){ + if($value){ + $vars[$key] = 'ok'; + } else { + $vars[$key] = 'fail';} + } + $vars = array_merge($vars,charcreation::data(NULL,false)); $vars['char_skin_color'] = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_SKIN,$vars['char_skin_color']))['name']; $vars['char_hair'] = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_HAIR,$vars['char_hair']))['name']; @@ -15,6 +22,7 @@ class wizard_summary extends SYSTEM\PAGE\Page { $vars['char_class'] = player_classes::name($vars['char_class']); $vars['char_spawn'] = player_spawns::name($vars['char_spawn']); + $vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons'); $vars['WOW_GENDER'] = \SYSTEM\FILES\files::getURL('gender'); $vars['WOW_RACE'] = \SYSTEM\FILES\files::getURL('race'); $vars['WOW_CLASS'] = \SYSTEM\FILES\files::getURL('class'); diff --git a/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl b/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl index 4e80a34..bd0c73c 100644 --- a/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl +++ b/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl @@ -6,5 +6,5 @@ - + \ No newline at end of file diff --git a/mojotrollz/page/wizard_toolbar/wizard_toolbar.php b/mojotrollz/page/wizard_toolbar/wizard_toolbar.php index 730b80a..b833341 100644 --- a/mojotrollz/page/wizard_toolbar/wizard_toolbar.php +++ b/mojotrollz/page/wizard_toolbar/wizard_toolbar.php @@ -18,6 +18,7 @@ class wizard_toolbar extends SYSTEM\PAGE\Page { $vars['char_class'] = player_classes::name($vars['char_class']); $vars['char_race'] = player_races::name($vars['char_race']); $vars['char_spawn'] = player_spawns::name($vars['char_spawn']); + $vars['char_summary'] = charcreation::check_all() ? 'ok_summary' : 'default'; $vars['last'] = $this->last; $vars['next'] = $this->next; $vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons');