MaximilianGT500/cache-domains
1
0
Fork 0
mirror of https://github.com/uklans/cache-domains synced 2025-06-19 07:52:56 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moving service type "A" into the logic with the others, to support the new $services_out format and individual cache server ip's

Browse Source
This commit is contained in:
Mikki Sørensen 2018-03-12 18:14:58 +01:00
parent 14b401719e
commit de55e8c580
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/lib/cli_mode.php
View File

@ -198,10 +198,6 @@ class cli_mode
echo "No services chosen" . PHP_EOL . PHP_EOL; echo "No services chosen" . PHP_EOL . PHP_EOL;
return $this->services(); return $this->services();
} }
elseif (in_array("A", $services))
{
return $files;
}
else else
{ {
// Ensure that nomather the order the json content is in we always find the correct service if the file name and the service name in the json match // Ensure that nomather the order the json content is in we always find the correct service if the file name and the service name in the json match
@ -278,7 +274,7 @@ class cli_mode
$services_out[$file] = $cache_server; $services_out[$file] = $cache_server;
} }
} }
elseif ((is_int(intval($service)) && $service == $key1+1) || $service == strtolower(scrape_between($file, "../../", ".txt"))) elseif ((is_int(intval($service)) && $service == $key1+1) || $service == strtolower(scrape_between($file, "../../", ".txt")) || $service == "A")
{ {
//Service is a int and and service match the file number we are lokking at, OR, the service name is the same as the file we are lokking in. //Service is a int and and service match the file number we are lokking at, OR, the service name is the same as the file we are lokking in.
if ($cache_server == "service_dependent") if ($cache_server == "service_dependent")