diff --git a/mojotrollz/api/autoload.inc.php b/mojotrollz/api/autoload.inc.php index 13cb766..fa2d14e 100644 --- a/mojotrollz/api/autoload.inc.php +++ b/mojotrollz/api/autoload.inc.php @@ -1,3 +1,4 @@ &1');} +} \ No newline at end of file diff --git a/mojotrollz/api/world/world.php b/mojotrollz/api/world/world.php new file mode 100644 index 0000000..892bfd7 --- /dev/null +++ b/mojotrollz/api/world/world.php @@ -0,0 +1,5 @@ +&1');} +} diff --git a/mojotrollz/dbd/tbl/locale_string.php b/mojotrollz/dbd/tbl/locale_string.php index 02ac0f2..3eb3b46 100644 --- a/mojotrollz/dbd/tbl/locale_string.php +++ b/mojotrollz/dbd/tbl/locale_string.php @@ -4,8 +4,9 @@ namespace DBD; class locale_string extends \SYSTEM\DBD\system_locale_string { -const VALUE_CATEGORY_MAINPAGE = 100; +const VALUE_CATEGORY_MAINPAGE = 100; const VALUE_CATEGORY_WOW_INFOTEXT_RACES = 120; -const VALUE_CATEGORY_WOW_INFOTEXT_HELP = 130; +const VALUE_CATEGORY_WOW_INFOTEXT_HELP = 130; +const VALUE_CATEGORY_WOW_SERVERINFO = 140; } \ No newline at end of file diff --git a/mojotrollz/page/default_page/css/default_page.css b/mojotrollz/page/default_page/css/default_page.css index 04b4ec1..764bfdb 100644 --- a/mojotrollz/page/default_page/css/default_page.css +++ b/mojotrollz/page/default_page/css/default_page.css @@ -91,7 +91,8 @@ body { #frame_content_right { float: right; width: 30%; - margin: 1.5%; + margin-left: 1.5%; + margin-right: 1.5%; } #frame_footer{ diff --git a/mojotrollz/page/default_page/default_page.php b/mojotrollz/page/default_page/default_page.php index 6c8cfac..1d6d12a 100644 --- a/mojotrollz/page/default_page/default_page.php +++ b/mojotrollz/page/default_page/default_page.php @@ -24,14 +24,17 @@ class default_page extends SYSTEM\PAGE\Page { $vars['js'] = $this->js(); $vars['css'] = $this->css(); $vars['default_page_welcome'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/default_page_welcome.tpl'), array()); - $vars['default_page_serverinfo'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/default_page_serverinfo.tpl'), - array('database_version' => wow_db::version())); + $vars['default_page_serverinfo'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/default_page_serverinfo.tpl'), array()); $vars['default_page_login'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/default_page_login.tpl'), array()); $vars['default_page_toolbar'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/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['copyright'] = ''; $vars['inprint'] = ''; - $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); + $vars['realm_status'] = realm::status(); + $vars['world_status'] = world::status(); + $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); } } \ No newline at end of file diff --git a/mojotrollz/page/default_page/default_page.tpl b/mojotrollz/page/default_page/default_page.tpl index cef302f..c883ad5 100644 --- a/mojotrollz/page/default_page/default_page.tpl +++ b/mojotrollz/page/default_page/default_page.tpl @@ -20,7 +20,7 @@
Database Version: ${database_version}
Realm Server: ${realm_status}
World Server: ${world_status}
Download realmlist.wtf
-Download WoW 1.12
\ No newline at end of file + + \ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php b/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php index 79b5cc6..5cc5818 100644 --- a/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php +++ b/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php @@ -18,13 +18,13 @@ class saimod_mojotrollz_server_handling extends \SYSTEM\SAI\SaiModule { public static function sai_mod_saimod_mojotrollz_server_handling_action_realmstop(){ return shell_exec('/home/mojotrolls/mojo_zero/realm stop 2>&1');} public static function sai_mod_saimod_mojotrollz_server_handling_action_realmstatus(){ - return shell_exec('/home/mojotrolls/mojo_zero/realm status 2>&1');} + return realm::status();} public static function sai_mod_saimod_mojotrollz_server_handling_action_worldstart(){ return shell_exec('/home/mojotrolls/mojo_zero/world start 2>&1');} public static function sai_mod_saimod_mojotrollz_server_handling_action_worldstop(){ return shell_exec('/home/mojotrolls/mojo_zero/world stop 2>&1');} public static function sai_mod_saimod_mojotrollz_server_handling_action_worldstatus(){ - return shell_exec('/home/mojotrolls/mojo_zero/world status 2>&1');} + return world::status();} public static function sai_mod_saimod_mojotrollz_server_handling_action_compile(){ return shell_exec('/home/mojotrolls/mojo_zero/compile 2>&1');} public static function sai_mod_saimod_mojotrollz_server_handling_action_backup_db(){