ordered pictures, files, improved several wizard parts, updated system reference

mojotrollz/api/char/charcreation.php

@@ -5,7 +5,7 @@ class charcreation {
     const DEFAULT_CHAR_RACE = 'default';
     const DEFAULT_CHAR_CLASS = 0;
     const MOJO_CC_SESSIONKEY = 'mojo_charcreation';
-    const DEFAULT_CHAR_APPEARANCE = 0;
+    const DEFAULT_CHAR_APPEARANCE = 1;
     public static function data($json = NULL, $returnasjson = true){
         if(!\SYSTEM\SECURITY\Security::load(self::MOJO_CC_SESSIONKEY)){
             \SYSTEM\SECURITY\Security::save(self::MOJO_CC_SESSIONKEY, self::session_default());}
@@ -41,7 +41,7 @@ class charcreation {
             case 'human': return in_array($class,   array(player_classes::WARRIOR, player_classes::ROGUE,  player_classes::PRIEST, player_classes::MAGE,   player_classes::WARLOCK, player_classes::PALADIN));
             case 'ork': return in_array($class,     array(player_classes::WARRIOR, player_classes::HUNTER, player_classes::SHAMAN, player_classes::ROGUE,  player_classes::WARLOCK));
             case 'dwarf': return in_array($class,   array(player_classes::WARRIOR, player_classes::HUNTER, player_classes::ROGUE,  player_classes::PRIEST, player_classes::PALADIN));
-            case 'undead': return in_array($class,  array(player_classes::WARRIOR, player_classes::ROGUE,  player_classes::PRIEST, player_classes::MAGE,   player_classes::WARLOCK)); 
+            case 'scorge': return in_array($class,  array(player_classes::WARRIOR, player_classes::ROGUE,  player_classes::PRIEST, player_classes::MAGE,   player_classes::WARLOCK)); 
             case 'nightelf': return in_array($class,array(player_classes::WARRIOR, player_classes::HUNTER, player_classes::ROGUE,  player_classes::PRIEST, player_classes::DRUID));
             case 'tauren': return in_array($class,  array(player_classes::WARRIOR, player_classes::HUNTER, player_classes::SHAMAN, player_classes::DRUID));
             case 'gnome': return in_array($class,   array(player_classes::WARRIOR, player_classes::ROGUE,  player_classes::MAGE,   player_classes::WARLOCK));

mojotrollz/files/register_files.php

@@ -4,9 +4,14 @@
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/buttons/','buttons','*.png');
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/backgrounds/','backgrounds','*.png');
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/wow_city_icons/','wow_city_icons','*.png');
-\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/default_page/','default_page','*.png');
+
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/skilltree/','skilltree','*.*');
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/skilltree/tree/','skilltree_tree','*.*');
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/skilltree/skills/','skilltree_skills','*.*');
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/skilltree/skills_grey/','skilltree_skills_grey','*.*');
-\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/class/','class','*.*');
+
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/class/','class','*.*');
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/race/','race','*.*');
+
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/default_page/','default_page','*.png');
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/default_start/','default_start','*.png');

mojotrollz/page/default_page/default_page.php

@@ -11,26 +11,22 @@ class default_page extends SYSTEM\PAGE\Page {
                 '<script src="https://www.google.com/jsapi" type="text/javascript"></script>'.
                 '<script type="text/javascript">google.load("visualization", "1", {packages:["corechart"]});</script>'.
                 '<script type="text/javascript" language="JavaScript" src="./api.php?call=files&cat=sys&id=system.js"></script>'.
-                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/wizard.js').'"></script>';
+                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/wizard.js').'"></script>';}
-    }
       
     private function css (){
         return   '<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap.css').'" rel="stylesheet">'.
-                 '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/default_page.css').'" rel="stylesheet">'.
+                 '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/default_page.css').'" rel="stylesheet">';}
-                 //'<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/font.css').'" rel="stylesheet">'.
-                 '<link href="'.SYSTEM\WEBPATH(new PAPI(),'char/css/skilltree.css').'" rel="stylesheet">';
-    }
 
     public function html(){
         $vars = array();               
         $vars['js'] = $this->js();
         $vars['css'] = $this->css();
-        $vars['PICPATH'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=default_page&id=';
+        $vars['PICPATH'] = \SYSTEM\FILES\files::getURL('default_page');
         $vars['copyright'] = '';
         $vars['inprint'] = '';
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE),
                                     \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_SERVERINFO),
                                     \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_BASIC));
-        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/default_page.tpl'), $vars);
+        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/default_page.tpl'), $vars);
     }
 }

mojotrollz/page/default_start/default_start.php

@@ -1,26 +1,26 @@
 <?php
 class default_start extends SYSTEM\PAGE\Page {
     public static function js(){
-        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_start/js/onlinegraphic.js'),
+        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_start/js/default_start.js'));}
-                        \SYSTEM\WEBPATH(new PPAGE(),'default_start/js/default_start.js'));}
     public static function css(){
         return array();}
     
     public function html(){
         $vars = array();               
-        $vars['default_page_welcome'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/default_page_welcome.tpl'), array());
+        $vars['default_page_welcome']       = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_page_welcome.tpl'), array());
-        $vars['default_page_serverinfo'] =  \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/default_page_serverinfo.tpl'), array());
+        $vars['default_page_serverinfo']    = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_page_serverinfo.tpl'), array());
-        $vars['default_page_login'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/default_page_login.tpl'), array());
+        $vars['default_page_login']         = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_page_login.tpl'), array());
-        $vars['default_page_toolbar'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/default_page_toolbar.tpl'), array());
+        
-        $vars['PICPATH'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=default_page&id=';
+        $vars['PICPATH']         = \SYSTEM\FILES\files::getURL('default_start');
-        $vars['copyright'] = '';
+        $vars['PICPATH_DEFAULT'] = \SYSTEM\FILES\files::getURL('default_page');
-        $vars['inprint'] = '';
+        
-        $vars['realm_status'] = realm::status();
+        $vars['realm_status']   = realm::status();
-        $vars['world_status'] = world::status();
+        $vars['world_status']   = world::status();
-        $vars['player_online'] = database::player_online();
+        $vars['player_online']  = database::player_online();
+        
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE),
                                     \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_SERVERINFO),
                                     \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_BASIC));
-        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/default_start.tpl'), $vars);
+        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_start.tpl'), $vars);
     }
 }

mojotrollz/page/default_start/js/default_start.js

@@ -21,4 +21,26 @@ function register_login(){
             event.preventDefault();
         }
     });
+}
+function load_visualisation(id){
+    system.call('call=stats',function handle_visualisation_result(json){
+                                if(!json || json.status !== true || !json.result){
+                                    return;}
+                                json = json.result;
+                                var data = new google.visualization.DataTable();
+                                first = true;        
+                                $.each(json[0], function(key, value){
+                                    if(first){                
+                                        data.addColumn('datetime',key);
+                                        first = false;
+                                    } else {
+                                        data.addColumn('number',key);
+                                    }
+                                });            
+                                $.each(json, function(key, value){first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [(v == null || parseFloat(v) <= 0) ? 0 : parseFloat(v)];}}));});
+
+                                var options = {title: id, backgroundColor: 'darkslategrey', aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{left:20,top:40},  interpolateNulls: false, height: "200"};
+                                new google.visualization.LineChart(document.getElementById(id)).draw(data, options);
+                            },
+                {},'json',true);
 }

mojotrollz/page/default_start/js/onlinegraphic.js

@@ -1,23 +0,0 @@
-function load_visualisation(id){
-    system.call('call=stats',function handle_visualisation_result(json){
-                                if(!json || json.status !== true || !json.result){
-                                    return;}
-                                json = json.result;
-                                var data = new google.visualization.DataTable();
-                                first = true;        
-                                $.each(json[0], function(key, value){
-                                    if(first){                
-                                        data.addColumn('datetime',key);
-                                        first = false;
-                                    } else {
-                                        data.addColumn('number',key);
-                                    }
-                                });            
-                                $.each(json, function(key, value){first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [(v == null || parseFloat(v) <= 0) ? 0 : parseFloat(v)];}}));});
-
-                                var options = {title: id, backgroundColor: 'darkslategrey', aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{left:20,top:40},  interpolateNulls: false, height: "200"};
-                                new google.visualization.LineChart(document.getElementById(id)).draw(data, options);
-                            },
-                {},'json',true);
-}
-

mojotrollz/page/default_start/tpl/default_start.tpl

@@ -2,40 +2,40 @@
 <div id="frame_content_center">
     <div class="threecol_parent" style="width: 30%;  height: 462px;">
         <div class="threecol_row" style="height: 12px;">
-            <div class="threecol_col" style="background: url(${PICPATH}border_tops_l.png) no-repeat;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_l.png) no-repeat;"></div>
-            <div class="threecol_col" style="background: url(${PICPATH}border_tops_m.png) repeat-x;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_m.png) repeat-x;"></div>
-            <div class="threecol_col" style="background: url(${PICPATH}border_tops_r.png) no-repeat;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_r.png) no-repeat;"></div>
         </div>
         <div class="threecol_row">
-            <div class="threecol_col" style="background: url(${PICPATH}border_lefts.png) repeat-y; width: 12px;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_lefts.png) repeat-y; width: 12px;"></div>
             <div class="threecol_col" style="background-color: darkslategrey; padding-left: 10px;">${default_page_login}</div>
-            <div class="threecol_col" style="background: url(${PICPATH}border_rights.png) repeat-y; width: 12px;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_rights.png) repeat-y; width: 12px;"></div>
         </div>                                
         <div class="threecol_row" style="height: 12px;">
-            <div class="threecol_col" style="background: url(${PICPATH}border_bots_l.png) no-repeat;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_bots_l.png) no-repeat;"></div>
-            <div class="threecol_col" style="background: url(${PICPATH}border_bots_m.png) repeat-x;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_bots_m.png) repeat-x;"></div>
-            <div class="threecol_col" style="background: url(${PICPATH}border_bots_r.png) no-repeat;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_bots_r.png) no-repeat;"></div>
         </div>
     </div>
 </div>
 <div id="frame_content_right">
     <div class="threecol_parent" style="width: 30%; height: 462px;">
         <div class="threecol_row" style="height: 12px;">
-            <div class="threecol_col" style="background: url(${PICPATH}border_tops_l.png) no-repeat;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_l.png) no-repeat;"></div>
-            <div class="threecol_col" style="background: url(${PICPATH}border_tops_m.png) repeat-x;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_m.png) repeat-x;"></div>
-            <div class="threecol_col" style="background: url(${PICPATH}border_tops_r.png) no-repeat;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_r.png) no-repeat;"></div>
         </div>
         <div class="threecol_row">
-            <div class="threecol_col" style="background: url(${PICPATH}border_lefts.png) repeat-y; width: 12px;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_lefts.png) repeat-y; width: 12px;"></div>
             <div class="threecol_col" style="background-color: darkolivegreen; padding-left: 10px;">${default_page_serverinfo}</div>
-            <div class="threecol_col" style="background: url(${PICPATH}border_rights.png) repeat-y; width: 12px;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_rights.png) repeat-y; width: 12px;"></div>
         </div>                                
         <div class="threecol_row" style="height: 12px;">
-            <div class="threecol_col" style="background: url(${PICPATH}border_bots_l.png) no-repeat;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_bots_l.png) no-repeat;"></div>
-            <div class="threecol_col" style="background: url(${PICPATH}border_bots_m.png) repeat-x;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_bots_m.png) repeat-x;"></div>
-            <div class="threecol_col" style="background: url(${PICPATH}border_bots_r.png) no-repeat;"></div>
+            <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_bots_r.png) no-repeat;"></div>
         </div>
     </div>
 </div>
 <div class="clear"></div>
-<div id="frame_content_toolbar">${default_page_toolbar}</div>
+<div id="frame_content_toolbar"></div>

mojotrollz/page/wizard_details/js/wizard_details.js

@@ -2,12 +2,12 @@ function init_wizard_details_toolbar(){
     wizard_toolbar();}
 
 function init_wizard_details (){
-    //sys.load('wizard_details_toolbar');
+    /*$('#charname').keyup(function(event){
-    
-    $('#charname').keyup(function(event){
         if(event.keyCode == 13){
             sendInfo('{"char_name" : "'+$(this).val()+'"}','wizard_details');}
-    });
+    });*/
+    $('#btn_check_name').click(function(){
+        sendInfo('{"char_name" : "'+$('#charname').val()+'"}','wizard_details');})
     $('.info').mouseover(function(){
         var info = $(this).attr('info');
         $('#info_content').load('./?page=default_info&id='+info);
@@ -43,8 +43,8 @@ function init_wizard_details (){
             $('#details_race .ork').addClass('fadein');}
         if($(this).hasClass('dwarf')){
             $('#details_race .dwarf').addClass('fadein');}
-        if($(this).hasClass('undead')){
+        if($(this).hasClass('scorge')){
-            $('#details_race .undead').addClass('fadein');}
+            $('#details_race .scorge').addClass('fadein');}
         if($(this).hasClass('nightelf')){
             $('#details_race .nightelf').addClass('fadein');}
         if($(this).hasClass('tauren')){
@@ -63,7 +63,7 @@ function init_wizard_details (){
     $('#content .male').click(function (){male();});
     $('#content .female').click(function (){female ();});
     
-    $('#details_race .human, #details_race .ork, #details_race .dwarf, #details_race .undead, #details_race .nightelf, #details_race .tauren, #details_race .gnome, #details_race .troll').click(function (){wowrace($(this).attr('race'));});
+    $('#details_race .human, #details_race .ork, #details_race .dwarf, #details_race .scorge, #details_race .nightelf, #details_race .tauren, #details_race .gnome, #details_race .troll').click(function (){wowrace($(this).attr('race'));});
 }
 
 function male (){

mojotrollz/page/wizard_details/tpl/details.tpl

@@ -1,28 +1,29 @@
 <div id="details_gender" style="float: left; margin: 15px;">
-    <input type="text" class="form-control input-lg" id="charname" maxlength="12" value="${char_name}"></br>
+    <input type="text" class="form-control input-lg" id="charname" maxlength="12" value="${char_name}">
+    <button class="btn btn-success" id="btn_check_name">Check</button></br></br>
     <a class="male fadein"                  gender="male" href="#"><img src="${WOWICONS}male.png" width="110px"/></a>
     <a class="female fadein"                gender="female" href="#"><img src="${WOWICONS}female.png" width="110px"/></a>
 </div>
 <div id="details_race" style="float: left; margin: 15px;">
-    <a class="male human fadein info"        info="race_human" race="human" gender="male" href="#"><img src="${WOWICONS}human_male.png"/></a>
+    <a class="male human fadein info"        info="race_human" race="human" gender="male" href="#"><img src="${WOW_RACE}human_male.png"/></a>
-    <a class="female human fadein info"      info="race_human" race="human" gender="female" href="#"><img src="${WOWICONS}human_female.png" /></a>
+    <a class="female human fadein info"      info="race_human" race="human" gender="female" href="#"><img src="${WOW_RACE}human_female.png" /></a>
-    <a class="male ork fadein info"          info="race_ork" race="ork" gender="male" href="#"><img src="${WOWICONS}ork_male.png" /></a>
+    <a class="male ork fadein info"          info="race_ork" race="ork" gender="male" href="#"><img src="${WOW_RACE}ork_male.png" /></a>
-    <a class="female ork fadein info"        info="race_ork" race="ork" gender="female" href="#"><img src="${WOWICONS}ork_female.png" /></a>
+    <a class="female ork fadein info"        info="race_ork" race="ork" gender="female" href="#"><img src="${WOW_RACE}ork_female.png" /></a>
     <br>
-    <a class="male dwarf fadein info"        info="race_dwarf" race="dwarf" gender="male" href="#"><img src="${WOWICONS}dwarf_male.png" /></a>
+    <a class="male dwarf fadein info"        info="race_dwarf" race="dwarf" gender="male" href="#"><img src="${WOW_RACE}dwarf_male.png" /></a>
-    <a class="female dwarf fadein info"      info="race_dwarf" race="dwarf" gender="female" href="#"><img src="${WOWICONS}dwarf_female.png" /></a>
+    <a class="female dwarf fadein info"      info="race_dwarf" race="dwarf" gender="female" href="#"><img src="${WOW_RACE}dwarf_female.png" /></a>
-    <a class="male undead fadein info"       info="race_undead" race="undead" gender="male" href="#"><img src="${WOWICONS}undead_male.png" /></a>
+    <a class="male scourge fadein info"       info="race_scourge" race="scourge" gender="male" href="#"><img src="${WOW_RACE}scourge_male.png" /></a>
-    <a class="female undead fadein info"     info="race_undead" race="undead" gender="female" href="#"><img class="select" src="${WOWICONS}undead_female.png" /></a>
+    <a class="female scourge fadein info"     info="race_scourge" race="scourge" gender="female" href="#"><img class="select" src="${WOW_RACE}scourge_female.png" /></a>
     <br>
-    <a class="male nightelf fadein info"     info="race_nightelf" race="nightelf" gender="male" href="#"><img src="${WOWICONS}nightelf_male.png" /></a>
+    <a class="male nightelf fadein info"     info="race_nightelf" race="nightelf" gender="male" href="#"><img src="${WOW_RACE}nightelf_male.png" /></a>
-    <a class="female nightelf fadein info"   info="race_nightelf" race="nightelf" gender="female" href="#"><img src="${WOWICONS}nightelf_female.png" /></a>
+    <a class="female nightelf fadein info"   info="race_nightelf" race="nightelf" gender="female" href="#"><img src="${WOW_RACE}nightelf_female.png" /></a>
-    <a class="male tauren fadein info"       info="race_tauren" race="tauren" gender="male" href="#"><img src="${WOWICONS}tauren_male.png" /></a>
+    <a class="male tauren fadein info"       info="race_tauren" race="tauren" gender="male" href="#"><img src="${WOW_RACE}tauren_male.png" /></a>
-    <a class="female tauren fadein info"     info="race_tauren" race="tauren" gender="female" href="#"><img src="${WOWICONS}tauren_female.png" /></a>
+    <a class="female tauren fadein info"     info="race_tauren" race="tauren" gender="female" href="#"><img src="${WOW_RACE}tauren_female.png" /></a>
     <br>
-    <a class="male gnome fadein info"        info="race_gnome" race="gnome" gender="male" href="#"><img src="${WOWICONS}gnome_male.png" /></a>
+    <a class="male gnome fadein info"        info="race_gnome" race="gnome" gender="male" href="#"><img src="${WOW_RACE}gnome_male.png" /></a>
-    <a class="female gnome fadein info"      info="race_gnome" race="gnome" gender="female" href="#"><img src="${WOWICONS}gnome_female.png" /></a>
+    <a class="female gnome fadein info"      info="race_gnome" race="gnome" gender="female" href="#"><img src="${WOW_RACE}gnome_female.png" /></a>
-    <a class="male troll fadein info"        info="race_troll" race="troll" gender="male" href="#"><img src="${WOWICONS}troll_male.png" /></a>
+    <a class="male troll fadein info"        info="race_troll" race="troll" gender="male" href="#"><img src="${WOW_RACE}troll_male.png" /></a>
-    <a class="female troll fadein info"      info="race_troll" race="troll" gender="female" href="#"><img src="${WOWICONS}troll_female.png" /></a>
+    <a class="female troll fadein info"      info="race_troll" race="troll" gender="female" href="#"><img src="${WOW_RACE}troll_female.png" /></a>
 </div>
 <div id="details_class" style="float: left; margin: 15px;">
     <a class="human dwarf nightelf gnome ork undead tauren troll fadein info" info="class_warrior" cclass="1" href="#"><img src="${WOW_CLASS}Warrior.png" /></a>

mojotrollz/page/wizard_details/wizard_details.php

@@ -7,11 +7,15 @@ class wizard_details extends SYSTEM\PAGE\Page {
        return array();}
 
     public function html(){
-        $vars = json_decode(charcreation::data(),true)['result'];
+        $vars = charcreation::data(NULL, false);
-        $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=wowicons&id=';
+        
-        $vars['WOW_CLASS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=class&id=';
+        $vars['WOWICONS']   = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=wowicons&id=';
+        $vars['WOW_RACE']   = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=race&id=';
+        $vars['WOW_CLASS']  = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=class&id=';
+        
         $vars['infotext_default'] = \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT)['default'];
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_details/details.tpl'), $vars);
+        
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_details/tpl/details.tpl'), $vars);
     }
 }

mojotrollz/page/wizard_skills/wizard_skills.php

@@ -6,11 +6,11 @@ class wizard_skills extends SYSTEM\PAGE\Page {
                         \SYSTEM\WEBPATH(new PPAGE(),'wizard_skills/js/wizard_skills.js'));}
       
     public static function css (){
-       return array();}
+       return array(    \SYSTEM\WEBPATH(new PAPI(),'char/css/skilltree.css'));}
        
     public function html(){
-        $vars = json_decode(charcreation::data(),true)['result'];
+        $vars = charcreation::data(NULL,false);
         $vars['skilltree'] = skilltree::generate($vars['char_class']);
-        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_skills/wizard_skills.tpl'), $vars);
+        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_skills/tpl/wizard_skills.tpl'), $vars);
     }
 }

mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl

@@ -1,6 +1,6 @@
 <a class="tb_link" id="tb_last" sysload="${last}" href="#${last}" style="padding-left: 10px;"><img src="${WOWICONS}arrow_left.png" /></a>
 <a class="tb_link" id="tb_name" sysload="wizard_details" href="#wizard_details" style="padding-left: 10px;">${char_name}</a>
-<a class="tb_link" id="tb_gender race" sysload="wizard_details" href="#wizard_details" style="padding-left: 10px;"><img src="${WOWICONS}${char_race}_${char_gender}.png" /></a>
+<a class="tb_link" id="tb_gender race" sysload="wizard_details" href="#wizard_details" style="padding-left: 10px;"><img src="${WOW_RACE}${char_race}_${char_gender}.png" /></a>
 <a class="tb_link" id="tb_class" sysload="wizard_details" href="#wizard_details" style="padding-left: 10px;"><img src="${WOW_CLASS}${char_class}.png" /></a>
 <a class="tb_link" id="tb_visuals" sysload="wizard_visuals" href="#wizard_visuals" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a>
 <a class="tb_link" id="tb_skills" sysload="wizard_skills" href="#wizard_skills" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a>

mojotrollz/page/wizard_toolbar/wizard_toolbar.php

@@ -18,8 +18,9 @@ class wizard_toolbar extends SYSTEM\PAGE\Page {
         $vars['char_class'] = player_classes::name($vars['char_class']);
         $vars['last'] = $this->last;
         $vars['next'] = $this->next;
-        $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=wowicons&id=';
+        $vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons');
-        $vars['WOW_CLASS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=class&id=';
+        $vars['WOW_RACE'] = \SYSTEM\FILES\files::getURL('race');
-        return  SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_toolbar/wizard_toolbar.tpl'), $vars);
+        $vars['WOW_CLASS'] = \SYSTEM\FILES\files::getURL('class');
+        return  SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_toolbar/tpl/wizard_toolbar.tpl'), $vars);
     }
 }

mojotrollz/page/wizard_visuals/wizard_visuals.php

@@ -10,11 +10,9 @@ class wizard_visuals extends SYSTEM\PAGE\Page {
 
     public function html(){
         $vars = json_decode(charcreation::data(),true)['result'];
-        if($vars['char_race'] == 'undead'){
-            $vars['char_race'] = 'scourge';}
         $vars['char_equip'] = '';//'1,110744,3,109807,16,111412,5,111190,9,111188,10,126342,6,110003,7,120793,8,115217,21,125312,14,110641';//
         $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=wowicons&id=';
         $vars['infotext_default'] = \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT)['default'];
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_visuals/wizard_visuals.tpl'), $vars);
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_visuals/tpl/wizard_visuals.tpl'), $vars);
     }
 }

system

@@ -1 +1 @@
-Subproject commit f4352cced5fd3e75c40df43e33ce5f06e9bf27da
+Subproject commit 8d259452fa874c185a2593b4660fe1a74292c2ba