diff --git a/includes/functions.php b/includes/functions.php index d8bc546..5e9a4b4 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -230,6 +230,8 @@ function DisplayLokinetConfig() exec('pidof lokinet | wc -l', $lokinetstatus); if ($lokinetstatus[0] != 0) { $exitstatus = exec("lokinet-vpn --status"); + } else { + $exitstatus = "no exits"; } $rulestate = exec("ip rule show default | grep lokinet | awk {'print $5'}", $output); $lokiversion = exec("dpkg -s lokinet | grep '^Version:'", $output); @@ -265,10 +267,10 @@ function DisplayLokinetConfig()
' , PHP_EOL; - } else { + if ($exitstatus != "no exits") { echo '' , PHP_EOL; + } else { + echo '' , PHP_EOL; } if ($lokinetstatus[0] == 0) { echo '' , PHP_EOL; @@ -367,7 +369,8 @@ function ActivateLokinetConfig() //STOP } elseif (isset($_POST['StopDaemon'])) { - exec('sudo /var/lib/lokinet/lokilaunch.sh stop'); + exec ('sudo /var/lib/lokinet/lokilaunch.sh exitdown'); + exec('sudo /var/lib/lokinet/lokilaunch.sh stop'); DisplayLokinetConfig(); //START EXIT