GEANT / CAT

web/diag/findRealm.php

Spacing +2 added lines, -2 removed lines

@@ -108,7 +108,7 @@ 
             $telepath = new \core\diag\Telepath($givenRealm);
             $outerUser = $telepath->getOuter();
         }
-        $testsuite = new \core\diag\RADIUSTests($givenRealm, $outerUser . '@' . $givenRealm);
+        $testsuite = new \core\diag\RADIUSTests($givenRealm, $outerUser.'@'.$givenRealm);
        
         $naptr = $rfc7585suite->relevantNAPTR(); 
         if ($naptr != \core\diag\RADIUSTests::RETVAL_NOTCONFIGURED && $naptr > 0) {
@@ -206,7 +206,7 @@ 
 $json_data = json_encode($returnArray);
 
 if ($token) {
-    $loggerInstance->debug(4, 'JSON data written to ' .$jsonDir.'/'.$token);
+    $loggerInstance->debug(4, 'JSON data written to '.$jsonDir.'/'.$token);
     file_put_contents($jsonDir.'/'.$token.'/realm', $json_data);
 }
 header("Content-type: application/json; utf-8");

core/DeploymentManaged.php

Spacing +30 added lines, -30 removed lines

@@ -316,7 +316,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") {
@@ -340,7 +340,7 @@ 
      */
     private function createTLScredentials()
     {
-        $clientName = "SP_" . $this->identifier . '-' . $this->institution;
+        $clientName = "SP_".$this->identifier.'-'.$this->institution;
         $dn = array(
                     "organizationName" => "eduroam",
                     "organizationalUnitName" => "eduroam Managed SP",
@@ -354,13 +354,13 @@ 
         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");
         $clientcert = openssl_csr_sign($csr, $cacert, $caprivkey, \config\Master::MANAGEDSP['daystoexpiry'],
-                          array('digest_alg'=>'sha256', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"), rand());
+                          array('digest_alg'=>'sha256', 'config' => ROOT."/config/ManagedSPCerts/openssl.cnf"), rand());
         openssl_x509_export($clientcert, $this->radsec_cert);
     } 
     /**
@@ -385,7 +385,7 @@ 
             $conditional1 = "AND activity_time > DATE_SUB(NOW(), INTERVAL $backlog SECOND)";
             $conditional2 = "";
         }
-        $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result, ap_id FROM activity WHERE operatorname = ? $conditional1 ORDER BY activity_time $conditional2", "s", $opName );
+        $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result, ap_id FROM activity WHERE operatorname = ? $conditional1 ORDER BY activity_time $conditional2", "s", $opName);
         return mysqli_fetch_all($stats, \MYSQLI_ASSOC);
     }
         
@@ -505,7 +505,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"];
     }
@@ -520,13 +520,13 @@ 
     private function sendToRADIUS(int $idx, $post)
     {
         $hostname = "radius_hostname_$idx";
-        $ch = curl_init("http://" . $this->$hostname . ':8080');
+        $ch = curl_init("http://".$this->$hostname.':8080');
         if ($ch === FALSE) {
             $res = 'FAILURE';
         } else {
             curl_setopt($ch, CURLOPT_POST, 1);
             curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
-            $this->loggerInstance->debug(1, "Posting to http://" . $this->$hostname . ":8080/$post\n");
+            $this->loggerInstance->debug(1, "Posting to http://".$this->$hostname.":8080/$post\n");
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
             curl_setopt($ch, CURLOPT_HEADER, 0);
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -565,19 +565,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');
@@ -611,7 +611,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);
@@ -703,41 +703,41 @@ 
     {
         $remove = ($this->status == \core\AbstractDeployment::INACTIVE) ? 0 : 1;
         $toPost = ($onlyone ? array($onlyone => '') : array(1 => '', 2 => ''));
-        $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).'&';
                 }
             }
         }
         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);
             }
         }

core/ExternalEduroamDBData.php

Spacing +6 added lines, -6 removed lines

@@ -126,7 +126,7 @@ 
             return $this->counter;
         }
 
-        $cachedNumber = @file_get_contents(ROOT . "/var/tmp/cachedSPNumber.serialised");
+        $cachedNumber = @file_get_contents(ROOT."/var/tmp/cachedSPNumber.serialised");
         if ($cachedNumber !== FALSE) {
             $numberData = unserialize($cachedNumber);
             $now = new \DateTime();
@@ -139,7 +139,7 @@ 
         } else { // data in cache is too old or doesn't exist. We really need to ask the database
             $list = $this->listAllServiceProviders();
             $this->counter = count($list);
-            file_put_contents(ROOT . "/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()]));
+            file_put_contents(ROOT."/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()]));
             return $this->counter;
         }
     }
@@ -188,7 +188,7 @@ 
         $returnarray = [];
         $query = "SELECT id_institution AS id, country, inst_realm as realmlist, name AS collapsed_name, contact AS collapsed_contact, type FROM view_active_institution WHERE country = ?";
         if ($eduroamDbType !== NULL) {
-            $query .= " AND ( type = '" . ExternalEduroamDBData::TYPE_IDPSP . "' OR type = '" . $eduroamDbType . "')";
+            $query .= " AND ( type = '".ExternalEduroamDBData::TYPE_IDPSP."' OR type = '".$eduroamDbType."')";
         }
         $externals = $this->db->exec($query, "s", $tld);
         // was a SELECT query, so a resource and not a boolean
@@ -284,19 +284,19 @@ 
      * 
      * @return array
      */
-    public function listExternalTlsServersInstitution($tld, $include_not_ready=FALSE) {
+    public function listExternalTlsServersInstitution($tld, $include_not_ready = FALSE) {
         $retval = [];
         // this includes servers of type "staging", which is fine
         $query = "SELECT ROid, instid, type, inst_name, servers, contacts, ts FROM eduroamv2.view_tls_inst WHERE country = ?";
         if (!$include_not_ready) {
-            $query = $query . " AND servers IS NOT NULL AND contacts IS NOT NULL";
+            $query = $query." AND servers IS NOT NULL AND contacts IS NOT NULL";
         }
         $instServerTransaction = $this->db->exec($query, "s", $tld);
         while ($instServerResponses = mysqli_fetch_object(/** @scrutinizer ignore-type */ $instServerTransaction)) {
             $contactList = $this::dissectCollapsedContacts($instServerResponses->contacts);
             $names = $this->splitNames($instServerResponses->inst_name);
             $thelanguage = $names[$this->languageInstance->getLang()] ?? $names["en"] ?? array_shift($names);
-            $retval[$instServerResponses->ROid . "-". $instServerResponses->instid] = [
+            $retval[$instServerResponses->ROid."-".$instServerResponses->instid] = [
                 "names" => $names,
                 "name" => $thelanguage,
                 "type" => array_search($instServerResponses->type, self::TYPE_MAPPING),

core/AbstractProfile.php

Spacing +5 added lines, -5 removed lines

@@ -332,7 +332,7 @@ 
                     // for now (no OpenRoaming client certs available) only run server-side tests
                     foreach ($listOfIPs as $oneIP) {
                         $connectionResult = $connectionTests->cApathCheck($oneIP);
-                        if ($connectionResult != \core\diag\AbstractTest::RETVAL_OK || ( isset($connectionTests->TLS_CA_checks_result['cert_oddity']) && count($connectionTests->TLS_CA_checks_result['cert_oddity']) > 0)) {
+                        if ($connectionResult != \core\diag\AbstractTest::RETVAL_OK || (isset($connectionTests->TLS_CA_checks_result['cert_oddity']) && count($connectionTests->TLS_CA_checks_result['cert_oddity']) > 0)) {
                             $allHostsOkay = FALSE;
                         } else {
                             $oneHostOkay = TRUE;
@@ -486,7 +486,7 @@ 
             // which is different from the outer username we put into installers
             return $this->getAttributes("internal:checkuser_value")[0]['value']."@".$realm;
         }
-        if (count($this->getAttributes("internal:use_anon_outer")) > 0 && $this->getAttributes("internal:anon_local_value")[0]['value'] != NULL ) {
+        if (count($this->getAttributes("internal:use_anon_outer")) > 0 && $this->getAttributes("internal:anon_local_value")[0]['value'] != NULL) {
             // no special check username, but there is an anon outer ID for
             // installers - so let's use that one
             return $this->getAttributes("internal:anon_local_value")[0]['value']."@".$realm;
@@ -642,7 +642,7 @@ 
         }
 
         $monthlyList = [];
-        $monthly = $this->frontendHandle->exec("SELECT downloads_user,device_id FROM downloads_history WHERE profile_id=? AND stat_date=DATE_FORMAT(NOW(),'%Y-%m-01')", "i",  $this->identifier);
+        $monthly = $this->frontendHandle->exec("SELECT downloads_user,device_id FROM downloads_history WHERE profile_id=? AND stat_date=DATE_FORMAT(NOW(),'%Y-%m-01')", "i", $this->identifier);
         while ($statsQuery = mysqli_fetch_object(/** @scrutinizer ignore-type */ $monthly)) {
             $monthlyList[$statsQuery->device_id] = $statsQuery->downloads_user;
         }
@@ -654,7 +654,7 @@ 
         }        
         
         \core\common\Entity::intoThePotatoes();
-        ksort($finalarray, SORT_STRING|SORT_FLAG_CASE);
+        ksort($finalarray, SORT_STRING | SORT_FLAG_CASE);
         \core\common\Entity::outOfThePotatoes();
         return $finalarray;
     }
@@ -964,7 +964,7 @@ 
         $profileStatus = self::CERT_STATUS_NONE;
         foreach ($rows as $row) {
             $encodedCert = $row[0];
-            $tm = $x509->processCertificate(base64_decode($encodedCert))['full_details']['validTo_time_t']- time();
+            $tm = $x509->processCertificate(base64_decode($encodedCert))['full_details']['validTo_time_t'] - time();
             if ($tm < \config\ConfAssistant::CERT_WARNINGS['expiry_critical']) {
                 $certStatus = self::CERT_STATUS_ERROR;
             } elseif ($tm < \config\ConfAssistant::CERT_WARNINGS['expiry_warning']) {

web/admin/overview_radsec_readiness.php

Spacing +22 added lines, -22 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();
@@ -82,9 +82,9 @@ 
         echo '<br/>';
         echo _("In the 'Timestamp' column we show last update time.");
         echo '<p/>';
-        echo _('To check eduroam database specification see') . 
-                ' <a target="_blank" href="https://monitor.eduroam.org/eduroam-database/v2/docs/eduroam-database-ver30112021.pdf">' .
-                _('this document') . '</a>.<p/>';
+        echo _('To check eduroam database specification see'). 
+                ' <a target="_blank" href="https://monitor.eduroam.org/eduroam-database/v2/docs/eduroam-database-ver30112021.pdf">'.
+                _('this document').'</a>.<p/>';
         echo _('If you cannot find your institution on this list it means that this institiution is not present in your upstream data.');        
         echo '<p/>';
         $allAuthorizedFeds = $user->getAttributes("user:fedadmin");
@@ -93,11 +93,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');
@@ -111,22 +111,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 == '') {
@@ -145,11 +145,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(){
@@ -171,18 +171,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/edit_hotspot.php

Spacing +14 added lines, -14 removed lines

@@ -27,7 +27,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -41,10 +41,10 @@ 
             ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 )
             )
     ) {*/
-    if (isset($_POST['consortium']) &&  $_POST['consortium'] == "eduroam")
+    if (isset($_POST['consortium']) && $_POST['consortium'] == "eduroam")
     {
         $deployment = $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']);
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '#profilebox_' . $deployment->identifier);
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier.'#profilebox_'.$deployment->identifier);
         exit(0);
     } else {
         throw new Exception("Desired consortium for Managed SP needs to be specified, and allowed!");
@@ -101,23 +101,23 @@ 
                 if (isset($_POST['agreement']) && $_POST['agreement'] == "true") {
                     $deployment->addAttribute("hiddenmanagedsp:tou_accepted", NULL, 1);
                 }
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '#profilebox_' . $deployment->identifier);
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier.'#profilebox_'.$deployment->identifier);
                 exit(0);
             case web\lib\common\FormElements::BUTTON_DELETE:
                 $response = $deployment->setRADIUSconfig();
                 if (in_array('OK', $response)) {
                     $deployment->deactivate();
                 }
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . 
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)).'#profilebox_'. 
                        $deployment->identifier);
                 exit(0);
             case web\lib\common\FormElements::BUTTON_REMOVESP:
                 $deployment->remove();
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier);
                 exit(0);
             case web\lib\common\FormElements::BUTTON_RENEWTLS:
                 $deployment->renewtls();
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier);
                 exit(0);
             case web\lib\common\FormElements::BUTTON_ACTIVATE:
                 if (count($deployment->getAttributes("hiddenmanagedsp:tou_accepted")) > 0) {
@@ -125,7 +125,7 @@ 
                     if (in_array('OK', $response)) {
                         $deployment->activate();
                     }
-                    header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . $deployment->identifier);
+                    header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)).'#profilebox_'.$deployment->identifier);
                     exit(0);
                 } else {
                     throw new Exception("Activate button pushed without acknowledged ToUs!");
@@ -154,7 +154,7 @@ 
                 } else {
                     $response = ['NOOP', 'NOOP'];
                 }
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . $deployment->identifier);
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)).'#profilebox_'.$deployment->identifier);
                 exit(0);
             default:
                 throw new Exception("Unknown button action requested!");
@@ -163,10 +163,10 @@ 
     if (isset($_POST['command'])) {
         switch ($_POST['command']) {
         case web\lib\common\FormElements::BUTTON_CLOSE:
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier) . '#profilebox_' . $deployment->identifier;
+            header("Location: overview_org.php?inst_id=".$my_inst->identifier).'#profilebox_'.$deployment->identifier;
             exit(0);
         default:
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '#profilebox_' . $deployment->identifier);
+            header("Location: overview_org.php?inst_id=".$my_inst->identifier.'#profilebox_'.$deployment->identifier);
             exit(0);
         }
     }
@@ -193,7 +193,7 @@ 
     echo $uiElements->instLevelInfoBoxes($my_inst);
     $deploymentOptions = $deployment->getAttributes();
     echo "<form enctype='multipart/form-data' action='edit_hotspot.php?inst_id=$my_inst->identifier&amp;deployment_id=$deployment->identifier' method='post' accept-charset='UTF-8'>
-                <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
+                <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>";
     $optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE);
     ?>
     <fieldset class='option_container' id='managedsp_override'>
@@ -227,7 +227,7 @@ 
                 <!-- input for VLAN identifier for home users-->
                 <td>
                     <span id='vlan_label'>
-                        <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?>
+                        <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?>
                     </span>
                 </td>
                 <td>
@@ -247,7 +247,7 @@ 
     </fieldset>
 
     <?php
-    echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>";
+    echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>";
     echo $deco->footer();
 
     
\ No newline at end of file

web/admin/overview_org.php

Spacing +68 added lines, -68 removed lines

@@ -27,7 +27,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 function displaySilverbulletPropertyWidget(&$theProfile, $readonly, &$uiElements) {
     ?>
@@ -44,14 +44,14 @@ 
                 <ul style='margin:1px'>
                     <?php
                     foreach ($completeness as $missing_attrib) {
-                        echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                        echo "<li>".$uiElements->displayName($missing_attrib)."</li>";
                     }
                     ?>
                 </ul>
             </div>
             <?php
         } else {
-            echo sprintf(_("You can create up to %d users."), $maxusers[0]['value']) . "<br/>" . sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm);
+            echo sprintf(_("You can create up to %d users."), $maxusers[0]['value'])."<br/>".sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm);
         }
         ?>
         <br/>
@@ -60,7 +60,7 @@ 
         if ($readonly === FALSE) {
             ?>
             <form action='edit_silverbullet.php?inst_id=<?php echo $theProfile->institution; ?>&amp;profile_id=<?php echo $theProfile->identifier; ?>' method='POST'>
-                <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
+                <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
             </form>
             <?php
         }
@@ -96,21 +96,21 @@ 
                 $has_overrides = TRUE;
             }
         }
-        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>";
+        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>";
         $typelist = $theProfile->getEapMethodsinOrderOfPreference();
         $allcomplete = TRUE;
         foreach ($typelist as $eaptype) {
             $buffer_eaptypediv .= $eaptype->getPrintableRep();
             $completeness = $theProfile->isEapTypeDefinitionComplete($eaptype);
             if ($completeness === true) {
-                $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>";
+                $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>";
             } else {
                 $buffer_eaptypediv .= " <div class='notacceptable'>";
                 $buffer_eaptypediv .= _("Information needed!");
                 if (is_array($completeness)) {
                     $buffer_eaptypediv .= "<ul style='margin:1px'>";
                     foreach ($completeness as $missing_attrib) {
-                        $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                        $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>";
                     }
                     $buffer_eaptypediv .= "</ul>";
                 }
@@ -122,7 +122,7 @@ 
             foreach ($attribs as $attrib) {
                 if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) {
                     $justOnce = TRUE;
-                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Tabler/square-rounded-letter-e-blue.svg' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>";
+                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Tabler/square-rounded-letter-e-blue.svg' alt='"._("Options on EAP Method/Device level are in effect.")."'>";
                 }
             }
             $buffer_eaptypediv .= "<br/>";
@@ -148,7 +148,7 @@ 
         if ($theProfile->isRedirected()) {
             $iconData = $uiElements->iconData('PROFILES_REDIRECTED');
             $iconData['text'] = _("Profile redirected");
-            $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));
+            $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData));
             
         } 
         
@@ -156,15 +156,15 @@ 
         switch ($certStatus) {
             case core\AbstractProfile::CERT_STATUS_OK:
                 $iconData = $uiElements->iconData('CERT_STATUS_OK');
-                $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));
+                $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData));
                 break;
             case core\AbstractProfile::CERT_STATUS_WARN:
                 $iconData = $uiElements->iconData('CERT_STATUS_WARN');
-                $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));                
+                $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData));                
                 break;
             case core\AbstractProfile::CERT_STATUS_ERROR:
                 $iconData = $uiElements->iconData('CERT_STATUS_ERROR');
-                $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));
+                $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData));
                 break;            
         }
         $buffer_headline .= "</div>";
@@ -190,11 +190,11 @@ 
                 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") {
                     $diagUrl = "../diag/";
                 } else {
-                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/";
+                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/";
                 }
                 ?>
-                <form action='<?php echo $diagUrl . "action_realmcheck.php?inst_id=" . $theProfile->institution . "&profile_id=" . $theProfile->identifier ?>' method='post' accept-charset='UTF-8'>
-                    <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link . $_SERVER['SCRIPT_NAME']); ?>'/>
+                <form action='<?php echo $diagUrl."action_realmcheck.php?inst_id=".$theProfile->institution."&profile_id=".$theProfile->identifier ?>' method='post' accept-charset='UTF-8'>
+                    <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link.$_SERVER['SCRIPT_NAME']); ?>'/>
                     <button type='submit' name='profile_action' value='check' <?php echo ($has_realm ? "" : "disabled='disabled'"); ?> title='<?php echo _("The realm can only be checked if you configure the realm!"); ?>'>
                         <?php echo _("Check realm reachability"); ?>
                     </button>
@@ -241,9 +241,9 @@ 
                 ?>
                 <div style='display: flex;'>
                     <?php
-                    $idpLevelUrl = $link . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $theProfile->institution;
-                    $displayurl = $idpLevelUrl . "&amp;profile=" . $theProfile->identifier;
-                    $QRurl = $idpLevelUrl . "&profile=" . $theProfile->identifier;
+                    $idpLevelUrl = $link.dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$theProfile->institution;
+                    $displayurl = $idpLevelUrl."&amp;profile=".$theProfile->identifier;
+                    $QRurl = $idpLevelUrl."&profile=".$theProfile->identifier;
                     $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([
                                 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG,
                                 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H,
@@ -255,9 +255,9 @@ 
                     if (empty($rawQr)) {
                         throw new Exception("Something went seriously wrong during QR code generation!");
                     }
-                    $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
+                    $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
                     $size = getimagesize($uri);
-                    echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>";
+                    echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>";
 
                     //echo "<nobr>$displayurl</nobr></a>";
                     echo "<p>$displayurl</p></a>";
@@ -286,7 +286,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();
     if (is_array($retry)) {
         foreach ($retry as $id => $stat) {
@@ -297,11 +297,11 @@ 
     }
     ?>
     <div style='display: table-row_id;'>
-        <div class='profilebox' id="profilebox_<?php echo $deploymentObject->identifier;?>" style='display: table-cell;'>
+        <div class='profilebox' id="profilebox_<?php echo $deploymentObject->identifier; ?>" style='display: table-cell;'>
             <h2><?php
                 switch ($deploymentObject->consortium) {
                     case "eduroam":
-                        $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME;
+                        $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME;
                         break;
                     case "OpenRoaming":
                         $displayname = "OpenRoaming ANP";
@@ -309,7 +309,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>
                 <caption><?php echo _("Deployment Details"); ?></caption>
@@ -324,13 +324,13 @@ 
                     <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/>
                         <?php
                         if ($deploymentObject->host1_v4 !== NULL) {
-                            echo _("IPv4") . ": " . $deploymentObject->host1_v4;
+                            echo _("IPv4").": ".$deploymentObject->host1_v4;
                         }
                         if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) {
                             echo "<br/>";
                         }
                         if ($deploymentObject->host1_v6 !== NULL) {
-                            echo _("IPv6") . ": " . $deploymentObject->host1_v6;
+                            echo _("IPv6").": ".$deploymentObject->host1_v6;
                         }
                         ?>
                     </td>
@@ -338,9 +338,9 @@ 
                     <td><?php echo $deploymentObject->port1; ?></td>
                     <td>
                         <?php
-                        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>
                 </tr>
@@ -348,22 +348,22 @@ 
                     <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong>
                         <?php
                         if ($deploymentObject->host2_v4 !== NULL) {
-                            echo _("IPv4") . ": " . $deploymentObject->host2_v4;
+                            echo _("IPv4").": ".$deploymentObject->host2_v4;
                         }
                         if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) {
                             echo "<br/>";
                         }
                         if ($deploymentObject->host2_v6 !== NULL) {
-                            echo _("IPv6") . ": " . $deploymentObject->host2_v6;
+                            echo _("IPv6").": ".$deploymentObject->host2_v6;
                         }
                         ?></td>
                     <td><?php echo _("RADIUS port number: ") ?></td>
                     <td><?php echo $deploymentObject->port2; ?></td>
                     <td>
                         <?php
-                        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>
                 </tr>
@@ -379,28 +379,28 @@ 
                 <tr>
                         <td><strong><?php echo _("RADSEC over TLS credentials"); ?></strong></td>
                         <td>
-                            <input type="hidden" id="priv_key_data_<?php echo $deploymentObject->identifier;?>" value="<?php echo $deploymentObject->radsec_priv;?>">
-                            <input type="hidden" id="cert_data_<?php echo $deploymentObject->identifier;?>" value="<?php echo $deploymentObject->radsec_cert;?>">
-                            <input type="hidden" id="ca_cert_data" value="<?php echo $cacert;?>">
-                            <button class="sp_priv_key" id="priv_key_<?php echo $deploymentObject->identifier;?>" name="showc" style="background-color: gray; color: white" type="submit"><?php echo _('private key');?></button>
-                            <button class="sp_cert" id="cert_<?php echo $deploymentObject->identifier;?>" name="showp" style="background-color: gray; color: white" type="submit"><?php echo _('certificate');?></button>
-                            <button class="ca_cert" name="showca" style="background-color: gray; color: white" type="submit"><?php echo _('CA certificate');?></button>
-                            <button name="sendzip" onclick="location.href='inc/sendzip.inc.php?inst_id=<?php echo $deploymentObject->institution;?>&dep_id=<?php echo $deploymentObject->identifier;?>'" style="background-color: gray; color: white" type="button"><?php echo _('download ZIP-file with full data');?></button>
+                            <input type="hidden" id="priv_key_data_<?php echo $deploymentObject->identifier; ?>" value="<?php echo $deploymentObject->radsec_priv; ?>">
+                            <input type="hidden" id="cert_data_<?php echo $deploymentObject->identifier; ?>" value="<?php echo $deploymentObject->radsec_cert; ?>">
+                            <input type="hidden" id="ca_cert_data" value="<?php echo $cacert; ?>">
+                            <button class="sp_priv_key" id="priv_key_<?php echo $deploymentObject->identifier; ?>" name="showc" style="background-color: gray; color: white" type="submit"><?php echo _('private key'); ?></button>
+                            <button class="sp_cert" id="cert_<?php echo $deploymentObject->identifier; ?>" name="showp" style="background-color: gray; color: white" type="submit"><?php echo _('certificate'); ?></button>
+                            <button class="ca_cert" name="showca" style="background-color: gray; color: white" type="submit"><?php echo _('CA certificate'); ?></button>
+                            <button name="sendzip" onclick="location.href='inc/sendzip.inc.php?inst_id=<?php echo $deploymentObject->institution; ?>&dep_id=<?php echo $deploymentObject->identifier; ?>'" style="background-color: gray; color: white" type="button"><?php echo _('download ZIP-file with full data'); ?></button>
                         </td
                 </tr>
                 <tr> <td></td><td>
                     <?php 
-                    echo _('Not valid after:') . ' '. date_create_from_format('ymdGis', substr($data['validTo'], 0, -1))->format('Y-m-d H:i:s') . ' UTC';
-                    $dleft = floor(($data['validTo_time_t']-time())/(24*60*60));
+                    echo _('Not valid after:').' '.date_create_from_format('ymdGis', substr($data['validTo'], 0, -1))->format('Y-m-d H:i:s').' UTC';
+                    $dleft = floor(($data['validTo_time_t'] - time()) / (24 * 60 * 60));
                     if ($dleft > 0) {
-                        echo '<br>' . _('Number of days to expiry:') . ' ' . $dleft;
+                        echo '<br>'._('Number of days to expiry:').' '.$dleft;
                     } else {
-                        echo '<br>' . _('If you are using RADSEC over TLS you should urgently renew your credentisls') . '!';
+                        echo '<br>'._('If you are using RADSEC over TLS you should urgently renew your credentisls').'!';
                     }
                     ?></td></tr>
                 <tr> <td></td><td>
                         <?php
-                        echo _('If your certificate is close to expiry or you need to create new RADSEC over TLS credentials') . '<br>' .
+                        echo _('If your certificate is close to expiry or you need to create new RADSEC over TLS credentials').'<br>'.
                                 _('click on "Renew RADSEC over TLS credentials" button');
                         ?>
                 </td></tr>
@@ -411,14 +411,14 @@ 
                 <tr>
                         <td><strong><?php echo _("RADSEC TLS-PSK identity"); ?></strong></td>
                         <td>
-                           SP_<?php echo $deploymentObject->identifier . '-' . $deploymentObject->institution;?>
+                           SP_<?php echo $deploymentObject->identifier.'-'.$deploymentObject->institution; ?>
                         </td>
                 </tr>
                 
                 <tr>
                         <td><strong><?php echo _("RADSEC TLS-PSK key"); ?></strong></td>
                         <td>
-                           <?php echo $deploymentObject->pskkey;?>
+                           <?php echo $deploymentObject->pskkey; ?>
                         </td>
                 </tr>
                 <?php } ?>
@@ -473,12 +473,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>';
                                     }
                                 }
                             }
@@ -513,12 +513,12 @@ 
                                 if ($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>';
                                         }
                                     }
                                 }
@@ -546,24 +546,24 @@ 
         </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 _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)");?></p>
+            <h2><?php echo _("5 most recent authentications"); ?></h2>
+            <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)"); ?></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 _("Realm");?></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 _("Result");?></strong></th>
-        <th scope="col"><strong><?php echo _("AP Identifier");?></strong></th>
+        <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Realm"); ?></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 _("Result"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("AP Identifier"); ?></strong></th>
     </tr>
     <?php
-    $userAuthData = $deploymentObject->retrieveStatistics(0,5);
+    $userAuthData = $deploymentObject->retrieveStatistics(0, 5);
     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['realm']."</td>"
                 . "<td>".$oneRecord['mac']."</td>"
@@ -755,7 +755,7 @@ 
             }
             ?>
         </h2>
-        <?php if(count($profiles_for_this_idp) > 1 && $readonly === FALSE && $editMode === 'fullaccess') { ?>
+        <?php if (count($profiles_for_this_idp) > 1 && $readonly === FALSE && $editMode === 'fullaccess') { ?>
                     <form method='post' action='sort_profiles.php?inst_id=<?php echo $my_inst->identifier; ?>' accept-charset='UTF-8'>
                         <div>
                             <button type='submit' name='profile_sorting'>
@@ -824,7 +824,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) { 

web/admin/action_req_certificate.php

Spacing +40 added lines, -40 removed lines

@@ -27,7 +27,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();
 $validator = new \web\lib\common\InputValidation();
@@ -90,23 +90,23 @@ 
     $subject_prefix = implode(', ', array_reverse($DN));
     /* Messages */
     $messages = [
-    'WRONG_SUBJECT' => _('Submitted Certificate Signing Request contains subject field that does not start with') . ' ' .
-                       $subject_prefix  . '<br>' . _("See CSR generation rules below."),
+    'WRONG_SUBJECT' => _('Submitted Certificate Signing Request contains subject field that does not start with').' '.
+                       $subject_prefix.'<br>'._("See CSR generation rules below."),
     'WRONG_CSR' => _('Submitted Certificate Signing Request is broken - unable to extract the public key from CSR')
     ];
     $settings = array();
-    if  (isset($_SESSION['CSR_ERRORS']) && $_SESSION['CSR_ERRORS'] != '') {
-        print '<h3 id="errorbox"><font color="red">'. $messages[$_SESSION['CSR_ERRORS']].'</font></h3>';
+    if (isset($_SESSION['CSR_ERRORS']) && $_SESSION['CSR_ERRORS'] != '') {
+        print '<h3 id="errorbox"><font color="red">'.$messages[$_SESSION['CSR_ERRORS']].'</font></h3>';
         unset($_SESSION['CSR_ERRORS']);
     }
-    if  (isset($_SESSION['FORM_SETTINGS']) && $_SESSION['FORM_SETTINGS'] != '') {
+    if (isset($_SESSION['FORM_SETTINGS']) && $_SESSION['FORM_SETTINGS'] != '') {
         $settings = $_SESSION['FORM_SETTINGS'];
         unset($_SESSION['FORM_SETTINGS']);
     }
     if (empty($settings) && isset($_POST['LEVEL'])) {
         $settings = array('LEVEL' => $_POST['LEVEL'], 'NRO-list' => $_POST['NRO-list'], 'INST-list' => $_POST['INST-list']);
     }
-    if  ( isset($_POST['requestcert']) && $_POST['requestcert'] == \web\lib\common\FormElements::BUTTON_SAVE) {
+    if (isset($_POST['requestcert']) && $_POST['requestcert'] == \web\lib\common\FormElements::BUTTON_SAVE) {
         // basic sanity checks before we hand this over to openssl
         $sanitisedCsr = $validator->string($_POST['CSR'] ?? "", TRUE);
         
@@ -123,7 +123,7 @@ 
         if (!empty($subject_keys)) {
             if ($subject_keys[0] == 'DC' && $subject['DC']) {
                 foreach ($subject['DC'] as $v) {
-                    $dc[] = 'DC=' . $v;
+                    $dc[] = 'DC='.$v;
                 }
                 if ($DN !== array_reverse($dc)) {
                    $dc = array();
@@ -147,12 +147,12 @@ 
                 }
                 $fed = $validator->existingFederation($_POST['NRO-list']);
                 $country = strtoupper($fed->tld);
-                $code = isset($cat->knownFederations[$country]['code']) ? $cat->knownFederations[$country]['code'] : $country ;
+                $code = isset($cat->knownFederations[$country]['code']) ? $cat->knownFederations[$country]['code'] : $country;
                 $DN[] = "C=$code";
-                $DN[] = "O=NRO of " . iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[$country]['name']);
+                $DN[] = "O=NRO of ".iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[$country]['name']);
                 $serverInfo = $externalDb->listExternalTlsServersFederation($fed->tld);
                 $serverList = explode(",", array_key_first($serverInfo));
-                $DN[] = "CN=" . $serverList[0];
+                $DN[] = "CN=".$serverList[0];
                 $policies[] = "eduroam IdP";
                 $policies[] = "eduroam SP";
                 $firstName = $serverInfo[array_key_first($serverInfo)][0]["name"];
@@ -167,7 +167,7 @@ 
                     throw new Exception(sprintf("Sorry: you are not %s admin for the %s requested in the form.", $uiElements->nomenclatureFed, $uiElements->nomenclatureFed));
                 }
                 $country = strtoupper($matches[1]);
-                $code = isset($cat->knownFederations[$country]['code']) ? $cat->knownFederations[$country]['code'] : $country ;
+                $code = isset($cat->knownFederations[$country]['code']) ? $cat->knownFederations[$country]['code'] : $country;
                 $DN[] = "C=$code";
                 $serverInfo = $extInsts[$_POST['INST-list']];
                 if (isset($serverInfo["names"]["en"])) {
@@ -180,14 +180,14 @@ 
 		    $modou = 1;
 		    $ou = str_replace(",", "/,", $ou);
 		}
-		$ou = preg_replace('/\s+/', ' ',  $ou);
+		$ou = preg_replace('/\s+/', ' ', $ou);
 		if (strlen($ou) >= 64) {
 			$ou = substr($ou, 0, 64);
 			$modou += 2;
 		}
                 $DN[] = "O=".iconv('UTF-8', 'ASCII//TRANSLIT', $ou);
                 $serverList = explode(",", $serverInfo["servers"]);
-                $DN[] = "CN=" . $serverList[0];
+                $DN[] = "CN=".$serverList[0];
                 switch ($serverInfo["type"]) {
                     case core\IdP::TYPE_IDPSP:
                         $policies[] = "eduroam IdP";
@@ -206,13 +206,13 @@ 
             default:
                 throw new Exception("Sorry: Unknown level of issuance requested.");
         }
-        echo "<p style='font-size: large'>" . _("Requesting a certificate with the following properties");
+        echo "<p style='font-size: large'>"._("Requesting a certificate with the following properties");
         echo "<ul>";
-        echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>";
-	echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN);
+        echo "<li>"._("Policy OIDs: ").implode(", ", $policies)."</li>";
+	echo "<li>"._("Distinguished Name: ").implode(", ", $DN);
 	if ($modou > 0) {
 	    echo " (";
-            echo _("Organization field adjusted"). ': ';
+            echo _("Organization field adjusted").': ';
 	    $desc = array();
 	    if ($modou >= 2) {
 		$desc[] = _("truncated to 64 chars");
@@ -224,8 +224,8 @@ 
 	    echo ")";
 	}
         echo "</li>";
-        echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>";
-        echo "<li>" . _("Requester Contact Details: ") . $firstName . " &lt;" . $firstMail . "&gt;" . "</li>";
+        echo "<li>"._("subjectAltName:DNS : ").implode(", ", $serverList)."</li>";
+        echo "<li>"._("Requester Contact Details: ").$firstName." &lt;".$firstMail."&gt;"."</li>";
         echo "</ul></p>";
 
         $vettedCsr = $validator->string($_POST['CSR'], true);
@@ -241,7 +241,7 @@ 
         $loggerInstance->debug(2, $DN, "CERT DN: ", "\n");
         // our certs can be good for max 5 years
         $fed->requestCertificate($user->identifier, $newCsrWithMeta, $expiryDays);
-        echo "<p>" . _("The certificate was requested.") . "</p>";
+        echo "<p>"._("The certificate was requested.")."</p>";
         ?>
         <form action="overview_certificates.php" method="GET">
             <button type="submit"><?php echo _("Back to Certificate Overview"); ?></button>
@@ -259,7 +259,7 @@ 
         switch (count($feds)) {
             case 0:
                 echo "<div>";
-                echo $uiElements->boxRemark("<strong>" . sprintf(_("None of your %s servers has complete information in the database."),$uiElements->nomenclatureFed)."</strong>" . _("At least the DNS names of TLS servers and a role-based contact mail address are required."));
+                echo $uiElements->boxRemark("<strong>".sprintf(_("None of your %s servers has complete information in the database."), $uiElements->nomenclatureFed)."</strong>"._("At least the DNS names of TLS servers and a role-based contact mail address are required."));
                 echo "</div>";
                 break;
             case 1:
@@ -267,22 +267,22 @@ 
                 if (empty($settings) || (isset($settings['LEVEL']) && $settings['LEVEL'] == 'NRO')) {
                     echo ' checked';
                 }
-                echo '>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>';
-                echo " <strong>" . $cat->knownFederations[$feds[0]->tld]['name'] . "</strong>";
-                echo '<input type="hidden" name="NRO-list" id="NRO-list" value="' . $feds[0]->tld . '"/>';
+                echo '>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>';
+                echo " <strong>".$cat->knownFederations[$feds[0]->tld]['name']."</strong>";
+                echo '<input type="hidden" name="NRO-list" id="NRO-list" value="'.$feds[0]->tld.'"/>';
                 break;
             default:
                 echo '<input type="radio" name="LEVEL" id="NRO" value="NRO"';
                 if (empty($settings) || isset($settings['LEVEL']) && $settings['LEVEL'] == 'NRO') {
                     echo ' checked';
                 }
-                echo '>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>';
+                echo '>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>';
                 ?>
                 <select name="NRO-list" id="NRO-list">
                     <option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option>
                     <?php
                     foreach ($feds as $oneFed) {
-                        echo '<option value="' . strtoupper($oneFed->tld) . '">' . $cat->knownFederations[$oneFed->tld]['name'] . "</option>";
+                        echo '<option value="'.strtoupper($oneFed->tld).'">'.$cat->knownFederations[$oneFed->tld]['name']."</option>";
                         #echo '<option value="AAA' . strtoupper($oneFed->tld) . '">' . $oneIdP["names"][$langObject->getLang()] . "</option>";
                         
                     }
@@ -295,18 +295,18 @@ 
         <script>
             var instservers = [];
             var instpolicies = [];
-            var nroservers = '<?php echo str_replace(",", ", ", array_key_first($serverInfo));?>';
+            var nroservers = '<?php echo str_replace(",", ", ", array_key_first($serverInfo)); ?>';
         <?php 
         $allIdPs = [];
         foreach ($allAuthorizedFeds as $oneFed) {
             foreach ($externalDb->listExternalTlsServersInstitution($oneFed['value']) as $id => $oneIdP) {
-                $allIdPs[$id] = '[' . substr($id, 0, 2) . '] ' . $oneIdP["name"];            
-                echo "instservers['" . $id . "']='" . str_replace(",", ", ", $oneIdP["servers"]) . "';\n";
-                echo "instpolicies['" . $id . "']='";
+                $allIdPs[$id] = '['.substr($id, 0, 2).'] '.$oneIdP["name"];            
+                echo "instservers['".$id."']='".str_replace(",", ", ", $oneIdP["servers"])."';\n";
+                echo "instpolicies['".$id."']='";
                 if ($oneIdP["type"] == 'IdPSP') {
                     echo "eduroam IdP/SP";
                 } else {
-                    echo "eduroam " . $oneIdP["type"];
+                    echo "eduroam ".$oneIdP["type"];
                 }
                 echo "';\n";
             }
@@ -352,9 +352,9 @@ 
             <option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option>
 <?php
 foreach ($allIdPs as $id => $name) {
-    echo '<option value="' . $id . '"';
+    echo '<option value="'.$id.'"';
     if (isset($settings['INST-list']) && $settings['INST-list'] == $id) { echo ' selected'; }
-    echo '>' . $name . "</option>";
+    echo '>'.$name."</option>";
 }
 ?>
         </select>
@@ -368,7 +368,7 @@ 
             <?php 
             echo _('According to the above settings you will receive')
             ?>
-            <span id='certlevel'><?php echo _('NRO level certificate');?></span>
+            <span id='certlevel'><?php echo _('NRO level certificate'); ?></span>
             
         for server names:
         <span id='serversinfo'><?php echo str_replace(",", ", ", array_key_first($serverInfo)); ?></span>
@@ -384,12 +384,12 @@ 
         <?php
         } else {
             echo "<div>";
-            echo $uiElements->boxRemark(sprintf(_("<strong>No organisation inside your %s has complete information in the database</strong>."." "._("At least the DNS names of TLS servers and a role-based contact mail address are required.")),$uiElements->nomenclatureFed), "No TLS capable org!", true);
+            echo $uiElements->boxRemark(sprintf(_("<strong>No organisation inside your %s has complete information in the database</strong>."." "._("At least the DNS names of TLS servers and a role-based contact mail address are required.")), $uiElements->nomenclatureFed), "No TLS capable org!", true);
             echo "</div>";
         }
         ?>
         <?php
-        echo '<div id="ondb"><h4 style="margin: 0">' . _("Can't you find an institution on the select list above?") . '</h4>';
+        echo '<div id="ondb"><h4 style="margin: 0">'._("Can't you find an institution on the select list above?").'</h4>';
         echo _("Most likely we do not have required data on this institution in the eduroam database.");
         echo '<br/>';
         ?>
@@ -397,16 +397,16 @@ 
         <?php
         echo _('On this page');
         echo '</a> ';
-        echo _('you can check what information is in the datatabase') . '.';
+        echo _('you can check what information is in the datatabase').'.';
         echo '</div>';
         if (count($feds) > 0 || count($allIdPs) > 0) {?>
         <h2><?php echo _("2. CSR generation"); ?></h2>
         <p>
         <?php 
-        echo _("The CSR subject field has to start with ") .'<b>' . $subject_prefix . '</b><br>';
+        echo _("The CSR subject field has to start with ").'<b>'.$subject_prefix.'</b><br>';
         echo _("One way to generate an acceptable certificate request is via this openssl one-liner:"); ?></p>
         <?php 
-        echo "<b>openssl req -new -newkey rsa:4096 -out test.csr -keyout test.key -subj /". implode('/', array_reverse($DN)) ."/C=XY/O=WillBeReplaced/CN=will.be.replaced</b>";
+        echo "<b>openssl req -new -newkey rsa:4096 -out test.csr -keyout test.key -subj /".implode('/', array_reverse($DN))."/C=XY/O=WillBeReplaced/CN=will.be.replaced</b>";
         ?>
         <h2><?php echo _("3. Submission"); ?></h2>
 <?php echo _("Please paste your CSR here:"); ?><br/><textarea name="CSR" id="CSR" rows="20" cols="85"/></textarea><br/>