GEANT / CAT

web/admin/inc/manageDBLink.inc.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 // if we have a pushed close button, submit attributes and send user back to the overview page
 // if external DB sync is disabled globally, the user never gets to this page. If he came here *anyway* -> send him back immediately.
-if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\common\FormElements::BUTTON_CLOSE ) || CONFIG['DB']['enforce-external-sync'] == FALSE) {
+if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\common\FormElements::BUTTON_CLOSE) || CONFIG['DB']['enforce-external-sync'] == FALSE) {
     header("Location: ../overview_federation.php");
     exit;
 }

web/admin/inc/manageAdmins.inc.php

Spacing +1 added lines, -1 removed lines

@@ -159,7 +159,7 @@
 
         echo "</td>
               <td>
-                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ( $oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "" ) . " accept-charset='UTF-8'>
+                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ($oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "") . " accept-charset='UTF-8'>
                 <input type='hidden' name='admin_id' value='" . $oneowner['ID'] . "'></input>
                 <button type='submit' name='submitbutton' class='delete' value='" . web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Delete Administrator") . "</button>
                 </form>

core/IdP.php

Spacing +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
                 case "SILVERBULLET":
                     $theProfile = new ProfileSilverbullet($identifier, $this);
                     $theProfile->addSupportedEapMethod(new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET), 1);
-                    $theProfile->setRealm($this->identifier."-".$theProfile->identifier."." . strtolower($this->federation) . strtolower(CONFIG_CONFASSISTANT['SILVERBULLET']['realm_suffix']));
+                    $theProfile->setRealm($this->identifier . "-" . $theProfile->identifier . "." . strtolower($this->federation) . strtolower(CONFIG_CONFASSISTANT['SILVERBULLET']['realm_suffix']));
                     return $theProfile;
                 default:
                     throw new Exception("This type of profile is unknown and can not be added.");

Indentation +6 added lines, -6 removed lines

@@ -155,12 +155,12 @@
      * @return bool TRUE if this user is an admin with FED-level blessing
      */
     public function isPrimaryOwner($user) {
-       foreach ($this->listOwners() as $oneOwner) {
-           if ($oneOwner['ID'] == $user && $oneOwner['LEVEL'] == "FED") {
-               return TRUE;
-           }
-       }
-       return FALSE;
+        foreach ($this->listOwners() as $oneOwner) {
+            if ($oneOwner['ID'] == $user && $oneOwner['LEVEL'] == "FED") {
+                return TRUE;
+            }
+        }
+        return FALSE;
     }
     
     /**

web/admin/overview_idp.php

Spacing +4 added lines, -4 removed lines

@@ -56,7 +56,7 @@ 
         <div class='infobox' style='text-align:center;'>
             <h2><?php echo sprintf(_("QR Code for %s download area"), $uiElements->nomenclature_inst); ?></h2>
             <?php
-            $displayurl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier;
+            $displayurl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier;
             $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo(QRcode::png($displayurl, FALSE, QR_ECLEVEL_Q, QRCODE_PIXELS_PER_SYMBOL), QRCODE_PIXELS_PER_SYMBOL));
             $size = getimagesize($uri);
             echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>";
@@ -93,7 +93,7 @@ 
                 </td>
                 <td>
                     <form action='edit_idp_result.php?inst_id=<?php echo $my_inst->identifier; ?>' method='post' accept-charset='UTF-8'>
-                        <button class='delete' type='submit' name='submitbutton' value='<?php echo web\lib\common\FormElements::BUTTON_DELETE; ?>' onclick="return confirm('<?php echo ( CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration'] === NULL ? sprintf(_("After deleting the IdP, you can not recreate it yourself - you need a new invitation token from the %s administrator!"), $uiElements->nomenclature_fed) . " " : "" ) . sprintf(_("Do you really want to delete your %s %s?"), $uiElements->nomenclature_inst, $my_inst->name); ?>')"><?php echo sprintf(_("Delete %s"), $uiElements->nomenclature_inst); ?></button>
+                        <button class='delete' type='submit' name='submitbutton' value='<?php echo web\lib\common\FormElements::BUTTON_DELETE; ?>' onclick="return confirm('<?php echo (CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration'] === NULL ? sprintf(_("After deleting the IdP, you can not recreate it yourself - you need a new invitation token from the %s administrator!"), $uiElements->nomenclature_fed) . " " : "") . sprintf(_("Do you really want to delete your %s %s?"), $uiElements->nomenclature_inst, $my_inst->name); ?>')"><?php echo sprintf(_("Delete %s"), $uiElements->nomenclature_inst); ?></button>
                     </form>
 
                 </td>
@@ -181,7 +181,7 @@ 
                         if ($readonly === FALSE) {
                             ?>
                             <form action='edit_silverbullet.php?inst_id=<?php echo $my_inst->identifier; ?>&profile_id=<?php echo $profile_list->identifier; ?>' method='POST'>
-                                <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
+                                <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
                             </form>
                             <?php
                         }
@@ -315,7 +315,7 @@ 
                     if (isset($URL['device-specific:redirect'])) {
                         $displayurl = $URL['device-specific:redirect'][0];
                     } else {
-                        $displayurl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier . "&amp;profile=" . $profile_list->identifier;
+                        $displayurl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier . "&amp;profile=" . $profile_list->identifier;
                     }
                     echo "<a href='$displayurl' style='white-space: nowrap; text-align: center;'>";
                     $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo(QRcode::png($displayurl, FALSE, QR_ECLEVEL_Q, QRCODE_PIXELS_PER_SYMBOL), QRCODE_PIXELS_PER_SYMBOL));

web/admin/overview_user.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
             $country[$key] = $row['country'];
             $name[$key] = $row['name'];
         }
-        echo "<tr><th>" . sprintf(_("%s Name"), $uiElements->nomenclature_inst) . "</th><th>" . sprintf(_("Other admins of this %s"), $uiElements->nomenclature_inst) . "</th><th>" . ( CONFIG['DB']['INST']['readonly'] === FALSE ? _("Administrator Management") : "") . "</th></tr>";
+        echo "<tr><th>" . sprintf(_("%s Name"), $uiElements->nomenclature_inst) . "</th><th>" . sprintf(_("Other admins of this %s"), $uiElements->nomenclature_inst) . "</th><th>" . (CONFIG['DB']['INST']['readonly'] === FALSE ? _("Administrator Management") : "") . "</th></tr>";
         foreach ($myFeds as $fed_id => $fed_name) {
             echo "<tr><td colspan='3'><strong>" . sprintf(_("%s %s: %s list"), $uiElements->nomenclature_fed, $fed_name, $uiElements->nomenclature_inst) . "</strong></td></tr>";
 

web/admin/sanity_tests.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     'mailer',
 ];
 
-if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_RADIUS'] == "LOCAL" ) {
+if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_RADIUS'] == "LOCAL") {
     $Tests[] = 'makensis';
     $Tests[] = 'makensis=>NSISmodules';
 }

core/diag/Telepath.php

Doc Comments +1 added lines, -1 removed lines

@@ -216,7 +216,7 @@
      * realm (and indirectly that of the links and statuses of involved proxies
      * and returns a judgment whether external Monitoring API tests are warranted
      * or not
-     * @return boolean TRUE if external tests have to be run
+     * @return boolean|null TRUE if external tests have to be run
      */
     private function CATInternalTests() {
         // we are expecting to get a REJECT from all runs, because that means the packet got through to the IdP.

web/admin/112365365321.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
                     <th>Device</th>
                     <th>Admin Downloads</th>
                     <th>User Downloads (classic)</th>
-                    <th>User Downloads (<?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>)</th>
+                    <th>User Downloads (<?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>)</th>
                     <th>User Downloads (total)</th>
                 </tr>
                 <?php
@@ -130,7 +130,7 @@ 
                     $admin_query = $dbHandle->exec("SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user, SUM(downloads_silverbullet) as silverbullet FROM downloads WHERE device_id = '$index'");
                     // SELECT -> mysqli_result, not boolean
                     while ($a = mysqli_fetch_object(/** @scrutinizer ignore-type */ $admin_query)) {
-                        echo "<td>" . $device_array['display'] . "</td><td>" . $a->admin . "</td><td>" . $a->user . "</td><td>" . $a->silverbullet . "</td><td>" . sprintf("%s",$a->user + $a->silverbullet) . "</td>";
+                        echo "<td>" . $device_array['display'] . "</td><td>" . $a->admin . "</td><td>" . $a->user . "</td><td>" . $a->silverbullet . "</td><td>" . sprintf("%s", $a->user + $a->silverbullet) . "</td>";
                         $gross_admin = $gross_admin + $a->admin;
                         $gross_user = $gross_user + $a->user;
                         $gross_silverbullet = $gross_silverbullet + $a->silverbullet;

core/ProfileSilverbullet.php

Doc Comments +1 added lines, -1 removed lines

@@ -254,7 +254,7 @@
      * create a CSR
      * 
      * @param resource $privateKey the private key to create the CSR with
-     * @return array with the CSR and some meta info
+     * @return integer with the CSR and some meta info
      */
     private function generateCsr($privateKey) {
         // token leads us to the NRO, to set the OU property of the cert

Spacing +1 added lines, -1 removed lines

@@ -455,7 +455,7 @@
                 $indexStatement = "$certstatus\t$expiryIndexTxt\t" . ($certstatus == "R" ? "$nowIndexTxt,unspecified" : "") . "\t$serialHex\tunknown\t/O=" . CONFIG_CONFASSISTANT['CONSORTIUM']['name'] . "/OU=$federation/CN=$cn/emailAddress=$cn\n";
                 $logHandle->debug(4, "index.txt contents-to-be: $indexStatement");
                 if (!file_put_contents($tempdir . "/index.txt", $indexStatement)) {
-                $logHandle->debug(1,"Unable to write openssl index.txt file for revocation handling!");
+                $logHandle->debug(1, "Unable to write openssl index.txt file for revocation handling!");
                 }
                 // index.txt.attr is dull but needs to exist
                 file_put_contents($tempdir . "/index.txt.attr", "unique_subject = yes\n");