GEANT / CAT

devices/apple_mobileconfig/mobileconfig_superclass.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
       <key>PayloadIdentifier</key>
          <string>" . mobileconfig_superclass::$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>

core/UserManagement.php

Doc Comments +4 added lines, -4 removed lines

@@ -211,9 +211,9 @@ 
      * @param boolean $isByFedadmin is the invitation token created for a federation admin or from an existing inst admin
      * @param type $for identifier (typically email address) for which the invitation is created
      * @param mixed $instIdentifier either an instance of the IdP class (for existing institutions to invite new admins) or a string (new institution - this is the inst name then)
-     * @param string $externalId if the IdP to be created is related to an external DB entity, this parameter contains that ID
-     * @param type $country if the institution is new (i.e. $inst is a string) this parameter needs to specify the federation of the new inst
-     * @return mixed The function returns either the token (as string) or FALSE if something went wrong
+     * @param integer $externalId if the IdP to be created is related to an external DB entity, this parameter contains that ID
+     * @param integer $country if the institution is new (i.e. $inst is a string) this parameter needs to specify the federation of the new inst
+     * @return string|false The function returns either the token (as string) or FALSE if something went wrong
      */
     public function createToken($isByFedadmin, $for, $instIdentifier, $externalId = 0, $country = 0) {
         $escapedFor = DBConnection::escape_value(UserManagement::$databaseType, $for);
@@ -243,7 +243,7 @@ 
     /**
      * Retrieves all pending invitations for an institution or for a federation.
      * 
-     * @param type $idpIdentifier the identifier of the institution. If not set, returns invitations for not-yet-created insts
+     * @param integer $idpIdentifier the identifier of the institution. If not set, returns invitations for not-yet-created insts
      * @return if idp_identifier is set: an array of strings (mail addresses); otherwise an array of tuples (country;name;mail)
      */
     public function listPendingInvitations($idpIdentifier = 0) {

Spacing +2 added lines, -2 removed lines

@@ -250,8 +250,8 @@
         $retval = [];
         $invitations = DBConnection::exec(UserManagement::$databaseType, "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");
-        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");
+        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];
         }

web/admin/inc/manageAdmins.inc.php

Spacing +2 added lines, -2 removed lines

@@ -136,7 +136,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='" . BUTTON_DELETE . "'>" . _("Delete Administrator") . "</button>
                 </form>
@@ -154,7 +154,7 @@ 
     echo "<strong>" . _("Pending invitations for this IdP") . "</strong>";
     echo "<table>";
     foreach ($pending_invites as $invitee)
-        echo "<tr><td>".$invitee['mail']."</td></tr>";
+        echo "<tr><td>" . $invitee['mail'] . "</td></tr>";
     echo "</table>";
 }
 ?>

Braces +34 added lines, -25 removed lines

@@ -45,9 +45,10 @@ 
 $is_admin_with_blessing = FALSE;
 $owners = $my_inst->owner();
 foreach ($owners as $oneowner) {
-    if ($oneowner['ID'] == $_SESSION['user'] && $oneowner['LEVEL'] == "FED")
-        $is_admin_with_blessing = TRUE;
-}
+    if ($oneowner['ID'] == $_SESSION['user'] && $oneowner['LEVEL'] == "FED") {
+            $is_admin_with_blessing = TRUE;
+    }
+    }
 
 // if none of the two, send the user away
 
@@ -65,8 +66,9 @@ 
             $ownermgmt->removeAdminFromIdP($my_inst, $_POST['admin_id']);
             // if the user deleted himself, go back to overview page. Otherwise, just stay here and display the remaining owners
             // we don't decide about that here; it's done by JS magic in the calling button
-            if ($_POST['admin_id'] == $_SESSION['user'])
-                header("Location: $dest");
+            if ($_POST['admin_id'] == $_SESSION['user']) {
+                            header("Location: $dest");
+            }
         } else {
             echo "Fatal Error: asked to delete an administrator, but no administrator ID was given!";
             exit(1);
@@ -91,12 +93,13 @@ 
 if (isset($_GET['invitation'])) {
     echo "<div class='ca-summary' style='position:relative;'><table>";
 
-    if ($_GET['invitation'] == "SUCCESS")
-        echo UI_remark(_("The invitation email was sent successfully."), _("The invitation email was sent."));
-    else if ($_GET['invitation'] == "FAILURE")
-        echo UI_error(_("The invitation email could not be sent!"), _("The invitation email could not be sent!"));
-    else
-        echo UI_error(_("Error: unknown result code of invitation!?!"), _("Unknown result!"));
+    if ($_GET['invitation'] == "SUCCESS") {
+            echo UI_remark(_("The invitation email was sent successfully."), _("The invitation email was sent."));
+    } else if ($_GET['invitation'] == "FAILURE") {
+            echo UI_error(_("The invitation email could not be sent!"), _("The invitation email could not be sent!"));
+    } else {
+            echo UI_error(_("Error: unknown result code of invitation!?!"), _("Unknown result!"));
+    }
 
     echo "</table></div>";
 }
@@ -119,20 +122,22 @@ 
     foreach ($my_inst->owner() as $oneowner) {
         $ownerinfo = new User($oneowner['ID']);
         $ownername = $ownerinfo->getAttributes("user:realname");
-        if (count($ownername) > 0)
-            $prettyprint = $ownername[0]['value'];
-        else
-            $prettyprint = _("User without name");
+        if (count($ownername) > 0) {
+                    $prettyprint = $ownername[0]['value'];
+        } else {
+                    $prettyprint = _("User without name");
+        }
         echo "
             <tr>
               <td>
                  <strong>$prettyprint</strong>
                  <br/>";
 
-        if ($oneowner['MAIL'] != "SELF-APPOINTED")
-            printf(_("(originally invited as %s)"), $oneowner['MAIL']);
-        else
-            echo _("(self-appointed)");
+        if ($oneowner['MAIL'] != "SELF-APPOINTED") {
+                    printf(_("(originally invited as %s)"), $oneowner['MAIL']);
+        } else {
+                    echo _("(self-appointed)");
+        }
 
         echo "</td>
               <td>
@@ -153,8 +158,9 @@ 
 if (count($pending_invites) > 0) {
     echo "<strong>" . _("Pending invitations for this IdP") . "</strong>";
     echo "<table>";
-    foreach ($pending_invites as $invitee)
-        echo "<tr><td>".$invitee['mail']."</td></tr>";
+    foreach ($pending_invites as $invitee) {
+            echo "<tr><td>".$invitee['mail']."</td></tr>";
+    }
     echo "</table>";
 }
 ?>
@@ -167,14 +173,17 @@ 
 if ($is_fed_admin) {
     $is_admin_himself = FALSE;
     foreach ($owners as $oneowner) {
-        if ($oneowner['ID'] == $_SESSION['user'])
-            $is_admin_himself = TRUE;
+        if ($oneowner['ID'] == $_SESSION['user']) {
+                    $is_admin_himself = TRUE;
+        }
     }
 
-    if (!$is_admin_himself) echo "<form action='inc/manageAdmins.inc.php?inst_id=$my_inst->identifier' method='post' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
+    if (!$is_admin_himself) {
+        echo "<form action='inc/manageAdmins.inc.php?inst_id=$my_inst->identifier' method='post' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
     <button type='submit' name='submitbutton' value='" . BUTTON_TAKECONTROL . "'>" . _("Take control of this institution") . "</button>
 </form>";
-}
+    }
+    }
 ?>
 <hr/>
 <form action='inc/manageAdmins.inc.php?inst_id=<?php echo $my_inst->identifier; ?>' method='post' accept-charset='UTF-8'>

web/admin/inc/manageDBLink.inc.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,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'] == BUTTON_CLOSE ) || Config::$DB['enforce-external-sync'] == FALSE)
+if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == BUTTON_CLOSE) || Config::$DB['enforce-external-sync'] == FALSE)
     header("Location: ../overview_federation.php");
 
 // if not, must operate on a proper IdP
@@ -161,7 +161,7 @@ 
     echo "<strong>" . _("Pending invitations for this IdP") . "</strong>";
     echo "<table>";
     foreach ($pending_invites as $invitee)
-        echo "<tr><td>".$invitee['mail']."</td></tr>";
+        echo "<tr><td>" . $invitee['mail'] . "</td></tr>";
     echo "</table>";
 }
 ?>

Braces +34 added lines, -23 removed lines

@@ -25,8 +25,9 @@ 
 
 // 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'] == BUTTON_CLOSE ) || Config::$DB['enforce-external-sync'] == FALSE)
+if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == BUTTON_CLOSE ) || Config::$DB['enforce-external-sync'] == FALSE) {
     header("Location: ../overview_federation.php");
+}
 
 // if not, must operate on a proper IdP
 $my_inst = valid_IdP($_GET['inst_id']);
@@ -48,8 +49,9 @@ 
 
 if (isset($_POST['submitbutton']) && $_POST['submitbutton'] == BUTTON_SAVE) {
     // someone clever pushed the button without selecting an inst?
-    if (!isset($_POST['inst_link']))
-        header("Location: ../overview_federation.php");
+    if (!isset($_POST['inst_link'])) {
+            header("Location: ../overview_federation.php");
+    }
     // okay, he did sumbit an inst. It's either a (string) handle from a promising 
     // candidate, or "other" as selected from the drop-down list
     if ($_POST['inst_link'] != "other") {
@@ -78,10 +80,11 @@ 
 
         foreach ($names as $name) {
             $thename = unserialize($name['value']);
-            if ($thename['lang'] == "C")
-                $language = "default/other";
-            else
-                $language = Config::$LANGUAGES[$thename['lang']]['display'];
+            if ($thename['lang'] == "C") {
+                            $language = "default/other";
+            } else {
+                            $language = Config::$LANGUAGES[$thename['lang']]['display'];
+            }
 
             echo "<tr><td>" . sprintf(_("Institution Name (%s)"), $language) . "</td><td>" . $thename['content'] . "</td></tr>";
         }
@@ -91,8 +94,9 @@ 
         foreach ($admins as $admin) {
             $user = new User($admin['ID']);
             $username = $user->getAttributes("user:realname");
-            if (count($username) == 0)
-                $username[0]['value'] = _("Unnamed User");
+            if (count($username) == 0) {
+                            $username[0]['value'] = _("Unnamed User");
+            }
             echo "<tr><td>" . _("Administrator [invited as]") . "</td><td>" . $username[0]['value'] . " [" . $admin['MAIL'] . "]</td></tr>";
         }
         echo "</table>";
@@ -101,10 +105,12 @@ 
         // right-hand side: external DB
         $extinfo = $my_inst->getExternalDBEntityDetails();
         echo "<table>";
-        foreach ($extinfo['names'] as $lang => $name)
-            echo "<tr><td>" . sprintf(_("Institution Name (%s)"), $lang) . "</td><td>$name</td>";
-        foreach ($extinfo['admins'] as $number => $admin_details)
-            echo "<tr><td>" . _("Administrator email") . "</td><td>" . $admin_details['email'] . "</td></tr>";
+        foreach ($extinfo['names'] as $lang => $name) {
+                    echo "<tr><td>" . sprintf(_("Institution Name (%s)"), $lang) . "</td><td>$name</td>";
+        }
+        foreach ($extinfo['admins'] as $number => $admin_details) {
+                    echo "<tr><td>" . _("Administrator email") . "</td><td>" . $admin_details['email'] . "</td></tr>";
+        }
         echo "</table>";
         // end of right-hand side
         echo "</td></tr></table>";
@@ -116,17 +122,20 @@ 
         $candidates = $my_inst->getExternalDBSyncCandidates();
         echo "<br/><form name='form-link-inst' action='inc/manageDBLink.inc.php?inst_id=$my_inst->identifier' method='post' accept-charset='UTF-8'>";
         printf(_("Please select an entity from the %s DB which corresponds to this CAT institution."), Config::$CONSORTIUM['name']) . " ";
-        if (count($candidates) > 0)
-            printf(_("Particularly promising entries (names in CAT and %s DB are a 100%% match) are on top of the list."), Config::$CONSORTIUM['name']);
+        if (count($candidates) > 0) {
+                    printf(_("Particularly promising entries (names in CAT and %s DB are a 100%% match) are on top of the list."), Config::$CONSORTIUM['name']);
+        }
         echo "<table><tr><th>" . _("Link to this entity?") . "</th><th>" . _("Name of the institution") . "</th><th>" . _("Administrators") . "</th></tr>";
         foreach ($candidates as $candidate) {
             $info = Federation::getExternalDBEntityDetails($candidate);
             echo "<tr><td><input type='radio' name='inst_link' value='$candidate' onclick='document.getElementById(\"submit\").disabled = false;'>$candidate</input></td><td>";
-            foreach ($info['names'] as $lang => $name)
-                echo "[$lang] $name<br/>";
+            foreach ($info['names'] as $lang => $name) {
+                            echo "[$lang] $name<br/>";
+            }
             echo "</td><td>";
-            foreach ($info['admins'] as $number => $admin_details)
-                echo "[E-Mail] " . $admin_details['email'] . "<br/>";
+            foreach ($info['admins'] as $number => $admin_details) {
+                            echo "[E-Mail] " . $admin_details['email'] . "<br/>";
+            }
             echo "</td></tr>";
             $temparray[] = $candidate;
         }
@@ -147,8 +156,9 @@ 
             echo "</select></td></tr>";
         }
         // issue a big red warning if there are no link candidates at all in the federation
-        if (empty($buffer) && empty($candidates))
-            echo "<tr><td style='color:#ff0000' colspan='2'>There are no unmapped institutions in the external database for this federation!</td></tr>";
+        if (empty($buffer) && empty($candidates)) {
+                    echo "<tr><td style='color:#ff0000' colspan='2'>There are no unmapped institutions in the external database for this federation!</td></tr>";
+        }
         echo "</table><button type='submit' name='submitbutton' id='submit' value='" . BUTTON_SAVE . "' disabled >" . _("Create Link") . "</button></form>";
     }
     ?>
@@ -160,8 +170,9 @@ 
 if (count($pending_invites) > 0) {
     echo "<strong>" . _("Pending invitations for this IdP") . "</strong>";
     echo "<table>";
-    foreach ($pending_invites as $invitee)
-        echo "<tr><td>".$invitee['mail']."</td></tr>";
+    foreach ($pending_invites as $invitee) {
+            echo "<tr><td>".$invitee['mail']."</td></tr>";
+    }
     echo "</table>";
 }
 ?>

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;

core/DBConnection.php

Doc Comments +4 added lines

@@ -84,6 +84,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) {
@@ -134,6 +135,8 @@ 
     /**
      * Checks if a raw data pointer is public data (return value FALSE) or if 
      * yes who the authorised admins to view it are (return array of user IDs)
+     * @param string $table
+     * @param string $row
      */
     public static function isDataRestricted($table, $row) {
         if ($table != "institution_option" && $table != "profile_option" && $table != "federation_option") {
@@ -177,6 +180,7 @@ 
 
     /**
      * Retrieves the last auto-id of an INSERT. Needs to be called immediately after the corresponding exec() call
+     * @param string $database
      * @return int the last autoincrement-ID
      */
     public static function lastID($database) {

web/admin/action_fedcheck.php

Spacing +20 added lines, -20 removed lines

@@ -18,7 +18,7 @@ 
 require_once("../resources/inc/header.php");
 require_once("../resources/inc/footer.php");
 
-function profilechecks(IdP $idpinfo,Profile $profile) {
+function profilechecks(IdP $idpinfo, Profile $profile) {
 
     $tabletext = "<tr><td>" . $idpinfo->name . "</td><td>" . $profile->name . "</td>";
     
@@ -30,12 +30,12 @@ 
         // update database with the findings
         
         DBConnection::exec("INST", "UPDATE profile SET "
-                . "status_dns = ".RETVAL_SKIPPED.", "
-                . "status_cert = ".RETVAL_SKIPPED.", "
-                . "status_reachability = ". RETVAL_SKIPPED.", "
-                . "status_TLS = ".RETVAL_SKIPPED.", "
+                . "status_dns = " . RETVAL_SKIPPED . ", "
+                . "status_cert = " . RETVAL_SKIPPED . ", "
+                . "status_reachability = " . RETVAL_SKIPPED . ", "
+                . "status_TLS = " . RETVAL_SKIPPED . ", "
                 . "last_status_check = NOW() "
-                . "WHERE profile_id = ".$profile->identifier);
+                . "WHERE profile_id = " . $profile->identifier);
         
         return $tabletext;
     }
@@ -82,9 +82,9 @@ 
     }
 
     if ($NAPTR_issues) {
-        $tabletext .= UI_error(0,0,true);
+        $tabletext .= UI_error(0, 0, true);
     } else {
-        $tabletext .= UI_okay(0,0,true);
+        $tabletext .= UI_okay(0, 0, true);
     }
     
     $UDPErrors = false;
@@ -106,13 +106,13 @@ 
     }
     
     $tabletext .= "</td><td>";
-    $tabletext .= UI_message($certBiggestOddity,0,0,true);
+    $tabletext .= UI_message($certBiggestOddity, 0, 0, true);
         
     $tabletext .= "</td><td>";
     if (!$UDPErrors) {
-        $tabletext .= UI_okay(0,0,true);
+        $tabletext .= UI_okay(0, 0, true);
     } else {
-        $tabletext .= UI_error(0,0,true);
+        $tabletext .= UI_error(0, 0, true);
     }
     
     $tabletext .= "</td><td>";
@@ -127,19 +127,19 @@ 
         }
     }
     if (!$dynamicErrors) {
-        $tabletext .= UI_okay(0,0,true);
+        $tabletext .= UI_okay(0, 0, true);
     } else {
-        $tabletext .= UI_error(0,0,true);
+        $tabletext .= UI_error(0, 0, true);
     }
     $tabletext .= "</td></tr>";
 
     DBConnection::exec("INST", "UPDATE profile SET "
-                . "status_dns = ".($NAPTR_issues ? RETVAL_INVALID : RETVAL_OK) . ", "
-                . "status_cert = ".($certBiggestOddity) . ", "
-                . "status_reachability = ".($UDPErrors ? RETVAL_INVALID : RETVAL_OK) . ", "
-                . "status_TLS = ".($dynamicErrors ? RETVAL_INVALID : RETVAL_OK) . ", "
+                . "status_dns = " . ($NAPTR_issues ? RETVAL_INVALID : RETVAL_OK) . ", "
+                . "status_cert = " . ($certBiggestOddity) . ", "
+                . "status_reachability = " . ($UDPErrors ? RETVAL_INVALID : RETVAL_OK) . ", "
+                . "status_TLS = " . ($dynamicErrors ? RETVAL_INVALID : RETVAL_OK) . ", "
                 . "last_status_check = NOW() "
-                . "WHERE profile_id = ".$profile->identifier);    
+                . "WHERE profile_id = " . $profile->identifier);    
         
     return $tabletext;
 }
@@ -177,7 +177,7 @@ 
     echo "<h2>" . _("Profiles marked as visible (V)") . "</h2>" . "<table>";
     echo rowdescription();
     foreach ($profiles_showtime as $oneprofile)
-        echo profilechecks($oneprofile['idp'],$oneprofile['profile']);
+        echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
     echo "</table>";
 }
 
@@ -185,7 +185,7 @@ 
     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']);
+        echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
     echo "</table>";
 }
 ?>

Braces +32 added lines, -21 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"));
@@ -62,23 +63,26 @@ 
 
     if ($naptr > 0) {
         $naptrValid = $testsuite->NAPTR_compliance();
-        if ($naptrValid == RETVAL_INVALID)
-            $NAPTR_issues = true;
+        if ($naptrValid == RETVAL_INVALID) {
+                    $NAPTR_issues = true;
+        }
     }
 
     // SRV resolution
 
     if ($naptr > 0 && $naptrValid == RETVAL_OK) {
         $srv = $testsuite->NAPTR_SRV();
-        if ($srv == RETVAL_INVALID)
-            $NAPTR_issues = true;
+        if ($srv == RETVAL_INVALID) {
+                    $NAPTR_issues = true;
+        }
     }
 
     // IP addresses for the hosts
     if ($naptr > 0 && $naptrValid == RETVAL_OK && $srv > 0) {
         $hosts = $testsuite->NAPTR_hostnames();
-        if ($hosts == RETVAL_INVALID)
-            $NAPTR_issues = true;
+        if ($hosts == RETVAL_INVALID) {
+                    $NAPTR_issues = true;
+        }
     }
 
     if ($NAPTR_issues) {
@@ -94,14 +98,17 @@ 
         $testsuite->UDP_reachability($hostindex, true, true);
         $results = $testsuite->UDP_reachability_result[$hostindex];
         //echo "<pre>".print_r($results,true)."</pre>";
-        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'];
+            }
         }
     }
     
@@ -122,8 +129,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) {
@@ -165,10 +173,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];
         }
@@ -176,16 +185,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/Profile.php

Doc Comments +13 added lines, -8 removed lines

@@ -73,7 +73,7 @@ 
      * supported EAP types from the DB and stores them in the priv_ arrays.
      * 
      * @param int $profileId identifier of the profile in the DB
-     * @param IdP $idpObject optionally, the institution to which this Profile belongs. Saves the construction of the IdP instance. If omitted, an extra query and instantiation is executed to find out.
+     * @param integer $idpObject optionally, the institution to which this Profile belongs. Saves the construction of the IdP instance. If omitted, an extra query and instantiation is executed to find out.
      */
     public function __construct($profileId, $idpObject = 0) {
         debug(3, "--- BEGIN Constructing new Profile object ... ---\n");
@@ -215,6 +215,9 @@ 
         debug(3, "--- END Constructing new Profile object ... ---\n");
     }
 
+    /**
+     * @param string $devicesOrEAPMethods
+     */
     private function fetchDeviceOrEAPLevelAttributes($devicesOrEAPMethods) {
         // only one of the two is allowed to be set
         $temparray = [];
@@ -322,6 +325,8 @@ 
      * 
      * @param string device the device identifier string
      * @param string path the path where the new installer can be found
+     * @param string $device
+     * @param string $path
      */
     public function updateCache($device, $path, $mime) {
         $escapedDevice = DBConnection::escape_value($this->databaseType, $device);
@@ -334,9 +339,9 @@ 
     /**
      * Log a new download for our stats
      * 
-     * @param device the device id string
-     * @param area either admin or user
-     * @return TRUE if incrementing worked, FALSE if not
+     * @param device string device id string
+     * @param area string admin or user
+     * @return boolean if incrementing worked, FALSE if not
      */
     public function incrementDownloadStats($device, $area) {
         $escapedDevice = DBConnection::escape_value($this->databaseType, $device);
@@ -349,7 +354,7 @@ 
 
     /**
      * Retrieve current download stats from database, either for one specific device or for all devices
-     * @param string $device the device id string
+     * @param integer $device the device id string
      * @return mixed user downloads of this profile; if device is given, returns the counter as int, otherwise an array with devicename => counter
      */
     public function getUserDownloadStats($device = 0) {
@@ -382,7 +387,7 @@ 
      * @param string $attrName name of the attribute to set
      * @param string $attrValue value of the attribute to set
      * @param int $eapType identifier of the EAP type in the database. 0 if the attribute is valid for all EAP types.
-     * @param string $device identifier of the device in the databse. Omit the argument if attribute is valid for all devices.
+     * @param integer $device identifier of the device in the databse. Omit the argument if attribute is valid for all devices.
      */
     private function addAttributeAllLevels($attrName, $attrValue, $eapType, $device = 0) {
         $escapedAttrName = DBConnection::escape_value($this->databaseType, $attrName);
@@ -549,7 +554,7 @@ 
     /**
      * list all devices marking their availabiblity and possible redirects
      *
-     * @param string $locale for text-based attributes, either returns values for the default value, or if specified here, in the locale specified
+     * @param integer $locale for text-based attributes, either returns values for the default value, or if specified here, in the locale specified
      * @return array of device ids display names and their status
      */
     public function listDevices($locale = 0) {
@@ -640,7 +645,7 @@ 
      * as wel as the chosen language.
      * can be called with an optional $eap argument
      * 
-     * @param array $eap if specified, retrieves attributes specific to the given EAP type
+     * @param integer $eap if specified, retrieves attributes specific to the given EAP type
      * @return array list of attributes in collapsed style (index is the attrib name, value is an array of different values)
      */
     public function getCollapsedAttributes($eap = 0) {

Spacing +4 added lines, -4 removed lines

@@ -126,7 +126,7 @@ 
         // add internal attributes
         // they share many attribute properties, so condense the generation
 
-        $localValueIfAny = (preg_match('/@/', $this->realm) ? substr($this->realm, 0, strpos($this->realm, '@')) : "anonymous" );
+        $localValueIfAny = (preg_match('/@/', $this->realm) ? substr($this->realm, 0, strpos($this->realm, '@')) : "anonymous");
 
         $internalAttributes = [
             "internal:profile_count" => $idp->profileCount(),
@@ -251,7 +251,7 @@ 
 
                 $temparray[] = [
                     "name" => $attributeQuery->option_name,
-                    "value" => ( $decodedAttribute['lang'] == "" ? $decodedAttribute['content'] : serialize($decodedAttribute)),
+                    "value" => ($decodedAttribute['lang'] == "" ? $decodedAttribute['content'] : serialize($decodedAttribute)),
                     "level" => "Method",
                     "row" => $attributeQuery->row,
                     "flag" => $optinfo['flag'],
@@ -389,7 +389,7 @@ 
         $escapedAttrValue = DBConnection::escape_value($this->databaseType, $attrValue);
 
         DBConnection::exec($this->databaseType, "INSERT INTO $this->entityOptionTable ($this->entityIdColumn, option_name, option_value, eap_method_id" . ($device !== 0 ? ",device_id" : "") . ") 
-                          VALUES(" . $this->identifier . ", '$escapedAttrName', '$escapedAttrValue', $eapType" . ($device !== 0 ? ",'" . DBConnection::escape_value($this->databaseType, $device) . "'" : "" ) . ")");
+                          VALUES(" . $this->identifier . ", '$escapedAttrName', '$escapedAttrValue', $eapType" . ($device !== 0 ? ",'" . DBConnection::escape_value($this->databaseType, $device) . "'" : "") . ")");
         $this->updateFreshness();
     }
 
@@ -456,7 +456,7 @@ 
      */
     public function setRealmCheckUser($shallwe, $localpart = NULL) {
         DBConnection::exec($this->databaseType, "UPDATE profile SET checkuser_outer = " . ($shallwe == true ? "1" : "0") .
-                ( $localpart !== NULL ? ", checkuser_value = '$localpart' " : "") .
+                ($localpart !== NULL ? ", checkuser_value = '$localpart' " : "") .
                 " WHERE profile_id = $this->identifier");
     }
 

Indentation +3 added lines, -3 removed lines

@@ -692,11 +692,11 @@
                     $out[$name][0] = (isset($S[$this->langIndex])) ? $S[$this->langIndex] : $S['C'];
                 }
                 if (isset($S['en'])) {
-                   $out[$name][1] = $S['en'];
+                    $out[$name][1] = $S['en'];
                 } elseif(isset($S['C'])) {
-                   $out[$name][1] = $S['C'];
+                    $out[$name][1] = $S['C'];
                 } else {
-                   $out[$name][1] = $out[$name][0];
+                    $out[$name][1] = $out[$name][0];
                 }
             } else {
                 if (isset($temp[$name]['Method'])) {