GEANT / CAT

ansible/ManagedSP/templates/web/index.php

Indentation +15 added lines, -15 removed lines

@@ -8,27 +8,27 @@
 if (isset($_REQUEST['port']) && isset($_REQUEST['secret']) &&
     isset($_REQUEST['country']) &&
     isset($_REQUEST['instid']) && isset($_REQUEST['deploymentid'])) {
-  if (isset($_REQUEST['remove'])) {
+    if (isset($_REQUEST['remove'])) {
     $remove = 1;
-  } else {
+    } else {
     if (isset($_REQUEST['operatorname'])) {
-      $opn = trim($_REQUEST['operatorname']);
+        $opn = trim($_REQUEST['operatorname']);
     } else {
-      $opn = OPNAME_PREFIX . trim($_REQUEST['instid']) . '-' . trim($_REQUEST['deploymentid']) . OPNAME_SUFFIX;
+        $opn = OPNAME_PREFIX . trim($_REQUEST['instid']) . '-' . trim($_REQUEST['deploymentid']) . OPNAME_SUFFIX;
     }
     if (isset($_REQUEST['vlan']) && isset($_REQUEST['realmforvlan']) &&
         is_array($_REQUEST['realmforvlan'])) {
-      $vlans = $_REQUEST['vlan'] . '#' . implode('#', $_REQUEST['realmforvlan']);
+        $vlans = $_REQUEST['vlan'] . '#' . implode('#', $_REQUEST['realmforvlan']);
+    }
     }
-  }
-  # arguments 5-7 are Base64 encoded
-  $res = cat_socket(implode(':', array($_REQUEST['country'],
-                                 $_REQUEST['instid'], $_REQUEST['deploymentid'],
-                                 $_REQUEST['port'],
-                                 base64_encode($_REQUEST['secret']),
-                                 base64_encode($opn), 
-                                 base64_encode($vlans), $remove)));
-  echo $res;
+    # arguments 5-7 are Base64 encoded
+    $res = cat_socket(implode(':', array($_REQUEST['country'],
+                                    $_REQUEST['instid'], $_REQUEST['deploymentid'],
+                                    $_REQUEST['port'],
+                                    base64_encode($_REQUEST['secret']),
+                                    base64_encode($opn), 
+                                    base64_encode($vlans), $remove)));
+    echo $res;
 } else {
-  echo "FAILURE";
+    echo "FAILURE";
 }

Spacing +2 added lines, -2 removed lines

@@ -14,11 +14,11 @@
     if (isset($_REQUEST['operatorname'])) {
       $opn = trim($_REQUEST['operatorname']);
     } else {
-      $opn = OPNAME_PREFIX . trim($_REQUEST['instid']) . '-' . trim($_REQUEST['deploymentid']) . OPNAME_SUFFIX;
+      $opn = OPNAME_PREFIX.trim($_REQUEST['instid']).'-'.trim($_REQUEST['deploymentid']).OPNAME_SUFFIX;
     }
     if (isset($_REQUEST['vlan']) && isset($_REQUEST['realmforvlan']) &&
         is_array($_REQUEST['realmforvlan'])) {
-      $vlans = $_REQUEST['vlan'] . '#' . implode('#', $_REQUEST['realmforvlan']);
+      $vlans = $_REQUEST['vlan'].'#'.implode('#', $_REQUEST['realmforvlan']);
     }
   }
   # arguments 5-7 are Base64 encoded

ansible/ManagedSP/templates/web/lib.inc

Indentation +8 added lines, -8 removed lines

@@ -4,12 +4,12 @@
 define('OPNAME_SUFFIX', '.hosted.eduroam.org');
 
 function cat_socket($obj) {
-   $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
-   $conn = socket_connect($sock, SOCKET);
-   if ( $conn ) {
-     socket_write ($sock, $obj, strlen($obj));
-     $out = socket_read ($sock, 2048);
-     return $out;
-   }
-   return 'FAILURE';
+    $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
+    $conn = socket_connect($sock, SOCKET);
+    if ( $conn ) {
+        socket_write ($sock, $obj, strlen($obj));
+        $out = socket_read ($sock, 2048);
+        return $out;
+    }
+    return 'FAILURE';
 }

Spacing +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 function cat_socket($obj) {
    $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
    $conn = socket_connect($sock, SOCKET);
-   if ( $conn ) {
-     socket_write ($sock, $obj, strlen($obj));
-     $out = socket_read ($sock, 2048);
+   if ($conn) {
+     socket_write($sock, $obj, strlen($obj));
+     $out = socket_read($sock, 2048);
      return $out;
    }
    return 'FAILURE';