GEANT / CAT

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

Spacing +51 added lines, -51 removed lines

@@ -322,7 +322,7 @@ 
                 $serverCandidates[IdPlist::geoDistance($adminLocation, ['lat' => $iterator->location_lat, 'lon' => $iterator->location_lon])] = $iterator->server_id;
             }
             if ($clients > $maxSupportedClients * 0.9) {
-                $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (" . $iterator->server_id . ") is serving at more than 90% capacity!");
+                $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (".$iterator->server_id.") is serving at more than 90% capacity!");
             }
         }
         if (count($serverCandidates) == 0 && $federation != "DEFAULT") {
@@ -344,7 +344,7 @@ 
      * 
      * @throws Exception
      */
-    private function setTLSSerialNumber($max=PHP_INT_MAX) {
+    private function setTLSSerialNumber($max = PHP_INT_MAX) {
         $nonDupSerialFound = FALSE;
         do {
             $serial = random_int(1000000000, $max);
@@ -364,7 +364,7 @@ 
      */
     private function createTLScredentials()
     {
-        $clientName = 'SP' . $this->identifier . '-' . $this->institution;
+        $clientName = 'SP'.$this->identifier.'-'.$this->institution;
         $dn = array(
                     "organizationName" => "eduroam",
                     "organizationalUnitName" => "eduroam Managed SP",
@@ -378,14 +378,14 @@ 
         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"),
+        $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");
+        $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);
     } 
     /**
@@ -410,8 +410,8 @@ 
             $conditional1 = "AND activity_time > DATE_SUB(NOW(), INTERVAL $backlog SECOND )";
             $conditional2 = "DESC";
         }
-        $client = 'SP' . $this->identifier . '-' . $this->institution;
-        $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result, ap_id, prot, outer_user FROM activity WHERE owner = ? $conditional1 ORDER BY activity_time $conditional2", "s", $client );
+        $client = 'SP'.$this->identifier.'-'.$this->institution;
+        $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result, ap_id, prot, outer_user FROM activity WHERE owner = ? $conditional1 ORDER BY activity_time $conditional2", "s", $client);
        
         return mysqli_fetch_all($stats, \MYSQLI_ASSOC);
     }
@@ -529,11 +529,11 @@ 
        $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;
+       $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");
+       $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);
@@ -542,7 +542,7 @@ 
        $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');
+       $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)));
@@ -584,7 +584,7 @@ 
     {
         $customAttrib = $this->getAttributes("managedsp:operatorname");
         if (count($customAttrib) == 0) {
-            return "1sp." . $this->identifier . "-" . $this->institution . \config\ConfAssistant::SILVERBULLET['realm_suffix'];
+            return "1sp.".$this->identifier."-".$this->institution.\config\ConfAssistant::SILVERBULLET['realm_suffix'];
         }
         return $customAttrib[0]["value"];
     }
@@ -599,14 +599,14 @@ 
     private function sendToRADIUS(int $idx, $post)
     {
         $hostname = "radius_hostname_$idx";
-        $ch = curl_init("http://" . $this->$hostname . ':' . \config\Master::MANAGEDSP['radiusconfigport']);
+        $ch = curl_init("http://".$this->$hostname.':'.\config\Master::MANAGEDSP['radiusconfigport']);
         if ($ch === FALSE) {
             $res = 'FAILURE';
         } else {
             curl_setopt($ch, CURLOPT_USERAGENT, "CAT-ManagedSP");
             curl_setopt($ch, CURLOPT_POST, 1);
             curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
-            $this->loggerInstance->debug(1, "Posting to http://" . $this->$hostname . ':' . \config\Master::MANAGEDSP['radiusconfigport'] . "/$post\n");
+            $this->loggerInstance->debug(1, "Posting to http://".$this->$hostname.':'.\config\Master::MANAGEDSP['radiusconfigport']."/$post\n");
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
             curl_setopt($ch, CURLOPT_HEADER, 0);
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -647,19 +647,19 @@ 
         } else {
             $txt = $remove ? _('Profile deactivation failed') : _('Profile activation/modification failed');
         }
-        $txt = $txt . ' ';
+        $txt = $txt.' ';
         if (array_count_values($response)[$status] == 2) {
-            $txt = $txt . _('on both RADIUS servers: primary and backup') . '.';
+            $txt = $txt._('on both RADIUS servers: primary and backup').'.';
         } else {
             if ($response['res[1]'] == $status) {
-                $txt = $txt . _('on primary RADIUS server') . '.';
+                $txt = $txt._('on primary RADIUS server').'.';
             } else {
-                $txt = $txt . _('on backup RADIUS server') . '.';
+                $txt = $txt._('on backup RADIUS server').'.';
             }
         }
         $mail = \core\common\OutsideComm::mailHandle();
         $email = $this->getAttributes("support:email")[0]['value'];
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System";
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System";
         $mail->addAddress($email);
         if ($status == 'OK') {
             $mail->Subject = _('RADIUS profile update problem fixed');
@@ -693,7 +693,7 @@ 
             return NULL;
         }
         $timeout = 10;
-        curl_setopt($ch, CURLOPT_URL, 'http://' . $host);
+        curl_setopt($ch, CURLOPT_URL, 'http://'.$host);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
         curl_exec($ch);
@@ -785,52 +785,52 @@ 
     {
         $toPost = ($onlyone ? array($onlyone => '') : array(1 => '', 2 => ''));
         if ($torevoke != '') {
-            $toPostTemplate = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier .
+            $toPostTemplate = 'instid='.$this->institution.'&deploymentid='.$this->identifier.
                     "&torevoke=$torevoke";
             foreach (array_keys($toPost) as $key) {
                 $toPost[$key] = $toPostTemplate;
             }
         } else {
             $remove = ($this->status == \core\AbstractDeployment::INACTIVE) ? 0 : 1;
-            $toPostTemplate = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier . 
-                '&secret=' . $this->secret .
-                '&country=' . $this->getAttributes("internal:country")[0]['value'] .
-                '&pskkey=' . $this->pskkey . '&';
+            $toPostTemplate = 'instid='.$this->institution.'&deploymentid='.$this->identifier. 
+                '&secret='.$this->secret.
+                '&country='.$this->getAttributes("internal:country")[0]['value'].
+                '&pskkey='.$this->pskkey.'&';
             if ($remove) {
-                $toPostTemplate = $toPostTemplate . 'remove=1&';
+                $toPostTemplate = $toPostTemplate.'remove=1&';
             } else {
-                $toPostTemplate = $toPostTemplate . 'operatorname=' . $this->getOperatorName() . '&'; 
+                $toPostTemplate = $toPostTemplate.'operatorname='.$this->getOperatorName().'&'; 
                 if ($this->getAttributes("managedsp:vlan")[0]['value'] ?? NULL) {
                     $allRealms = $this->getAllRealms();
                     if (!empty($allRealms)) {
-                        $toPostTemplate = $toPostTemplate . 'vlan=' . $this->getAttributes("managedsp:vlan")[0]['value'] . '&';
-                        $toPostTemplate = $toPostTemplate . 'realmforvlan[]=' . implode('&realmforvlan[]=', $allRealms) . '&';
+                        $toPostTemplate = $toPostTemplate.'vlan='.$this->getAttributes("managedsp:vlan")[0]['value'].'&';
+                        $toPostTemplate = $toPostTemplate.'realmforvlan[]='.implode('&realmforvlan[]=', $allRealms).'&';
                     }
                 }
                 if ($this->getAttributes("managedsp:guest_vlan")[0]['value'] ?? NULL) {
-                    $toPostTemplate = $toPostTemplate . 'guest_vlan=' . $this->getAttributes("managedsp:guest_vlan")[0]['value'] . '&';
+                    $toPostTemplate = $toPostTemplate.'guest_vlan='.$this->getAttributes("managedsp:guest_vlan")[0]['value'].'&';
                 }
             }
             foreach (array_keys($toPost) as $key) {
-                $elem = 'port' . $key;
-                $toPost[$key] = $toPostTemplate . 'port=' . $this->$elem;
+                $elem = 'port'.$key;
+                $toPost[$key] = $toPostTemplate.'port='.$this->$elem;
             }
         }
         $response = array();
         foreach ($toPost as $key => $value) {
-            $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n");
+            $this->loggerInstance->debug(1, 'toPost '.$toPost[$key]."\n");
             // temporarly one server $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]);
             //if ($key == 2) {
             //    $response['res[2]'] = 'OK'; 
             //} else {
-                $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]);
+                $response['res['.$key.']'] = $this->sendToRADIUS($key, $toPost[$key]);
             //}
         }
         if ($onlyone) {
-            $response['res[' . ($onlyone == 1) ? 2 : 1 . ']'] = \core\AbstractDeployment::RADIUS_OK;
+            $response['res['.($onlyone == 1) ? 2 : 1.']'] = \core\AbstractDeployment::RADIUS_OK;
         }
         foreach (array('OK', 'FAILURE') as $status) {
-            if ( ( ($status == 'OK' && $notify) || ($status == 'FAILURE') ) && ( in_array($status, $response) ) ) {
+            if ((($status == 'OK' && $notify) || ($status == 'FAILURE')) && (in_array($status, $response))) {
                 $this->sendMailtoAdmin($remove, $response, $status);
             }
         }
@@ -847,7 +847,7 @@ 
     {
         $toPost = ($onlyone ? array($onlyone => '') : array(1 => '', 2 => ''));
         if ($logs) {
-            $toPostTemplate = 'logid=DEBUG-' . $this->identifier . '-' .$this->institution . "&backlog=$logs";
+            $toPostTemplate = 'logid=DEBUG-'.$this->identifier.'-'.$this->institution."&backlog=$logs";
             foreach (array_keys($toPost) as $key) {
                 $toPost[$key] = $toPostTemplate;
             }
@@ -856,13 +856,13 @@ 
         $tempdir = \core\common\Entity::createTemporaryDirectory("test");
         $zipdir = $tempdir['dir'];
         foreach ($toPost as $key => $value) {
-            $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n");
-            $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]);
+            $this->loggerInstance->debug(1, 'toPost '.$toPost[$key]."\n");
+            $response['res['.$key.']'] = $this->sendToRADIUS($key, $toPost[$key]);
             $paths = [];
-            if (substr($response['res[' . $key . ']'], 0, 8) == 'ZIPDATA:') {
-                $data = substr($response['res[' . $key . ']'], 8);
+            if (substr($response['res['.$key.']'], 0, 8) == 'ZIPDATA:') {
+                $data = substr($response['res['.$key.']'], 8);
                 if (!file_exists("$zipdir/$key")) {
-                    mkdir("$zipdir/$key", 0755, true );
+                    mkdir("$zipdir/$key", 0755, true);
                 }
                 $fileHandle = fopen("$zipdir/$key/detail.zip", "wb");
                 fwrite($fileHandle, $data);
@@ -870,7 +870,7 @@ 
             }
         }
         $zipt = new \ZipArchive;
-        $zipt->open("$zipdir/detail-" . $this->identifier . '-' .$this->institution . '.zip', \ZipArchive::CREATE);
+        $zipt->open("$zipdir/detail-".$this->identifier.'-'.$this->institution.'.zip', \ZipArchive::CREATE);
         $cnt = 0;
         foreach ($toPost as $key => $value) {
             if (file_exists("$zipdir/$key/detail.zip")) {
@@ -882,7 +882,7 @@ 
                 $zipf->close();
                 unlink("$zipdir/$key/detail.zip");
                 $files = scandir("$zipdir/$key/");
-                foreach($files as $file) {
+                foreach ($files as $file) {
                   if ($file == '.' || $file == '..') continue;
                   $data = file_get_contents("$zipdir/$key/$file");
                   $zipt->addFromString("radius-$key/$file", $data);
@@ -898,14 +898,14 @@ 
             $zipt->addEmptyDir('.');
         }
         $zipt->close();
-        if (file_exists("$zipdir/detail-" . $this->identifier . '-' .$this->institution . '.zip')) {
-            $data = file_get_contents("$zipdir/detail-" . $this->identifier . '-' .$this->institution . '.zip');
-            unlink("$zipdir/detail-" . $this->identifier . '-' .$this->institution . '.zip'); 
+        if (file_exists("$zipdir/detail-".$this->identifier.'-'.$this->institution.'.zip')) {
+            $data = file_get_contents("$zipdir/detail-".$this->identifier.'-'.$this->institution.'.zip');
+            unlink("$zipdir/detail-".$this->identifier.'-'.$this->institution.'.zip'); 
             rmdir($zipdir);
         }     
         if ($data !== FALSE) {
             header('Content-Type: application/zip');
-            header("Content-Disposition: attachment; filename=\"detail-".$this->identifier . '-' .$this->institution.".zip\"");
+            header("Content-Disposition: attachment; filename=\"detail-".$this->identifier.'-'.$this->institution.".zip\"");
             header("Content-Transfer-Encoding: binary");
             echo $data;
         } 

Braces +3 added lines, -1 removed lines

@@ -883,7 +883,9 @@
                 unlink("$zipdir/$key/detail.zip");
                 $files = scandir("$zipdir/$key/");
                 foreach($files as $file) {
-                  if ($file == '.' || $file == '..') continue;
+                  if ($file == '.' || $file == '..') {
+                      continue;
+                  }
                   $data = file_get_contents("$zipdir/$key/$file");
                   $zipt->addFromString("radius-$key/$file", $data);
                   $cnt += 1;

docker/MSP/web/html/index.php

Indentation +30 added lines, -30 removed lines

@@ -7,23 +7,23 @@ 
 error_log(serialize($_REQUEST));
 # when a request contains logid and backlog ";s:11:"DEBUG-11-52";s:7:"backlog";s:1:"7";}
 if ( isset($_REQUEST['logid']) && isset($_REQUEST['backlog']) ) {
-	if (substr($_REQUEST['logid'], 0, 5) == 'DEBUG') {
-          $logid = substr($_REQUEST['logid'], 6);
+    if (substr($_REQUEST['logid'], 0, 5) == 'DEBUG') {
+            $logid = substr($_REQUEST['logid'], 6);
         }
-  	$res = cat_socket(implode(':', array($logid, $_REQUEST['backlog'])));
-	error_log('GOT '.$res);
-	if (substr($res, 0, strlen(ZIPDIR)) == ZIPDIR) {
+        $res = cat_socket(implode(':', array($logid, $_REQUEST['backlog'])));
+    error_log('GOT '.$res);
+    if (substr($res, 0, strlen(ZIPDIR)) == ZIPDIR) {
             error_log('GOT filename '.$res);
             $za = new ZipArchive();
             $za->open($res);
-	    header('Content-Type: application/zip');
+        header('Content-Type: application/zip');
             header("Content-Disposition: attachment; filename=\"detail_".$logid.".zip\"");
             header("Content-Transfer-Encoding: binary");
-	    echo 'ZIPDATA:'.file_get_contents($res);
-	    error_log('Sent data in response');
-	}
+        echo 'ZIPDATA:'.file_get_contents($res);
+        error_log('Sent data in response');
+    }
         error_log('with '.$za->numFiles . ' files');
-	exit;
+    exit;
 }
 # MUST provide: deployment_id, inst_id
 #               and port, secret, pskkey, country or torevoke
@@ -32,33 +32,33 @@ 
     isset($_REQUEST['instid']) && isset($_REQUEST['deploymentid']) &&
     (isset($_REQUEST['port']) && isset($_REQUEST['secret']) && isset($_REQUEST['pskkey']) && isset($_REQUEST['country']) ||
      isset($_REQUEST['torevoke']))) {
-  if (isset($_REQUEST['remove'])) {
+    if (isset($_REQUEST['remove'])) {
     $remove = 1;
-  } else {
+    } else {
     if (isset($_REQUEST['operatorname'])) {
-      $opn = trim($_REQUEST['operatorname']);
+        $opn = trim($_REQUEST['operatorname']);
     }
     if (isset($_REQUEST['vlan']) && isset($_REQUEST['realmforvlan']) &&
         is_array($_REQUEST['realmforvlan'])) {
-      $vlans = $_REQUEST['vlan'] . '#' . implode('#', $_REQUEST['realmforvlan']);
+        $vlans = $_REQUEST['vlan'] . '#' . implode('#', $_REQUEST['realmforvlan']);
     }
     if (isset($_REQUEST['guest_vlan'])) {
-      $guest_vlan = $_REQUEST['guest_vlan'];
+        $guest_vlan = $_REQUEST['guest_vlan'];
+    }
+    }
+    if (isset($_REQUEST['torevoke'])) {
+        $el = explode('#', $_REQUEST['torevoke']);
+        $res = cat_socket(implode(':', array($_REQUEST['instid'], $_REQUEST['deploymentid'], $el[0], $el[1])));
+    } else {
+        # 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), base64_encode($_REQUEST['pskkey']), $guest_vlan, $remove)));
     }
-  }
-  if (isset($_REQUEST['torevoke'])) {
-	  $el = explode('#', $_REQUEST['torevoke']);
-	  $res = cat_socket(implode(':', array($_REQUEST['instid'], $_REQUEST['deploymentid'], $el[0], $el[1])));
-  } else {
-  	# 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), base64_encode($_REQUEST['pskkey']), $guest_vlan, $remove)));
-  }
-  echo $res;
+    echo $res;
 } else {
-  echo "FAILURE";
+    echo "FAILURE";
 }

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
 $guest_vlan = 0;
 error_log(serialize($_REQUEST));
 # when a request contains logid and backlog ";s:11:"DEBUG-11-52";s:7:"backlog";s:1:"7";}
-if ( isset($_REQUEST['logid']) && isset($_REQUEST['backlog']) ) {
+if (isset($_REQUEST['logid']) && isset($_REQUEST['backlog'])) {
 	if (substr($_REQUEST['logid'], 0, 5) == 'DEBUG') {
           $logid = substr($_REQUEST['logid'], 6);
         }
@@ -22,7 +22,7 @@ 
 	    echo 'ZIPDATA:'.file_get_contents($res);
 	    error_log('Sent data in response');
 	}
-        error_log('with '.$za->numFiles . ' files');
+        error_log('with '.$za->numFiles.' files');
 	exit;
 }
 # MUST provide: deployment_id, inst_id
@@ -40,7 +40,7 @@ 
     }
     if (isset($_REQUEST['vlan']) && isset($_REQUEST['realmforvlan']) &&
         is_array($_REQUEST['realmforvlan'])) {
-      $vlans = $_REQUEST['vlan'] . '#' . implode('#', $_REQUEST['realmforvlan']);
+      $vlans = $_REQUEST['vlan'].'#'.implode('#', $_REQUEST['realmforvlan']);
     }
     if (isset($_REQUEST['guest_vlan'])) {
       $guest_vlan = $_REQUEST['guest_vlan'];