GEANT / CAT

web/admin/overview_certificates.php

Spacing +5 added lines, -5 removed lines

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

web/admin/action_req_certificate.php

Spacing +45 added lines, -45 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,7 +437,7 @@ 
         <?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>
@@ -447,7 +447,7 @@ 
         echo '<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/>