Skip to content

Commit

Permalink
IVAO: add private servers support (WHAZZUP_URL_IVAO in config.php)
Browse files Browse the repository at this point in the history
  • Loading branch information
Iunusov committed Nov 4, 2020
1 parent 5022d30 commit c4f7c61
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
3 changes: 3 additions & 0 deletions config.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
define("STATUS_URL_IVAO", "https://www.ivao.aero/whazzup/status.txt");
define("STATUS_URL_VATSIM", "http://status.vatsim.net/");


define("WHAZZUP_URL_IVAO", ""); // for private servers

define("CACHE_LIFETIME_SECONDS", 100);

define("CLIENTS_DATA", "CLIENTS_DATA");
Expand Down
13 changes: 7 additions & 6 deletions vatsim_parser/parse.php
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ function trytoparse($url)
{
//error_log('old data, skip');
return false;

}

preg_match_all("/(.*?):" . EOL__ . "/", $clients_container[1], $clients);
Expand Down Expand Up @@ -297,16 +297,17 @@ function trytoparse($url)
return true;
}

getServers();
$serversArray = loadServersArray();
if (isIvao())
$serversArray = array();
if (isIvao() && defined("WHAZZUP_URL_IVAO") && !empty(WHAZZUP_URL_IVAO))
{
$serversArray[] = "https://api.ivao.aero/getdata/whazzup/whazzup.txt";
$serversArray[] = WHAZZUP_URL_IVAO;
}
else
{
$serversArray[] = "http://eu.data.vatsim.net/vatsim-data.txt";
getServers();
$serversArray = loadServersArray();
}

if (count($serversArray) <= 0)
{
error_log("loadServersArray() fails!");
Expand Down

0 comments on commit c4f7c61

Please sign in to comment.