GEANT / CAT

web/skins/msp/user/cat_info.php

Indentation +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
          " . $Tou['title'] . "
     </h1>
 <div id='tou_1'>" . $Tou['subtitle'] .
-               '<div style="direction:ltr">' . $Tou['short'] . "</div>
+                '<div style="direction:ltr">' . $Tou['short'] . "</div>
 </div>
 <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
 <div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" .

docker/MSP/web/html/lib.inc

Indentation +8 added lines, -8 removed lines

@@ -2,12 +2,12 @@
 define('SOCKET', '/opt/Socket/CAT_requests/queue');
 
 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';
 }

core/Federation.php

Indentation +4 added lines, -4 removed lines

@@ -367,7 +367,7 @@ 
         if (\config\Master::MAILSETTINGS['notify_nro']) {
             foreach ($admins as $id) {
                 $user = new User($id);
-                 /// organisation
+                    /// organisation
                 $retval = $user->sendMailToUser(sprintf(_("%s in your federation was created"), common\Entity::$nomenclature_participant), $message);
                 if ($retval === FALSE) {
                     $this->loggerInstance->debug(2, "Mail to federation admin was NOT sent!\n");
@@ -434,7 +434,7 @@ 
         $newReq = new CertificationAuthorityEduPkiServer();
         $reqserial = $newReq->sendRequestToCa($csr, $revocationPin, $expiryDays);
         if ($reqserial > 0) {
-             $this->loggerInstance->writeAudit($user, "NEW", "Certificate request - NRO: ".$this->tld." - serial: ".$reqserial." - subject: ".$csr['SUBJECT']);
+                $this->loggerInstance->writeAudit($user, "NEW", "Certificate request - NRO: ".$this->tld." - serial: ".$reqserial." - subject: ".$csr['SUBJECT']);
             $reqQuery = "INSERT INTO federation_servercerts "
                 ."(federation_id, ca_name, request_serial, distinguished_name, status, revocation_pin) "
                 ."VALUES (?, 'eduPKI', ?, ?, 'REQUESTED', ?)";
@@ -494,7 +494,7 @@ 
         $result = $this->databaseHandle->exec($query);
         $rows = $result->fetch_all();
         foreach ($rows as $row) {
-           $activeProfiles[] = $row[0];
+            $activeProfiles[] = $row[0];
         }
         $query = "SELECT institution.inst_id AS inst_id, profile.profile_id AS profile_id, profile_option.option_value AS cert FROM profile_option JOIN profile ON profile_option.profile_id=profile.profile_id JOIN institution ON profile.inst_id=institution.inst_id WHERE profile_option.option_name='eap:ca_file' and institution.country='".$this->tld."'";        
         $result = $this->databaseHandle->exec($query);
@@ -579,7 +579,7 @@ 
                 'country' => strtoupper($idp->federation),
                 'instance' => $idp,
                 'realms' => $idpQuery->realms]
-                 ;
+                    ;
             $returnarray[$idp->identifier] = $idpInfo;
         }
         if ($activeOnly != 0) { // we're only doing this once.

core/common/Logging.php

Indentation +11 added lines, -11 removed lines

@@ -159,17 +159,17 @@
         }
     }
     
-     /**
-     * Writes an audit log entry to the audit log file - static version. These audits are semantic logs; they don't record every single modification
-     * in the database, but provide a logical "who did what" overview. The exact modification SQL statements are logged
-     * automatically with writeSQLAudit() instead. The log file path is configurable in _config.php.
-     * 
-     * @param string $user     persistent identifier of the user who triggered the action
-     * @param string $category type of modification, from the fixed vocabulary: "NEW", "OWN", "MOD", "DEL"
-     * @param string $message  message to log into the audit log
-     * @return boolean TRUE if successful. Will terminate script execution on failure. 
-     * @throws Exception
-     */
+        /**
+         * Writes an audit log entry to the audit log file - static version. These audits are semantic logs; they don't record every single modification
+         * in the database, but provide a logical "who did what" overview. The exact modification SQL statements are logged
+         * automatically with writeSQLAudit() instead. The log file path is configurable in _config.php.
+         * 
+         * @param string $user     persistent identifier of the user who triggered the action
+         * @param string $category type of modification, from the fixed vocabulary: "NEW", "OWN", "MOD", "DEL"
+         * @param string $message  message to log into the audit log
+         * @return boolean TRUE if successful. Will terminate script execution on failure. 
+         * @throws Exception
+         */
     public static function writeAudit_s($user, $category, $message)
     {
         switch ($category) {

web/admin/edit_hotspot.php

Indentation +5 added lines, -5 removed lines

@@ -109,7 +109,7 @@ 
                 $deployment->deactivate();
             }
             header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . 
-                   $deployment->identifier);
+                    $deployment->identifier);
             exit(0);
         case web\lib\common\FormElements::BUTTON_REMOVESP:
             $deployment->remove();
@@ -140,9 +140,9 @@ 
                     // valid signature
                     $data = openssl_x509_parse($deployment->radsec_cert);
                     $certdata = array(
-                              $data['serialNumberHex'],
-                              date_create_from_format('ymdGis', substr($data['validTo'], 0, -1))->format('YmdHis')
-                             );
+                                $data['serialNumberHex'],
+                                date_create_from_format('ymdGis', substr($data['validTo'], 0, -1))->format('YmdHis')
+                                );
                     $torevoke = implode('#', $certdata);
                     $response = $deployment->setRADIUSconfig(0, 0, $torevoke);
                     $deployment->tlsfromcsr($csr);
@@ -194,7 +194,7 @@ 
             }
             header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . $deployment->identifier);
             exit(0);
-          default:
+            default:
                 throw new Exception("Unknown button action requested!");
     }
 }

core/DeploymentManaged.php

Indentation +44 added lines, -44 removed lines

@@ -372,20 +372,20 @@ 
         );
         // Generate a new private (and public) key pair
         $privkey = openssl_pkey_new(array(
-                                          "private_key_bits" => 4096,
-                                          "private_key_type" => OPENSSL_KEYTYPE_RSA));
+                                            "private_key_bits" => 4096,
+                                            "private_key_type" => OPENSSL_KEYTYPE_RSA));
         // export private key to $clientprivateKey (as string)
         openssl_pkey_export($privkey, $this->radsec_priv);
         // Generate a certificate signing request
         $csr = openssl_csr_new($dn, $privkey,
-                               array('digest_alg' => 'sha256', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"));
+                                array('digest_alg' => 'sha256', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"));
         // get CA certificate and private key
         $caprivkey = array(file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.key"),
                             \config\Master::MANAGEDSP['capass']);
         $cacert = file_get_contents(ROOT .  "/config/ManagedSPCerts/eduroamSP-CA.pem");
         $this->setTLSSerialNumber();
         $clientcert = openssl_csr_sign($csr, $cacert, $caprivkey, \config\Master::MANAGEDSP['daystoexpiry'],
-                          array('digest_alg'=>'sha512', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"), $this->radsec_cert_serial_no);
+                            array('digest_alg'=>'sha512', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"), $this->radsec_cert_serial_no);
         openssl_x509_export($clientcert, $this->radsec_cert);
     } 
     /**
@@ -506,9 +506,9 @@ 
      */
     public function renewtls()
     {
-       $id = $this->identifier;
-       $futureTlsClient = $this->createTLScredentials();
-       $this->databaseHandle->exec("UPDATE deployment SET radsec_priv = ?, radsec_cert = ?, radsec_cert_serial_number = ? WHERE deployment_id = ?", "ssii", $this->radsec_priv, $this->radsec_cert, $this->radsec_cert_serial_no, $id);           
+        $id = $this->identifier;
+        $futureTlsClient = $this->createTLScredentials();
+        $this->databaseHandle->exec("UPDATE deployment SET radsec_priv = ?, radsec_cert = ?, radsec_cert_serial_number = ? WHERE deployment_id = ?", "ssii", $this->radsec_priv, $this->radsec_cert, $this->radsec_cert_serial_no, $id);           
     }
     
     /**
@@ -518,38 +518,38 @@ 
      */
     public function tlsfromcsr($csr)
     {
-       $id = $this->identifier;
-       $dn = array();
-       $dn['rdnSequence'] = array();
-       $dn['rdnSequence'][0] = array();
-       $dn['rdnSequence'][0][] = array('type' => 'id-at-organizationName', 'value' => array());
-       $dn['rdnSequence'][0][0]['value']['utf8String'] = 'eduroam';
-       $dn['rdnSequence'][1] = array();
-       $dn['rdnSequence'][1][] = array('type' => 'id-at-organizationalUnitName', 'value' => array());
-       $dn['rdnSequence'][1][0]['value']['utf8String'] = 'eduroam Managed SP';
-       $dn['rdnSequence'][2] = array();
-       $dn['rdnSequence'][2][] = array('type' => 'id-at-commonName', 'value' => array());
-       $dn['rdnSequence'][2][0]['value']['utf8String'] = 'SP' . $this->identifier . "-" . $this->institution;
-       $csr->setDN($dn);
-       $pemcakey = file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.key");
-       $cakey = \phpseclib3\Crypt\PublicKeyLoader::loadPrivateKey($pemcakey, \config\Master::MANAGEDSP['capass'] );
-       $pemca = file_get_contents(ROOT .  "/config/ManagedSPCerts/eduroamSP-CA.pem");
-       $ca = new \phpseclib3\File\X509();
-       $ca->loadX509($pemca);
-       $ca->setPrivateKey($cakey);
-       // Sign the updated request, producing the certificate.
-       $x509 = new \phpseclib3\File\X509();
-       $csr->setExtension('id-ce-keyUsage', ['digitalSignature', 'nonRepudiation', 'keyEncipherment']);
-       $csr->setExtension('id-ce-extKeyUsage', ['id-kp-clientAuth']);
-       $csr->setExtension('id-ce-basicConstraints', ['cA' => false], false);
-       $x509->setEndDate('+' . \config\Master::MANAGEDSP['daystoexpiry'] . ' days');
-       $this->setTLSSerialNumber(999999999999999999);
-       $x509->setSerialNumber($this->radsec_cert_serial_no, 10);
-       $cert = $x509->loadX509($x509->saveX509($x509->sign($ca, $csr)));
-       $this->radsec_cert = $x509->saveX509($cert);
-       $this->radsec_priv = NULL;
-       //$futureTlsClient = $this->createTLScredentials();
-       $this->databaseHandle->exec("UPDATE deployment SET radsec_priv = NULL, radsec_cert = ?, radsec_cert_serial_number = ? WHERE deployment_id = ?", "sii", $this->radsec_cert, $this->radsec_cert_serial_no, $id);           
+        $id = $this->identifier;
+        $dn = array();
+        $dn['rdnSequence'] = array();
+        $dn['rdnSequence'][0] = array();
+        $dn['rdnSequence'][0][] = array('type' => 'id-at-organizationName', 'value' => array());
+        $dn['rdnSequence'][0][0]['value']['utf8String'] = 'eduroam';
+        $dn['rdnSequence'][1] = array();
+        $dn['rdnSequence'][1][] = array('type' => 'id-at-organizationalUnitName', 'value' => array());
+        $dn['rdnSequence'][1][0]['value']['utf8String'] = 'eduroam Managed SP';
+        $dn['rdnSequence'][2] = array();
+        $dn['rdnSequence'][2][] = array('type' => 'id-at-commonName', 'value' => array());
+        $dn['rdnSequence'][2][0]['value']['utf8String'] = 'SP' . $this->identifier . "-" . $this->institution;
+        $csr->setDN($dn);
+        $pemcakey = file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.key");
+        $cakey = \phpseclib3\Crypt\PublicKeyLoader::loadPrivateKey($pemcakey, \config\Master::MANAGEDSP['capass'] );
+        $pemca = file_get_contents(ROOT .  "/config/ManagedSPCerts/eduroamSP-CA.pem");
+        $ca = new \phpseclib3\File\X509();
+        $ca->loadX509($pemca);
+        $ca->setPrivateKey($cakey);
+        // Sign the updated request, producing the certificate.
+        $x509 = new \phpseclib3\File\X509();
+        $csr->setExtension('id-ce-keyUsage', ['digitalSignature', 'nonRepudiation', 'keyEncipherment']);
+        $csr->setExtension('id-ce-extKeyUsage', ['id-kp-clientAuth']);
+        $csr->setExtension('id-ce-basicConstraints', ['cA' => false], false);
+        $x509->setEndDate('+' . \config\Master::MANAGEDSP['daystoexpiry'] . ' days');
+        $this->setTLSSerialNumber(999999999999999999);
+        $x509->setSerialNumber($this->radsec_cert_serial_no, 10);
+        $cert = $x509->loadX509($x509->saveX509($x509->sign($ca, $csr)));
+        $this->radsec_cert = $x509->saveX509($cert);
+        $this->radsec_priv = NULL;
+        //$futureTlsClient = $this->createTLScredentials();
+        $this->databaseHandle->exec("UPDATE deployment SET radsec_priv = NULL, radsec_cert = ?, radsec_cert_serial_number = ? WHERE deployment_id = ?", "sii", $this->radsec_cert, $this->radsec_cert_serial_no, $id);           
     }
     /**
      * marks the deployment as deactivated 
@@ -883,11 +883,11 @@ 
                 unlink("$zipdir/$key/detail.zip");
                 $files = scandir("$zipdir/$key/");
                 foreach($files as $file) {
-                  if ($file == '.' || $file == '..') continue;
-                  $data = file_get_contents("$zipdir/$key/$file");
-                  $zipt->addFromString("radius-$key/$file", $data);
-                  $cnt += 1;
-                  unlink("$zipdir/$key/$file");
+                    if ($file == '.' || $file == '..') continue;
+                    $data = file_get_contents("$zipdir/$key/$file");
+                    $zipt->addFromString("radius-$key/$file", $data);
+                    $cnt += 1;
+                    unlink("$zipdir/$key/$file");
                 } 
                 if (file_exists("$zipdir/$key")) {
                     rmdir("$zipdir/$key");

web/admin/inc/deploymentStats.inc.php

Indentation +13 added lines, -13 removed lines

@@ -20,7 +20,7 @@ 
     $deployment = $validator->existingDeploymentManaged($_GET['deployment_id'], $inst);
     $format = '';
     if (isset($_GET['as']) && $_GET['as']=='csv') {
-    	$format = 'csv';
+        $format = 'csv';
     }
     if (!isset($_POST['stats'])) {
         $backlog = $_GET['backlog'];
@@ -47,25 +47,25 @@ 
     
     $userAuthData = $deployment->retrieveStatistics($backlogTime);
     if ($format == 'csv') {
-	    header('Content-Type: text/csv');
+        header('Content-Type: text/csv');
             header('Content-Disposition: attachment; filename="backlog_'.$deployment->identifier.'_'.$backlog.'.csv"');
-	    $fp = fopen('php://output', 'w');
-	    fputcsv($fp, [_("Timestamp (UTC)"), _("Outer-Identity"), _("Result"), _("MAC Address"),
-		          _("Chargeable-User-Identity"), _("AP Identifier"), _("Protocol")], ';', '"', '');
-	    foreach ($userAuthData as $oneRecord) {
-		    fputcsv($fp, [$oneRecord['activity_time'], $oneRecord['outer_user'],
-			    ($oneRecord['result'] == "OK" ? _("Success") : _("Failure")),
-			    $oneRecord['mac'], $oneRecord['cui'],
-			    $oneRecord['ap_id'], $oneRecord['prot']], ';', '"', '');
+        $fp = fopen('php://output', 'w');
+        fputcsv($fp, [_("Timestamp (UTC)"), _("Outer-Identity"), _("Result"), _("MAC Address"),
+                    _("Chargeable-User-Identity"), _("AP Identifier"), _("Protocol")], ';', '"', '');
+        foreach ($userAuthData as $oneRecord) {
+            fputcsv($fp, [$oneRecord['activity_time'], $oneRecord['outer_user'],
+                ($oneRecord['result'] == "OK" ? _("Success") : _("Failure")),
+                $oneRecord['mac'], $oneRecord['cui'],
+                $oneRecord['ap_id'], $oneRecord['prot']], ';', '"', '');
             }
-	    fclose($fp);
+        fclose($fp);
     } else {
     ?>
     
     <h1><?php $tablecaption = _("Deployment Usage Records"); echo $tablecaption; ?></h1>
     <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)");
-             echo _("Protocol is a protocol used between a client and RADIUS server, for TLS it is a /-separated tuple TLS/TLS-Client-Cert-Serial");
-       ?></p>
+                echo _("Protocol is a protocol used between a client and RADIUS server, for TLS it is a /-separated tuple TLS/TLS-Client-Cert-Serial");
+        ?></p>
     <table class='authrecord'>
         <caption><?php echo $tablecaption;?></caption>
         <tr>

web/admin/overview_sp.php

Indentation +15 added lines, -15 removed lines

@@ -20,11 +20,11 @@ 
  *          <base_url>/copyright.php after deploying the software
  * */
  
- /**
- * This file is used to display a deployment.
- * 
- * @author Maja Gorecka-Wolniewicz <mgw@umk.pl>
- */
+    /**
+     * This file is used to display a deployment.
+     * 
+     * @author Maja Gorecka-Wolniewicz <mgw@umk.pl>
+     */
 ?>
 <?php
 
@@ -342,7 +342,7 @@ 
                         if ($deploymentObject->radsec_cert != NULL) {
                             echo "<i>";
                             echo _('If your certificate is close to expiry or you need to create new RADIUS over TLS credentials') . '<br>' .
-                                 _('click on "Renew RADIUS over TLS credentials" button') . '<br>';
+                                    _('click on "Renew RADIUS over TLS credentials" button') . '<br>';
                         
                             echo '<br/>' . _('You can upload your own CSR to replace default TLS credentials.') . '<br>' . 
                                 _('Click on "Upload CSR to sign my own TLS credentials"');
@@ -361,7 +361,7 @@ 
                         <td>
                             <?php printf(_("PSK Identity: %s"), "<span id='pskid_data_$depId'>SP".$depId.'-'.$deploymentObject->institution.'</span>');
                             echo copyIcon("pskid_icon_$depId");
-                           ?>
+                            ?>
                             <br>
                             <?php printf(_("PSK hexphrase: %s"), "<span id='pskkey_data_$depId'>".$deploymentObject->pskkey."</span>");
                             echo copyIcon("pskkey_icon_$depId");
@@ -564,7 +564,7 @@ 
             <h1><?php echo $tablecaption; ?></h1>
             <h2><?php echo _("5 most recent authentications");?></h2>
             <p><?php echo _("<b>AP Identifier</b> is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id") .'<br>';
-                     echo _("<b>Protocol</b> is a protocol used between a client and RADIUS server, for TLS it is a /-separated tuple TLS/<i>TLS-Client-Cert-Serial</i>"); ?></p>
+                        echo _("<b>Protocol</b> is a protocol used between a client and RADIUS server, for TLS it is a /-separated tuple TLS/<i>TLS-Client-Cert-Serial</i>"); ?></p>
             <table class='authrecord'>
     <caption><?php echo $tablecaption;?></caption>
     <tr style='text-align: left;'>
@@ -585,9 +585,9 @@ 
                 . "<td>".$oneRecord['outer_user']."</td>"
                 . "<td>".($oneRecord['result'] == "OK" ? _("Success") : _("Failure"))."</td>"
                 . "<td>".$oneRecord['mac']."</td>"
-		. "<td>".substr($oneRecord['cui'], 0, 18)
-		. ($oneRecord['cui']=='' ? "" : "... " . copyIcon("cui_icon_".$deploymentObject->identifier."_$i") 
-	        . "<span style='display: none;' id='cui_data_".$deploymentObject->identifier."_$i'>".$oneRecord['cui'].'</span>')."</td>"
+        . "<td>".substr($oneRecord['cui'], 0, 18)
+        . ($oneRecord['cui']=='' ? "" : "... " . copyIcon("cui_icon_".$deploymentObject->identifier."_$i") 
+            . "<span style='display: none;' id='cui_data_".$deploymentObject->identifier."_$i'>".$oneRecord['cui'].'</span>')."</td>"
                 . "<td>".$oneRecord['ap_id']."</td>"
                 . "<td>".$oneRecord['prot']."</td>"
                 . "</tr>";
@@ -627,7 +627,7 @@ 
             $query = 'inc/deploymentLogs.inc.php?inst_id='.$deploymentObject->institution."&deployment_id=$depId&backlog=";
             ?></h2>
             <?php echo _('You will receive zip file with logs from both RADIUS servers: primary (folder named radius-1) and secondary (folder named radius-2).') . '<br>' .
-                  _('If no logs are available an empty zip file is provided.');?>
+                    _('If no logs are available an empty zip file is provided.');?>
             <div style='height:3px'></div>
             <button name="logs" type="button" onclick="location.href='<?php echo $query;?>1';"><?php echo _('Today');?>
             </button>
@@ -659,9 +659,9 @@ 
     foreach (array($dsp->host1_v4, $dsp->host2_v4) as $host) {
         $connection = @fsockopen($host, \config\Master::MANAGEDSP['radiusconfigport']);
         if (is_resource($connection)) {
-           fclose($connection);
+            fclose($connection);
         } else {
-           return false;
+            return false;
         }
     }
     return true;
@@ -683,7 +683,7 @@ 
                             </button>
                             <span style='color: red;'>
                             <?php if ($hasMail == 0) { 
-                              echo _("Helpdesk mail address is required but missing!");  
+                                echo _("Helpdesk mail address is required but missing!");  
                             }
                             ?>
                             </span>

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";
 }