GEANT / CAT

core/DBConnection.php

Doc Comments +4 added lines

@@ -87,6 +87,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 $db
      * @return mixed the query result as mysqli_result object; or TRUE on non-return-value statements
      */
     public static function exec($db, $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")
@@ -175,6 +178,7 @@ 
 
     /**
      * Retrieves the last auto-id of an INSERT. Needs to be called immediately after the corresponding exec() call
+     * @param string $db
      * @return int the last autoincrement-ID
      */
     public static function lastID($db) {

Braces +3 added lines, -2 removed lines

@@ -211,8 +211,9 @@
             exit(1);
         }
 
-        if ($db == "EXTERNAL" && Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team")
-            mysqli_query($this->connection, "SET NAMES 'latin1'");
+        if ($db == "EXTERNAL" && Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") {
+                    mysqli_query($this->connection, "SET NAMES 'latin1'");
+        }
     }
 
 }
\ No newline at end of file

core/UserManagement.php

Doc Comments +4 added lines, -4 removed lines

@@ -211,9 +211,9 @@ 
      * @param boolean $by_fedadmin 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 $inst_identifier 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 $external_id 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 $external_id 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($by_fedadmin, $for, $inst_identifier, $external_id = 0, $country = 0) {
         $escapedFor = DBConnection::escape_value(UserManagement::$DB_TYPE, $for);
@@ -243,7 +243,7 @@ 
     /**
      * Retrieves all pending invitations for an institution or for a federation.
      * 
-     * @param type $idp_identifier the identifier of the institution. If not set, returns invitations for not-yet-created insts
+     * @param integer $idp_identifier 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($idp_identifier = 0) {

Spacing +1 added lines, -1 removed lines

@@ -250,7 +250,7 @@
         $retval = [];
         $invitations = DBConnection::exec(UserManagement::$DB_TYPE, "SELECT cat_institution_id, country, name, invite_issuer_level, invite_dest_mail, invite_token 
                                         FROM invitations 
-                                        WHERE cat_institution_id " . ( $idp_identifier != 0 ? "= $idp_identifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
+                                        WHERE cat_institution_id " . ($idp_identifier != 0 ? "= $idp_identifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
         if ($idp_identifier != 0) { // list invitations for existing institution, must match cat_institution_id
             while ($a = mysqli_fetch_object($invitations)) {
                 debug(4, "Retrieving pending invitations for IdP $idp_identifier.\n");

web/admin/edit_profile_result.php

Braces +10 added lines, -6 removed lines

@@ -48,25 +48,29 @@
 // extended input checks
 
 $realm = FALSE;
-if (isset($_POST['realm']) && $_POST['realm'] != "")
+if (isset($_POST['realm']) && $_POST['realm'] != "") {
     $realm = valid_Realm($_POST['realm']);
+}
 
 $anon = FALSE;
-if (isset($_POST['anon_support']))
+if (isset($_POST['anon_support'])) {
     $anon = valid_boolean($_POST['anon_support']);
+}
 
 $anon_local = "anonymous";
 if (isset($_POST['anon_local'])) {
     $anon_local = valid_string_db($_POST['anon_local']);
 } else if ($my_profile !== FALSE) { // get the old anon outer id from DB. People don't appreciate "forgetting" it when unchecking anon id
     $local = $my_profile->getAttributes("internal:anon_local_value");
-    if (isset($local[0]))
-        $anon_local = $local[0]['value'];
-}
+    if (isset($local[0])) {
+            $anon_local = $local[0]['value'];
+    }
+    }
 
 $checkuser = FALSE;
-if (isset($_POST['checkuser_support']))
+if (isset($_POST['checkuser_support'])) {
     $checkuser = valid_boolean($_POST['checkuser_support']);
+}
 
 $checkuser_name = "anonymous";
 if (isset($_POST['checkuser_local'])) {