diff --git a/mojotrollz/api/database/player_races.php b/mojotrollz/api/database/player_races.php new file mode 100644 index 0000000..ca07688 --- /dev/null +++ b/mojotrollz/api/database/player_races.php @@ -0,0 +1,65 @@ +
-
-
+
+
+
+
+
-
-
diff --git a/mojotrollz/page/user_menu/js/user_menu.js b/mojotrollz/page/user_menu/js/user_menu.js index c5e9d5a..ca15a3e 100644 --- a/mojotrollz/page/user_menu/js/user_menu.js +++ b/mojotrollz/page/user_menu/js/user_menu.js @@ -6,6 +6,9 @@ function init_user_menu(){ $("#btn_db").click(function(){ sys.load('user_database'); }); + $("#btn_achieve").click(function(){ + sys.load('user_achievements'); + }); } function register_logout(){ $("#btn_logout").click(function(){ diff --git a/mojotrollz/page/user_menu/user_menu.tpl b/mojotrollz/page/user_menu/user_menu.tpl index 9674e1f..0e452fb 100644 --- a/mojotrollz/page/user_menu/user_menu.tpl +++ b/mojotrollz/page/user_menu/user_menu.tpl @@ -1,5 +1,8 @@ -
-
  • News
  • +
    +
  • News
  • +
  • Achievements
  • +
  • Inventory
  • +
  • Armory
  • Database
  • Logout
  • diff --git a/mojotrollz/page/user_start/char_stats_realm.tpl b/mojotrollz/page/user_start/char_stats_realm.tpl deleted file mode 100644 index a25e80d..0000000 --- a/mojotrollz/page/user_start/char_stats_realm.tpl +++ /dev/null @@ -1 +0,0 @@ -${race} diff --git a/mojotrollz/page/user_start/tpl/char_stats_realm.tpl b/mojotrollz/page/user_start/tpl/char_stats_realm.tpl new file mode 100644 index 0000000..6e2fd6b --- /dev/null +++ b/mojotrollz/page/user_start/tpl/char_stats_realm.tpl @@ -0,0 +1,14 @@ + + + + + + + + +

    ${race}

    + + +

    ${count}

    + + \ No newline at end of file diff --git a/mojotrollz/page/user_start/tpl/class_stats_realm.tpl b/mojotrollz/page/user_start/tpl/class_stats_realm.tpl new file mode 100644 index 0000000..817f88d --- /dev/null +++ b/mojotrollz/page/user_start/tpl/class_stats_realm.tpl @@ -0,0 +1,11 @@ + + + + + +

    ${class}

    + + +

    ${count}

    + + \ No newline at end of file diff --git a/mojotrollz/page/user_start/tpl/faction_balance.tpl b/mojotrollz/page/user_start/tpl/faction_balance.tpl new file mode 100644 index 0000000..915b744 --- /dev/null +++ b/mojotrollz/page/user_start/tpl/faction_balance.tpl @@ -0,0 +1 @@ +Alliance: ${class_alliance} Horde: ${class_horde} \ No newline at end of file diff --git a/mojotrollz/page/user_start/tpl/user_start.tpl b/mojotrollz/page/user_start/tpl/user_start.tpl new file mode 100644 index 0000000..258aa93 --- /dev/null +++ b/mojotrollz/page/user_start/tpl/user_start.tpl @@ -0,0 +1,41 @@ +
    +
    +

    Server Info

    +

    Realmlist: ${realmlist}

    +

    Server Version: ${server_version}

    +

    Client Version: ${client_version}

    +
    +

    Crossfaction Raids: enabled

    +
    +

    Realm Server: ${realm_status}

    +

    World Server: ${world_status}

    +

    Players Online: ${player_online}

    + +

    Server Help

    +

    Download realmlist.wtf

    +

    Download WoW 1.12

    +
    +
    +

    Racial Pluralism

    + + ${char_stats}
    +
    +

    ${factionbalance}

    +
    +
    +

    Class Diffusion

    + ${class_stats}
    +
    +
    + +

    Guilds overallcount:${guildcount}

    + +
    +
    + +
    +
    \ No newline at end of file diff --git a/mojotrollz/page/user_start/user_start.php b/mojotrollz/page/user_start/user_start.php index 96d3484..b66595e 100644 --- a/mojotrollz/page/user_start/user_start.php +++ b/mojotrollz/page/user_start/user_start.php @@ -6,23 +6,82 @@ class user_start extends SYSTEM\PAGE\Page { public static function css (){ return array();} - public static function get_char_statistics(){ + + + private function switch_order($race){ + switch($race){ + case 1: + return '1'; + case 2: + return '3'; + case 3: + return '7'; + case 4: + return '4'; + case 5: + return '2'; + case 6: + return '8'; + case 7: + return '6'; + case 8: + return '5'; + default: + return ''; + } + } + + + + public function get_char_statistics(){ + $result = ''; $chars = \DBD\CHAR_STATS::QA(); - $vars = array(); - $result = SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/char_stats_realm.tpl'), $vars); + foreach ($chars as $race){ + $vars = array(); + $vars['race'] = player_races::name($race['race']); + $vars['count'] = $race['count']; + $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/tpl/char_stats_realm.tpl'), $vars); + } + return $result; } + public function get_class_statistics(){ + $result = ''; + $chars = \DBD\CLASS_STATS::QA(); + foreach ($chars as $class){ + $vars = array(); + $vars['class'] = player_classes::name($class['class']); + $vars['count'] = $class['count']; + $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/tpl/class_stats_realm.tpl'), $vars); + } + + + return $result; + } + + public function get_faction_balance(){ + $balance = \DBD\FACTION_BALANCE::Q1(); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/tpl/faction_balance.tpl'), $balance); + } + + + public function html(){ $vars = array(); $vars['char_stats'] = $this->get_char_statistics(); + $vars['class_stats'] = $this->get_class_statistics(); + $vars['guildcount'] = \DBD\COUNT_GUILDS::Q1()['count']; $vars['realm_status'] = realm::status(); $vars['world_status'] = world::status(); $vars['player_online'] = database::player_online(); + $vars['factionbalance'] = $this->get_faction_balance(); $vars['PICPATH'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=default_page&id='; + $vars['PIC'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=race&id='; + $vars['PI'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=class&id='; $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(),'user_start/user_start.tpl'), $vars); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/tpl/user_start.tpl'), $vars); } } \ No newline at end of file diff --git a/mojotrollz/page/user_start/user_start.tpl b/mojotrollz/page/user_start/user_start.tpl deleted file mode 100644 index 2b29679..0000000 --- a/mojotrollz/page/user_start/user_start.tpl +++ /dev/null @@ -1,16 +0,0 @@ -
    -

    Server Info

    -

    Realmlist: ${realmlist}

    -

    Server Version: ${server_version}

    -

    Client Version: ${client_version}

    -
    - -

    Realm Server: ${realm_status}

    -

    World Server: ${world_status}

    -

    Players Online: ${player_online}

    - -

    Server Help

    -

    Download realmlist.wtf

    -

    Download WoW 1.12

    -
    -
    ${char_stats}
    diff --git a/system b/system index 8d25945..b3bf40d 160000 --- a/system +++ b/system @@ -1 +1 @@ -Subproject commit 8d259452fa874c185a2593b4660fe1a74292c2ba +Subproject commit b3bf40d17d3c707d7af17943b1f6ff147c0e71a6