yebekhe / TelegramV2rayCollector

modules/singbox.php

Spacing +18 added lines, -18 removed lines

@@ -14,14 +14,14 @@ 
     return $length % 2 == 0;
 }
 
-function process_jsons($input, $locationNames){
+function process_jsons($input, $locationNames) {
     $input[0]['outbounds'] = array_merge($input[0]['outbounds'], array_filter($locationNames));
     return $input;
 }
 
-function extract_names($input){
-    foreach($input as $config){
-        if ($config['tag'] !== ""){
+function extract_names($input) {
+    foreach ($input as $config) {
+        if ($config['tag'] !== "") {
              $locationNames[] = $config['tag'];
         }
     }
@@ -271,7 +271,7 @@ 
 
 function ShadowsocksSingbox($ShadowsocksUrl) {
     $decoded_shadowsocks = ParseShadowsocks($ShadowsocksUrl);
-    if (is_null($decoded_shadowsocks['name']) || $decoded_shadowsocks['name'] === ""){
+    if (is_null($decoded_shadowsocks['name']) || $decoded_shadowsocks['name'] === "") {
         return null;
     }
     if ($decoded_shadowsocks['encryption_method'] === "chacha20-poly1305") {
@@ -371,7 +371,7 @@ 
     return $configResult;
 }
 
-function GenerateConfig($input, $output, $theType){
+function GenerateConfig($input, $output, $theType) {
     $outbound = [];
     $v2ray_subscription = str_replace(" ", "%20", $input);
 
@@ -379,7 +379,7 @@ 
     foreach ($configArray as $config) {
         $configType = detect_type($config);
         $config = str_replace("%20", " ", $config);
-        switch($configType) {
+        switch ($configType) {
             case "vmess":
                 $configSingbox = VmessSingbox($config);
                 break;
@@ -399,9 +399,9 @@ 
                 $configSingbox = ShadowsocksSingbox($config);
                 break;
         }
-        if (!is_null($configSingbox)){
+        if (!is_null($configSingbox)) {
             $configName = $configSingbox['tag'];
-            if (stripos($configName, "RELAY

Braces +18 added lines, -6 removed lines

@@ -97,7 +97,9 @@ 
             "max_early_data" => $pathProcess['max_early_data'],
             "early_data_header_name" => "Sec-WebSocket-Protocol",
         ];
-        if ($configResult["transport"]["headers"]["Host"] === "" || is_null($configResult["transport"]["headers"]["Host"])) return null;
+        if ($configResult["transport"]["headers"]["Host"] === "" || is_null($configResult["transport"]["headers"]["Host"])) {
+            return null;
+        }
     } elseif ($decode_vmess["net"] === "grpc") {
         $configResult["transport"] = [
             "type" => $decode_vmess["net"],
@@ -106,7 +108,9 @@ 
             "ping_timeout" => "15s",
             "permit_without_stream" => false,
         ];
-      if ($configResult["transport"]["service_name"] === "" || is_null($configResult["transport"]["service_name"])) return null;
+      if ($configResult["transport"]["service_name"] === "" || is_null($configResult["transport"]["service_name"])) {
+          return null;
+      }
     }
 
     return $configResult;
@@ -200,8 +204,12 @@ 
                 $transportTypes[$decoded_vless["params"]["type"]];
         }
     }
-    if ($decoded_vless["params"]["type"] === "ws" && ($configResult["transport"]["headers"]["Host"] === "" || is_null($configResult["transport"]["headers"]["Host"]))) return null;
-    if ($decoded_vless["params"]["type"] === "grpc" && ($configResult["transport"]["service_name"] === "" || is_null($configResult["transport"]["service_name"]))) return null;
+    if ($decoded_vless["params"]["type"] === "ws" && ($configResult["transport"]["headers"]["Host"] === "" || is_null($configResult["transport"]["headers"]["Host"]))) {
+        return null;
+    }
+    if ($decoded_vless["params"]["type"] === "grpc" && ($configResult["transport"]["service_name"] === "" || is_null($configResult["transport"]["service_name"]))) {
+        return null;
+    }
     return $configResult;
 }
 
@@ -264,8 +272,12 @@ 
                 $transportTypes[$decoded_trojan["params"]["type"]];
         }
     }
-    if ($decoded_trojan["params"]["type"] === "ws" && ($configResult["transport"]["headers"]["Host"] === "" || is_null($configResult["transport"]["headers"]["Host"]))) return null;
-    if ($decoded_trojan["params"]["type"] === "grpc" && ($configResult["transport"]["service_name"] === "" || is_null($configResult["transport"]["service_name"]))) return null;
+    if ($decoded_trojan["params"]["type"] === "ws" && ($configResult["transport"]["headers"]["Host"] === "" || is_null($configResult["transport"]["headers"]["Host"]))) {
+        return null;
+    }
+    if ($decoded_trojan["params"]["type"] === "grpc" && ($configResult["transport"]["service_name"] === "" || is_null($configResult["transport"]["service_name"]))) {
+        return null;
+    }
     return $configResult;
 }