Update cmd_overrides + stripArtifacts regex

RaspAP · Oct 21, 2023 · ee662ad · ee662ad
1 parent 1e6d945
commit ee662ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/config/vpn-providers.json b/config/vpn-providers.json
@@ -7,7 +7,8 @@
             "install_page": "https://www.expressvpn.com/support/vpn-setup/app-for-linux/",
             "cmd_overrides": {
                "countries": "list all",
-               "log": "diagnostics"
+               "log": "diagnostics",
+               "version": "-v"
             },
             "regex": {
                 "status": "\/not connected\/",

diff --git a/includes/provider.php b/includes/provider.php
@@ -122,7 +122,7 @@ function saveProviderConfig($status, $binPath, $country, $id = null)
  */
 function stripArtifacts($output, $pattern = null)
 {
-    $result = preg_replace('/[-\/\n\t\\\\'.$pattern.'|]/', '', $output);
+    $result = preg_replace('/[-\/\n\t\\\\'.$pattern.'|\[0m\[1;33;49m]/', '', $output);
     return $result;
 }