GEANT / CAT

core/Federation.php

Braces +79 added lines, -55 removed lines

@@ -73,8 +73,9 @@ 
         $timestamp = date("Y-m-d") . "T" . date("H:i:s");
         
         $retstring = "";
-        if (!$astablerows)
-            $retstring .= "<federation id='" . ( $federationid == NULL ? "ALL" : $federationid ) . "' ts='$timestamp'>\n";
+        if (!$astablerows) {
+                    $retstring .= "<federation id='" . ( $federationid == NULL ? "ALL" : $federationid ) . "' ts='$timestamp'>\n";
+        }
 
         foreach (Devices::listDevices() as $index => $device_array) {
             $query = "SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user FROM downloads, profile, institution WHERE device_id = '$index' AND downloads.profile_id = profile.profile_id AND profile.inst_id = institution.inst_id ";
@@ -84,8 +85,9 @@ 
             $retstring .= ($astablerows ? "<tr>" : "  <device name='" . $device_array['display'] . "'>\n");
             $admin_query = DBConnection::exec("INST", $query);
             while ($a = mysqli_fetch_object($admin_query)) {
-                if ($astablerows)
-                    $retstring .= "<td>" . $device_array['display'] . "</td>";
+                if ($astablerows) {
+                                    $retstring .= "<td>" . $device_array['display'] . "</td>";
+                }
                 $retstring .= ($astablerows ? "<td>" : "    <downloads group='admin'>");
                 $retstring .= ( $a->admin === NULL ? "0" : $a->admin);
                 $retstring .= ($astablerows ? "</td><td>" : "</downloads>\n    <downloads group='user'>");
@@ -97,16 +99,18 @@ 
             $retstring .= ($astablerows ? "</tr>" : "  </device>\n");
         }
         $retstring .= ($astablerows ? "<tr>" : "  <total>\n");
-        if ($astablerows)
-            $retstring .= "<td><strong>TOTAL</ts>";
+        if ($astablerows) {
+                    $retstring .= "<td><strong>TOTAL</ts>";
+        }
         $retstring .= ($astablerows ? "<td><strong>" : "    <downloads group='admin'>");
         $retstring .= $gross_admin;
         $retstring .= ($astablerows ? "</strong></td><td><strong>" : "</downloads>\n    <downloads group='user'>");
         $retstring .= $gross_user;
         $retstring .= ($astablerows ? "</strong></td>" : "</downloads>\n");
         $retstring .= ($astablerows ? "</tr>" : "  </total>\n");
-        if (!$astablerows)
-            $retstring .= "</federation>\n";
+        if (!$astablerows) {
+                    $retstring .= "</federation>\n";
+        }
 
         return $retstring;
     }
@@ -437,8 +441,9 @@ 
         $level = DBConnection::escape_value(Federation::$DB_TYPE, $level);
         $mail = DBConnection::escape_value(Federation::$DB_TYPE, $mail);
 
-        if ($owner_id != "PENDING")
-            DBConnection::exec(Federation::$DB_TYPE, "INSERT INTO ownership (user_id,institution_id, blesslevel, orig_mail) VALUES('$owner_id', $identifier, '$level', '$mail')");
+        if ($owner_id != "PENDING") {
+                    DBConnection::exec(Federation::$DB_TYPE, "INSERT INTO ownership (user_id,institution_id, blesslevel, orig_mail) VALUES('$owner_id', $identifier, '$level', '$mail')");
+        }
         return $identifier;
     }
 
@@ -485,13 +490,16 @@ 
 
     public function listFederationAdmins() {
         $returnarray = [];
-        if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") // SW: APPROVED
+        if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") {
+            // SW: APPROVED
             $admins = DBConnection::exec("USER", "SELECT eptid as user_id FROM view_admin WHERE role = 'fedadmin' AND realm = '" . strtolower($this->identifier) . "'");
-        else
-            $admins = DBConnection::exec("USER", "SELECT user_id FROM user_options WHERE option_name = 'user:fedadmin' AND option_value = '" . strtoupper($this->identifier) . "'");
+        } else {
+                    $admins = DBConnection::exec("USER", "SELECT user_id FROM user_options WHERE option_name = 'user:fedadmin' AND option_value = '" . strtoupper($this->identifier) . "'");
+        }
 
-        while ($a = mysqli_fetch_object($admins))
-            $returnarray[] = $a->user_id;
+        while ($a = mysqli_fetch_object($admins)) {
+                    $returnarray[] = $a->user_id;
+        }
         return $returnarray;
     }
 
@@ -499,10 +507,11 @@ 
         $returnarray = [];
         $countrysuffix = "";
         
-        if ($this->identifier != "")
-            $countrysuffix = " WHERE country = '" . strtolower($this->identifier) . "'";
-        else
-            $countrysuffix = "";
+        if ($this->identifier != "") {
+                    $countrysuffix = " WHERE country = '" . strtolower($this->identifier) . "'";
+        } else {
+                    $countrysuffix = "";
+        }
         
         if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
             $usedarray = [];
@@ -515,15 +524,18 @@ 
                                                                                                       WHERE external_db_uniquehandle IS NOT NULL 
                                                                                                       AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) 
                                                                                                       AND used = 0");
-            while ($a = mysqli_fetch_object($already_used))
-                $usedarray[] = $a->external_db_id;
-            while ($a = mysqli_fetch_object($pending_invite))
-                if (!in_array($a->external_db_uniquehandle, $usedarray))
+            while ($a = mysqli_fetch_object($already_used)) {
+                            $usedarray[] = $a->external_db_id;
+            }
+            while ($a = mysqli_fetch_object($pending_invite)) {
+                            if (!in_array($a->external_db_uniquehandle, $usedarray))
                     $usedarray[] = $a->external_db_uniquehandle;
+            }
             while ($a = mysqli_fetch_object($externals)) {
                 if ($unmapped_only === TRUE) {
-                    if (in_array($a->id, $usedarray))
-                        continue;
+                    if (in_array($a->id, $usedarray)) {
+                                            continue;
+                    }
                 }
                 $names = explode('#', $a->collapsed_name);
                 // trim name list to current best language match
@@ -547,8 +559,9 @@ 
                     $matches = [];
                     preg_match("/^n: (.*), e: (.*), p: .*$/", $contact, $matches);
                     if ($matches[2] != "") {
-                        if ($mailnames != "")
-                            $mailnames .= ", ";
+                        if ($mailnames != "") {
+                                                    $mailnames .= ", ";
+                        }
                         // extracting real names is nice, but the <> notation
                         // really gets screwed up on POSTs and HTML safety
                         // so better not do this; use only mail addresses
@@ -567,10 +580,11 @@ 
     public static function getExternalDBEntityDetails($external_id, $realm = NULL) {
         $list = [];
         if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
-            if ($realm !== NULL)
-                $scanforrealm = "OR inst_realm LIKE '%$realm%'";
-            else
-                $scanforrealm = "";
+            if ($realm !== NULL) {
+                            $scanforrealm = "OR inst_realm LIKE '%$realm%'";
+            } else {
+                            $scanforrealm = "";
+            }
             $info_list = DBConnection::exec("EXTERNAL", "SELECT name AS collapsed_name, inst_realm as realmlist, contact AS collapsed_contact, country FROM view_active_idp_institution WHERE id_institution = $external_id $scanforrealm");
             // split names and contacts into proper pairs
             while ($a = mysqli_fetch_object($info_list)) {
@@ -604,14 +618,16 @@ 
         $query = "SELECT distinct institution.inst_id AS inst_id, institution.country AS country,
                      group_concat(concat_ws('===',institution_option.option_name,LEFT(institution_option.option_value,200)) separator '---') AS options
                      FROM institution ";
-        if ($active_only == 1)
-            $query .= "JOIN profile ON institution.inst_id = profile.inst_id ";
+        if ($active_only == 1) {
+                    $query .= "JOIN profile ON institution.inst_id = profile.inst_id ";
+        }
         $query .= "JOIN institution_option ON institution.inst_id = institution_option.institution_id ";
         $query .= "WHERE (institution_option.option_name = 'general:instname' 
                           OR institution_option.option_name = 'general:geo_coordinates'
                           OR institution_option.option_name = 'general:logo_file') ";
-        if ($active_only == 1)
-            $query .= "AND profile.showtime = 1 ";
+        if ($active_only == 1) {
+                    $query .= "AND profile.showtime = 1 ";
+        }
 
         if ($country) {
             // escape the parameter
@@ -624,34 +640,41 @@ 
         while ($a = mysqli_fetch_object($allIDPs)) {
             $O = explode('---', $a->options);
             $A = [];
-            if (isset($geo))
-                unset($geo);
-            if (isset($names))
-                unset($names);
+            if (isset($geo)) {
+                            unset($geo);
+            }
+            if (isset($names)) {
+                            unset($names);
+            }
             $A['entityID'] = $a->inst_id;
             $A['country'] = strtoupper($a->country);
             foreach ($O as $o) {
                 $opt = explode('===', $o);
-                if ($opt[0] == 'general:logo_file')
-                    $A['icon'] = $a->inst_id;
+                if ($opt[0] == 'general:logo_file') {
+                                    $A['icon'] = $a->inst_id;
+                }
                 if ($opt[0] == 'general:geo_coordinates') {
                     $at1 = unserialize($opt[1]);
-                    if (!isset($geo))
-                        $geo = [];
+                    if (!isset($geo)) {
+                                            $geo = [];
+                    }
                     $geo[] = $at1;
                 }
                 if ($opt[0] == 'general:instname') {
-                    if (!isset($names))
-                        $names = [];
+                    if (!isset($names)) {
+                                            $names = [];
+                    }
                     $names[] = ['value' => $opt[1]];
                 }
             }
             $name = getLocalisedValue($names, CAT::get_lang());
-            if (!$name)
-                continue;
+            if (!$name) {
+                            continue;
+            }
             $A['title'] = $name;
-            if (isset($geo))
-                $A['geo'] = $geo;
+            if (isset($geo)) {
+                            $A['geo'] = $geo;
+            }
             $returnarray[] = $A;
         }
         return $returnarray;
@@ -667,12 +690,12 @@ 
     public function getAttributes($option_name = 0) {
         if ($option_name) {
             $returnarray = Array();
-            foreach ($this->priv_attributes as $the_attr)
-                if ($the_attr['name'] == $option_name)
+            foreach ($this->priv_attributes as $the_attr) {
+                            if ($the_attr['name'] == $option_name)
                     $returnarray[] = $the_attr;
+            }
             return $returnarray;
-        }
-        else {
+        } else {
             return $this->priv_attributes;
         }
     }
@@ -686,8 +709,9 @@ 
         DBConnection::exec(Federation::$DB_TYPE, "DELETE FROM federation_option WHERE federation_id = '$this->identifier' AND option_name NOT LIKE '%_file'");
         $exec_q = DBConnection::exec(Federation::$DB_TYPE, "SELECT row FROM federation_option WHERE federation_id = '$this->identifier'");
         $return_array = [];
-        while ($a = mysqli_fetch_object($exec_q))
-            $return_array[$a->row] = "KILLME";
+        while ($a = mysqli_fetch_object($exec_q)) {
+                    $return_array[$a->row] = "KILLME";
+        }
         return $return_array;
     }
 

core/DBConnection.php

Braces +25 added lines, -14 removed lines

@@ -106,8 +106,9 @@ 
         }
 
         // log exact query to audit log, if it's not a SELECT
-        if (preg_match("/^SELECT/i", $querystring) == 0)
-            CAT::writeSQLAudit("[DB: " . strtoupper($db) . "] " . $querystring);
+        if (preg_match("/^SELECT/i", $querystring) == 0) {
+                    CAT::writeSQLAudit("[DB: " . strtoupper($db) . "] " . $querystring);
+        }
         return $result;
     }
 
@@ -120,14 +121,17 @@ 
      */
     public static function fetchRawDataByIndex($table, $row) {
         // only for select tables!
-        if ($table != "institution_option" && $table != "profile_option" && $table != "federation_option")
-            return FALSE;
+        if ($table != "institution_option" && $table != "profile_option" && $table != "federation_option") {
+                    return FALSE;
+        }
         $blob_query = DBConnection::exec("INST", "SELECT option_value from $table WHERE row = $row");
-        while ($a = mysqli_fetch_object($blob_query))
-            $blob = $a->option_value;
+        while ($a = mysqli_fetch_object($blob_query)) {
+                    $blob = $a->option_value;
+        }
 
-        if (!isset($blob))
-            return FALSE;
+        if (!isset($blob)) {
+                    return FALSE;
+        }
         return $blob;
     }
 
@@ -136,13 +140,17 @@ 
      * yes who the authorised admins to view it are (return array of user IDs)
      */
     public static function isDataRestricted($table, $row) {
-        if ($table != "institution_option" && $table != "profile_option" && $table != "federation_option")
-            return []; // better safe than sorry: that's an error, so assume nobody is authorised to act on that data
+        if ($table != "institution_option" && $table != "profile_option" && $table != "federation_option") {
+                    return [];
+        }
+        // better safe than sorry: that's an error, so assume nobody is authorised to act on that data
         switch ($table) {
             case "profile_option":
                 $blob_query = DBConnection::exec("INST", "SELECT profile_id from $table WHERE row = $row");
-                while ($a = mysqli_fetch_object($blob_query)) // only one row
+                while ($a = mysqli_fetch_object($blob_query)) {
+                    // only one row
                     $blobprofile = $a->profile_id;
+                }
                 // is the profile in question public?
                 $profile = new Profile($blobprofile);
                 if ($profile->getShowtime() == TRUE) { // public data
@@ -154,8 +162,10 @@ 
                 break;
             case "institution_option":
                 $blob_query = DBConnection::exec("INST", "SELECT institution_id from $table WHERE row = $row");
-                while ($a = mysqli_fetch_object($blob_query)) // only one row
+                while ($a = mysqli_fetch_object($blob_query)) {
+                    // only one row
                     $blobinst = $a->institution_id;
+                }
                 $inst = new IdP($blobinst);
                 // if at least one of the profiles belonging to the inst is public, the data is public
                 if ($inst->isOneProfileShowtime()) { // public data
@@ -209,8 +219,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'");
+        }
     }
 
 }

core/UserManagement.php

Braces +22 added lines, -16 removed lines

@@ -78,10 +78,11 @@ 
         } else { // invalid token... be a little verbose what's wrong with it
             $check_reason = DBConnection::exec(UserManagement::$DB_TYPE, "SELECT invite_token, used FROM invitations WHERE invite_token = '$token'");
             if ($a = mysqli_fetch_object($check_reason)) {
-                if ($a->used == 1)
-                    return "FAIL-ALREADYCONSUMED";
-                else
-                    return "FAIL-EXPIRED";
+                if ($a->used == 1) {
+                                    return "FAIL-ALREADYCONSUMED";
+                } else {
+                                    return "FAIL-EXPIRED";
+                }
             } else {
                 return "FAIL-NONEXISTINGTOKEN";
             }
@@ -157,8 +158,9 @@ 
 
 %s"), $bestnameguess, Config::$CONSORTIUM['name'], strtoupper($fed->identifier), Config::$APPEARANCE['productname'], Config::$APPEARANCE['productname_long']);
                     $retval = $user->sendMailToUser(_("IdP in your federation was created"), $message);
-                    if ($retval == FALSE)
-                        debug (2, "Mail to federation admin was NOT sent!\n");
+                    if ($retval == FALSE) {
+                                            debug (2, "Mail to federation admin was NOT sent!\n");
+                    }
                 }
 
                 return $idp;
@@ -256,14 +258,16 @@ 
         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");
-                if ($a->cat_institution_id == $idp_identifier)
-                    $retval[] = $a->invite_dest_mail;
+                if ($a->cat_institution_id == $idp_identifier) {
+                                    $retval[] = $a->invite_dest_mail;
+                }
             }
         } else { // list all invitations for *new* institutions
             while ($a = mysqli_fetch_object($invitations)) {
                 debug(4, "Retrieving pending invitations for NEW institutions.\n");
-                if ($a->cat_institution_id == NULL)
-                    $retval[] = ["country" => $a->country, "name" => $a->name, "mail" => $a->invite_dest_mail, "token" => $a->invite_token];
+                if ($a->cat_institution_id == NULL) {
+                                    $retval[] = ["country" => $a->country, "name" => $a->name, "mail" => $a->invite_dest_mail, "token" => $a->invite_token];
+                }
             }
         };
         return $retval;
@@ -280,10 +284,11 @@ 
                                         WHERE invite_created >= TIMESTAMPADD(HOUR, -25, NOW()) AND invite_created < TIMESTAMPADD(HOUR, -24, NOW()) AND used = 0");
         while ($a = mysqli_fetch_object($invitations)) {
                 debug(4, "Retrieving recently expired invitations (expired in last hour)\n");
-                if ($a->cat_institution_id == NULL)
-                    $retval[] = ["country" => $a->country, "level" => $a->invite_issuer_level, "name" => $a->name, "mail" => $a->invite_dest_mail];
-                else
-                    $retval[] = ["country" => $a->country, "level" => $a->invite_issuer_level, "name" => "Existing IdP", "mail" => $a->invite_dest_mail];
+                if ($a->cat_institution_id == NULL) {
+                                    $retval[] = ["country" => $a->country, "level" => $a->invite_issuer_level, "name" => $a->name, "mail" => $a->invite_dest_mail];
+                } else {
+                                    $retval[] = ["country" => $a->country, "level" => $a->invite_issuer_level, "name" => "Existing IdP", "mail" => $a->invite_dest_mail];
+                }
             }
         return $retval;
     }
@@ -299,8 +304,9 @@ 
         $returnarray = [];
         $userid = DBConnection::escape_value(UserManagement::$DB_TYPE, $userid);
         $institutions = DBConnection::exec(UserManagement::$DB_TYPE, "SELECT institution_id FROM ownership WHERE user_id = '$userid' ORDER BY institution_id");
-        while ($a = mysqli_fetch_object($institutions))
-            $returnarray[] = $a->institution_id;
+        while ($a = mysqli_fetch_object($institutions)) {
+                    $returnarray[] = $a->institution_id;
+        }
         return $returnarray;
     }
 

core/CAT.php

Braces +17 added lines, -12 removed lines

@@ -74,14 +74,16 @@ 
 
         if (CAT::$RELEASE_VERSION) {
             $temp_version = "CAT-".CAT::$VERSION_MAJOR.".".CAT::$VERSION_MINOR;
-            if (CAT::$VERSION_PATCH != 0)
-                    $temp_version .= ".".CAT::$VERSION_PATCH;
-            if (CAT::$VERSION_EXTRA != "")
-                $temp_version .= "-".CAT::$VERSION_EXTRA;
+            if (CAT::$VERSION_PATCH != 0) {
+                                $temp_version .= ".".CAT::$VERSION_PATCH;
+            }
+            if (CAT::$VERSION_EXTRA != "") {
+                            $temp_version .= "-".CAT::$VERSION_EXTRA;
+            }
             CAT::$VERSION = sprintf(_("Release %s"), $temp_version );
+        } else {
+                    CAT::$VERSION = _("Unreleased SVN Revision");
         }
-        else
-            CAT::$VERSION = _("Unreleased SVN Revision");
     }
 
     /** 
@@ -170,16 +172,18 @@ 
             // we need to map stuff manually
             $thelang = $try_lang;
 
-            foreach (Config::$LANGUAGES as $language => $value)
-                if (preg_match("/^" . $language . ".*/", $try_lang)) {
+            foreach (Config::$LANGUAGES as $language => $value) {
+                            if (preg_match("/^" . $language . ".*/", $try_lang)) {
                     $thelang = $value['locale'];
+            }
                     $lang_index = $language;
                 }
 
             // echo "Trying to set language to $thelang...";
 //        putenv("LC_ALL=$thelang");
-            if (setlocale(LC_ALL, $thelang))
-                break;
+            if (setlocale(LC_ALL, $thelang)) {
+                            break;
+            }
         }
         putenv("LC_ALL=" . $thelang);
         debug(4, "selected lang:$lang_index:$thelang\n");
@@ -191,8 +195,9 @@ 
      * gets the language setting in CAT
      */
     static public function get_lang() {
-       if(self::$LANG === '')
-         list(self::$LANG, $xx) = self::set_lang();
+       if(self::$LANG === '') {
+                list(self::$LANG, $xx) = self::set_lang();
+       }
        return self::$LANG;
     }
 

core/SanityTests.php

Braces +209 added lines, -159 removed lines

@@ -100,11 +100,12 @@ 
          if(preg_match('/(.+)=>(.+)/',$t,$m)) {
             $tst = $m[1];
             $subtst=$m[2];
-            if($this->test_result[$tst]  < L_ERROR)
-               $this->test($subtst);
+            if($this->test_result[$tst]  < L_ERROR) {
+                           $this->test($subtst);
+            }
+         } else {
+                     $this->test($t);
          }
-         else
-            $this->test($t);
        }
     }
 
@@ -145,10 +146,11 @@ 
              preg_match('/([^ ]+) ?/',Config::$PATHS[$s],$m);
              $exe = $m[1];
              $the_path = exec("which " . Config::$PATHS[$s]);
-             if ($the_path == $exe)
-                 $exec_is = "EXPLICIT";
-             else
-                 $exec_is = "IMPLICIT";
+             if ($the_path == $exe) {
+                              $exec_is = "EXPLICIT";
+             } else {
+                              $exec_is = "IMPLICIT";
+             }
          } 
         return(['exec'=>$the_path,'exec_is'=>$exec_is]);
     }
@@ -157,38 +159,42 @@ 
       *  Test for php version
       */
     private function php_test() {
-         if (version_compare(phpversion(), $this->php_needversion, '>='))
-            $this->test_return(L_OK,"<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
-         else
-            $this->test_return(L_ERROR,"<strong>PHP</strong> is too old. We need at least $this->php_needversion, but you only have ".phpversion(). ".");
+         if (version_compare(phpversion(), $this->php_needversion, '>=')) {
+                     $this->test_return(L_OK,"<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
+         } else {
+                     $this->test_return(L_ERROR,"<strong>PHP</strong> is too old. We need at least $this->php_needversion, but you only have ".phpversion(). ".");
+         }
     }
 
     /**
       * test for simpleSAMLphp
       */
     private function ssp_test() {
-         if (!is_file(CONFIG::$AUTHENTICATION['ssp-path-to-autoloader']))
-             $this->test_return(L_ERROR,"<strong>simpleSAMLphp</strong> not found!");
-         else
-             $this->test_return(L_OK,"<strong>simpleSAMLphp</strong> autoloader found.");
+         if (!is_file(CONFIG::$AUTHENTICATION['ssp-path-to-autoloader'])) {
+                      $this->test_return(L_ERROR,"<strong>simpleSAMLphp</strong> not found!");
+         } else {
+                      $this->test_return(L_OK,"<strong>simpleSAMLphp</strong> autoloader found.");
+         }
     }
 
     /**
       * test for security setting
       */
     private function security_test() {
-         if (in_array("I do not care about security!", Config::$SUPERADMINS))
-             $this->test_return(L_WARN,"You do not care about security. This page should be made accessible to the CAT admin only! See config.php 'Superadmins'!");
+         if (in_array("I do not care about security!", Config::$SUPERADMINS)) {
+                      $this->test_return(L_WARN,"You do not care about security. This page should be made accessible to the CAT admin only! See config.php 'Superadmins'!");
+         }
     }
 
     /**
       * test if zip is available
       */
     private function zip_test() {
-         if (exec("which zip") != "")
-             $this->test_return(L_OK,"<strong>zip</strong> binary found.");
-         else
-             $this->test_return(L_ERROR,"<strong>zip</strong> not found in your \$PATH!");
+         if (exec("which zip") != "") {
+                      $this->test_return(L_OK,"<strong>zip</strong> binary found.");
+         } else {
+                      $this->test_return(L_ERROR,"<strong>zip</strong> not found in your \$PATH!");
+         }
     }
 
     /**
@@ -198,59 +204,67 @@ 
          exec(Config::$PATHS['eapol_test'], $out, $retval);
          if($retval == 255 ) {
             $o = preg_grep('/-o<server cert/',$out);
-               if(count($o) > 0)
-                   $this->test_return(L_OK,"<strong>eapol_test</strong> script found.");
-               else
-                   $this->test_return(L_ERROR,"<strong>eapol_test</strong> found, but is too old!");
+               if(count($o) > 0) {
+                                  $this->test_return(L_OK,"<strong>eapol_test</strong> script found.");
+               } else {
+                                  $this->test_return(L_ERROR,"<strong>eapol_test</strong> found, but is too old!");
+               }
+         } else {
+                     $this->test_return(L_ERROR,"<strong>eapol_test</strong> not found!");
          }
-         else
-            $this->test_return(L_ERROR,"<strong>eapol_test</strong> not found!");
     }
 
     /**
       * test if logdir exists and is writable
       */
     private function logdir_test() {
-         if (fopen(Config::$PATHS['logdir'] . "/debug.log", "a") == FALSE)
-             $this->test_return(L_WARN,"Log files in <strong>" . Config::$PATHS['logdir'] . "</strong> are not writable!");
-         else
-             $this->test_return(L_OK,"Log directory is writable.");
+         if (fopen(Config::$PATHS['logdir'] . "/debug.log", "a") == FALSE) {
+                      $this->test_return(L_WARN,"Log files in <strong>" . Config::$PATHS['logdir'] . "</strong> are not writable!");
+         } else {
+                      $this->test_return(L_OK,"Log directory is writable.");
+         }
     }
 
     /**
       * test for required PHP modules
       */
     private function phpModules_test() {
-        if (function_exists('idn_to_ascii'))
-            $this->test_return(L_OK,"PHP can handle internationalisation.");
-        else
-            $this->test_return(L_ERROR,"PHP can <strongNOT</strong> handle internationalisation (idn_to_ascii() from php5-intl).");
+        if (function_exists('idn_to_ascii')) {
+                    $this->test_return(L_OK,"PHP can handle internationalisation.");
+        } else {
+                    $this->test_return(L_ERROR,"PHP can <strongNOT</strong> handle internationalisation (idn_to_ascii() from php5-intl).");
+        }
 
-        if (function_exists('gettext'))
-            $this->test_return(L_OK,"PHP extension <strong>GNU Gettext</strong> is installed.");
-        else
-           $this->test_return(L_ERROR,"PHP extension <strong>GNU Gettext</strong> not found!");
+        if (function_exists('gettext')) {
+                    $this->test_return(L_OK,"PHP extension <strong>GNU Gettext</strong> is installed.");
+        } else {
+                   $this->test_return(L_ERROR,"PHP extension <strong>GNU Gettext</strong> not found!");
+        }
 
-        if (function_exists('openssl_sign'))
-            $this->test_return(L_OK,"PHP extension <strong>OpenSSL</strong> is installed.");
-        else
-            $this->test_return(L_ERROR,"PHP extension <strong>OpenSSL</strong> not found!");
+        if (function_exists('openssl_sign')) {
+                    $this->test_return(L_OK,"PHP extension <strong>OpenSSL</strong> is installed.");
+        } else {
+                    $this->test_return(L_ERROR,"PHP extension <strong>OpenSSL</strong> not found!");
+        }
 
-        if (class_exists('Imagick'))
-            $this->test_return(L_OK,"PHP extension <strong>Imagick</strong> is installed.");
-        else
-            $this->test_return(L_ERROR,"PHP extension <strong>Imagick</strong> not found! Get it from your distribution or <a href='http://pecl.php.net/package/imagick'>here</a>.");
+        if (class_exists('Imagick')) {
+                    $this->test_return(L_OK,"PHP extension <strong>Imagick</strong> is installed.");
+        } else {
+                    $this->test_return(L_ERROR,"PHP extension <strong>Imagick</strong> not found! Get it from your distribution or <a href='http://pecl.php.net/package/imagick'>here</a>.");
+        }
 
-        if (function_exists('ImageCreate'))
-            $this->test_return(L_OK,"PHP extension <strong>GD</strong> is installed.");
-        else
-            $this->test_return(L_ERROR,"PHP extension <strong>GD</strong> not found!</a>.");
+        if (function_exists('ImageCreate')) {
+                    $this->test_return(L_OK,"PHP extension <strong>GD</strong> is installed.");
+        } else {
+                    $this->test_return(L_ERROR,"PHP extension <strong>GD</strong> not found!</a>.");
+        }
 
-        if (function_exists('mysqli_connect'))
-            $this->test_return(L_OK,"PHP extension <strong>MySQL</strong> is installed.");
-        else
-            $this->test_return(L_ERROR,"PHP extension <strong>MySQL</strong> not found!");
-/*
+        if (function_exists('mysqli_connect')) {
+                    $this->test_return(L_OK,"PHP extension <strong>MySQL</strong> is installed.");
+        } else {
+                    $this->test_return(L_ERROR,"PHP extension <strong>MySQL</strong> not found!");
+        }
+        /*
         if (function_exists('geoip_record_by_name')) {
            $host = '158.75.1.10';
            $record = geoip_record_by_name($host);
@@ -339,12 +353,14 @@ 
          $A = $this->get_exec_path('openssl');    
          if($A['exec'] != "") {
              $t = exec($A['exec'] . ' version');
-             if($A['exec_is'] == "EXPLICIT")
-                $this->test_return(L_OK,"<strong>$t</strong> was found and is configured explicitly in your config.");
-             else
-                $this->test_return(L_WARN,"<strong>$t</strong> was found, but is not configured with an absolute path in your config.");
-         } else
-            $this->test_return(L_ERROR,"<strong>openssl</strong> was not found on your system!");
+             if($A['exec_is'] == "EXPLICIT") {
+                             $this->test_return(L_OK,"<strong>$t</strong> was found and is configured explicitly in your config.");
+             } else {
+                             $this->test_return(L_WARN,"<strong>$t</strong> was found, but is not configured with an absolute path in your config.");
+             }
+         } else {
+                     $this->test_return(L_ERROR,"<strong>openssl</strong> was not found on your system!");
+         }
     }
 
     /**
@@ -362,18 +378,22 @@ 
          $A = $this->get_exec_path('makensis');    
          if($A['exec'] != "") {
              $t = exec($A['exec'] . ' -VERSION');
-             if($A['exec_is'] == "EXPLICIT") 
-                $this->test_return(L_OK,"<strong>makensis $t</strong> was found and is configured explicitly in your config.");
-             else
-                $this->test_return(L_WARN,"<strong>makensis $t</strong> was found, but is not configured with an absolute path in your config.");
+             if($A['exec_is'] == "EXPLICIT") {
+                             $this->test_return(L_OK,"<strong>makensis $t</strong> was found and is configured explicitly in your config.");
+             } else {
+                             $this->test_return(L_WARN,"<strong>makensis $t</strong> was found, but is not configured with an absolute path in your config.");
+             }
              exec($A['exec'] . ' -HELP',$t);
              $t1 = count(preg_grep('/INPUTCHARSET/',$t));
-             if($t1 == 1 && Config::$NSIS_VERSION == 2)
-                $this->test_return(L_ERROR,"Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
-             if($t1 == 0 && Config::$NSIS_VERSION >= 3)
-                $this->test_return(L_ERROR,"Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
-         } else
-            $this->test_return(L_ERROR,"<strong>makensis</strong> was not found on your system!");
+             if($t1 == 1 && Config::$NSIS_VERSION == 2) {
+                             $this->test_return(L_ERROR,"Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
+             }
+             if($t1 == 0 && Config::$NSIS_VERSION >= 3) {
+                             $this->test_return(L_ERROR,"Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
+             }
+         } else {
+                     $this->test_return(L_ERROR,"<strong>makensis</strong> was not found on your system!");
+         }
     }
 
     /**
@@ -391,18 +411,21 @@ 
          foreach ($this->NSIS_Modules as $module) {
             unset($out);
             exec(Config::$PATHS['makensis']." -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
-            if($retval > 0) 
-               $NSIS_Module_status[$module] = 0;
-            else
-               $NSIS_Module_status[$module] = 1;
+            if($retval > 0) {
+                           $NSIS_Module_status[$module] = 0;
+            } else {
+                           $NSIS_Module_status[$module] = 1;
+            }
+         }
+         if(is_file($exe)) {
+                     unlink($exe);
          }
-         if(is_file($exe))
-            unlink($exe);
          foreach ($NSIS_Module_status as $module => $status) {
-            if($status == 1)
-               $this->test_return(L_OK,"NSIS module <strong>$module</strong> was found.");
-            else
-               $this->test_return(L_ERROR,"NSIS module <strong>$module</strong> was not found or is not working correctly.");
+            if($status == 1) {
+                           $this->test_return(L_OK,"NSIS module <strong>$module</strong> was found.");
+            } else {
+                           $this->test_return(L_ERROR,"NSIS module <strong>$module</strong> was not found or is not working correctly.");
+            }
          }
     }
     private function NSIS_GetVersion_test() {
@@ -414,12 +437,14 @@ 
          }
          $exe= 'tt.exe';
          exec(Config::$PATHS['makensis']." -V1 '-XOutFile $exe' '-XSection X' '-XGetVersion::WindowsName' '-XSectionEnd'", $out, $retval);
-         if($retval > 0)
-            $this->test_return(L_ERROR,"NSIS module <strong>GetVersion</strong> was not found or is not working correctly.");
-         else
-            $this->test_return(L_OK,"NSIS module <strong>GetVersion</strong> was found.");
-         if(is_file($exe))
-            unlink($exe);
+         if($retval > 0) {
+                     $this->test_return(L_ERROR,"NSIS module <strong>GetVersion</strong> was not found or is not working correctly.");
+         } else {
+                     $this->test_return(L_OK,"NSIS module <strong>GetVersion</strong> was found.");
+         }
+         if(is_file($exe)) {
+                     unlink($exe);
+         }
     }
 
     /**
@@ -461,21 +486,24 @@ 
     private function locales_test() {
                 $locales = shell_exec("locale -a");
                 $allthere = "";
-                foreach (Config::$LANGUAGES as $onelanguage)
-                    if (preg_match("/" . $onelanguage['locale'] . "/", $locales) == 0)
+                foreach (Config::$LANGUAGES as $onelanguage) {
+                                    if (preg_match("/" . $onelanguage['locale'] . "/", $locales) == 0)
                         $allthere .= $onelanguage['locale'] . " ";
+                }
 
-                if ($allthere == "")
-                    $this->test_return(L_OK,"All of your configured locales are available on your system.");
-                else
-                    $this->test_return(L_WARN,"Some of your configured locales (<strong>$allthere</strong>) are not installed and will not be displayed correctly!");
+                if ($allthere == "") {
+                                    $this->test_return(L_OK,"All of your configured locales are available on your system.");
+                } else {
+                                    $this->test_return(L_WARN,"Some of your configured locales (<strong>$allthere</strong>) are not installed and will not be displayed correctly!");
+                }
     }
 
     private function check_config_default($type,$key,$value) {
-                if (empty(Config::$type[$key]))
-                    $missingvalues .="type/webcert_OCSP ";
-                elseif (Config::$type['webcert_OCSP'] == $value)
-                    $defaultvalues .="type/$key ";
+                if (empty(Config::$type[$key])) {
+                                    $missingvalues .="type/webcert_OCSP ";
+                } elseif (Config::$type['webcert_OCSP'] == $value) {
+                                    $defaultvalues .="type/$key ";
+                }
     }
 
 
@@ -485,32 +513,44 @@ 
     private function defaults_test() {
                 $defaultvalues = "";
                 $missingvalues = "";
-                if (Config::$APPEARANCE['from-mail'] == "cat-invite@your-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/from-mail ";
-                if (Config::$APPEARANCE['support-contact']['url'] == "cat-support@our-cat-installation.example?body=Only%20English%20language%20please!")
-                    $defaultvalues .="APPEARANCE/support-contact/url ";
-                if (Config::$APPEARANCE['support-contact']['display'] == "cat-support@our-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/support-contact/display ";
-                if (Config::$APPEARANCE['support-contact']['developer-mail'] == "cat-develop@our-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/support-contact/mail ";
-                if (Config::$APPEARANCE['abuse-mail'] == "my-abuse-contact@your-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/abuse-mail ";
-                if (Config::$APPEARANCE['MOTD'] == "Release Candidate. All bugs to be shot on sight!")
-                    $defaultvalues .="APPEARANCE/MOTD ";
-                if (Config::$APPEARANCE['webcert_CRLDP'] == ['list', 'of', 'CRL', 'pointers'])
-                    $defaultvalues .="APPEARANCE/webcert_CRLDP ";
-                if (empty(Config::$APPEARANCE['webcert_OCSP']))
-                    $missingvalues .="APPEARANCE/webcert_OCSP ";
-                elseif (Config::$APPEARANCE['webcert_OCSP'] == ['list', 'of', 'OCSP', 'pointers'])
-                    $defaultvalues .="APPEARANCE/webcert_OCSP ";
-                if (isset(Config::$RADIUSTESTS['UDP-hosts'][0]) && Config::$RADIUSTESTS['UDP-hosts'][0]['ip'] == "192.0.2.1")
-                    $defaultvalues .="RADIUSTESTS/UDP-hosts ";
-                if (Config::$DB['INST']['host'] == "db.host.example")
-                    $defaultvalues .="DB/INST ";
-                if (Config::$DB['INST']['host'] == "db.host.example")
-                    $defaultvalues .="DB/USER ";
-                if(!empty(Config::$DB['EXTERNAL']) && Config::$DB['EXTERNAL']['host'] == "customerdb.otherhost.example")
-                    $defaultvalues .="DB/EXTERNAL ";
+                if (Config::$APPEARANCE['from-mail'] == "cat-invite@your-cat-installation.example") {
+                                    $defaultvalues .="APPEARANCE/from-mail ";
+                }
+                if (Config::$APPEARANCE['support-contact']['url'] == "cat-support@our-cat-installation.example?body=Only%20English%20language%20please!") {
+                                    $defaultvalues .="APPEARANCE/support-contact/url ";
+                }
+                if (Config::$APPEARANCE['support-contact']['display'] == "cat-support@our-cat-installation.example") {
+                                    $defaultvalues .="APPEARANCE/support-contact/display ";
+                }
+                if (Config::$APPEARANCE['support-contact']['developer-mail'] == "cat-develop@our-cat-installation.example") {
+                                    $defaultvalues .="APPEARANCE/support-contact/mail ";
+                }
+                if (Config::$APPEARANCE['abuse-mail'] == "my-abuse-contact@your-cat-installation.example") {
+                                    $defaultvalues .="APPEARANCE/abuse-mail ";
+                }
+                if (Config::$APPEARANCE['MOTD'] == "Release Candidate. All bugs to be shot on sight!") {
+                                    $defaultvalues .="APPEARANCE/MOTD ";
+                }
+                if (Config::$APPEARANCE['webcert_CRLDP'] == ['list', 'of', 'CRL', 'pointers']) {
+                                    $defaultvalues .="APPEARANCE/webcert_CRLDP ";
+                }
+                if (empty(Config::$APPEARANCE['webcert_OCSP'])) {
+                                    $missingvalues .="APPEARANCE/webcert_OCSP ";
+                } elseif (Config::$APPEARANCE['webcert_OCSP'] == ['list', 'of', 'OCSP', 'pointers']) {
+                                    $defaultvalues .="APPEARANCE/webcert_OCSP ";
+                }
+                if (isset(Config::$RADIUSTESTS['UDP-hosts'][0]) && Config::$RADIUSTESTS['UDP-hosts'][0]['ip'] == "192.0.2.1") {
+                                    $defaultvalues .="RADIUSTESTS/UDP-hosts ";
+                }
+                if (Config::$DB['INST']['host'] == "db.host.example") {
+                                    $defaultvalues .="DB/INST ";
+                }
+                if (Config::$DB['INST']['host'] == "db.host.example") {
+                                    $defaultvalues .="DB/USER ";
+                }
+                if(!empty(Config::$DB['EXTERNAL']) && Config::$DB['EXTERNAL']['host'] == "customerdb.otherhost.example") {
+                                    $defaultvalues .="DB/EXTERNAL ";
+                }
                 $files = [];
                 foreach (Config::$RADIUSTESTS['TLS-clientcerts'] as $cadata) {
                     foreach ($cadata['certificates'] as $cert_files) {
@@ -521,15 +561,17 @@ 
 
                 foreach ($files as $file) {
                     $handle = fopen(CAT::$root . "/config/cli-certs/" . $file, 'r');
-                    if (!$handle)
-                        $defaultvalues .="CERTIFICATE/$file ";
-                    else
-                        fclose($handle);
+                    if (!$handle) {
+                                            $defaultvalues .="CERTIFICATE/$file ";
+                    } else {
+                                            fclose($handle);
+                    }
+                }
+                if ($defaultvalues != "") {
+                                    $this->test_return(L_WARN,"Your configuration in config/config.php contains unchanged default values or links to inexistent files: <strong>$defaultvalues</strong>!");
+                } else {
+                                    $this->test_return(L_OK,"Your configuration does not contain any unchanged defaults, which is a good sign.");
                 }
-                if ($defaultvalues != "")
-                    $this->test_return(L_WARN,"Your configuration in config/config.php contains unchanged default values or links to inexistent files: <strong>$defaultvalues</strong>!");
-                else
-                    $this->test_return(L_OK,"Your configuration does not contain any unchanged defaults, which is a good sign.");
     }
 
    /**
@@ -542,10 +584,11 @@ 
            $this->test_return(L_ERROR,"Connection to the  $DB database failed");
         } else {
            $r = mysqli_query($db,'select * from profile_option_dict');
-           if($r->num_rows == $this->profile_option_ct)
-              $this->test_return(L_OK,"The $DB database appears to be OK.");
-           else
-              $this->test_return(L_ERROR,"The $DB database is reacheable but probably not updated to this version of CAT.");
+           if($r->num_rows == $this->profile_option_ct) {
+                         $this->test_return(L_OK,"The $DB database appears to be OK.");
+           } else {
+                         $this->test_return(L_ERROR,"The $DB database is reacheable but probably not updated to this version of CAT.");
+           }
         }
         $DB = 'USER';
         $db = mysqli_connect(Config::$DB[$DB]['host'], Config::$DB[$DB]['user'], Config::$DB[$DB]['pass'], Config::$DB[$DB]['db']);
@@ -553,10 +596,11 @@ 
            $this->test_return(L_ERROR,"Connection to the  $DB database failed");
         } else {
            $r = mysqli_query($db,'desc view_admin');
-           if($r->num_rows == $this->view_admin_ct)
-              $this->test_return(L_OK,"The $DB database appears to be OK.");
-           else
-              $this->test_return(L_ERROR,"The $DB is reacheable but there is something wrong with the schema");
+           if($r->num_rows == $this->view_admin_ct) {
+                         $this->test_return(L_OK,"The $DB database appears to be OK.");
+           } else {
+                         $this->test_return(L_ERROR,"The $DB is reacheable but there is something wrong with the schema");
+           }
         }
         $DB = 'EXTERNAL';
         if(! empty(Config::$DB[$DB])) {
@@ -565,10 +609,11 @@ 
            $this->test_return(L_ERROR,"Connection to the  $DB database failed");
         } else {
            $r = mysqli_query($db,'desc view_admin');
-           if($r->num_rows == $this->view_admin_ct)
-              $this->test_return(L_OK,"The $DB database appears to be OK.");
-           else
-              $this->test_return(L_ERROR,"The $DB is reacheable but there is something wrong with the schema");
+           if($r->num_rows == $this->view_admin_ct) {
+                         $this->test_return(L_OK,"The $DB database appears to be OK.");
+           } else {
+                         $this->test_return(L_ERROR,"The $DB is reacheable but there is something wrong with the schema");
+           }
         }
         }
    }
@@ -578,13 +623,15 @@ 
      * test devices.php for the no_cache option
      */
    private function device_cache_test() {
-       if((! empty(Devices::$Options['no_cache'])) && Devices::$Options['no_cache'])
-          $global_no_cache = 1;
-       else
-          $global_no_cache = 0;
+       if((! empty(Devices::$Options['no_cache'])) && Devices::$Options['no_cache']) {
+                 $global_no_cache = 1;
+       } else {
+                 $global_no_cache = 0;
+       }
 
-       if($global_no_cache == 1)
-          $this->test_return(L_WARN,"Devices no_cache global option is set, this is not a good idea in a production setting\n");
+       if($global_no_cache == 1) {
+                 $this->test_return(L_WARN,"Devices no_cache global option is set, this is not a good idea in a production setting\n");
+       }
        $Devs = Devices::listDevices();
        $no_cache_dev = '';
        $no_cache_dev_count = 0;
@@ -605,10 +652,12 @@ 
        }
 
 
-       if($no_cache_dev_count > 1 ) 
-          $this->test_return(L_WARN,"The following devices will not be cached: $no_cache_dev");
-       if($no_cache_dev_count == 1 ) 
-          $this->test_return(L_WARN,"The following device will not be cached: $no_cache_dev");
+       if($no_cache_dev_count > 1 ) {
+                 $this->test_return(L_WARN,"The following devices will not be cached: $no_cache_dev");
+       }
+       if($no_cache_dev_count == 1 ) {
+                 $this->test_return(L_WARN,"The following device will not be cached: $no_cache_dev");
+       }
 
    }
 
@@ -637,10 +686,11 @@ 
       $mail->Subject = "testing CAT configuration mail";
       $mail->Body = "Testing CAT mailing\n";
       $sent = $mail->send();
-      if($sent)
-          $this->test_return(L_OK,"mailer settings appear to be working, check ".Config::$APPEARANCE['abuse-mail']." mailbox if the message was receiced.");
-      else
-          $this->test_return(L_ERROR,"mailer settings failed, check the Config::MAILSETTINGS");
+      if($sent) {
+                $this->test_return(L_OK,"mailer settings appear to be working, check ".Config::$APPEARANCE['abuse-mail']." mailbox if the message was receiced.");
+      } else {
+                $this->test_return(L_ERROR,"mailer settings failed, check the Config::MAILSETTINGS");
+      }
 
    }
 

core/DeviceConfig.php

Braces +93 added lines, -66 removed lines

@@ -107,8 +107,9 @@ 
        $CAs = [];
        if(isset($this->attributes['eap:ca_file'])) {
        foreach ($this->attributes['eap:ca_file'] as $ca) {
-          if($c = X509::processCertificate($ca))
-             $CAs[] = $c;
+          if($c = X509::processCertificate($ca)) {
+                       $CAs[] = $c;
+          }
           }
           $this->attributes['internal:CAs'][0]=$CAs;
        }
@@ -116,9 +117,10 @@ 
           $this->attributes['internal:info_file'][0] = 
              $this->saveInfoFile($this->attributes['support:info_file'][0]);
        }
-       if(isset($this->attributes['general:logo_file']))
-          $this->attributes['internal:logo_file'] = 
+       if(isset($this->attributes['general:logo_file'])) {
+                 $this->attributes['internal:logo_file'] = 
              $this->saveLogoFile($this->attributes['general:logo_file']);
+       }
        $this->attributes['internal:SSID'] = $this->getSSIDs()['add'];;
        $this->attributes['internal:remove_SSID'] = $this->getSSIDs()['del'];;
        $this->attributes['internal:consortia'] = $this->getConsortia();
@@ -130,8 +132,9 @@ 
        $this->support_url_substitute = sprintf(_("your local %s support page"),Config::$CONSORTIUM['name']);
        CAT::set_locale($olddomain);
 
-       if($this->signer && $this->options['sign'])
-         $this->sign = CAT::$root . '/signer/'. $this->signer;
+       if($this->signer && $this->options['sign']) {
+                $this->sign = CAT::$root . '/signer/'. $this->signer;
+       }
        $this->installerBasename = $this->getInstallerBasename();
     }
 
@@ -178,22 +181,24 @@ 
     * @final not to be redefined
     */
    final protected function copyFile($source_name, $output_name = 0) {
-      if  ( $output_name === 0)
-        $output_name = $source_name;
+      if  ( $output_name === 0) {
+              $output_name = $source_name;
+      }
 
       debug(4,"fileCopy($source_name, $output_name)\n");
-      if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name))
-         $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
-      elseif(is_file($this->module_path.'/Files/'.$source_name))
-         $source = $this->module_path.'/Files/'.$source_name;
-      else {
+      if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name)) {
+               $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
+      } elseif(is_file($this->module_path.'/Files/'.$source_name)) {
+               $source = $this->module_path.'/Files/'.$source_name;
+      } else {
         debug(2,"fileCopy:reqested file $source_name does not exist\n");
         return(FALSE);
       }
       debug(4,"Copying $source to $output_name\n");
       $result = copy($source,"$output_name");
-      if(! $result )
-        debug(2,"fileCopy($source_name, $output_name) failed\n");
+      if(! $result ) {
+              debug(2,"fileCopy($source_name, $output_name) failed\n");
+      }
       return($result); 
    }
 
@@ -223,28 +228,33 @@ 
     */
 
    final protected function translateFile($source_name, $output_name = 0, $encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
-        $encoding = 0;
-      if  ( $output_name === 0)
-        $output_name = $source_name;
+      if(Config::$NSIS_VERSION >= 3) {
+              $encoding = 0;
+      }
+      if  ( $output_name === 0) {
+              $output_name = $source_name;
+      }
 
       debug(4,"translateFile($source_name, $output_name, $encoding)\n");
       ob_start();
       debug(4,$this->module_path.'/Files/'.$this->device_id.'/'.$source_name."\n");
-      if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name))
-         $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
-      elseif(is_file($this->module_path.'/Files/'.$source_name))
-         $source = $this->module_path.'/Files/'.$source_name;
+      if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name)) {
+               $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
+      } elseif(is_file($this->module_path.'/Files/'.$source_name)) {
+               $source = $this->module_path.'/Files/'.$source_name;
+      }
       include($source);
       $output = ob_get_clean();
       if($encoding) {
         $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$output);
-        if($output_c)
-           $output = $output_c;
+        if($output_c) {
+                   $output = $output_c;
+        }
       }
       $f = fopen("$output_name","w");
-      if(! $f)
-         debug(2,"translateFile($source, $output_name, $encoding) failed\n");
+      if(! $f) {
+               debug(2,"translateFile($source, $output_name, $encoding) failed\n");
+      }
       fwrite($f,$output);
       fclose($f);
       debug(4,"translateFile($source, $output_name, $encoding) end\n");
@@ -269,16 +279,19 @@ 
     */
 
    final protected function translateString($source_string,$encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
-        $encoding = 0;
-      if($encoding)
-        $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$source_string);
-      else
-        $output_c = $source_string;
-      if($output_c) 
-         $source_string  = str_replace('"','$\\"',$output_c);
-      else
-         debug(2,"Failed to convert string $source_string\n");
+      if(Config::$NSIS_VERSION >= 3) {
+              $encoding = 0;
+      }
+      if($encoding) {
+              $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$source_string);
+      } else {
+              $output_c = $source_string;
+      }
+      if($output_c) {
+               $source_string  = str_replace('"','$\\"',$output_c);
+      } else {
+               debug(2,"Failed to convert string $source_string\n");
+      }
       return $source_string;
    }
 
@@ -299,15 +312,19 @@ 
        $i = 0;
        $CA_files = [];
        $ca_array = $this->attributes['internal:CAs'][0];
-       if(! $ca_array)
-         return(FALSE);
+       if(! $ca_array) {
+                return(FALSE);
+       }
        foreach ($ca_array as $CA) {
          $f = fopen("cert-$i.crt","w");
-         if(! $f) die("problem opening the file\n");
-         if($format == "pem")
-            fwrite($f,$CA['pem']);
-         else
-            fwrite($f,$CA['der']);
+         if(! $f) {
+             die("problem opening the file\n");
+         }
+         if($format == "pem") {
+                     fwrite($f,$CA['pem']);
+         } else {
+                     fwrite($f,$CA['der']);
+         }
          fclose($f);
          $C = [];
          $C['file'] = "cert-$i.crt";
@@ -340,8 +357,9 @@ 
       $Inst_a = explode('_',$inst);
       if(count($Inst_a) > 2) {
          $inst = '';
-         foreach($Inst_a as $i)
-           $inst .= $i[0];
+         foreach($Inst_a as $i) {
+                    $inst .= $i[0];
+         }
       }   
       $c_name = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', Config::$CONSORTIUM['name']));
       if($this->attributes['internal:profile_count'][0] > 1) {
@@ -356,10 +374,12 @@ 
 
   private function getDeviceId() {
     $d_id = $this->device_id;
-    if(isset($this->options['device_id'])) 
-      $d_id = $this->options['device_id'];
-    if($d_id !== '')
-      $d_id .= '-';
+    if(isset($this->options['device_id'])) {
+          $d_id = $this->options['device_id'];
+    }
+    if($d_id !== '') {
+          $d_id .= '-';
+    }
     return $d_id;
   }
 
@@ -369,9 +389,9 @@ 
     $S['del']=[];
     if (isset(Config::$CONSORTIUM['ssid'])) {
        foreach (Config::$CONSORTIUM['ssid'] as $ssid) {
-        if(isset(Config::$CONSORTIUM['tkipsupport']) && Config::$CONSORTIUM['tkipsupport'] == TRUE)
-          $S['add'][$ssid] = 'TKIP';
-        else {
+        if(isset(Config::$CONSORTIUM['tkipsupport']) && Config::$CONSORTIUM['tkipsupport'] == TRUE) {
+                  $S['add'][$ssid] = 'TKIP';
+        } else {
           $S['add'][$ssid] = 'AES';
           $S['del'][$ssid] = 'TKIP';
         }
@@ -380,18 +400,21 @@ 
     if(isset($this->attributes['media:SSID'])) {
       $SSID = $this->attributes['media:SSID'];
 
-      foreach($SSID as $ssid)
-         $S['add'][$ssid] = 'AES';
+      foreach($SSID as $ssid) {
+               $S['add'][$ssid] = 'AES';
+      }
       }
     if(isset($this->attributes['media:SSID_with_legacy'])) {
       $SSID = $this->attributes['media:SSID_with_legacy'];
-      foreach($SSID as $ssid)
-         $S['add'][$ssid] = 'TKIP';
+      foreach($SSID as $ssid) {
+               $S['add'][$ssid] = 'TKIP';
+      }
     }
     if(isset($this->attributes['media:remove_SSID'])) {
       $SSID = $this->attributes['media:remove_SSID'];
-      foreach($SSID as $ssid)
-         $S['del'][$ssid] = 'DEL';
+      foreach($SSID as $ssid) {
+               $S['del'][$ssid] = 'DEL';
+      }
     }
     return $S;
   }
@@ -399,9 +422,10 @@ 
   private function getConsortia() {
       $OIs = [];
       $OIs = array_merge($OIs, Config::$CONSORTIUM['interworking-consortium-oi']);
-      if (isset($this->attributes['media:consortium_OI']))
-          foreach ($this->attributes['media:consortium_OI'] as $new_oi)
+      if (isset($this->attributes['media:consortium_OI'])) {
+                foreach ($this->attributes['media:consortium_OI'] as $new_oi)
             $OIs[] = $new_oi;
+      }
       return $OIs;
   }
   
@@ -421,10 +445,11 @@ 
     foreach ($Logos as $blob) {
       $finfo = new finfo(FILEINFO_MIME_TYPE);
       $mime = $finfo->buffer($blob);
-      if(preg_match('/^image\/(.*)/',$mime,$m))
-        $ext = $m[1];
-      else
-        $ext = 'unsupported';
+      if(preg_match('/^image\/(.*)/',$mime,$m)) {
+              $ext = $m[1];
+      } else {
+              $ext = 'unsupported';
+      }
       debug(4,"saveLogoFile: $mime : $ext\n");
       $f_name = 'logo-'.$i.'.'.$ext;
       $f = fopen($f_name,"w");
@@ -447,7 +472,9 @@ 
     $ext = isset($this->mime_extensions[$mime]) ? $this->mime_extensions[$mime] : 'usupported';
     debug(4,"saveInfoFile: $mime : $ext\n");
     $f = fopen('local-info.'.$ext,"w");
-    if(! $f) die("problem opening the file\n");
+    if(! $f) {
+        die("problem opening the file\n");
+    }
     fwrite($f,$blob);
     fclose($f);
     return(['name'=>'local-info.'.$ext,'mime'=>$ext]);

core/DeviceFactory.php

Braces +6 added lines, -4 removed lines

@@ -48,8 +48,9 @@ 
 
       $Dev = Devices::listDevices();
         if(isset($Dev[$blueprint])) {
-            if($Dev[$blueprint]['directory'] && $Dev[$blueprint]['module'])
-                require_once("devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php");
+            if($Dev[$blueprint]['directory'] && $Dev[$blueprint]['module']) {
+                            require_once("devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php");
+            }
             debug(4,"loaded: devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php\n");
             $class_name = "Device_".$Dev[$blueprint]['module'];
             $this->device = new $class_name();
@@ -66,8 +67,9 @@ 
        $options = Devices::$Options;
        if(isset($Dev[$blueprint]['options'])) {
           $Opt = $Dev[$blueprint]['options'];
-          foreach ($Opt as $option => $value)
-            $options[$option] = $value;
+          foreach ($Opt as $option => $value) {
+                      $options[$option] = $value;
+          }
        }
        $this->device->options = $options;
     }

core/phpqrcode.php

Braces +194 added lines, -109 removed lines

@@ -176,8 +176,9 @@ 
         {

             $barcode_array = [];

             

-            if (!is_array($mode))

-                $mode = explode(',', $mode);

+            if (!is_array($mode)) {
+                            $mode = explode(',', $mode);
+            }
                 

             $eccLevel = 'L';

                 

@@ -194,8 +195,9 @@ 
                 

             foreach ($qrTab as $line) {

                 $arrAdd = [];

-                foreach(str_split($line) as $char)

-                    $arrAdd[] = ($char=='1')?1:0;

+                foreach(str_split($line) as $char) {
+                                    $arrAdd[] = ($char=='1')?1:0;
+                }
                 $barcode_array['bcode'][] = $arrAdd;

             }

                     

@@ -223,8 +225,9 @@ 
 				

 				$width = count($frame);

 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));

-				for ($maskNo=0; $maskNo<8; $maskNo++)

-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

+				for ($maskNo=0; $maskNo<8; $maskNo++) {
+									$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
+				}
             }

 			

 			QRtools::markTime('after_build_cache');

@@ -261,8 +264,9 @@ 
             list($usec, $sec) = explode(" ", microtime());

             $time = ((float)$usec + (float)$sec);

             

-            if (!isset($GLOBALS['qr_time_bench']))

-                $GLOBALS['qr_time_bench'] = [];

+            if (!isset($GLOBALS['qr_time_bench'])) {
+                            $GLOBALS['qr_time_bench'] = [];
+            }
             

             $GLOBALS['qr_time_bench'][$markerId] = $time;

         }

@@ -427,8 +431,9 @@ 
 

             for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {

                 $words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];

-                if($words >= $size) 

-                    return $i;

+                if($words >= $size) {
+                                    return $i;
+                }
             }

 

             return -1;

@@ -446,8 +451,9 @@ 
         //----------------------------------------------------------------------

         public static function lengthIndicator($mode, $version)

         {

-            if ($mode == QR_MODE_STRUCTURE)

-                return 0;

+            if ($mode == QR_MODE_STRUCTURE) {
+                            return 0;
+            }
                 

             if ($version <= 9) {

                 $l = 0;

@@ -463,8 +469,9 @@ 
         //----------------------------------------------------------------------

         public static function maximumWords($mode, $version)

         {

-            if($mode == QR_MODE_STRUCTURE) 

-                return 3;

+            if($mode == QR_MODE_STRUCTURE) {
+                            return 3;
+            }
                 

             if($version <= 9) {

                 $l = 0;

@@ -610,8 +617,9 @@ 
         //----------------------------------------------------------------------

         public static function putAlignmentPattern($version, &$frame, $width)

         {

-            if($version < 2)

-                return;

+            if($version < 2) {
+                            return;
+            }
 

             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];

             if($d < 0) {

@@ -663,8 +671,9 @@ 
         //----------------------------------------------------------------------

         public static function getVersionPattern($version)

         {

-            if($version < 7 || $version > QRSPEC_VERSION_MAX)

-                return 0;

+            if($version < 7 || $version > QRSPEC_VERSION_MAX) {
+                            return 0;
+            }
 

             return self::$versionPattern[$version -7];

         }

@@ -681,11 +690,13 @@ 
 

         public static function getFormatInfo($mask, $level)

         {

-            if($mask < 0 || $mask > 7)

-                return 0;

+            if($mask < 0 || $mask > 7) {
+                            return 0;
+            }
                 

-            if($level < 0 || $level > 3)

-                return 0;                

+            if($level < 0 || $level > 3) {
+                            return 0;
+            }
 

             return self::$formatInfo[$level][$mask];

         }

@@ -865,8 +876,9 @@ 
         //----------------------------------------------------------------------

         public static function newFrame($version)

         {

-            if($version < 1 || $version > QRSPEC_VERSION_MAX) 

-                return null;

+            if($version < 1 || $version > QRSPEC_VERSION_MAX) {
+                            return null;
+            }
 

             if(!isset(self::$frames[$version])) {

                 

@@ -884,8 +896,9 @@ 
                 }

             }

             

-            if(is_null(self::$frames[$version]))

-                return null;

+            if(is_null(self::$frames[$version])) {
+                            return null;
+            }
 

             return self::$frames[$version];

         }

@@ -953,7 +966,7 @@ 
                     ImagePng($image, $filename);

                     header("Content-type: image/png");

                     ImagePng($image);

-                }else{

+                } else{

                     ImagePng($image, $filename);

                 }

             }

@@ -1213,8 +1226,9 @@ 
         {

             $bits = 0;

 

-            if($version == 0) 

-                $version = 1;

+            if($version == 0) {
+                            $version = 1;
+            }
 

             switch($this->mode) {

                 case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

@@ -1273,8 +1287,9 @@ 
                             break;

                     }

                     

-                    if($ret < 0)

-                        return -1;

+                    if($ret < 0) {
+                                            return -1;
+                    }
                 }

 

                 return $this->bstream->size();

@@ -1491,8 +1506,9 @@ 
         //----------------------------------------------------------------------

         public static function checkModeKanji($size, $data)

         {

-            if($size & 1)

-                return false;

+            if($size & 1) {
+                            return false;
+            }
 

             for($i=0; $i<$size; $i+=2) {

                 $val = (ord($data[$i]) << 8) | ord($data[$i+1]);

@@ -1512,8 +1528,9 @@ 
 

         public static function check($mode, $size, $data)

         {

-            if($size <= 0) 

-                return false;

+            if($size <= 0) {
+                            return false;
+            }
 

             switch($mode) {

                 case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

@@ -1578,8 +1595,9 @@ 
                     $chunks = (int)($payload / 11);

                     $remain = $payload - $chunks * 11;

                     $size = $chunks * 2;

-                    if($remain >= 6) 

-                        $size++;

+                    if($remain >= 6) {
+                                            $size++;
+                    }
                     break;

                 case QR_MODE_8:

                     $size = (int)($payload / 8);

@@ -1596,8 +1614,12 @@ 
             }

             

             $maxsize = QRspec::maximumWords($mode, $version);

-            if($size < 0) $size = 0;

-            if($size > $maxsize) $size = $maxsize;

+            if($size < 0) {
+                $size = 0;
+            }
+            if($size > $maxsize) {
+                $size = $maxsize;
+            }
 

             return $size;

         }

@@ -1610,8 +1632,9 @@ 
             foreach($this->items as $item) {

                 $bits = $item->encodeBitStream($this->version);

                 

-                if($bits < 0) 

-                    return -1;

+                if($bits < 0) {
+                                    return -1;
+                }
                     

                 $total += $bits;

             }

@@ -1630,8 +1653,9 @@ 
             for(;;) {

                 $bits = $this->createBitStream();

                 

-                if($bits < 0) 

-                    return -1;

+                if($bits < 0) {
+                                    return -1;
+                }
                     

                 $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

                 if($ver < 0) {

@@ -1668,8 +1692,9 @@ 
             $padding = new QRbitstream();

             $ret = $padding->appendNum($words * 8 - $bits + 4, 0);

             

-            if($ret < 0) 

-                return $ret;

+            if($ret < 0) {
+                            return $ret;
+            }
 

             $padlen = $maxwords - $words;

             

@@ -1682,8 +1707,9 @@ 
                 

                 $ret = $padding->appendBytes($padlen, $padbuf);

                 

-                if($ret < 0)

-                    return $ret;

+                if($ret < 0) {
+                                    return $ret;
+                }
                 

             }

 

@@ -1860,13 +1886,15 @@ 
         //----------------------------------------------------------------------

         public function appendNum($bits, $num)

         {

-            if ($bits == 0) 

-                return 0;

+            if ($bits == 0) {
+                            return 0;
+            }
 

             $b = QRbitstream::newFromNum($bits, $num);

             

-            if(is_null($b))

-                return -1;

+            if(is_null($b)) {
+                            return -1;
+            }
 

             $ret = $this->append($b);

             unset($b);

@@ -1877,13 +1905,15 @@ 
         //----------------------------------------------------------------------

         public function appendBytes($size, $data)

         {

-            if ($size == 0) 

-                return 0;

+            if ($size == 0) {
+                            return 0;
+            }
 

             $b = QRbitstream::newFromBytes($size, $data);

             

-            if(is_null($b))

-                return -1;

+            if(is_null($b)) {
+                            return -1;
+            }
 

             $ret = $this->append($b);

             unset($b);

@@ -1987,8 +2017,9 @@ 
         //----------------------------------------------------------------------

         public static function isdigitat($str, $pos)

         {    

-            if ($pos >= strlen($str))

-                return false;

+            if ($pos >= strlen($str)) {
+                            return false;
+            }
             

             return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));

         }

@@ -1996,8 +2027,9 @@ 
         //----------------------------------------------------------------------

         public static function isalnumat($str, $pos)

         {

-            if ($pos >= strlen($str))

-                return false;

+            if ($pos >= strlen($str)) {
+                            return false;
+            }
                 

             return (QRinput::lookAnTable(ord($str[$pos])) >= 0);

         }

@@ -2005,8 +2037,9 @@ 
         //----------------------------------------------------------------------

         public function identifyMode($pos)

         {

-            if ($pos >= strlen($this->dataStr)) 

-                return QR_MODE_NUL;

+            if ($pos >= strlen($this->dataStr)) {
+                            return QR_MODE_NUL;
+            }
                 

             $c = $this->dataStr[$pos];

             

@@ -2060,8 +2093,9 @@ 
             }

             

             $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -2107,8 +2141,9 @@ 
             }

 

             $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -2123,8 +2158,9 @@ 
             }

             

             $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -2178,8 +2214,9 @@ 
             $run = $p;

             $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));

             

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -2189,8 +2226,9 @@ 
         {

             while (strlen($this->dataStr) > 0)

             {

-                if($this->dataStr == '')

-                    return 0;

+                if($this->dataStr == '') {
+                                    return 0;
+                }
 

                 $mode = $this->identifyMode(0);

                 

@@ -2198,16 +2236,22 @@ 
                     case QR_MODE_NUM: $length = $this->eatNum(); break;

                     case QR_MODE_AN:  $length = $this->eatAn(); break;

                     case QR_MODE_KANJI:

-                        if ($hint == QR_MODE_KANJI)

-                                $length = $this->eatKanji();

-                        else    $length = $this->eat8();

+                        if ($hint == QR_MODE_KANJI) {
+                                                        $length = $this->eatKanji();
+                        } else {
+                            $length = $this->eat8();
+                        }
                         break;

                     default: $length = $this->eat8(); break;

                 

                 }

 

-                if($length == 0) return 0;

-                if($length < 0)  return -1;

+                if($length == 0) {
+                    return 0;
+                }
+                if($length < 0) {
+                    return -1;
+                }
                 

                 $this->dataStr = substr($this->dataStr, $length);

             }

@@ -2243,8 +2287,9 @@ 
 

             $split = new QRsplit($string, $input, $modeHint);

             

-            if(!$casesensitive)

-                $split->toUpper();

+            if(!$casesensitive) {
+                            $split->toUpper();
+            }
                 

             return $split->splitString();

         }

@@ -2321,11 +2366,23 @@ 
             $rs = null;

             

             // Check parameter ranges

-            if($symsize < 0 || $symsize > 8)                     return $rs;

-            if($fcr < 0 || $fcr >= (1<<$symsize))                return $rs;

-            if($prim <= 0 || $prim >= (1<<$symsize))             return $rs;

-            if($nroots < 0 || $nroots >= (1<<$symsize))          return $rs; // Can't have more roots than symbol values!

-            if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) return $rs; // Too much padding

+            if($symsize < 0 || $symsize > 8) {
+                return $rs;
+            }
+            if($fcr < 0 || $fcr >= (1<<$symsize)) {
+                return $rs;
+            }
+            if($prim <= 0 || $prim >= (1<<$symsize)) {
+                return $rs;
+            }
+            if($nroots < 0 || $nroots >= (1<<$symsize)) {
+                return $rs;
+            }
+            // Can't have more roots than symbol values!

+            if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) {
+                return $rs;
+            }
+            // Too much padding

 

             $rs = new QRrsItem();

             $rs->mm = $symsize;

@@ -2391,8 +2448,9 @@ 
             }

             

             // convert rs->genpoly[] to index form for quicker encoding

-            for ($i = 0; $i <= $nroots; $i++)

-                $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];

+            for ($i = 0; $i <= $nroots; $i++) {
+                            $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];
+            }
 

             return $rs;

         }

@@ -2450,12 +2508,24 @@ 
         public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)

         {

             foreach(self::$items as $rs) {

-                if($rs->pad != $pad)       continue;

-                if($rs->nroots != $nroots) continue;

-                if($rs->mm != $symsize)    continue;

-                if($rs->gfpoly != $gfpoly) continue;

-                if($rs->fcr != $fcr)       continue;

-                if($rs->prim != $prim)     continue;

+                if($rs->pad != $pad) {
+                    continue;
+                }
+                if($rs->nroots != $nroots) {
+                    continue;
+                }
+                if($rs->mm != $symsize) {
+                    continue;
+                }
+                if($rs->gfpoly != $gfpoly) {
+                    continue;
+                }
+                if($rs->fcr != $fcr) {
+                    continue;
+                }
+                if($rs->prim != $prim) {
+                    continue;
+                }
 

                 return $rs;

             }

@@ -2594,8 +2664,9 @@ 
         {

             $codeArr = [];

             

-            foreach ($bitFrame as $line)

-                $codeArr[] = join('', $line);

+            foreach ($bitFrame as $line) {
+                            $codeArr[] = join('', $line);
+            }
                 

             return gzcompress(join("\n", $codeArr), 9);

         }

@@ -2606,8 +2677,9 @@ 
             $codeArr = [];

             

             $codeLines = explode("\n", gzuncompress($code));

-            foreach ($codeLines as $line)

-                $codeArr[] = str_split($line);

+            foreach ($codeLines as $line) {
+                            $codeArr[] = str_split($line);
+            }
             

             return $codeArr;

         }

@@ -2625,16 +2697,18 @@ 
                     $bitMask = self::unserial(file_get_contents($fileName));

                 } else {

                     $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);

-                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))

-                        mkdir(QR_CACHE_DIR.'mask_'.$maskNo);

+                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) {
+                                            mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
+                    }
                     file_put_contents($fileName, self::serial($bitMask));

                 }

             } else {

                 $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);

             }

 

-            if ($maskGenOnly)

-                return;

+            if ($maskGenOnly) {
+                            return;
+            }
                 

             $d = $s;

 

@@ -2701,8 +2775,9 @@ 
                 

                 $frameY = $frame[$y];

                 

-                if ($y>0)

-                    $frameYM = $frame[$y-1];

+                if ($y>0) {
+                                    $frameYM = $frame[$y-1];
+                }
                 

                 for($x=0; $x<$width; $x++) {

                     if(($x > 0) && ($y > 0)) {

@@ -2915,14 +2990,17 @@ 
                 $blockNo++;

             }

 

-            if(QRspec::rsBlockNum2($spec) == 0)

-                return 0;

+            if(QRspec::rsBlockNum2($spec) == 0) {
+                            return 0;
+            }
 

             $dl = QRspec::rsDataCodes2($spec);

             $el = QRspec::rsEccCodes2($spec);

             $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);

             

-            if($rs == NULL) return -1;

+            if($rs == NULL) {
+                return -1;
+            }
             

             for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {

                 $ecc = array_slice($this->ecccode,$eccPos);

@@ -3060,7 +3138,9 @@ 
             }

 

             $input = new QRinput($version, $level);

-            if($input == NULL) return NULL;

+            if($input == NULL) {
+                return NULL;
+            }
 

             $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));

             if($ret < 0) {

@@ -3080,7 +3160,9 @@ 
             }

 

             $input = new QRinput($version, $level);

-            if($input == NULL) return NULL;

+            if($input == NULL) {
+                return NULL;
+            }
 

             $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);

             if($ret < 0) {

@@ -3190,7 +3272,9 @@ 
                         }

                     }

                 }

-                if($x < 0 || $y < 0) return null;

+                if($x < 0 || $y < 0) {
+                    return null;
+                }
 

                 $this->x = $x;

                 $this->y = $y;

@@ -3297,8 +3381,9 @@ 
                 $err = ob_get_contents();

                 ob_end_clean();

                 

-                if ($err != '')

-                    QRtools::log($outfile, $err);

+                if ($err != '') {
+                                    QRtools::log($outfile, $err);
+                }
                 

                 $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));

                 

core/IdP.php

Braces +72 added lines, -52 removed lines

@@ -136,8 +136,9 @@ 
      */
     public function listProfiles($active_only = 0) {
         $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier";
-        if ($active_only)
-            $query .= " AND showtime = 1";
+        if ($active_only) {
+                    $query .= " AND showtime = 1";
+        }
         $allProfiles = DBConnection::exec(IdP::$DB_TYPE, $query);
         $returnarray = [];
         while ($a = mysqli_fetch_object($allProfiles)) {
@@ -152,24 +153,27 @@ 
         // migration phase: are there NULLs in the profile list sufficient_config column?
         // if so, run prepShowtime on all profiles
         $needTreatment = DBConnection::exec(IdP::$DB_TYPE, "SELECT profile_id FROM profile WHERE inst_id = $this->identifier AND sufficient_config IS NULL");
-        if (mysqli_num_rows($needTreatment) > 0)
-            foreach ($this->listProfiles() as $prof)
+        if (mysqli_num_rows($needTreatment) > 0) {
+                    foreach ($this->listProfiles() as $prof)
                 $prof->prepShowtime();
+        }
        
         // now, just look in the DB
         $allProfiles = DBConnection::exec(IdP::$DB_TYPE, "SELECT profile_id FROM profile WHERE inst_id = $this->identifier AND sufficient_config = 1");
-        if (mysqli_num_rows($allProfiles) > 0)
-            return TRUE;
-        else
-            return FALSE;
+        if (mysqli_num_rows($allProfiles) > 0) {
+                    return TRUE;
+        } else {
+                    return FALSE;
+        }
     }
 
     public function isOneProfileShowtime() {
         $allProfiles = DBConnection::exec(IdP::$DB_TYPE, "SELECT profile_id FROM profile WHERE inst_id = $this->identifier AND showtime = 1");
-        if (mysqli_num_rows($allProfiles) > 0)
-            return TRUE;
-        else
-            return FALSE;
+        if (mysqli_num_rows($allProfiles) > 0) {
+                    return TRUE;
+        } else {
+                    return FALSE;
+        }
         
     }
     
@@ -177,16 +181,21 @@ 
         $allProfiles = DBConnection::exec(IdP::$DB_TYPE, "SELECT status_dns, status_cert, status_reachability, status_TLS, last_status_check FROM profile WHERE inst_id = $this->identifier AND sufficient_config = 1");
         $returnarray = ['dns' => RETVAL_SKIPPED, 'cert' => L_OK, 'reachability' => RETVAL_SKIPPED, 'TLS' => RETVAL_SKIPPED, 'checktime' => NULL];
         while ($a = mysqli_fetch_object($allProfiles)) {
-            if ($a->status_dns < $returnarray['dns'])
-                $returnarray['dns'] = $a->status_dns;
-            if ($a->status_reachability < $returnarray['reachability'])
-                $returnarray['reachability'] = $a->status_reachability;
-            if ($a->status_TLS < $returnarray['TLS'])
-                $returnarray['TLS'] = $a->status_TLS;
-            if ($a->status_cert < $returnarray['cert'])
-                $returnarray['cert'] = $a->status_cert;
-            if ($a->last_status_check > $returnarray['checktime'])
-                $returnarray['checktime'] = $a->last_status_check;
+            if ($a->status_dns < $returnarray['dns']) {
+                            $returnarray['dns'] = $a->status_dns;
+            }
+            if ($a->status_reachability < $returnarray['reachability']) {
+                            $returnarray['reachability'] = $a->status_reachability;
+            }
+            if ($a->status_TLS < $returnarray['TLS']) {
+                            $returnarray['TLS'] = $a->status_TLS;
+            }
+            if ($a->status_cert < $returnarray['cert']) {
+                            $returnarray['cert'] = $a->status_cert;
+            }
+            if ($a->last_status_check > $returnarray['checktime']) {
+                            $returnarray['checktime'] = $a->last_status_check;
+            }
         }
         return $returnarray;
     }
@@ -199,8 +208,9 @@ 
     public function owner() {
         $returnarray = [];
         $admins = DBConnection::exec(IdP::$DB_TYPE, "SELECT user_id, orig_mail, blesslevel FROM ownership WHERE institution_id = $this->identifier ORDER BY user_id");
-        while ($a = mysqli_fetch_object($admins))
-            $returnarray[] = ['ID' => $a->user_id, 'MAIL' => $a->orig_mail, 'LEVEL' => $a->blesslevel];
+        while ($a = mysqli_fetch_object($admins)) {
+                    $returnarray[] = ['ID' => $a->user_id, 'MAIL' => $a->orig_mail, 'LEVEL' => $a->blesslevel];
+        }
         return $returnarray;
     }
 
@@ -253,12 +263,12 @@ 
     public function getAttributes($option_name = 0) {
         if ($option_name) {
             $returnarray = [];
-            foreach ($this->priv_attributes as $the_attr)
-                if ($the_attr['name'] == $option_name)
+            foreach ($this->priv_attributes as $the_attr) {
+                            if ($the_attr['name'] == $option_name)
                     $returnarray[] = $the_attr;
+            }
             return $returnarray;
-        }
-        else {
+        } else {
             return $this->priv_attributes;
         }
     }
@@ -273,8 +283,9 @@ 
         $this->updateFreshness();
         $exec_q = DBConnection::exec(IdP::$DB_TYPE, "SELECT row FROM institution_option WHERE institution_id = $this->identifier");
         $return_array = [];
-        while ($a = mysqli_fetch_object($exec_q))
-            $return_array[$a->row] = "KILLME";
+        while ($a = mysqli_fetch_object($exec_q)) {
+                    $return_array[$a->row] = "KILLME";
+        }
         return $return_array;
     }
 
@@ -324,10 +335,11 @@ 
         DBConnection::exec(IdP::$DB_TYPE, "INSERT INTO profile (inst_id) VALUES($this->identifier)");
         $identifier = DBConnection::lastID(IdP::$DB_TYPE);
 
-        if ($identifier > 0)
-            return new Profile($identifier, $this);
-        else
-            return NULL;
+        if ($identifier > 0) {
+                    return new Profile($identifier, $this);
+        } else {
+                    return NULL;
+        }
     }
 
     /**
@@ -335,13 +347,15 @@ 
      */
     public function destroy() {
         /* delete all profiles */
-        foreach ($this->listProfiles() as $profile)
-            $profile->destroy();
+        foreach ($this->listProfiles() as $profile) {
+                    $profile->destroy();
+        }
         /* double-check that all profiles are gone */
         $profiles = $this->listProfiles();
 
-        if (count($profiles) > 0)
-            die("This IdP shouldn't have any profiles any more!");
+        if (count($profiles) > 0) {
+                    die("This IdP shouldn't have any profiles any more!");
+        }
 
         DBConnection::exec(IdP::$DB_TYPE, "DELETE FROM ownership WHERE institution_id = $this->identifier");
         DBConnection::exec(IdP::$DB_TYPE, "DELETE FROM institution_option WHERE institution_id = $this->identifier");
@@ -380,13 +394,15 @@ 
             $candidate_list = DBConnection::exec("EXTERNAL", "SELECT id_institution AS id, name AS collapsed_name FROM view_active_idp_institution WHERE country = '" . strtolower($this->federation) . "'");
 
             $already_used = DBConnection::exec(IdP::$DB_TYPE, "SELECT DISTINCT external_db_id FROM institution WHERE external_db_id IS NOT NULL AND external_db_syncstate = " . EXTERNAL_DB_SYNCSTATE_SYNCED);
-            while ($a = mysqli_fetch_object($already_used))
-                $usedarray[] = $a->external_db_id;
+            while ($a = mysqli_fetch_object($already_used)) {
+                            $usedarray[] = $a->external_db_id;
+            }
 
             // and split them into ID, LANG, NAME pairs
             while ($a = mysqli_fetch_object($candidate_list)) {
-                if (in_array($a->id, $usedarray))
-                    continue;
+                if (in_array($a->id, $usedarray)) {
+                                    continue;
+                }
                 $names = explode('#', $a->collapsed_name);
                 foreach ($names as $name) {
                     $perlang = explode(': ', $name, 2);
@@ -396,12 +412,14 @@ 
             // now see if any of the languages in CAT match any of those in the external DB
             $mynames = $this->getAttributes("general:instname");
             $matching_candidates = [];
-            foreach ($mynames as $onename)
-                foreach ($list as $listentry) {
+            foreach ($mynames as $onename) {
+                            foreach ($list as $listentry) {
                     $unserialised = unserialize($onename['value']);
-                    if (($unserialised['lang'] == $listentry['lang'] || $unserialised['lang'] == "C") && $unserialised['content'] == $listentry['name'])
-                        if (array_search($listentry['ID'], $matching_candidates) === FALSE)
+            }
+                    if (($unserialised['lang'] == $listentry['lang'] || $unserialised['lang'] == "C") && $unserialised['content'] == $listentry['name']) {
+                                            if (array_search($listentry['ID'], $matching_candidates) === FALSE)
                             $matching_candidates[] = $listentry['ID'];
+                    }
                 }
 
             return $matching_candidates;
@@ -441,10 +459,11 @@ 
      */
     public function getExternalDBEntityDetails() {
         $external_id = $this->getExternalDBId();
-        if ($external_id !== FALSE)
-            return Federation::getExternalDBEntityDetails($external_id);
-        else
-            return [];
+        if ($external_id !== FALSE) {
+                    return Federation::getExternalDBEntityDetails($external_id);
+        } else {
+                    return [];
+        }
     }
 
     public function setExternalDBId($identifier) {
@@ -452,8 +471,9 @@ 
         if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
             $already_used = DBConnection::exec(IdP::$DB_TYPE, "SELECT DISTINCT external_db_id FROM institution WHERE external_db_id = '$identifier' AND external_db_syncstate = " . EXTERNAL_DB_SYNCSTATE_SYNCED);
 
-            if (mysqli_num_rows($already_used) == 0)
-                DBConnection::exec(IdP::$DB_TYPE, "UPDATE institution SET external_db_id = '$identifier', external_db_syncstate = " . EXTERNAL_DB_SYNCSTATE_SYNCED . " WHERE inst_id = $this->identifier");
+            if (mysqli_num_rows($already_used) == 0) {
+                            DBConnection::exec(IdP::$DB_TYPE, "UPDATE institution SET external_db_id = '$identifier', external_db_syncstate = " . EXTERNAL_DB_SYNCSTATE_SYNCED . " WHERE inst_id = $this->identifier");
+            }
         }
     }