GEANT / CAT

config/Master-template.php

Spacing +7 added lines, -7 removed lines

@@ -174,7 +174,7 @@ 
             'bg' => ['display' => 'Български', 'locale' => 'bg_BG.utf8', 'latin_based' => FALSE, 'rtl' => FALSE],
             'ca' => ['display' => 'Català', 'locale' => 'ca_ES.utf8', 'latin_based' => TRUE, 'rtl' => FALSE],
             'cs' => ['display' => 'Čeština', 'locale' => 'cs_CZ.utf8', 'latin_based' => TRUE, 'rtl' => FALSE],
-            'cy' => ['display' => 'Cymraeg',     'locale' => 'cy_GB.utf8',    'latin_based' => TRUE, 'rtl' => FALSE],
+            'cy' => ['display' => 'Cymraeg', 'locale' => 'cy_GB.utf8', 'latin_based' => TRUE, 'rtl' => FALSE],
             'de' => ['display' => 'Deutsch', 'locale' => 'de_DE.utf8', 'latin_based' => TRUE, 'rtl' => FALSE],
             'el' => ['display' => 'Ελληνικά', 'locale' => 'el_GR.utf8', 'latin_based' => FALSE, 'rtl' => FALSE],
             'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8', 'latin_based' => TRUE, 'rtl' => FALSE],
@@ -221,7 +221,7 @@ 
                 'db' => 'cat',
                 'user' => 'kitty',
                 'pass' => 'somepass',
-                'readonly' => FALSE,],
+                'readonly' => FALSE, ],
             // this DB stores diagnostics data. The connection details can be
             // identical to INST as there is no table overlap
             'DIAGNOSTICS' => [
@@ -229,7 +229,7 @@ 
                 'db' => 'cat',
                 'user' => 'kitty',
                 'pass' => 'somepass',
-                'readonly' => FALSE,],
+                'readonly' => FALSE, ],
             // this slice of DB user is about the downloads table. The corresponding
             // DB user should have write access to update statistics and the cache
             // locations of installers. 
@@ -239,7 +239,7 @@ 
                 'db' => 'cat',
                 'user' => 'kitty',
                 'pass' => 'somepass',
-                'readonly' => FALSE,],
+                'readonly' => FALSE, ],
             // this slice of DB use is about user management in the user_options
             // table. Giving the corresponding user only read-only access means that
             // all user properties have to "magically" occur in the table by OOB
@@ -250,7 +250,7 @@ 
                 'db' => 'cat',
                 'user' => 'kitty',
                 'pass' => 'somepass',
-                'readonly' => FALSE,],
+                'readonly' => FALSE, ],
             /*   If you use this tool in conjunction with an external customer management database, you can configure that every 
              * institution entry in CAT MUST correspond to a customer entry in an external database. If you want this, set this
              * config variable to TRUE.
@@ -276,7 +276,7 @@ 
                 'db' => 'customer_db',
                 'user' => 'customerservice',
                 'pass' => '2lame4u',
-                'readonly' => TRUE,],
+                'readonly' => TRUE, ],
             /*
              * EXTERNAL_SOURCE is the source only used in the caching script, if you
              * do not use local caching then these settings are irrelevant
@@ -286,7 +286,7 @@ 
                 'db' => 'customer_db',
                 'user' => 'customerservice',
                 'pass' => '2lame4u',
-                'readonly' => TRUE,],
+                'readonly' => TRUE, ],
             
             'enforce-external-sync' => TRUE,
         ];

web/admin/action_req_certificate.php

Spacing +25 added lines, -25 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();
@@ -105,10 +105,10 @@ 
                 $fed = $validator->existingFederation($_POST['NRO-list']);
                 $country = strtoupper($fed->tld);
                 $DN[] = "C=$country";
-                $DN[] = "O=NRO of " . iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[strtoupper($fed->tld)]);
+                $DN[] = "O=NRO of ".iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[strtoupper($fed->tld)]);
                 $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"];
@@ -135,14 +135,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";
@@ -161,13 +161,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");
@@ -179,8 +179,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);
@@ -196,7 +196,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>
@@ -214,23 +214,23 @@ 
         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:
-                echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>';
-                echo " <strong>" . $cat->knownFederations[$feds[0]->tld] . "</strong>";
-                echo '<input type="hidden" name="NRO-list" id="NRO-list" value="' . $feds[0]->tld . '"/>';
+                echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>';
+                echo " <strong>".$cat->knownFederations[$feds[0]->tld]."</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" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>';
+                echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.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] . "</option>";
-                        echo '<option value="AAA' . strtoupper($oneFed->tld) . '">' . $oneIdP["names"][$langObject->getLang()] . "</option>";
+                        echo '<option value="AAA'.strtoupper($oneFed->tld).'">'.$oneIdP["names"][$langObject->getLang()]."</option>";
                         
                     }
                     ?>
@@ -241,13 +241,13 @@ 
         ?>
         <script>
             var instservers = [];
-            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["names"][$langObject->getLang()];
-                echo "instservers['" . $id . "']='" . str_replace(",", ", ", $oneIdP["servers"]) . "';\n";
+                $allIdPs[$id] = '['.substr($id, 0, 2).'] '.$oneIdP["names"][$langObject->getLang()];
+                echo "instservers['".$id."']='".str_replace(",", ", ", $oneIdP["servers"])."';\n";
             }
         }
         ?>
@@ -275,7 +275,7 @@ 
             <option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option>
 <?php
 foreach ($allIdPs as $id => $name) {
-    echo '<option value="' . $id . '">' . $name . "</option>";
+    echo '<option value="'.$id.'">'.$name."</option>";
 }
 ?>
         </select>
@@ -284,7 +284,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>
             
         </span>for server names:
         <span id='serversinfo'><?php echo str_replace(",", ", ", array_key_first($serverInfo)); ?></span>
@@ -292,7 +292,7 @@ 
         <?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>";
         }
         ?>
@@ -302,7 +302,7 @@ 
         <h2><?php echo _("2. CSR generation"); ?></h2>
         <p><?php echo _("One way to generate an acceptable certificate request is via this openssl one-liner:"); ?></p>
         <?php 
-        echo "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";
+        echo "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";
         ?>
         <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/>