GEANT / CAT

docker/MSP/web/html/index.php

Indentation +45 added lines, -45 removed lines

@@ -5,37 +5,37 @@ 
 $opn = $vlans = '';
 $guest_vlan = 0;
 if ( isset($_POST['enc'])  && $_POST['enc'] != '' && ($enc=base64_decode($_POST['enc'], true)) !== false ) {
-	$decrypted = openssl_decrypt($enc, "CHACHA20", SERVER_SECRET, 0, SERVER_IV);
-	if ($decrypted === false) {
-          echo "FAILURE";
-          exit;	  
-	} else {
-	  parse_str($decrypted, $darr);
-	  if (!isset($darr['token']) || $darr['token'] != SERVER_TOKEN) {
-		  echo "FAILURE";
-		  exit;
-          } 
-	} 
+    $decrypted = openssl_decrypt($enc, "CHACHA20", SERVER_SECRET, 0, SERVER_IV);
+    if ($decrypted === false) {
+            echo "FAILURE";
+            exit;	  
+    } else {
+        parse_str($decrypted, $darr);
+        if (!isset($darr['token']) || $darr['token'] != SERVER_TOKEN) {
+            echo "FAILURE";
+            exit;
+            } 
+    } 
 }
 # when a request contains logid and backlog ";s:11:"DEBUG-11-52";s:7:"backlog";s:1:"7";}
 if ( isset($darr['logid']) && isset($darr['backlog']) && isset($darr['iv']) ) {
-	if (substr($darr['logid'], 0, 5) == 'DEBUG') {
-          $logid = substr($darr['logid'], 6);
+    if (substr($darr['logid'], 0, 5) == 'DEBUG') {
+            $logid = substr($darr['logid'], 6);
         }
-	$iv = $darr['iv'];
-  	$res = cat_socket(implode(':', array($logid, $darr['backlog'])));
-	$cnt = 0;
-	if (substr($res, 0, strlen(ZIPDIR)) == ZIPDIR) {
-	    $content = file_get_contents($res);
+    $iv = $darr['iv'];
+        $res = cat_socket(implode(':', array($logid, $darr['backlog'])));
+    $cnt = 0;
+    if (substr($res, 0, strlen(ZIPDIR)) == ZIPDIR) {
+        $content = file_get_contents($res);
             $encrypted = openssl_encrypt(SERVER_TOKEN . $content, "CHACHA20", SERVER_SECRET, 0, $iv);
-	    header('Content-Type: application/octet-stream');
+        header('Content-Type: application/octet-stream');
             header("Content-Transfer-Encoding: binary");
-	    echo "ZIPDATA:$encrypted";
-	}
-	if (file_exists($res)) {
-	  unlink($res);
-	}
-	exit;
+        echo "ZIPDATA:$encrypted";
+    }
+    if (file_exists($res)) {
+        unlink($res);
+    }
+    exit;
 }
 # MUST provide: deployment_id, inst_id
 #               and port, secret, pskkey, country or torevoke
@@ -44,33 +44,33 @@ 
     isset($darr['instid']) && isset($darr['deploymentid']) &&
     (isset($darr['port']) && isset($darr['secret']) && isset($darr['pskkey']) && isset($darr['country']) ||
      isset($darr['torevoke']))) {
-  if (isset($darr['remove'])) {
+    if (isset($darr['remove'])) {
     $remove = 1;
-  } else {
+    } else {
     if (isset($darr['operatorname'])) {
-      $opn = trim($darr['operatorname']);
+        $opn = trim($darr['operatorname']);
     }
     if (isset($darr['vlan']) && isset($darr['realmforvlan']) &&
         is_array($darr['realmforvlan'])) {
-      $vlans = $darr['vlan'] . '#' . implode('#', $darr['realmforvlan']);
+        $vlans = $darr['vlan'] . '#' . implode('#', $darr['realmforvlan']);
     }
     if (isset($darr['guest_vlan'])) {
-      $guest_vlan = $darr['guest_vlan'];
+        $guest_vlan = $darr['guest_vlan'];
+    }
+    }
+    if (isset($darr['torevoke'])) {
+        $el = explode('#', $darr['torevoke']);
+        $res = cat_socket(implode(':', array($darr['instid'], $darr['deploymentid'], $el[0], $el[1])));
+    } else {
+        # arguments 5-7 are Base64 encoded
+        $res = cat_socket(implode(':', array($darr['country'],
+                                    $darr['instid'], $darr['deploymentid'],
+                                    $darr['port'],
+                                    base64_encode($darr['secret']),
+                                    base64_encode($opn), 
+                                    base64_encode($vlans), base64_encode($darr['pskkey']), $guest_vlan, $remove)));
     }
-  }
-  if (isset($darr['torevoke'])) {
-	  $el = explode('#', $darr['torevoke']);
-	  $res = cat_socket(implode(':', array($darr['instid'], $darr['deploymentid'], $el[0], $el[1])));
-  } else {
-  	# arguments 5-7 are Base64 encoded
-  	$res = cat_socket(implode(':', array($darr['country'],
-                                 $darr['instid'], $darr['deploymentid'],
-                                 $darr['port'],
-                                 base64_encode($darr['secret']),
-                                 base64_encode($opn), 
-                                 base64_encode($vlans), base64_encode($darr['pskkey']), $guest_vlan, $remove)));
-  }
-  echo $res;
+    echo $res;
 } else {
-  echo "FAILURE";
+    echo "FAILURE";
 }

Spacing +4 added lines, -4 removed lines

@@ -4,7 +4,7 @@ 
 $remove = 0;
 $opn = $vlans = '';
 $guest_vlan = 0;
-if ( isset($_POST['enc'])  && $_POST['enc'] != '' && ($enc=base64_decode($_POST['enc'], true)) !== false ) {
+if (isset($_POST['enc']) && $_POST['enc'] != '' && ($enc = base64_decode($_POST['enc'], true)) !== false) {
 	$decrypted = openssl_decrypt($enc, "CHACHA20", SERVER_SECRET, 0, SERVER_IV);
 	if ($decrypted === false) {
           echo "FAILURE";
@@ -18,7 +18,7 @@ 
 	} 
 }
 # when a request contains logid and backlog ";s:11:"DEBUG-11-52";s:7:"backlog";s:1:"7";}
-if ( isset($darr['logid']) && isset($darr['backlog']) && isset($darr['iv']) ) {
+if (isset($darr['logid']) && isset($darr['backlog']) && isset($darr['iv'])) {
 	if (substr($darr['logid'], 0, 5) == 'DEBUG') {
           $logid = substr($darr['logid'], 6);
         }
@@ -27,7 +27,7 @@ 
 	$cnt = 0;
 	if (substr($res, 0, strlen(ZIPDIR)) == ZIPDIR) {
 	    $content = file_get_contents($res);
-            $encrypted = openssl_encrypt(SERVER_TOKEN . $content, "CHACHA20", SERVER_SECRET, 0, $iv);
+            $encrypted = openssl_encrypt(SERVER_TOKEN.$content, "CHACHA20", SERVER_SECRET, 0, $iv);
 	    header('Content-Type: application/octet-stream');
             header("Content-Transfer-Encoding: binary");
 	    echo "ZIPDATA:$encrypted";
@@ -52,7 +52,7 @@ 
     }
     if (isset($darr['vlan']) && isset($darr['realmforvlan']) &&
         is_array($darr['realmforvlan'])) {
-      $vlans = $darr['vlan'] . '#' . implode('#', $darr['realmforvlan']);
+      $vlans = $darr['vlan'].'#'.implode('#', $darr['realmforvlan']);
     }
     if (isset($darr['guest_vlan'])) {
       $guest_vlan = $darr['guest_vlan'];