GEANT / CAT

web/admin/inc/deploymentStats.inc.php

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

Indentation +13 added lines, -13 removed lines

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

web/admin/inc/option_xhr.inc.php

Spacing +3 added lines, -3 removed lines

@@ -19,12 +19,12 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 \core\CAT::sessionStart();
 $validator = new \web\lib\common\InputValidation();
 
-if (!isset($_GET["class"] )) {
+if (!isset($_GET["class"])) {
     throw new Exception("Unknown type of option!");
 }
 
@@ -42,6 +42,6 @@ 
 
 // add one option of the specified class
 
-$list = \web\lib\admin\OptionDisplay::enumerateOptionsToDisplay($_GET["class"], $_GET['fedid'], (isset($_GET["device"])?$_GET["device"]:NULL));
+$list = \web\lib\admin\OptionDisplay::enumerateOptionsToDisplay($_GET["class"], $_GET['fedid'], (isset($_GET["device"]) ? $_GET["device"] : NULL));
 $optionDisplay = new \web\lib\admin\OptionDisplay($list);
 echo $optionDisplay->optiontext(array_values($list));

web/admin/action_req_certificate.php

Indentation +25 added lines, -25 removed lines

@@ -149,10 +149,10 @@ 
                     $dc[] = 'DC=' . $v;
                 }
                 if ($DN !== array_reverse($dc)) {
-                   $dc = array();
-                   $_SESSION['CSR_ERRORS'] = 'WRONG_SUBJECT';
-                   $_SESSION['FORM_SETTINGS'] = $settings;
-                   $_SESSION['csr_subject'] = $dn;
+                    $dc = array();
+                    $_SESSION['CSR_ERRORS'] = 'WRONG_SUBJECT';
+                    $_SESSION['FORM_SETTINGS'] = $settings;
+                    $_SESSION['csr_subject'] = $dn;
                 }
             } else {
                 $_SESSION['CSR_ERRORS'] = 'WRONG_SUBJECT';
@@ -201,15 +201,15 @@ 
                 } else {
                     $ou = $serverInfo["names"][$langInstance->getLang()];
                 }
-		if (str_contains($ou, ',')) {
-		    $modou = 1;
-		    $ou = str_replace(",", "/,", $ou);
-		}
-		$ou = preg_replace('/\s+/', ' ',  $ou);
-		if (strlen($ou) >= 64) {
-			$ou = substr($ou, 0, 64);
-			$modou += 2;
-		}
+        if (str_contains($ou, ',')) {
+            $modou = 1;
+            $ou = str_replace(",", "/,", $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];
@@ -234,20 +234,20 @@ 
         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);
-	if ($modou > 0) {
-	    echo " (";
+    echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN);
+    if ($modou > 0) {
+        echo " (";
             echo _("Organization field adjusted"). ': ';
-	    $desc = array();
-	    if ($modou >= 2) {
-		$desc[] = _("truncated to 64 chars");
-	    }
-	    if ($modou == 1 || $modou == 3) {
-		$desc[] = _("commas escaped");
+        $desc = array();
+        if ($modou >= 2) {
+        $desc[] = _("truncated to 64 chars");
+        }
+        if ($modou == 1 || $modou == 3) {
+        $desc[] = _("commas escaped");
             }
-	    echo implode(', ', $desc);
-	    echo ")";
-	}
+        echo implode(', ', $desc);
+        echo ")";
+    }
         echo "</li>";
         echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>";
         echo "<li>" . _("Requester Contact Details: ") . $firstName . " &lt;" . $firstMail . "&gt;" . "</li>";

Spacing +46 added lines, -46 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();
@@ -96,29 +96,29 @@ 
     'HINT' =>  _("See CSR generation rules below."),
     ];
     $settings = array();
-    if  (isset($_SESSION['CSR_ERRORS']) && $_SESSION['CSR_ERRORS'] != '') {
-        print '<h3 id="errorbox"><font color="red">'. $messages[$_SESSION['CSR_ERRORS']];
+    if (isset($_SESSION['CSR_ERRORS']) && $_SESSION['CSR_ERRORS'] != '') {
+        print '<h3 id="errorbox"><font color="red">'.$messages[$_SESSION['CSR_ERRORS']];
         if ($_SESSION['CSR_ERRORS'] == 'SOAP_ERROR' && isset($_SESSION['csr_faultcode'])) {
-            print '<br>'. _('Reason') . ': '. $_SESSION['csr_faultcode'];
+            print '<br>'._('Reason').': '.$_SESSION['csr_faultcode'];
             unset($_SESSION['csr_faultcode']);
         } else {
             if ($_SESSION['CSR_ERRORS'] == 'WRONG_SUBJECT' && isset($_SESSION['csr_subject'])) {
-                print '<br>'. _('Your subject is:') . ' '. $_SESSION['csr_subject'];
+                print '<br>'._('Your subject is:').' '.$_SESSION['csr_subject'];
                 unset($_SESSION['csr_subject']);
             }
-            print '<br>' . $messages['HINT'];
+            print '<br>'.$messages['HINT'];
         }
         print '</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);
         
@@ -139,14 +139,14 @@ 
                     $dn .= ', ';
                 }
                 if (is_array($subject[$sk])) {
-                    $dn .= $sk . '=' . implode(', ' . $sk . '=', $subject[$sk]);
+                    $dn .= $sk.'='.implode(', '.$sk.'=', $subject[$sk]);
                 } else {
-                    $dn .= $sk . '=' . $subject[$sk];
+                    $dn .= $sk.'='.$subject[$sk];
                 }
             }
             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();
@@ -174,11 +174,11 @@ 
                 }
                 $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);
-                $DN[] = "CN=" . $serverList[0];
+                $DN[] = "CN=".$serverList[0];
                 $policies[] = "eduroam IdP";
                 $policies[] = "eduroam SP";
                 $firstName = $serverInfo[array_key_first($serverInfo)][0]["name"];
@@ -193,7 +193,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"])) {
@@ -205,14 +205,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";
@@ -231,13 +231,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");
@@ -249,8 +249,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);
         $newCsrWithMeta = [
@@ -265,11 +265,11 @@ 
         $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>";
         if (isset($_SESSION['CSR_ERRORS']) && $_SESSION['CSR_ERRORS'] == 'SOAP_ERROR') {
-            print '<h3 id="errorbox"><font color="red">'. $messages[$_SESSION['CSR_ERRORS']];
+            print '<h3 id="errorbox"><font color="red">'.$messages[$_SESSION['CSR_ERRORS']];
             if (isset($_SESSION['csr_faultcode'])) {
-                print '<br>'. _('Reason') . ': '. $_SESSION['csr_faultcode'];
+                print '<br>'._('Reason').': '.$_SESSION['csr_faultcode'];
                 unset($_SESSION['csr_faultcode']);
             }
             unset($_SESSION['CSR_ERRORS']);
@@ -293,7 +293,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:
@@ -301,22 +301,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>";
                         
                     }
@@ -329,21 +329,21 @@ 
         <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) {
-                if (count($oneIdP['contacts']) ==0) {
+                if (count($oneIdP['contacts']) == 0) {
                     continue;
                 }
-                $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";
             }
@@ -391,9 +391,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>
@@ -407,7 +407,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>
@@ -424,12 +424,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/>';
         ?>
@@ -437,16 +437,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> and follow the pattern given in the example.<br>';
+        echo _("The CSR subject field has to start with ").'<b>'.$subject_prefix.'</b> and follow the pattern given in the example.<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/>

web/admin/action_enrollment.php

Switch Indentation +29 added lines, -29 removed lines

@@ -52,36 +52,36 @@
 }
 
 switch ($_GET['token']) {
-    case "EDUGAIN-SELF-REGISTER":
-        $token = "EDUGAIN-SELF-REGISTER";
-        $extIdUnfiltered = filter_input(INPUT_GET,'extid');
-        $extIdArray = explode('-', htmlspecialchars(strip_tags($extIdUnfiltered)), 2);
-        $ROid = $extIdArray[0];
-        $extId = $extIdArray[1];
-        $fed = new \core\Federation(strtoupper(substr($ROid,0,2)));
-        $newInstFlag = $fed->getAttributes('fed:autoregister-new-inst');
-        if ($newInstFlag === []) {
-            $elements->errorPage(_("Error creating new IdP!"),_("You tried to register in self-service, but this federation does not allow self-service!"));
-        }
-        // we must be sure that this person admins the ext institution and that it falls into the current federation
-        if ($validator->existingExtInstitution($extId, $userEmail, $ROid) === 1) {
+        case "EDUGAIN-SELF-REGISTER":
+            $token = "EDUGAIN-SELF-REGISTER";
+            $extIdUnfiltered = filter_input(INPUT_GET,'extid');
+            $extIdArray = explode('-', htmlspecialchars(strip_tags($extIdUnfiltered)), 2);
+            $ROid = $extIdArray[0];
+            $extId = $extIdArray[1];
+            $fed = new \core\Federation(strtoupper(substr($ROid,0,2)));
+            $newInstFlag = $fed->getAttributes('fed:autoregister-new-inst');
+            if ($newInstFlag === []) {
+                $elements->errorPage(_("Error creating new IdP!"),_("You tried to register in self-service, but this federation does not allow self-service!"));
+            }
+            // we must be sure that this person admins the ext institution and that it falls into the current federation
+            if ($validator->existingExtInstitution($extId, $userEmail, $ROid) === 1) {
+                $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW;
+            }
+            // and check that this institution does not match anuthing in CAT.
+            $usermgmt = new \core\UserManagement();
+            if ($usermgmt->checkForCatMatch($extId, $ROid) === 1) {
+                $elements->errorPage(_("Error creating new IdP!"),_("You tried to register a new institution while it already has a match in CAT or your email is not not listed as admin for this institution in the eduroam DB!"));            
+            }
+            break;
+        case "SELF-REGISTER":
+            $token = "SELF-REGISTER";
             $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW;
-        }
-        // and check that this institution does not match anuthing in CAT.
-        $usermgmt = new \core\UserManagement();
-        if ($usermgmt->checkForCatMatch($extId, $ROid) === 1) {
-            $elements->errorPage(_("Error creating new IdP!"),_("You tried to register a new institution while it already has a match in CAT or your email is not not listed as admin for this institution in the eduroam DB!"));            
-        }
-        break;
-    case "SELF-REGISTER":
-        $token = "SELF-REGISTER";
-        $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW;
-        $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration'];
-        break;
-    default:
-        $tokenUnfiltered = $validator->token(filter_input(INPUT_GET,'token'));
-        $token = htmlspecialchars(strip_tags($tokenUnfiltered));
-        $checkval = $usermgmt->checkTokenValidity($token);
+            $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration'];
+            break;
+        default:
+            $tokenUnfiltered = $validator->token(filter_input(INPUT_GET,'token'));
+            $token = htmlspecialchars(strip_tags($tokenUnfiltered));
+            $checkval = $usermgmt->checkTokenValidity($token);
 }
 
 if ($checkval < 0) {

Spacing +15 added lines, -15 removed lines

@@ -30,7 +30,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();
@@ -44,24 +44,24 @@ 
 
 
 if (!isset($_GET['token'])) {
-    $elements->errorPage(_("Error creating new IdP binding!"),_("This page needs to be called with a valid invitation token!"));
+    $elements->errorPage(_("Error creating new IdP binding!"), _("This page needs to be called with a valid invitation token!"));
 }
 
 if (\config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL && $_GET['token'] == "SELF-REGISTER") {
-    $elements->errorPage(_("Error creating new IdP binding!"),_("You tried to register in self-service, but this deployment does not allow self-service!"));
+    $elements->errorPage(_("Error creating new IdP binding!"), _("You tried to register in self-service, but this deployment does not allow self-service!"));
 }
 
 switch ($_GET['token']) {
     case "EDUGAIN-SELF-REGISTER":
         $token = "EDUGAIN-SELF-REGISTER";
-        $extIdUnfiltered = filter_input(INPUT_GET,'extid');
+        $extIdUnfiltered = filter_input(INPUT_GET, 'extid');
         $extIdArray = explode('-', htmlspecialchars(strip_tags($extIdUnfiltered)), 2);
         $ROid = $extIdArray[0];
         $extId = $extIdArray[1];
-        $fed = new \core\Federation(strtoupper(substr($ROid,0,2)));
+        $fed = new \core\Federation(strtoupper(substr($ROid, 0, 2)));
         $newInstFlag = $fed->getAttributes('fed:autoregister-new-inst');
         if ($newInstFlag === []) {
-            $elements->errorPage(_("Error creating new IdP!"),_("You tried to register in self-service, but this federation does not allow self-service!"));
+            $elements->errorPage(_("Error creating new IdP!"), _("You tried to register in self-service, but this federation does not allow self-service!"));
         }
         // we must be sure that this person admins the ext institution and that it falls into the current federation
         if ($validator->existingExtInstitution($extId, $userEmail, $ROid) === 1) {
@@ -70,7 +70,7 @@ 
         // and check that this institution does not match anuthing in CAT.
         $usermgmt = new \core\UserManagement();
         if ($usermgmt->checkForCatMatch($extId, $ROid) === 1) {
-            $elements->errorPage(_("Error creating new IdP!"),_("You tried to register a new institution while it already has a match in CAT or your email is not not listed as admin for this institution in the eduroam DB!"));            
+            $elements->errorPage(_("Error creating new IdP!"), _("You tried to register a new institution while it already has a match in CAT or your email is not not listed as admin for this institution in the eduroam DB!"));            
         }
         break;
     case "SELF-REGISTER":
@@ -79,23 +79,23 @@ 
         $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration'];
         break;
     default:
-        $tokenUnfiltered = $validator->token(filter_input(INPUT_GET,'token'));
+        $tokenUnfiltered = $validator->token(filter_input(INPUT_GET, 'token'));
         $token = htmlspecialchars(strip_tags($tokenUnfiltered));
         $checkval = $usermgmt->checkTokenValidity($token);
 }
 
 if ($checkval < 0) {
     echo $deco->pageheader(_("Error creating new IdP binding!"), "ADMIN-IDP");
-    echo "<h1>" . _("Error creating new IdP binding!") . "</h1>";
+    echo "<h1>"._("Error creating new IdP binding!")."</h1>";
     switch ($checkval) {
         case \core\UserManagement::TOKENSTATUS_FAIL_ALREADYCONSUMED:
-            echo "<p>" . sprintf(_("Sorry... this token has already been used. The %s is already created. If you got the invitation from a mailing list, probably someone else used it before you."), $elements->nomenclatureParticipant) . "</p>";
+            echo "<p>".sprintf(_("Sorry... this token has already been used. The %s is already created. If you got the invitation from a mailing list, probably someone else used it before you."), $elements->nomenclatureParticipant)."</p>";
             break;
         case \core\UserManagement::TOKENSTATUS_FAIL_EXPIRED:
-            echo "<p>" . sprintf(_("Sorry... this token has expired. Invitation tokens are valid for 24 hours. The %s administrator can create a new one for you."), $elements->nomenclatureFed) . "</p>";
+            echo "<p>".sprintf(_("Sorry... this token has expired. Invitation tokens are valid for 24 hours. The %s administrator can create a new one for you."), $elements->nomenclatureFed)."</p>";
             break;
         default:
-            echo "<p>" . _("Sorry... you have come to the enrollment page without a valid token. Are you a nasty person? If not, you should go to <a href='overview_user.php'>your profile page</a> instead.") . "</p>";
+            echo "<p>"._("Sorry... you have come to the enrollment page without a valid token. Are you a nasty person? If not, you should go to <a href='overview_user.php'>your profile page</a> instead.")."</p>";
     }
     echo $deco->footer();
     throw new Exception("Terminating because something is wrong with the token we received.");
@@ -109,17 +109,17 @@ 
 switch ($token) {
     case "EDUGAIN-SELF-REGISTER":
         $newidp = $usermgmt->createIdPFromExternal($extId, $fed, $user);
-        $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - selfservice eduGAIN registration");
+        $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - selfservice eduGAIN registration");
         break;    
     case "SELF-REGISTER":
         $fed = new \core\Federation($federation);
         $newidp = new \core\IdP($fed->newIdP('SELF', core\IdP::TYPE_IDPSP, $user, "FED", "SELFSERVICE"));
-        $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - selfservice registration");
+        $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - selfservice registration");
         break;
     default:
         $newidp = $usermgmt->createIdPFromToken($token, $user);
         $usermgmt->invalidateToken($token);
-        $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - Token used and invalidated");
+        $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - Token used and invalidated");
         break;
 }
 

web/lib/admin/AbstractMap.php

Spacing +2 added lines, -2 removed lines

@@ -138,7 +138,7 @@ 
         $wizard = new \web\lib\admin\Wizard($wizardMode);
         $wizard->setMessages();
         $retval = "<fieldset class='option_container_map'>
-        <legend><strong>" . _("Location") . "</strong></legend>";
+        <legend><strong>" . _("Location")."</strong></legend>";
         $retval .= $wizard->displayHelp("location");
         if ($additional) {
             $retval .= _("You can enter an <strong>additional</strong> location here. You can see the already defined locations in the 'General Information' field.");
@@ -155,7 +155,7 @@ 
      */
     protected function htmlPostEdit($allowDirectInput) {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<br/>" . _("Latitude:") . " <input style='width:80px' name='geo_lat' id='geo_lat' " .($allowDirectInput ? "": "readonly"). ">" . _("Longitude:") . " <input name='geo_long' id='geo_long' style='width:80px' " .($allowDirectInput ? "": "readonly"). "></fieldset>";
+        $retval = "<br/>"._("Latitude:")." <input style='width:80px' name='geo_lat' id='geo_lat' ".($allowDirectInput ? "" : "readonly").">"._("Longitude:")." <input name='geo_long' id='geo_long' style='width:80px' ".($allowDirectInput ? "" : "readonly")."></fieldset>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

web/lib/admin/UIElements.php

Spacing +38 added lines, -38 removed lines

@@ -149,7 +149,7 @@ 
                 'display' => sprintf(_("Mint %s with CA on creation"), $this->nomenclatureIdP),
                 'help' => _("Set of default CAs to add to new IdPs on signup")],
             "fed:openroaming" => [
-                'display' => sprintf(_("OpenRoaming: Allow %s Opt-In"),$this->nomenclatureParticipant),
+                'display' => sprintf(_("OpenRoaming: Allow %s Opt-In"), $this->nomenclatureParticipant),
                 'help' => _("Allow IdP to set OpenRoaming support for its users.")],
             "fed:openroaming_customtarget" => ['display' => _("OpenRoaming: Custom NAPTR Target"), 'help' => ""],
             "fed:autoregister-synced" => [
@@ -174,7 +174,7 @@ 
         ];
 
         if (!isset($displayNames[$input])) { // this is an error! throw an Exception
-            throw new \Exception("The translation of an option name was requested, but the option is not known to the system: " . htmlentities($input));
+            throw new \Exception("The translation of an option name was requested, but the option is not known to the system: ".htmlentities($input));
         }
         \core\common\Entity::outOfThePotatoes();
         // none of the strings have HTML in them, only translators can provide own text for it -> no threat, but complained about by the security review
@@ -200,7 +200,7 @@ 
 
         foreach ($optionlist as $option) {
             $type = $optioninfo->optionType($option['name']);
-            if (preg_match('/^' . $class . '/', $option['name']) && $option['level'] == "$level") {
+            if (preg_match('/^'.$class.'/', $option['name']) && $option['level'] == "$level") {
                 // all non-multilang attribs get this assignment ...
                 $language = "";
                 $content = $option['value'];
@@ -218,19 +218,19 @@ 
                         $locationMarkers[] = $coords;
                         break;
                     case "file":
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td>";
+                        $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td>";
                         switch ($option['name']) {
                             case "general:logo_file":
                             case "fed:logo_file":
-                                $retval .= $this->previewImageinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']);
+                                $retval .= $this->previewImageinHTML('ROWID-'.$option['level'].'-'.$option['row_id']);
                                 break;
                             case "eap:ca_file":
                             // fall-through intended: display both the same way
                             case "fed:minted_ca_file":
-                                $retval .= $this->previewCAinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']);
+                                $retval .= $this->previewCAinHTML('ROWID-'.$option['level'].'-'.$option['row_id']);
                                 break;
                             case "support:info_file":
-                                $retval .= $this->previewInfoFileinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']);
+                                $retval .= $this->previewInfoFileinHTML('ROWID-'.$option['level'].'-'.$option['row_id']);
                                 break;
                             default:
                         }
@@ -240,10 +240,10 @@ 
                             // do not display the option at all; it gets auto-set by the ProfileSilverbullet constructor and doesn't have to be seen
                             break;
                         }
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>";
+                        $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td><strong>".($content == "on" ? _("on") : _("off"))."</strong></td></tr>";
                         break;
                     default:
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>";
+                        $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td><strong>$content</strong></td></tr>";
                 }
             }
         }
@@ -252,11 +252,11 @@ 
             $locationCount = 0;
             foreach ($locationMarkers as $g) {
                 $locationCount++;
-                $marker .= '<marker name="' . $locationCount . '" lat="' . $g['lat'] . '" lng="' . $g['lon'] . '" />';
+                $marker .= '<marker name="'.$locationCount.'" lat="'.$g['lat'].'" lng="'.$g['lon'].'" />';
             }
             $marker .= '<\/markers>'; // some validator says this should be escaped
             $jMarker = json_encode($locationMarkers);
-            $retval .= '<tr><td><script>markers=\'' . $marker . '\'; jmarkers = \'' . $jMarker . '\';</script></td><td></td><td></td></tr>';
+            $retval .= '<tr><td><script>markers=\''.$marker.'\'; jmarkers = \''.$jMarker.'\';</script></td><td></td><td></td></tr>';
         }
         \core\common\Entity::outOfThePotatoes();
         return $retval;
@@ -272,11 +272,11 @@ 
         \core\common\Entity::intoThePotatoes();
         $idpoptions = $myInst->getAttributes();
         $retval = "<div class='infobox'>
-        <h2>" . sprintf(_("General %s details"), $this->nomenclatureParticipant) . "</h2>
+        <h2>" . sprintf(_("General %s details"), $this->nomenclatureParticipant)."</h2>
         <table>
             <tr>
                 <td>
-                    " . _("Country:") . "
+                    " . _("Country:")."
                 </td>
                 <td>
                 </td>
@@ -286,16 +286,16 @@ 
         $retval .= $myFed->name;
         $retval .= "</strong>
                 </td>
-            </tr>" . $this->infoblock($idpoptions, "general", "IdP") . "
+            </tr>" . $this->infoblock($idpoptions, "general", "IdP")."
         </table>
     </div>";
 
         $blocks = [["support", _("Global Helpdesk Details")], ["media", _("Media Properties")]];
         foreach ($blocks as $block) {
             $retval .= "<div class='infobox'>
-            <h2>" . $block[1] . "</h2>
+            <h2>" . $block[1]."</h2>
             <table>" .
-                    $this->infoblock($idpoptions, $block[0], "IdP") .
+                    $this->infoblock($idpoptions, $block[0], "IdP").
                     "</table>
         </div>";
         }
@@ -310,12 +310,12 @@ 
      */
     private function displaySize(int $number) {
         if ($number > 1024 * 1024) {
-            return round($number / 1024 / 1024, 2) . " MiB";
+            return round($number / 1024 / 1024, 2)." MiB";
         }
         if ($number > 1024) {
-            return round($number / 1024, 2) . " KiB";
+            return round($number / 1024, 2)." KiB";
         }
-        return $number . " B";
+        return $number." B";
     }
 
     /**
@@ -370,7 +370,7 @@ 
         $caExpiryTrashhold = \config\ConfAssistant::CERT_WARNINGS['expiry_warning'];
         $rawResult = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE);
         if (is_bool($rawResult)) { // we didn't actually get a CA!
-            $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the certificate from the database!") . "</div>";
+            $retval = "<div class='ca-summary'>"._("There was an error while retrieving the certificate from the database!")."</div>";
             \core\common\Entity::outOfThePotatoes();
             return $retval;
         }
@@ -386,8 +386,8 @@ 
 
         $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
         $details['name'] = preg_replace('/\//', "", $details['name']);
-        $certstatus = ( $details['root'] == 1 ? "R" : "I");
-        $certTooltip = ( $details['root'] == 1 ? _("Root CA") : _("Intermediate CA"));
+        $certstatus = ($details['root'] == 1 ? "R" : "I");
+        $certTooltip = ($details['root'] == 1 ? _("Root CA") : _("Intermediate CA"));
         $innerbgColor = "#0000ff";
         $leftBorderColor = "#00ff00";
         $message = "";
@@ -395,35 +395,35 @@ 
             $leftBorderColor = "red";
             $message = _("This is a <strong>SERVER</strong> certificate!");
             if (\config\ConfAssistant::CERT_GUIDELINES !== '') {
-                $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>". _("more info")."</a>";
+                $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>"._("more info")."</a>";
             }
             $message .= "<br/>";
-            $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . $message . $details['name'] . "</div>";
+            $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>".$message.$details['name']."</div>";
             \core\common\Entity::outOfThePotatoes();
             return $retval;
         }
         $now = time();
         if ($now + \config\ConfAssistant::CERT_WARNINGS['expiry_critical'] > $details['full_details']['validTo_time_t']) {
             $leftBorderColor = "red";
-            $message = _("Certificate expired!") . "<br>";
-        } elseif($now + \config\ConfAssistant::CERT_WARNINGS['expiry_warning']  > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) {
+            $message = _("Certificate expired!")."<br>";
+        } elseif ($now + \config\ConfAssistant::CERT_WARNINGS['expiry_warning'] > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) {
             if ($leftBorderColor == "#00ff00") {
                 $leftBorderColor = "yellow";
             }
-            $message = _("Certificate close to expiry!") . "<br/>";            
+            $message = _("Certificate close to expiry!")."<br/>";            
         }
    
         if ($details['root'] == 1 && $details['basicconstraints_set'] == 0) {
             if ($leftBorderColor == "#00ff00") {
                 $leftBorderColor = "yellow";
             }
-            $message .= "<div style='max-width: 25em'><strong>" . _("Improper root certificate, required critical CA extension missing, will not reliably install!") . "</strong>";
+            $message .= "<div style='max-width: 25em'><strong>"._("Improper root certificate, required critical CA extension missing, will not reliably install!")."</strong>";
             if (\config\ConfAssistant::CERT_GUIDELINES !== '') {
-                $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>". _("more info")."</a>";
+                $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>"._("more info")."</a>";
             }
             $message .= "</div><br/>";
         }
-        $retval =  "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div title='$certTooltip' style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>" . $message . $details['name'] . "<br>" . $this->displayName('eap:ca_vailduntil') . " " . gmdate('Y-m-d H:i:s', $details['full_details']['validTo_time_t']) . " UTC</div>";
+        $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div title='$certTooltip' style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>".$message.$details['name']."<br>".$this->displayName('eap:ca_vailduntil')." ".gmdate('Y-m-d H:i:s', $details['full_details']['validTo_time_t'])." UTC</div>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -436,7 +436,7 @@ 
      */
     public function previewImageinHTML($imageReference) {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=" . $imageReference . "' alt='" . _("Preview of logo file") . "'/>";
+        $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=".$imageReference."' alt='"._("Preview of logo file")."'/>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -453,13 +453,13 @@ 
         $ref = $validator->databaseReference($fileReference);
         $fileBlob = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE);
         if (is_bool($fileBlob)) { // we didn't actually get a file!
-            $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the file from the database!") . "</div>";
+            $retval = "<div class='ca-summary'>"._("There was an error while retrieving the file from the database!")."</div>";
             \core\common\Entity::outOfThePotatoes();
             return $retval;
         }
         $decodedFileBlob = base64_decode($fileBlob);
         $fileinfo = new \finfo();
-        $retval = "<div class='ca-summary'>" . _("File exists") . " (" . $fileinfo->buffer($decodedFileBlob, FILEINFO_MIME_TYPE) . ", " . $this->displaySize(strlen($decodedFileBlob)) . ")<br/><a href='inc/filepreview.php?id=$fileReference'>" . _("Preview") . "</a></div>";
+        $retval = "<div class='ca-summary'>"._("File exists")." (".$fileinfo->buffer($decodedFileBlob, FILEINFO_MIME_TYPE).", ".$this->displaySize(strlen($decodedFileBlob)).")<br/><a href='inc/filepreview.php?id=$fileReference'>"._("Preview")."</a></div>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -616,8 +616,8 @@ 
             return "";
         }
 
-        $loggerInstance->debug(4, "Consortium logo is at: " . ROOT . "/web/resources/images/consortium_logo_large.png");
-        $logogd = imagecreatefrompng(ROOT . "/web/resources/images/consortium_logo_large.png");
+        $loggerInstance->debug(4, "Consortium logo is at: ".ROOT."/web/resources/images/consortium_logo_large.png");
+        $logogd = imagecreatefrompng(ROOT."/web/resources/images/consortium_logo_large.png");
         if ($logogd === FALSE) { // consortium logo is bogus; don't do anything
             return "";
         }
@@ -643,7 +643,7 @@ 
         imagecolorallocate($whiteimage, 255, 255, 255);
         // also make sure the initial placement is a multitude of 12; otherwise "two half" symbols might be affected
         $targetplacementx = (int) ($symbolsize * round(($sizeinput[0] / 2 - ($targetwidth - $symbolsize + 1) / 2) / $symbolsize));
-        $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1 ) / 2) / $symbolsize));
+        $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1) / 2) / $symbolsize));
         imagecopyresized($inputgd, $whiteimage, $targetplacementx - $symbolsize, $targetplacementy - $symbolsize, 0, 0, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize);
         imagecopyresized($inputgd, $logogd, $targetplacementx, $targetplacementy, 0, 0, $targetwidth, $targetheight, $sizelogo[0], $sizelogo[1]);
         ob_start();
@@ -693,9 +693,9 @@ 
                 $message = "Your configuration appears to be fine.";
                 break;
             default:
-                throw new Exception("The result code level " . $test->test_result['global'] . " is not defined!");
+                throw new Exception("The result code level ".$test->test_result['global']." is not defined!");
         }
-        $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>" . $message . "<br>See below for details<br><hr>");
+        $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>".$message."<br>See below for details<br><hr>");
         foreach ($test->out as $testValue) {
             foreach ($testValue as $o) {
                 $out .= $this->boxFlexible($o['level'], $o['message']);

web/skins/msp/copyright.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 <head>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
 <link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
-<title><?php echo config\Master::APPEARANCE['productname'];?> Copyright and Licensing</title>
+<title><?php echo config\Master::APPEARANCE['productname']; ?> Copyright and Licensing</title>
 </head>
 <body>
 <div id="wrap">
@@ -35,7 +35,7 @@ 
             <div id="user_page" style="display:block">
                 <?php echo $divs->divPagetitle(config\Master::APPEARANCE['productname']." Copyright and Licensing", ""); ?>
                 <div style="padding:20px">
-            <?php require dirname(dirname(__DIR__)) . "/copyright.inc.php"; ?>
+            <?php require dirname(dirname(__DIR__))."/copyright.inc.php"; ?>
                 </div>
             </div>
         </div>

web/skins/msp/index.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
     print "vendorlogo ='';\n";
 }
 
-print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
 //TODO modify this based on OS detection
 $userAgent = $_SERVER['HTTP_USER_AGENT'] ?? "";
 if (preg_match('/Android/', $userAgent)) {
@@ -79,7 +79,7 @@ 
     <?php echo $divs->divHeading($visibility); ?>
     <div id="main_page">
         <div id="loading_ico">
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
+          <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
         </div>
         <div id="info_overlay"> <!-- device info -->
             <div id="info_window"></div>

web/skins/msp/Divs.php

Spacing +20 added lines, -20 removed lines

@@ -67,7 +67,7 @@ 
     public function divSilverbullet() {
         $retval = "
 <div id='silverbullet'>"
-    . $this->Gui->textTemplates->templates[user\SB_GO_AWAY] . 
+    . $this->Gui->textTemplates->templates[user\SB_GO_AWAY]. 
     "</div>
     ";
         return $retval;
@@ -109,9 +109,9 @@ 
     public function divProfiles() {
         return "
 <div id='profiles'> <!-- this is the profile selection filled during run time -->
-    <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION] . "
+    <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION]."
     </div>" .
-"<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>" .
+"<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>".
                 "</div>";
     }
 
@@ -126,7 +126,7 @@ 
     public function divInstitution($selectButton = TRUE) {
         $retval = "<div id='institution_name'>
     <span id='inst_name_span'></span> <div id='inst_extra_text'></div><!-- this will be filled with the IdP name -->" .
-                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">" . $this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION] . "</a>" : "") .
+                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : "").
                 "</div>";
         $retval .= $this->emptyImage('idp_logo', 'IdP Logo');
         return $retval;
@@ -140,7 +140,7 @@ 
     public function divOtherinstallers() {
         $retval = "
 <div class='sub_h'>
-    <div id='other_installers'>".$this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "
+    <div id='other_installers'>".$this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."
          <table id='device_list' style='padding:0px;'>";
 
         foreach ($this->Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) {
@@ -148,18 +148,18 @@ 
             $deviceIndex = 0;
 
             $imgTag = "";
-            $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $group . ".png");
+            $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$group.".png");
             if ($imgLocation !== FALSE) {
-                $imgTag = '<img src="' . $imgLocation . '" alt="' . $group . ' Device" title="' . $group . ' Device">';
+                $imgTag = '<img src="'.$imgLocation.'" alt="'.$group.' Device" title="'.$group.' Device">';
             }
-            $retval .= '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '">' . $imgTag . '</td>';
+            $retval .= '<tbody><tr><td class="vendor" rowspan="'.$groupIndex.'">'.$imgTag.'</td>';
             foreach ($deviceGroup as $d => $D) {
                 if ($deviceIndex) {
                     $retval .= '<tr>';
                 }
-                $retval .= "<td><button id='" . $d . "'>" . $D['display'] . "</button>"
-                        . "<div class='device_info' id='info_" . $d . "'></div></td>"
-                        . "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n";
+                $retval .= "<td><button id='".$d."'>".$D['display']."</button>"
+                        . "<div class='device_info' id='info_".$d."'></div></td>"
+                        . "<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n";
                 $deviceIndex++;
             }
             $retval .= "</tbody>";
@@ -172,15 +172,15 @@ 
     }
 
     public function divGuessOs($operatingSystem) {
-        $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $operatingSystem['group'] . ".png");
+        $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$operatingSystem['group'].".png");
         $vendorstyle = "";
         if ($vendorlogo !== FALSE) {
-            $vendorstyle = "style='background-image:url(\"" . $vendorlogo . "\")'";
+            $vendorstyle = "style='background-image:url(\"".$vendorlogo."\")'";
         }
         $deleteIcon = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/delete_32.png");
         $deleteImg = "";
         if ($deleteIcon !== FALSE) {
-            $deleteImg = "<img id='cross_icon_" . $operatingSystem['device'] . "' src='$deleteIcon' >";
+            $deleteImg = "<img id='cross_icon_".$operatingSystem['device']."' src='$deleteIcon' >";
         }
         return "
 <div class='sub_h' id='guess_os'>
@@ -188,23 +188,23 @@ 
     <table id='browser'>
         <tr>
             <td>
-                <button class='large_button guess_os' $vendorstyle id='g_" . $operatingSystem['device'] . "'>
+                <button class='large_button guess_os' $vendorstyle id='g_".$operatingSystem['device']."'>
                     $deleteImg
-                    <div class='download_button_text_1' id='download_button_header_" . $operatingSystem['device'] . "'> " . $this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE] . "
+                    <div class='download_button_text_1' id='download_button_header_".$operatingSystem['device']."'> ".$this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE]."
                     </div>
                     <div class='download_button_text'>" .
-                $operatingSystem['display'] . "
+                $operatingSystem['display']."
                     </div>
                 </button>
-                <div class='device_info' id='info_g_" . $operatingSystem['device'] . "'></div>
+                <div class='device_info' id='info_g_" . $operatingSystem['device']."'></div>
           </td>
           <td style='vertical-align:top'>
-               <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device'] . "'>i</button>
+               <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device']."'>i</button>
           </td>
       </tr>
     </table> <!-- id='browser' -->
     <div class='sub_h'>
-       <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "</a>
+       <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."</a>
     </div>
 </div> <!-- id='guess_os' -->";
     }