Merge branch 'master' of mojotrollz.eu:hosting

mojotrollz/autoload.inc.php

@@ -6,3 +6,4 @@ require_once dirname(__FILE__).'/page/register_page_classes.php';
 require_once dirname(__FILE__).'/dbd/autoload.inc.php';
 require_once dirname(__FILE__).'/api/autoload.inc.php';
 require_once dirname(__FILE__).'/docu/autoload.inc.php';
+require_once dirname(__FILE__).'/img/autoload.inc.php';

mojotrollz/img/autoload.inc.php

@@ -0,0 +1,3 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+require_once dirname(__FILE__).'/register_img.php';

mojotrollz/img/register_img.php

@@ -0,0 +1,2 @@
+<?php
+\SYSTEM\IMG\img::registerFolder(dirname(__FILE__).'/wowicons/','wowicons','*.png');

mojotrollz/page/default_navbar/default_navbar.php

@@ -2,15 +2,8 @@
 
 class default_navbar extends SYSTEM\PAGE\Page {
     
-    private function js(){        
+    private function js(){return  '';}      
-        return  '';
+    private function css (){return   '';}
-
-              
-    }
-      
-   private function css (){
-       return   '';
-   }
 
     public function html(){
         $vars = array();               
@@ -18,7 +11,8 @@ class default_navbar extends SYSTEM\PAGE\Page {
         $vars['css'] = $this->css();
         $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(), 'default_navbar/img/');
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_navbar/wizard_navbar.tpl'), $vars);
+        return  \SYSTEM\SECURITY\Security::isLoggedIn() ?
-        
+                SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_navbar/user_navbar.tpl'), $vars) :
+                SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_navbar/wizard_navbar.tpl'), $vars);        
     }
 }

mojotrollz/page/default_navbar/user_navbar.tpl

@@ -0,0 +1,2 @@
+<a class="brand active" href=""><font color="gold">Welcome</font></a>                                  
+<li><a href="#" state="wizard_details"><font color="gold">Character</font></a></li>

mojotrollz/page/default_page/default_page.php

@@ -9,8 +9,6 @@ class default_page extends SYSTEM\PAGE\Page {
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PCRYPTOSHA(),'jquery.sha1.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(),'wizard_details/js/wizard_details.js').'"></script>';
-
-              
     }
       
     private function css (){
@@ -23,9 +21,9 @@ class default_page extends SYSTEM\PAGE\Page {
         $vars = array();               
         $vars['js'] = $this->js();
         $vars['css'] = $this->css();
+        $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=wowicons&id=';
         $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(), 'default_page/img/');
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/default_page.tpl'), $vars);        
-        
     }
 }

mojotrollz/page/default_page/default_page.tpl

@@ -37,15 +37,41 @@
                             </div>
                             <div class="lifecraft" style="float: right; padding-right: 10px;">
                                 <h3>Login</h3>
-                                <input type="text" class="form-control input-lg" id="username" placeholder="${user_name}"></br>
+                                <form class="textbox" style="padding:10px" id="login_form">
-                                <input type="password" class="form-control input-lg" id="password" placeholder="${password}"></br>
+                                    <div class="control-group">
-                                <input type="submit" class="form-control input-lg" id="login" value="Login">
+                                        <div class="controls">
+                                            <input  type="text"
+                                                    size="30"
+                                                    style="margin-bottom: 15px;"
+                                                    id="bt_login_user"
+                                                    placeholder="${login_username}"
+                                                    minlength="3" data-validation-minlength-message="${login_username_too_short}"
+                                                    maxlength="16" data-validation-maxlength-message="${login_username_too_long}"
+                                                    required data-validation-required-message="${login_username_required}"/>
+                                        </div>
+                                        <div class="controls">
+                                            <input  type="password"
+                                                    size="30"
+                                                    style="margin-bottom: 15px;"
+                                                    id="bt_login_password"
+                                                    placeholder="${login_password}"
+                                                    minlength="5" data-validation-minlength-message="${login_password_too_short}"
+                                                    maxlength="16" data-validation-maxlength-message="${login_password_too_long}"
+                                                    required data-validation-required-message="${login_password_required}"/>
+                                        </div>        
+                                        <div class="help-block"></div>
+                                        <input type="hidden" />
+                                        <button class="btn" style="clear: left; height: 32px; font-size: 13px;"
+                                                type="submit"
+                                                id="login_submit">${login_login}</button>
+                                    </div>
+                                </form>                                
                             </div>
                         </div>
                         <div style="clear: both;"></div>
-                        <div id="back" style="float: left; display: none;"><a href="#"><img src="${PICPATH}arrow_left.png"/></a></div>
+                        <div id="back" style="float: left; display: none;"><a href="#"><img src="${WOWICONS}arrow_left.png"/></a></div>
                         <div id="start" style="float: left;"><a href="#"><img src="${PICPATH}button.png"/></a></div>
-                        <div id="next" style="float: right; display: none;"><a href="#"><img src="${PICPATH}arrow_right.png"/></a></div>                        
+                        <div id="next" style="float: right; display: none;"><a href="#"><img src="${WOWICONS}arrow_right.png"/></a></div>                        
                         <div id="register" style="float: right; display: none;"><a href="#"><img src="${PICPATH}register_button.png"/></a></div>
                     </div>
                     <div class="right" style="background: url(${PICPATH}border_right.png) repeat-y;"></div>              

mojotrollz/page/default_page/js/wizard.js

@@ -14,6 +14,22 @@ var wizard_state = '';
 
 $(document).ready(function() {
     
+    $("#login_form input").not("[type=submit]").jqBootstrapValidation({
+        preventSubmit: true,
+        submitError: function($form, event, errors) {},
+        submitSuccess: function($form, event){            
+            $.get('./api.php?call=account&action=login&username='+$('#bt_login_user').val()+'&password_sha='+$.sha1($('#bt_login_password').val())+'&password_md5='+$.md5($('#bt_login_password').val()), function (data) {
+                if(data == 1){
+                    $('.help-block').html("Login successfull.</br>");
+                    location.reload(true);
+                } else {
+                    $('.help-block').html("Login not successfull.</br> User & Password combination wrong.")
+                }
+            });
+            event.preventDefault();
+        }
+    });
+
     register_menu ();
     
     $('#back a').click(function() {
@@ -37,10 +53,11 @@ function register_menu (){
 }
 
 function load_wizard_page (state){            
+    wizard_state = state;
+    
     if(state == ''){
         window.location.reload();}
     
-    wizard_state = state;
     $('#content').hide();
     $('#content').load('?action='+state, function (){
         $('#content').show(750);
@@ -54,9 +71,8 @@ function load_wizard_page (state){
                 break;
             }
         }   
-    
+        if(window[state]){
-        window[state]();
+            window[state]();}        
-        
     });
 
 };
@@ -64,7 +80,7 @@ function load_wizard_page (state){
 function back(state){
     for(var i=0; i<WizardStates.length;i++){
         if(WizardStates[i][0] == state){
-            load_wizard_page (WizardStates[i][4]);
+            load_wizard_page (WizardStates[i][5]);
             break;
         }
     }
@@ -73,7 +89,7 @@ function back(state){
 function next(state){
     for(var i=0; i<WizardStates.length;i++){
         if(WizardStates[i][0] == state){
-            load_wizard_page (WizardStates[i][5]);
+            load_wizard_page (WizardStates[i][6]);
             break;
         }
     }

mojotrollz/page/wizard_details/details.tpl

@@ -6,45 +6,45 @@
     <br>
     <br>
     <br>
-    <a class="male fadein" href="#"><img src="${PICPATH}male.png" width="110px"/></a>
+    <a class="male fadein" href="#"><img src="${WOWICONS}male.png" width="110px"/></a>
-    <a class="female fadein" href="#"><img src="${PICPATH}female.png" width="110px"/></a>
+    <a class="female fadein" href="#"><img src="${WOWICONS}female.png" width="110px"/></a>
 </div>
 <div id="details_race" style="float: left; margin: 15px;">
-    <a class="male human fadein" href="#"><img src="${PICPATH}human_male.png"/></a>
+    <a class="male human fadein" href="#"><img src="${WOWICONS}human_male.png"/></a>
-    <a class="female human fadein" href="#"><img src="${PICPATH}human_female.png" /></a>
+    <a class="female human fadein" href="#"><img src="${WOWICONS}human_female.png" /></a>
-    <a class="male ork fadein" href="#"><img src="${PICPATH}ork_male.png" /></a>
+    <a class="male ork fadein" href="#"><img src="${WOWICONS}ork_male.png" /></a>
-    <a class="female ork fadein" href="#"><img src="${PICPATH}ork_female.png" /></a>
+    <a class="female ork fadein" href="#"><img src="${WOWICONS}ork_female.png" /></a>
     <br>
-    <a class="male dwarf fadein" href="#"><img src="${PICPATH}dwarf_male.png" /></a>
+    <a class="male dwarf fadein" href="#"><img src="${WOWICONS}dwarf_male.png" /></a>
-    <a class="female dwarf fadein" href="#"><img src="${PICPATH}dwarf_female.png" /></a>
+    <a class="female dwarf fadein" href="#"><img src="${WOWICONS}dwarf_female.png" /></a>
-    <a class="male undead fadein" href="#"><img src="${PICPATH}undead_male.png" /></a>
+    <a class="male undead fadein" href="#"><img src="${WOWICONS}undead_male.png" /></a>
-    <a class="female undead fadein" href="#"><img class="select" src="${PICPATH}undead_female.png" /></a>
+    <a class="female undead fadein" href="#"><img class="select" src="${WOWICONS}undead_female.png" /></a>
     <br>
-    <a class="male nightelf fadein" href="#"><img src="${PICPATH}nightelf_male.png" /></a>
+    <a class="male nightelf fadein" href="#"><img src="${WOWICONS}nightelf_male.png" /></a>
-    <a class="female nightelf fadein" href="#"><img src="${PICPATH}nightelf_female.png" /></a>
+    <a class="female nightelf fadein" href="#"><img src="${WOWICONS}nightelf_female.png" /></a>
-    <a class="male tauren fadein" href="#"><img src="${PICPATH}tauren_male.png" /></a>
+    <a class="male tauren fadein" href="#"><img src="${WOWICONS}tauren_male.png" /></a>
-    <a class="female tauren fadein" href="#"><img src="${PICPATH}tauren_female.png" /></a>
+    <a class="female tauren fadein" href="#"><img src="${WOWICONS}tauren_female.png" /></a>
     <br>
-    <a class="male gnome fadein" href="#"><img src="${PICPATH}gnome_male.png" /></a>
+    <a class="male gnome fadein" href="#"><img src="${WOWICONS}gnome_male.png" /></a>
-    <a class="female gnome fadein" href="#"><img src="${PICPATH}gnome_female.png" /></a>
+    <a class="female gnome fadein" href="#"><img src="${WOWICONS}gnome_female.png" /></a>
-    <a class="male troll fadein" href="#"><img src="${PICPATH}troll_male.png" /></a>
+    <a class="male troll fadein" href="#"><img src="${WOWICONS}troll_male.png" /></a>
-    <a class="female troll fadein" href="#"><img src="${PICPATH}troll_female.png" /></a>
+    <a class="female troll fadein" href="#"><img src="${WOWICONS}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" href="#"><img src="${PICPATH}warrior.png" /></a>
+    <a class="human dwarf nightelf gnome ork undead tauren troll fadein" href="#"><img src="${WOWICONS}warrior.png" /></a>
-    <a class="dwarf nightelf ork tauren troll fadein" href="#"><img src="${PICPATH}hunter.png" /></a>
+    <a class="dwarf nightelf ork tauren troll fadein" href="#"><img src="${WOWICONS}hunter.png" /></a>
     <br>
-    <a class="dwarf human fadein" href="#"><img src="${PICPATH}paladin.png" /></a>
+    <a class="dwarf human fadein" href="#"><img src="${WOWICONS}paladin.png" /></a>
-    <a class="dwarf human nightelf gnome ork undead troll fadein" href="#"><img src="${PICPATH}rogue.png" /></a>
+    <a class="dwarf human nightelf gnome ork undead troll fadein" href="#"><img src="${WOWICONS}rogue.png" /></a>
     <br>
-    <a class="dwarf human nightelf undead troll fadein" href="#"><img src="${PICPATH}priest.png" /></a>
+    <a class="dwarf human nightelf undead troll fadein" href="#"><img src="${WOWICONS}priest.png" /></a>
-    <a class="human gnome undead troll fadein" href="#"><img src="${PICPATH}mage.png" /></a>
+    <a class="human gnome undead troll fadein" href="#"><img src="${WOWICONS}mage.png" /></a>
     <br> 
-    <a class="human gnome ork undead fadein" href="#"><img src="${PICPATH}warlock.png" /></a>
+    <a class="human gnome ork undead fadein" href="#"><img src="${WOWICONS}warlock.png" /></a>
-    <a class="fadein nightelf tauren" href="#"><img src="${PICPATH}druid.png" /></a>
+    <a class="fadein nightelf tauren" href="#"><img src="${WOWICONS}druid.png" /></a>
 </div>
 
 <div class="lifecraft link-color" id="details_info" style="float: left; margin-top: 15px; width: 190px; padding: 8px; padding-bottom: 110px; font-size: 14px; background: url(${PICPATH}infotext_background.png) no-repeat;">
-    <h3 style="padding-left: 20px;"><img src="${PICPATH}help_questionmark.png" width="25px"/>&nbsp;&nbsp;Info</h3>
+    <h3 style="padding-left: 20px;"><img src="${WOWICONS}help_questionmark.png" width="25px"/>&nbsp;&nbsp;Info</h3>
     ${infotext_human}
 </div>

mojotrollz/page/wizard_details/wizard_details.php

@@ -16,6 +16,7 @@ class wizard_details extends SYSTEM\PAGE\Page {
         $vars['js'] = $this->js();
         $vars['css'] = $this->css();
         $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(),'wizard_details/img/');
+        $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=wowicons&id=';
         $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_WOW_INFOTEXT_RACES));
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_details/details.tpl'), $vars);

mojotrollz/page/wizard_friend/friend.tpl

@@ -6,8 +6,8 @@
         <div class="" style="outline: 2px white; background: url(${PICPATH}wall.png); height: 200px;">
             <div style="background: url(${PICPATH}background2.png);">
                 <div style="float: left; padding: 5px;">Molanor</div>
-            <img src="${PICPATH}warrior.png" width="30px;"/>
+            <img src="${WOWICONS}warrior.png" width="30px;"/>
-            <img src="${PICPATH}ork_male.png" width="30px;"/>
+            <img src="${WOWICONS}ork_male.png" width="30px;"/>
             <img src="${PICPATH}x.png" style="float: right; padding: 7px;"/>
             </div>
         </div>

mojotrollz/page/wizard_friend/wizard_friend.php

@@ -34,6 +34,7 @@ class wizard_friend extends SYSTEM\PAGE\Page {
         $vars['js'] = $this->js();
         $vars['css'] = $this->css();
         $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(),'wizard_friend/img/');
+        $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=wowicons&id=';
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_friend/friend.tpl'), $vars);