GEANT / CAT

web/admin/inc/common.inc.php

Spacing +2 added lines, -2 removed lines

@@ -264,7 +264,7 @@ 
 
     $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
     $details['name'] = preg_replace('/\//', "", $details['name']);
-    $certstatus = ( $details['root'] == 1 ? "R" : "I");
+    $certstatus = ($details['root'] == 1 ? "R" : "I");
     if ($details['ca'] == 0 && $details['root'] != 1) {
         return "<div class='ca-summary' style='background-color:red'><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:maroon;  border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . _("This is a <strong>SERVER</strong> certificate!") . "<br/>" . $details['name'] . "</div>";
     }
@@ -339,7 +339,7 @@ 
                     }
                     break;
                 case "boolean":
-                    $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>";
+                    $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off")) . "</strong></td></tr>";
                     break;
                 default:
                     $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>";

web/resources/inc/header.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
                     <select id='lang' name='lang' onchange='this.form.submit()'>
                         <?php
                         foreach (Config::$LANGUAGES as $lang => $value) {
-                            echo "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $value['display'] . "</option> ";
+                            echo "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "") . " >" . $value['display'] . "</option> ";
                         }
                         ?>
                     </select>

devices/ms/Files/geant_link.inc

Spacing +2 added lines, -2 removed lines

@@ -69,14 +69,14 @@
   File "GEANTLink64.msi"

   nsArray::Set Delete_files "GEANTLink64.msi"

   DetailPrint "Install GEANTLink installer"

-  MessageBox MB_OK  "<?php echo_nsi( _("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"

+  MessageBox MB_OK  "<?php echo_nsi(_("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"

   !insertmacro debug_cat 1 "Run GEANTLink installer"

   !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink$Platform.msi"'

   ClearErrors

   ExecWait '$Msiexec.exe /i "$TEMP\GEANTLink$Platform.msi" /qb' $0

   !insertmacro debug_cat 4 "GEANTLink returned $0"

   StrCmp $0 0 Cont2

-  MessageBox MB_OK "<?php echo_nsi( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"

+  MessageBox MB_OK "<?php echo_nsi(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"

   Quit

   Cont2:

 FunctionEnd

core/Federation.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
             }
             $numberQuery = DBConnection::exec("INST", $query);
             while ($queryResult = mysqli_fetch_object($numberQuery)) {
-                $dataArray[$deviceArray['display']] = ["ADMIN" => ( $queryResult->admin === NULL ? "0" : $queryResult->admin), "USER" => ($queryResult->user === NULL ? "0" : $queryResult->user)];
+                $dataArray[$deviceArray['display']] = ["ADMIN" => ($queryResult->admin === NULL ? "0" : $queryResult->admin), "USER" => ($queryResult->user === NULL ? "0" : $queryResult->user)];
                 $grossAdmin = $grossAdmin + $queryResult->admin;
                 $grossUser = $grossUser + $queryResult->user;
             }
@@ -88,7 +88,7 @@ 
                 $retstring .= "<tr><td><strong>TOTAL</strong></td><td><strong>" . $data['TOTAL']['ADMIN'] . "</strong></td><td><strong>" . $data['TOTAL']['USER'] . "</strong></td></tr>";
                 break;
             case "XML":
-                $retstring .= "<federation id='" . ( $federationid == NULL ? "ALL" : $federationid ) . "' ts='" . date("Y-m-d") . "T" . date("H:i:s") . "'>\n";
+                $retstring .= "<federation id='" . ($federationid == NULL ? "ALL" : $federationid) . "' ts='" . date("Y-m-d") . "T" . date("H:i:s") . "'>\n";
                 foreach ($data as $device => $numbers) {
                     if ($device == "TOTAL") {
                         continue;

devices/apple_mobileconfig/mobileconfigSuperclass.php

Spacing +2 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
       <key>PayloadIdentifier</key>
          <string>" . mobileconfigSuperclass::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
       <key>PayloadOrganization</key>
-         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
+         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ($this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
       <key>PayloadType</key>
          <string>Configuration</string>
       <key>PayloadUUID</key>
@@ -188,7 +188,7 @@ 
         return $retval;
     }
 
-    private function passPointBlock ($consortiumOi) {
+    private function passPointBlock($consortiumOi) {
         $retval = "
                <key>IsHotspot</key>
                <true/>

web/admin/action_fedcheck.php

Braces +26 added lines, -17 removed lines

@@ -44,10 +44,11 @@ 
     // NAPTR existence check
     $tabletext .= "<td>";
     $naptr = $testsuite->NAPTR();
-    if ($naptr != RETVAL_NOTCONFIGURED)
-        switch ($naptr) {
+    if ($naptr != RETVAL_NOTCONFIGURED) {
+            switch ($naptr) {
             case RETVAL_NONAPTR:
                 $tabletext .= _("No NAPTR records");
+    }
                 break;
             case RETVAL_ONLYUNRELATEDNAPTR:
                 $tabletext .= sprintf(_("No associated NAPTR records"));
@@ -73,8 +74,9 @@ 
                 }
                 if ($srv > 0) {
                     $hosts = $testsuite->NAPTR_hostnames();
-                    if ($hosts == RETVAL_INVALID)
-                        $NAPTR_issues = true;
+                    if ($hosts == RETVAL_INVALID) {
+                                            $NAPTR_issues = true;
+                    }
                 }
                 break;
         }
@@ -91,14 +93,17 @@ 
     foreach (Config::$RADIUSTESTS['UDP-hosts'] as $hostindex => $host) {
         $testsuite->UDP_reachability($hostindex, true, true);
         $results = $testsuite->UDP_reachability_result[$hostindex];
-        if ($results['packetflow_sane'] != TRUE)
-            $UDPErrors = true;
-        if (empty($results['packetflow'][11]))
-            $UDPErrors = true;
+        if ($results['packetflow_sane'] != TRUE) {
+                    $UDPErrors = true;
+        }
+        if (empty($results['packetflow'][11])) {
+                    $UDPErrors = true;
+        }
         if (count($results['cert_oddities']) > 0) {
-            foreach ($results['cert_oddities'] as $oddity)
-                if ($oddity['level'] > $certBiggestOddity)
+            foreach ($results['cert_oddities'] as $oddity) {
+                            if ($oddity['level'] > $certBiggestOddity)
                     $certBiggestOddity = $oddity['level'];
+            }
         }
     }
 
@@ -119,8 +124,9 @@ 
     if ($naptr > 0 && count($testsuite->NAPTR_hostname_records) > 0) {
         foreach ($testsuite->NAPTR_hostname_records as $hostindex => $addr) {
             $retval = $testsuite->TLS_clients_side_check($addr);
-            if ($retval != RETVAL_OK && $retval != RETVAL_SKIPPED)
-                $dynamicErrors = true;
+            if ($retval != RETVAL_OK && $retval != RETVAL_SKIPPED) {
+                            $dynamicErrors = true;
+            }
         }
     }
     if (!$dynamicErrors) {
@@ -162,10 +168,11 @@ 
 $profiles_showtime = [];
 $profiles_readyconf = [];
 
-foreach ($allIDPs as $index => $oneidp)
+foreach ($allIDPs as $index => $oneidp) {
     foreach ($oneidp['instance']->listProfiles() as $profile)
         if ($profile->isShowtime()) {
             $profiles_showtime[] = ['idp' => $oneidp['instance'], 'profile' => $profile];
+}
         } else if ($profile->readyForShowtime()) {
             $profiles_confready[] = ['idp' => $oneidp['instance'], 'profile' => $profile];
         }
@@ -173,16 +180,18 @@ 
 if (count($profiles_showtime) > 0) {
     echo "<h2>" . _("Profiles marked as visible (V)") . "</h2>" . "<table>";
     echo rowdescription();
-    foreach ($profiles_showtime as $oneprofile)
-        echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    foreach ($profiles_showtime as $oneprofile) {
+            echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    }
     echo "</table>";
 }
 
 if (count($profiles_confready) > 0) {
     echo "<h2>" . _("Profiles with sufficient configuration, not marked as visible (C)") . "</h2>" . "<table>";
     echo rowdescription();
-    foreach ($profiles_confready as $oneprofile)
-        echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    foreach ($profiles_confready as $oneprofile) {
+            echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    }
     echo "</table>";
 }
 ?>

core/DBConnection.php

Doc Comments +1 added lines

@@ -83,6 +83,7 @@
     /**
      * executes a query and triggers logging to the SQL audit log if it's not a SELECT
      * @param string $querystring the query to be executed
+     * @param string $database
      * @return mixed the query result as mysqli_result object; or TRUE on non-return-value statements
      */
     public static function exec($database, $querystring) {

web/admin/radius_tests.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 function disp_name($eap) {
     $displayName = EAP::eapDisplayName($eap);
-    return $displayName['OUTER'] . ( $displayName['INNER'] != '' ? '-' . $displayName['INNER'] : '');
+    return $displayName['OUTER'] . ($displayName['INNER'] != '' ? '-' . $displayName['INNER'] : '');
 }
 
 function printDN($distinguishedName) {

core/UserManagement.php

Spacing +2 added lines, -2 removed lines

@@ -259,8 +259,8 @@
         $retval = [];
         $invitations = $this->databaseHandle->exec("SELECT cat_institution_id, country, name, invite_issuer_level, invite_dest_mail, invite_token 
                                         FROM invitations 
-                                        WHERE cat_institution_id " . ( $idpIdentifier != 0 ? "= $idpIdentifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
-        $this->loggerInstance->debug(4, "Retrieving pending invitations for " . ($idpIdentifier != 0 ? "IdP $idpIdentifier" : "IdPs awaiting initial creation" ) . ".\n");
+                                        WHERE cat_institution_id " . ($idpIdentifier != 0 ? "= $idpIdentifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
+        $this->loggerInstance->debug(4, "Retrieving pending invitations for " . ($idpIdentifier != 0 ? "IdP $idpIdentifier" : "IdPs awaiting initial creation") . ".\n");
         while ($invitationQuery = mysqli_fetch_object($invitations)) {
             $retval[] = ["country" => $invitationQuery->country, "name" => $invitationQuery->name, "mail" => $invitationQuery->invite_dest_mail, "token" => $invitationQuery->invite_token];
         }