diff --git a/iframeServerBanner.php b/iframeServerBanner.php index 43c472d..a81ceb9 100644 --- a/iframeServerBanner.php +++ b/iframeServerBanner.php @@ -99,6 +99,7 @@ $tsAdmin->selectServer($port, "port"); $serverinfo = $tsAdmin->serverInfo(); $clients = $tsAdmin->clientList("-ip"); + $ts3clients = array(); if(!empty($clients['data'])) { @@ -109,9 +110,13 @@ $ts3clients[htmlentities($client['connection_client_ip'])] = htmlentities($client['client_nickname']); }; }; - $clientcache = fopen('./images/ts_banner/'.$instanz.'_'.$port.'_clients.php', 'w+'); - fwrite($clientcache, '$textInfos) + { + if (!file_exists($textInfos['fontfile'])) + { + throw new Exception ('Font File not found! Searched at '.$textInfos['fontfile'].PHP_EOL.'You may need to set the absolute path (from root directory /var/www/...)'); + }; + + if (strpos($text, '%nickname%') !== FALSE) + { + continue; + }; + + paintText($image, $textInfos['fontsize'], $textInfos['x'], $textInfos['y'], $textInfos['color'], $textInfos['fontfile'], $textInfos['text']); + }; + /* Clearing */ diff --git a/php/admin/web_admin_logs.php b/php/admin/web_admin_logs.php index 04dde49..09403bf 100644 --- a/php/admin/web_admin_logs.php +++ b/php/admin/web_admin_logs.php @@ -75,12 +75,16 @@
".$language['log_not_possible']."
"; } diff --git a/php/functions/functions.php b/php/functions/functions.php index ff1911d..617efd8 100644 --- a/php/functions/functions.php +++ b/php/functions/functions.php @@ -34,7 +34,7 @@ /* Installed Webinterface version */ - define("INTERFACE_VERSION", "1.3.12-OPEN-BETA"); + define("INTERFACE_VERSION", "1.3.13-OPEN-BETA"); /* Anti XSS diff --git a/php/functions/functionsTeamspeakPost.php b/php/functions/functionsTeamspeakPost.php index 27dfad6..4866c8f 100644 --- a/php/functions/functionsTeamspeakPost.php +++ b/php/functions/functionsTeamspeakPost.php @@ -508,7 +508,7 @@ { if(isSet($_POST['instanz'])) { - echo json_encode(getTeamspeakslots($_POST['instanz'], $_POST['force'])); + echo json_encode(getTeamspeakslots($_POST['instanz'], (isset($_POST['force'])) ? $_POST['force'] : false)); } else { diff --git a/php/main/web_main_main.php b/php/main/web_main_main.php index 556fc2e..a993bb3 100644 --- a/php/main/web_main_main.php +++ b/php/main/web_main_main.php @@ -65,32 +65,34 @@ $time = str_replace(".json", "", $datei); $cont = array(); $json = file_get_contents("../../files/news/".$datei); - $cont = json_decode($json, true); ?> + $cont = json_decode($json, true); -+ +
+ +- -
- -