From baaea85fb30c1a1a98a9625f9ee431ad234e1e8c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 16 Sep 2015 13:25:25 +0200 Subject: [PATCH] ts3 library reference, updated system reference, ts players on mainpage --- .gitmodules | 3 +++ lib/autoload.inc | 3 ++- lib/system | 2 +- lib/ts3 | 1 + mojotrollz/page/default_start/default_start.php | 8 ++++++++ mojotrollz/page/default_start/tpl/content_client.tpl | 2 +- mojotrollz/page/default_start/tpl/serverlist_tr.tpl | 2 +- 7 files changed, 17 insertions(+), 4 deletions(-) create mode 160000 lib/ts3 diff --git a/.gitmodules b/.gitmodules index 8726e06..02dbaf8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "lib/flexslider"] path = lib/flexslider url = git@mojotrollz.eu:webcraft/host_flexslider.git +[submodule "lib/ts3"] + path = lib/ts3 + url = git@mojotrollz.eu:webcraft/lib_ts3.git diff --git a/lib/autoload.inc b/lib/autoload.inc index 0b0f4f2..ef75c29 100644 --- a/lib/autoload.inc +++ b/lib/autoload.inc @@ -2,4 +2,5 @@ require_once dirname(__FILE__).'/system/autoload.inc'; require_once dirname(__FILE__).'/unslider/autoload.inc'; require_once dirname(__FILE__).'/font_awesome/autoload.inc'; -require_once dirname(__FILE__).'/flexslider/autoload.inc'; \ No newline at end of file +require_once dirname(__FILE__).'/flexslider/autoload.inc'; +require_once dirname(__FILE__).'/ts3/autoload.inc'; \ No newline at end of file diff --git a/lib/system b/lib/system index 9b8e0fb..f424846 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 9b8e0fb0952fa97e756987e4a69d785950eac463 +Subproject commit f4248464364cbb1bca66ac37d2e5a755371bdc64 diff --git a/lib/ts3 b/lib/ts3 new file mode 160000 index 0000000..ebb906e --- /dev/null +++ b/lib/ts3 @@ -0,0 +1 @@ +Subproject commit ebb906e2f2e30a3dda78cc1e245d27673ac163ee diff --git a/mojotrollz/page/default_start/default_start.php b/mojotrollz/page/default_start/default_start.php index 4aa395f..0b00830 100644 --- a/mojotrollz/page/default_start/default_start.php +++ b/mojotrollz/page/default_start/default_start.php @@ -20,6 +20,14 @@ class default_start extends \SYSTEM\PAGE\Page { while($row = $res->next()){ $row['version'] = self::version_icon($row['version']); $vars['server_list'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/serverlist_tr.tpl'),$row);} + + \LIB\lib_ts3::php(); + // connect to local server, authenticate and spawn an object for the virtual server on port 9987 + $ts3 = TeamSpeak3::factory("serverquery://mojotrollztsquery:9aYllYkG@127.0.0.1:10011/"); + // query clientlist from virtual server + $clients = $ts3->serverGetByPort(9987)->clientCount(); + $vars['ts_players'] = $clients; + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('basic')); return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_start.tpl'), $vars); } diff --git a/mojotrollz/page/default_start/tpl/content_client.tpl b/mojotrollz/page/default_start/tpl/content_client.tpl index 940604a..5b643d8 100644 --- a/mojotrollz/page/default_start/tpl/content_client.tpl +++ b/mojotrollz/page/default_start/tpl/content_client.tpl @@ -38,7 +38,7 @@

- Players on ts3:mojotrollz.eu: ${ts_players}   + Players on ts3:mojotrollz.eu: ${ts_players}