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

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;

Spacing +58 added lines, -58 removed lines

@@ -337,7 +337,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") {
@@ -359,7 +359,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);
@@ -379,7 +379,7 @@ 
      */
     private function createTLScredentials()
     {
-        $clientName = 'SP' . $this->identifier . '-' . $this->institution;
+        $clientName = 'SP'.$this->identifier.'-'.$this->institution;
         $dn = array(
                     "organizationName" => "eduroam",
                     "organizationalUnitName" => "eduroam Managed SP",
@@ -393,14 +393,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);
     } 
     /**
@@ -425,8 +425,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);
     }
@@ -544,11 +544,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);
@@ -557,7 +557,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)));
@@ -599,7 +599,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"];
     }
@@ -614,24 +614,24 @@ 
     private function sendToRADIUS(int $idx, $post)
     {
         $hostname = "radius_hostname_$idx";
-        $p = "server$idx" . "_secret";
+        $p = "server$idx"."_secret";
         $key = $this->$p;
-        $p = "server$idx" . "_iv";
+        $p = "server$idx"."_iv";
         $iv = $this->$p;
-        $p = "server$idx" . "_token";
+        $p = "server$idx"."_token";
         $token = $this->$p;
-        $encrypted = openssl_encrypt($post . "&token=$token", "CHACHA20", $key, 0, $iv);
+        $encrypted = openssl_encrypt($post."&token=$token", "CHACHA20", $key, 0, $iv);
         if ($encrypted !== false) {
-            $post = "enc=". urlencode(base64_encode($encrypted));
+            $post = "enc=".urlencode(base64_encode($encrypted));
         }
-        $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);
@@ -671,19 +671,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');
@@ -717,7 +717,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);
@@ -811,52 +811,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);
             }
         }
@@ -875,7 +875,7 @@ 
         $randomiv = "";
         if ($logs) {
             $randomiv = bin2hex(random_bytes(8));
-            $toPostTemplate = 'logid=DEBUG-' . $this->identifier . '-' .$this->institution . "&backlog=$logs&iv=$randomiv";
+            $toPostTemplate = 'logid=DEBUG-'.$this->identifier.'-'.$this->institution."&backlog=$logs&iv=$randomiv";
             foreach (array_keys($toPost) as $key) {
                 $toPost[$key] = $toPostTemplate;
             }
@@ -884,21 +884,21 @@ 
         $tempdir = \core\common\Entity::createTemporaryDirectory("test");
         $zipdir = $tempdir['dir'];
         foreach ($toPost as $key => $value) {
-            $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n");
-            $p = "server$key" . "_secret";
+            $this->loggerInstance->debug(1, 'toPost '.$toPost[$key]."\n");
+            $p = "server$key"."_secret";
             $secret = $this->$p;
-            $p = "server$key" . "_token";
+            $p = "server$key"."_token";
             $token = $this->$p;
-            $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]);
+            $response['res['.$key.']'] = $this->sendToRADIUS($key, $toPost[$key]);
             $paths = [];
-            if (substr($response['res[' . $key . ']'], 0, 8) == 'ZIPDATA:' && $randomiv != '') {
-                $encrypted = substr($response['res[' . $key . ']'], 8);
+            if (substr($response['res['.$key.']'], 0, 8) == 'ZIPDATA:' && $randomiv != '') {
+                $encrypted = substr($response['res['.$key.']'], 8);
                 $data = openssl_decrypt($encrypted, "CHACHA20", $secret, 0, $randomiv);
                 if ($data !== false && substr($data, 0, strlen($token)) == $token) {
                     $data = substr($data, strlen($token));
                 }
                 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);
@@ -906,7 +906,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")) {
@@ -918,7 +918,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);
@@ -934,14 +934,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;
         } 

web/admin/overview_radsec_readiness.php

Spacing +19 added lines, -19 removed lines

@@ -26,7 +26,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
@@ -92,11 +92,11 @@ 
         ?>
         
     <select name="INST-list" id="INST-list">
-        <option value=""><?php echo _('---PLEASE CHOOSE---');?></option>
+        <option value=""><?php echo _('---PLEASE CHOOSE---'); ?></option>
         <?php 
         $instdata = array();
         foreach ($extInsts as $iid => $oneInst) {
-            print '<option value="' . $iid . '">' . $oneInst['name'] . '</option>';
+            print '<option value="'.$iid.'">'.$oneInst['name'].'</option>';
             $instdata[$iid] = array();
             $instdata[$iid]['name'] = $oneInst['name'];   
             $instdata[$iid]['type'] = _('no data');
@@ -110,22 +110,22 @@ 
             $contactdata = '';
             foreach ($oneInst['contacts'] as $oneContact) {
                 if ($contactdata != '') {
-                    $contactdata = $contactdata . '<br>';
+                    $contactdata = $contactdata.'<br>';
                 }
                 if ($oneContact['name']) {
-                    $contactdata = $contactdata . $oneContact['name'];
+                    $contactdata = $contactdata.$oneContact['name'];
                 }
                 if ($contactdata != '') {
-                    $contactdata = $contactdata . '<br>';
+                    $contactdata = $contactdata.'<br>';
                 }
                 if ($oneContact['mail']) {
-                    $contactdata = $contactdata . $oneContact['mail'];
+                    $contactdata = $contactdata.$oneContact['mail'];
                 }
                 if ($contactdata != '') {
-                    $contactdata = $contactdata . '<br>';
+                    $contactdata = $contactdata.'<br>';
                 }
                 if ($oneContact['phone']) {
-                    $contactdata = $contactdata . $oneContact['phone'];
+                    $contactdata = $contactdata.$oneContact['phone'];
                 }        
             }
             if ($contactdata == '') {
@@ -144,11 +144,11 @@ 
             var instts = [];
             <?php
             foreach (array_keys($instdata) as $iid) {
-                echo "instservers['" . $iid . "']='" . $instdata[$iid]['servers']. "';\n";
-                echo "instname['" . $iid . "']='" . $instdata[$iid]['name']. "';\n";
-                echo "insttype['" . $iid . "']='" . $instdata[$iid]['type']. "';\n";
-                echo "instcontact['" . $iid . "']='" . $instdata[$iid]['contacts']. "';\n";
-                echo "instts['" . $iid . "']='" . $instdata[$iid]['ts']. "';\n";
+                echo "instservers['".$iid."']='".$instdata[$iid]['servers']."';\n";
+                echo "instname['".$iid."']='".$instdata[$iid]['name']."';\n";
+                echo "insttype['".$iid."']='".$instdata[$iid]['type']."';\n";
+                echo "instcontact['".$iid."']='".$instdata[$iid]['contacts']."';\n";
+                echo "instts['".$iid."']='".$instdata[$iid]['ts']."';\n";
             }
             ?>
             $(document).ready(function(){
@@ -170,18 +170,18 @@ 
     <div id="instdata_area">
         <table>
             <tr><th align="left" width="350">
-                    <?php echo _('Name');?>
+                    <?php echo _('Name'); ?>
                 </th><th align="left" width="100">
-                    <?php echo _('Type');?>
+                    <?php echo _('Type'); ?>
                 </th>
                 <th align="left" width="200">
-                    <?php echo _('Servers');?>
+                    <?php echo _('Servers'); ?>
                 </th>
                 <th align="left" width="200">
-                    <?php echo _('Contact data');?>
+                    <?php echo _('Contact data'); ?>
                 </th>
                 <th align="left" width="100">
-                    <?php echo _('Timestamp');?>
+                    <?php echo _('Timestamp'); ?>
                 </th>
             </tr>
             <tr id="toshow"></tr>

web/admin/overview_certificates.php

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
@@ -70,7 +70,7 @@ 
     $feds = $user->getAttributes("user:fedadmin");
     foreach ($feds as $oneFed) {
         $theFed = new \core\Federation($oneFed['value']);
-        printf("<h2>" . _("Certificate Information for %s %s")."</h2>", $uiElements->nomenclatureFed, $theFed->name);
+        printf("<h2>"._("Certificate Information for %s %s")."</h2>", $uiElements->nomenclatureFed, $theFed->name);
         foreach ($theFed->listTlsCertificates() as $oneCert) {
             if ($oneCert['STATUS'] == "REQUESTED") {
                 $theFed->updateCertificateStatus($oneCert['REQSERIAL']);
@@ -81,13 +81,13 @@ 
         foreach ($theFed->listTlsCertificates() as $oneCert) { // fetch list a second time, in case we got a cert
             $status = $oneCert['STATUS'];
             echo "<tr>";
-            echo "<td>" . $oneCert['REQSERIAL'] . "</td><td>" . $oneCert['DN'] . "</td><td>" . $status . "</td><td>" . $oneCert['EXPIRY'] . "</td>";
+            echo "<td>".$oneCert['REQSERIAL']."</td><td>".$oneCert['DN']."</td><td>".$status."</td><td>".$oneCert['EXPIRY']."</td>";
             if ($status == "ISSUED") {
                 ?>
             <td>
                 <form action='inc/showCert.inc.php' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8' method="POST">
-                    <input type="hidden" name="certdata" value="<?php echo $oneCert['CERT'];?>"/>
-                <button type="submit"><?php echo _("Display");?></button>
+                    <input type="hidden" name="certdata" value="<?php echo $oneCert['CERT']; ?>"/>
+                <button type="submit"><?php echo _("Display"); ?></button>
                 </form>
             <td>
                 <?php

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>

Spacing +11 added lines, -11 removed lines

@@ -9,7 +9,7 @@ 
  * ******************************************************************************
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 $auth = new \web\lib\admin\Authentication();
 $auth->authenticate();
 $languageInstance = new \core\common\Language();
@@ -19,7 +19,7 @@ 
 if ($editMode == 'fullaccess') {
     $deployment = $validator->existingDeploymentManaged($_GET['deployment_id'], $inst);
     $format = '';
-    if (isset($_GET['as']) && $_GET['as']=='csv') {
+    if (isset($_GET['as']) && $_GET['as'] == 'csv') {
     	$format = 'csv';
     }
     if (!isset($_POST['stats'])) {
@@ -67,19 +67,19 @@ 
              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>
+        <caption><?php echo $tablecaption; ?></caption>
         <tr>
-            <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th>
-            <th scope="col"><strong><?php echo _("Outer-Identity");?></strong></th>
-            <th scope="col"><strong><?php echo _("Result");?></strong></th>
-            <th scope="col"><strong><?php echo _("MAC Address");?></strong></th>
-            <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th>    
-            <th scope="col"><strong><?php echo _("AP Identifier");?></strong></th>
-            <th scope="col"><strong><?php echo _("Protocol");?></strong></th>
+            <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th>
+            <th scope="col"><strong><?php echo _("Outer-Identity"); ?></strong></th>
+            <th scope="col"><strong><?php echo _("Result"); ?></strong></th>
+            <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th>
+            <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th>    
+            <th scope="col"><strong><?php echo _("AP Identifier"); ?></strong></th>
+            <th scope="col"><strong><?php echo _("Protocol"); ?></strong></th>
         </tr>
         <?php
         foreach ($userAuthData as $oneRecord) {    
-            echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>"
+            echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>"
                     . "<td>".$oneRecord['activity_time']."</td>"
                     // $oneRecord['CN'] is a simple string, not an array, so disable Scrutinizer type check here
                     . "<td>".$oneRecord['outer_user']."</td>"

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>

Spacing +64 added lines, -64 removed lines

@@ -95,7 +95,7 @@ 
 
 <?php
 function copyIcon($target) {
-    return '<img class="copy_link" id="'.$target.'" src="../resources/images/icons/Tabler/copy.svg" title="'. _("Copy to clipboard").'" >';
+    return '<img class="copy_link" id="'.$target.'" src="../resources/images/icons/Tabler/copy.svg" title="'._("Copy to clipboard").'" >';
 }
 
 /**
@@ -104,7 +104,7 @@ 
  * @param \core\DeploymentManaged $deploymentObject the deployment to work with
  * @throws Exception
  */
-function displayDeploymentPropertyWidget(&$deploymentObject, $errormsg=[]) {
+function displayDeploymentPropertyWidget(&$deploymentObject, $errormsg = []) {
     // RADIUS status icons
     $depId = $deploymentObject->identifier;
     $radiusMessages = [
@@ -114,7 +114,7 @@ 
     $radius_status = array();
     $radius_status[0] = $deploymentObject->radius_status_1;
     $radius_status[1] = $deploymentObject->radius_status_2;
-    $cacert = file_get_contents(ROOT .  "/config/ManagedSPCerts/eduroamSP-CA.pem");
+    $cacert = file_get_contents(ROOT."/config/ManagedSPCerts/eduroamSP-CA.pem");
     $retry = $deploymentObject->checkRADIUSHostandConfigDaemon();
     $isradiusready = radius_ready($deploymentObject);
     if (is_array($retry)) {
@@ -126,11 +126,11 @@ 
     }
     ?>
     <div style='display: table-row_id;'>
-        <div class='profilebox' id="profilebox_<?php echo $depId;?>" style='display: table-cell;'>
+        <div class='profilebox' id="profilebox_<?php echo $depId; ?>" style='display: table-cell;'>
             <h2><?php
                 switch ($deploymentObject->consortium) {
                     case "eduroam":
-                        $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME. ": SP$depId-".$deploymentObject->institution;
+                        $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME.": SP$depId-".$deploymentObject->institution;
                         break;
                     case "OpenRoaming":
                         $displayname = "OpenRoaming ANP";
@@ -138,7 +138,7 @@ 
                     default:
                         throw new Exception("We are supposed to operate on a roaming consortium we don't know.");
                 }
-                echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)";
+                echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)";
                 ?></h2>
             <table class="deployments">
                 <caption><?php echo _("Deployment Details"); ?></caption>
@@ -171,9 +171,9 @@ 
                     <td>
                         <?php
                         if ($deploymentObject->status) {
-                            echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] .
-                                "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] .
-                                "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "' class='cat-icon'>";
+                            echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon'].
+                                "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text'].
+                                "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."' class='cat-icon'>";
                         }
                         ?>
                     </td>
@@ -203,9 +203,9 @@ 
                     <td>
                         <?php
                         if ($deploymentObject->status && $deploymentObject->radius_status_2) {
-                            echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] .
-                                "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] .
-                            "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "' class='cat-icon'>";
+                            echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon'].
+                                "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text'].
+                            "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."' class='cat-icon'>";
                         }
                         ?>
                     </td>
@@ -213,7 +213,7 @@ 
                 <tr style="vertical-align:bottom">
                     <td><?php echo _("RADIUS shared secret for both servers"); ?></td>
                     <td>
-                        <span id="shared_data_<?php echo $deploymentObject->identifier;?>"><?php echo $deploymentObject->secret;?></span>
+                        <span id="shared_data_<?php echo $deploymentObject->identifier; ?>"><?php echo $deploymentObject->secret; ?></span>
                         <?php echo copyIcon("shared_icon_".$deploymentObject->identifier) ?>
                     </td>
                     <td></td>
@@ -249,9 +249,9 @@ 
                     <td>
                         <?php
                         if ($deploymentObject->status) {
-                            echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] .
-                                "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] .
-                                "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "' class='cat-icon'>";
+                            echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon'].
+                                "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text'].
+                                "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."' class='cat-icon'>";
                         }
                         ?>
                     </td>
@@ -281,9 +281,9 @@ 
                     <td>
                         <?php
                         if ($deploymentObject->status && $deploymentObject->radius_status_2) {
-                            echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] .
-                                "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] .
-                            "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "' class='cat-icon'>";
+                            echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon'].
+                                "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text'].
+                            "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."' class='cat-icon'>";
                         }
                         ?>
                     </td>
@@ -299,27 +299,27 @@ 
                     <td>
                     <?php
                     if ($deploymentObject->radsec_priv == '') {
-                        echo _('The client certificate was created using an uploaded CSR, the private key is not available') . '<br><br>';
+                        echo _('The client certificate was created using an uploaded CSR, the private key is not available').'<br><br>';
                     }
-                    echo _('Subject:') . ' ' . $data['name'] . '<br>';
-                    echo _('Serial number:') . ' ' . $data['serialNumberHex'] . '<br>';
-                    $dleft = floor(($data['validTo_time_t']-time())/(24*60*60));
+                    echo _('Subject:').' '.$data['name'].'<br>';
+                    echo _('Serial number:').' '.$data['serialNumberHex'].'<br>';
+                    $dleft = floor(($data['validTo_time_t'] - time()) / (24 * 60 * 60));
                     if ($dleft < 30) {
                         echo '<font color="red">';
                     }
-                    echo _('Not valid after:') . ' '. date_create_from_format('ymdGis', substr($data['validTo'], 0, -1))->format('Y-m-d H:i:s') . ' UTC';
+                    echo _('Not valid after:').' '.date_create_from_format('ymdGis', substr($data['validTo'], 0, -1))->format('Y-m-d H:i:s').' UTC';
                     if ($dleft > 2) {
-                        echo '<br>' . _('Number of days to expiry:') . ' ' . $dleft;
+                        echo '<br>'._('Number of days to expiry:').' '.$dleft;
                     } else {
-                        echo '<br>' . _('If you are using RADIUS over TLS you should urgently renew your credentials') . '!';
+                        echo '<br>'._('If you are using RADIUS over TLS you should urgently renew your credentials').'!';
                     }
                     if ($dleft < 30) { echo '</font>'; }
                     ?></td>
                 </tr><tr><td></td>
 
                     <td>
-                        <span style="display: none;" id="cert_data_<?php echo $depId;?>"><?php echo $deploymentObject->radsec_cert;?></span>
-                        <span style="display: none;" id="ca_cert_data_<?php echo $depId;?>"><?php echo $cacert;?></span>
+                        <span style="display: none;" id="cert_data_<?php echo $depId; ?>"><?php echo $deploymentObject->radsec_cert; ?></span>
+                        <span style="display: none;" id="ca_cert_data_<?php echo $depId; ?>"><?php echo $cacert; ?></span>
                         <?php if ($deploymentObject->radsec_priv != '') {
                             echo _("private key").copyIcon("priv_key_icon_$depId")."&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
                             echo '<span style="display: none;" id="priv_key_data_'.$depId.'">'.$deploymentObject->radsec_priv.'</span>';
@@ -330,7 +330,7 @@ 
                             echo _("CA certificate").copyIcon("ca_cert_icon_$depId");
                         ?>
                         <br/>
-                        <button name="sendzip" onclick="location.href='inc/sendZip.inc.php?inst_id=<?php echo $deploymentObject->institution;?>&dep_id=<?php echo $depId?>'" type="button"><?php echo _('download ZIP-file with full data');?></button>
+                        <button name="sendzip" onclick="location.href='inc/sendZip.inc.php?inst_id=<?php echo $deploymentObject->institution; ?>&dep_id=<?php echo $depId?>'" type="button"><?php echo _('download ZIP-file with full data'); ?></button>
 
                     </td>
                     <td></td>
@@ -341,10 +341,10 @@ 
                     <?php
                         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>';
+                            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>';
                         
-                            echo '<br/>' . _('You can upload your own CSR to replace default TLS credentials.') . '<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"');
                             echo "</i>";
                     }
@@ -379,7 +379,7 @@ 
                 
                 ?>
                 <tr></tr>
-                <tr><th colspan="2"><?php echo _('Additional deployment settings');?></th></tr>
+                <tr><th colspan="2"><?php echo _('Additional deployment settings'); ?></th></tr>
                     <tr>
                         <td>
                             <?php
@@ -459,12 +459,12 @@ 
                             if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) {
                                 echo '<br>';
                                 if ($res['FAILURE'] == 2) {
-                                    echo ' <span style="color: red;">' . _("Activation failure.") . '</span>';
+                                    echo ' <span style="color: red;">'._("Activation failure.").'</span>';
                                 } else {
                                     if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                        echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>';
+                                        echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>';
                                     } else {
-                                        echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>';
+                                        echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>';
                                     }
                                 }
                             }
@@ -491,12 +491,12 @@ 
                                 if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) {
                                     echo '<br>';
                                     if ($res['FAILURE'] == 2) {
-                                        echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>';
+                                        echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>';
                                     } else {
                                         if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                            echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>';
+                                            echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>';
                                         } else {
-                                            echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>';
+                                            echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>';
                                         }
                                     }
                                 }
@@ -544,7 +544,7 @@ 
             </div>
             <?php 
             if (!$isradiusready) { 
-                echo '<p>'. _("We are not able to handle a new configuration request requiring contact with RADIUS servers now.") . '<br>' . _("Check later.");
+                echo '<p>'._("We are not able to handle a new configuration request requiring contact with RADIUS servers now.").'<br>'._("Check later.");
                 
             } 
             if (count($errormsg) > 0 && array_key_exists($deploymentObject->identifier, $errormsg)) {
@@ -560,38 +560,38 @@ 
         </div>
         <div style='width:20px;'></div> <!-- QR code space, reserved -->
         <div style='display: table-cell; min-width:200px;'>
-            <?php $tablecaption = _("Hotspot Usage Statistics");?>
+            <?php $tablecaption = _("Hotspot Usage Statistics"); ?>
             <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>';
+            <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>
             <table class='authrecord'>
-    <caption><?php echo $tablecaption;?></caption>
+    <caption><?php echo $tablecaption; ?></caption>
     <tr style='text-align: left;'>
-        <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th>
-        <th scope="col"><strong><?php echo _("Outer-Identity");?></strong></th>
-        <th scope="col"><strong><?php echo _("Result");?></strong></th>
-        <th scope="col"><strong><?php echo _("MAC Address");?></strong></th>
-        <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th> 
-        <th scope="col"><strong><?php echo _("AP Identifier");?></strong></th>
-        <th scope="col"><strong><?php echo _("Protocol");?></strong></th>
+        <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Outer-Identity"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Result"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th> 
+        <th scope="col"><strong><?php echo _("AP Identifier"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Protocol"); ?></strong></th>
     </tr>
     <?php
-    $userAuthData = $deploymentObject->retrieveStatistics(0,5);
+    $userAuthData = $deploymentObject->retrieveStatistics(0, 5);
     $i = 0;	   
     foreach ($userAuthData as $oneRecord) {
-        echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>"
+        echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>"
                 . "<td>".$oneRecord['activity_time']."</td>"
                 . "<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") 
+		. ($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>";
-        if ($oneRecord['cui']!='') {
+        if ($oneRecord['cui'] != '') {
             $i++;
         }
     }
@@ -613,11 +613,11 @@ 
             echo _('Get statistics as CSV file:').' '; 
             $query = 'inc/deploymentStats.inc.php?inst_id='.$deploymentObject->institution."&deployment_id=$depId&as=csv&backlog=";
             ?>
-	    <button name="sendcsv" type="button" onclick="location.href='<?php echo $query;?>WEEK';"><?php echo _('Last week');?>
+	    <button name="sendcsv" type="button" onclick="location.href='<?php echo $query; ?>WEEK';"><?php echo _('Last week'); ?>
             </button>
-	    <button name="sendcsv" type="button" onclick="location.href='<?php echo $query;?>MONTH';"><?php echo _('Last 30 days');?>
+	    <button name="sendcsv" type="button" onclick="location.href='<?php echo $query; ?>MONTH';"><?php echo _('Last 30 days'); ?>
             </button>
-	    <button name="sendcsv" type="button" onclick="location.href='<?php echo $query;?>FULL';"><?php echo _('Last 6 months');?>
+	    <button name="sendcsv" type="button" onclick="location.href='<?php echo $query; ?>FULL';"><?php echo _('Last 6 months'); ?>
             </button>
         </div><!-- statistics space -->
         <div style='height:5px'></div>
@@ -626,14 +626,14 @@ 
             <h2><?php echo _('To get detailed logs from RADIUS sites click a button below.'); 
             $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.');?>
+            <?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.'); ?>
             <div style='height:3px'></div>
-            <button name="logs" type="button" onclick="location.href='<?php echo $query;?>1';"><?php echo _('Today');?>
+            <button name="logs" type="button" onclick="location.href='<?php echo $query; ?>1';"><?php echo _('Today'); ?>
             </button>
-            <button name="logs" type="button" onclick="location.href='<?php echo $query;?>2';"><?php echo _('Last 2 days');?>
+            <button name="logs" type="button" onclick="location.href='<?php echo $query; ?>2';"><?php echo _('Last 2 days'); ?>
             </button>
-            <button name="logs" type="button" onclick="location.href='<?php echo $query;?>7';"><?php echo _('Last 7 days');?>
+            <button name="logs" type="button" onclick="location.href='<?php echo $query; ?>7';"><?php echo _('Last 7 days'); ?>
             </button>
         </div>
     </div> 
@@ -681,7 +681,7 @@ 
                         <div>
                             <input type="hidden" name="consortium" value="eduroam"/>
                             <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'>
-                                <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?>
+                                <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?>
                             </button>
                             <span style='color: red;'>
                             <?php if ($hasMail == 0) { 

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'];

utils/Update_eduroamDB1_2/update_monitor_copy.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
  * update the local copy
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 setlocale(LC_CTYPE, "en_US.UTF-8");
 require 'config.php';
 
@@ -113,7 +113,7 @@ 
         $this->db_ext->query("SET NAMES 'utf8'");
         $this->db_local->query("SET NAMES 'utf8mb4'");
         $result = $this->db_ext->query("SELECT * FROM $table");
-        $queryFields = implode(',', array_column($this->fields[$db][$table_name],0));
+        $queryFields = implode(',', array_column($this->fields[$db][$table_name], 0));
         while ($row = $result->fetch_assoc()) {
             $v = [];
             foreach ($this->fields[$db][$table_name] as $field) {
@@ -131,7 +131,7 @@ 
                     }
                 }
             }
-            $queryValues = implode(',',$v);
+            $queryValues = implode(',', $v);
             $query = "INSERT INTO $tmpTable (".$queryFields.") VALUES (".$queryValues.")";
             $this->db_local->query($query);
         }
@@ -153,9 +153,9 @@ 
             $realms = explode(',', $row[1]);
             foreach ($contacts as $contact) {
                 foreach ($realms as $realm) {
-                    $email = empty($contact['mail']) ? 'NULL' :'"'.$contact['mail'].'"';
-                    $name = empty($contact['name']) ? 'NULL' :'"'.$contact['name'].'"';
-                    $phone = empty($contact['phone']) ? 'NULL' :'"'.$contact['phone'].'"';
+                    $email = empty($contact['mail']) ? 'NULL' : '"'.$contact['mail'].'"';
+                    $name = empty($contact['name']) ? 'NULL' : '"'.$contact['name'].'"';
+                    $phone = empty($contact['phone']) ? 'NULL' : '"'.$contact['phone'].'"';
                     $id = $db == 'eduroam' ? $row[2] : '"'.$row[2].'"';
                     $query = "INSERT INTO tmp_institution_admins (name, email, phone, inst_realm, $instid)"
                             . ' VALUES ('.$name.','.$email.','.$phone.',"'.$realm.'",'.$id.')';
@@ -175,9 +175,9 @@ 
     }
 
     private function escape($inp) {
-        $out=str_replace('\\','\\\\',$inp);
-        $out=str_replace('"','\"',$out);
-        $out=str_replace('?','\?',$out);
+        $out = str_replace('\\', '\\\\', $inp);
+        $out = str_replace('"', '\"', $out);
+        $out = str_replace('?', '\?', $out);
         $out = 'convert(cast(convert("'.$out.'" using latin1) as binary) using utf8)';
         return($out);
     }

utils/Update_eduroamDB1_2/config.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 $databases = [
     'eduroam' => "eduroam1_1_tmp", // this is the local copy of eduroam (v1) database created by update_monitor_copy.php
     'eduroamv2' => "eduroam2_1_tmp", // this is the local copy of eduroam (v2) database created by update_monitor_copy.php
-    'cat' => "cat_twoln_214_test2",  // this is the curent production CAT database where we need to put in new identifiers
+    'cat' => "cat_twoln_214_test2", // this is the curent production CAT database where we need to put in new identifiers
     'eduroam_new' => "monitor_copy2_test_xxx" // this is the resulting monitor_copy database containing all data required by CAT it must exist but tables will be created by the sript
 ];
 

utils/Update_eduroamDB1_2/clean_databases.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 setlocale(LC_CTYPE, "en_US.UTF-8");
 require 'config.php';