GEANT / CAT

core/CAT.php

Doc Comments +1 added lines, -1 removed lines

@@ -230,7 +230,7 @@
      * @param string $user persistent identifier of the user who triggered the action
      * @param string $category type of modification, from the fixed vocabulary: "NEW", "OWN", "MOD", "DEL"
      * @param string $message message to log into the audit log
-     * @return boolean TRUE if successful. Will terminate script execution on failure. 
+     * @return boolean|null TRUE if successful. Will terminate script execution on failure. 
      */
     public static function writeAudit($user, $category, $message) {
         switch ($category) {

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/DBConnection.php

Doc Comments +4 added lines

@@ -87,6 +87,7 @@ 
     /**
      * executes a query and triggers logging to the SQL audit log if it's not a SELECT
      * @param string $querystring the query to be executed
+     * @param string $db
      * @return mixed the query result as mysqli_result object; or TRUE on non-return-value statements
      */
     public static function exec($db, $querystring) {
@@ -134,6 +135,8 @@ 
     /**
      * Checks if a raw data pointer is public data (return value FALSE) or if 
      * yes who the authorised admins to view it are (return array of user IDs)
+     * @param string $table
+     * @param string $row
      */
     public static function isDataRestricted($table, $row) {
         if ($table != "institution_option" && $table != "profile_option" && $table != "federation_option")
@@ -175,6 +178,7 @@ 
 
     /**
      * Retrieves the last auto-id of an INSERT. Needs to be called immediately after the corresponding exec() call
+     * @param string $db
      * @return int the last autoincrement-ID
      */
     public static function lastID($db) {

Braces +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/DeviceConfig.php

Doc Comments +2 added lines, -5 removed lines

@@ -172,7 +172,7 @@ 
     * named the same as device_id. The second option takes precedence.
     *
     * @param string $source_name The source file name
-    * @param string $output_name The destination file name
+    * @param integer $output_name The destination file name
     *
     * @return bool result of the copy operation
     * @final not to be redefined
@@ -216,8 +216,7 @@ 
     * named the same as device_id. The second option takes precedence.
     *
     * @param string $source_name The source file name
-    * @param string $output_name The destination file name
-    * @param int $use_win_cp Set Windows charset if non-zero
+    * @param integer $output_name The destination file name
     *
     * @final not to be redefined
     */
@@ -262,8 +261,6 @@ 
     * The second optional parameter, if nonzero, should be the character set understood by iconv
     * This is required by the Windows installer and is expected to go away in the future.
     *
-    * @param string $source_name The source file name
-    * @param int $use_win_cp Set Windows charset if non-zero
     *
     * @final not to be redefined
     */

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/Federation.php

Doc Comments +1 added lines, -1 removed lines

@@ -661,7 +661,7 @@
      * This function retrieves the federation attributes. If called with the optional parameter, only attribute values for the attribute
      * name in $option_name are retrieved; otherwise, all attributes are retrieved.
      *
-     * @param string $option_name optionally, the name of the attribute that is to be retrieved
+     * @param integer $option_name optionally, the name of the attribute that is to be retrieved
      * @return array of arrays of attributes which were set for this IdP
      */
     public function getAttributes($option_name = 0) {

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/Helper.php

Doc Comments +2 added lines, -1 removed lines

@@ -32,6 +32,7 @@ 
 /**
  * write debug messages to the log
  *
+ * @param integer $level
  */
 function debug($level, $t) {
     if (Config::$DEBUG_LEVEL >= $level) {
@@ -130,7 +131,7 @@ 
  * generates a UUID
  *
  * @param string $prefix an extra prefix to set before the UUID
- * @return UUID (possibly prefixed)
+ * @return string (possibly prefixed)
  */
 function uuid($prefix = '', $deterministic_source = NULL) {
     if ($deterministic_source === NULL) 

Braces +40 added lines, -30 removed lines

@@ -56,10 +56,11 @@ 
 
 function rrmdir($dir) {
     foreach (glob($dir . '/*') as $file) {
-        if (is_dir($file))
-            rrmdir($file);
-        else
-            unlink($file);
+        if (is_dir($file)) {
+                    rrmdir($file);
+        } else {
+                    unlink($file);
+        }
     }
     rmdir($dir);
 }
@@ -73,36 +74,42 @@ 
  */
 function calculateCommonHostSuffix(array $hosts) {
     // massage names. A trailing dot can be omitted
-    foreach ($hosts as $index => $host)
-        if (substr($host, -1) == '.') {
+    foreach ($hosts as $index => $host) {
+            if (substr($host, -1) == '.') {
             $hosts[$index] = substr($host, 0, -1);
+    }
             echo "Changed host to " . $hosts[$index] . "\n";
         }
     // easy :-)
-    if (count($hosts) == 1)
-        return $hosts[0];
+    if (count($hosts) == 1) {
+            return $hosts[0];
+    }
     // not so easy :-(
     else {
         // look for the last dot from the end; if the corresponding substring is
         // different, no common match!
         $explodednames = [];
-        foreach ($hosts as $host)
-            $explodednames[] = explode('.', $host);
+        foreach ($hosts as $host) {
+                    $explodednames[] = explode('.', $host);
+        }
         $commonsuffix = [];
         while (count($explodednames[0]) > 0) {
             $match = TRUE;
             $testname = array_pop($explodednames[0]);
             for ($i = 1; $i < count($explodednames); $i = $i + 1) {
-                if (count($explodednames[$i]) == 0)
-                    $match = FALSE;
+                if (count($explodednames[$i]) == 0) {
+                                    $match = FALSE;
+                }
                 $bla = array_pop($explodednames[$i]);
-                if ($bla != $testname)
-                    $match = FALSE;
+                if ($bla != $testname) {
+                                    $match = FALSE;
+                }
+            }
+            if ($match == TRUE) {
+                            $commonsuffix[] = $testname;
+            } else {
+                            break;
             }
-            if ($match == TRUE)
-                $commonsuffix[] = $testname;
-            else
-                break;
         }
         $finalsuffix = array_reverse($commonsuffix);
         return implode('.', $finalsuffix);
@@ -133,10 +140,11 @@ 
  * @return UUID (possibly prefixed)
  */
 function uuid($prefix = '', $deterministic_source = NULL) {
-    if ($deterministic_source === NULL) 
-        $chars = md5(uniqid(mt_rand(), true));
-    else
-        $chars = md5($deterministic_source);
+    if ($deterministic_source === NULL) {
+            $chars = md5(uniqid(mt_rand(), true));
+    } else {
+            $chars = md5($deterministic_source);
+    }
     $uuid = substr($chars, 0, 8) . '-';
     $uuid .= substr($chars, 8, 4) . '-';
     $uuid .= substr($chars, 12, 4) . '-';
@@ -159,12 +167,13 @@ 
             $try = unserialize($val['value']);
             $r_val[$try['lang']] = $try['content'];
         }
-        if (isset($r_val[$locale]))
-            $out = $r_val[$locale];
-        elseif (isset($r_val['C']))
-            $out = $r_val['C'];
-        else
-            $out = 0;
+        if (isset($r_val[$locale])) {
+                    $out = $r_val[$locale];
+        } elseif (isset($r_val['C'])) {
+                    $out = $r_val['C'];
+        } else {
+                    $out = 0;
+        }
     } else {
         $out = 0;
     }
@@ -203,8 +212,9 @@ 
             debug(4, "Directory creation failed for $tmp_dir\n");
             return ['base'=>$path,'dir'=>'',$name=>''];
           }
-        } else
-         debug(4, "Directory created: $tmp_dir\n");
+        } else {
+                 debug(4, "Directory created: $tmp_dir\n");
+        }
      return ['base'=>$path,'dir'=>$tmp_dir,'name'=>$name];
 }
 

core/IdP.php

Doc Comments +3 added lines, -2 removed lines

@@ -68,6 +68,7 @@ 
      * Cannot be used to define a new IdP in the database! This happens via Federation::newIdP()
      *
      * @param integer $i_id the database row identifier
+     * @return string
      */
     public function __construct($i_id) {
         debug(3, "--- BEGIN Constructing new IdP object ... ---\n");
@@ -247,7 +248,7 @@ 
      * This function retrieves the IdP-wide attributes. If called with the optional parameter, only attribute values for the attribute
      * name in $option_name are retrieved; otherwise, all attributes are retrieved.
      *
-     * @param string $option_name optionally, the name of the attribute that is to be retrieved
+     * @param integer $option_name optionally, the name of the attribute that is to be retrieved
      * @return array of arrays of attributes which were set for this IdP
      */
     public function getAttributes($option_name = 0) {
@@ -318,7 +319,7 @@ 
      * Adds a new profile to this IdP.
      * Only creates the DB entry for the Profile. If you want to add attributes later, see Profile::addAttribute().
      *
-     * @return object new Profile object if successful, or FALSE if an error occured
+     * @return Profile|null new Profile object if successful, or FALSE if an error occured
      */
     public function newProfile() {
         DBConnection::exec(IdP::$DB_TYPE, "INSERT INTO profile (inst_id) VALUES($this->identifier)");

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");
+            }
         }
     }
 

core/Options.php

Doc Comments +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
      * 
      * @assert ("user") == Array("user:email","user:fedadmin","user:realname")
      * 
-     * @param string $class_name optionally specifies the class of options to be listed (class is the part of the option name before the : sign)
+     * @param integer $class_name optionally specifies the class of options to be listed (class is the part of the option name before the : sign)
      * @return array of options
      */
     public function availableOptions($class_name = 0) {

Braces +3 added lines, -2 removed lines

@@ -79,8 +79,9 @@
         $this->type_db = [];
         debug(3,"--- BEGIN constructing Options instance ---\n");
         $options = DBConnection::exec(Options::$DB_TYPE, "SELECT name,type,flag from profile_option_dict ORDER BY name");
-        while($a = mysqli_fetch_object($options))
-            $this->type_db[$a->name]       =  ["type" => $a->type, "flag" => $a->flag];
+        while($a = mysqli_fetch_object($options)) {
+                    $this->type_db[$a->name]       =  ["type" => $a->type, "flag" => $a->flag];
+        }
         $this->type_db["general:logo_url"] =  ["type" => "string", "flag" => NULL];
         $this->type_db["eap:ca_url"]       =  ["type" => "string", "flag" => NULL];
         $this->type_db["internal:country"] =  ["type" => "string", "flag" => NULL];

core/phpqrcode.php

Doc Comments +108 added lines

@@ -96,6 +96,10 @@ 
 	define('QR_FORMAT_PNG',  1);

 	

 	class qrstr {

+
+		/**
+		 * @param string $repl
+		 */
 		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {

 			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));

 		}

@@ -231,6 +235,11 @@ 
         }

 

         //----------------------------------------------------------------------

+
+        /**
+         * @param boolean $outfile
+         * @param string $err
+         */
         public static function log($outfile, $err)

         {

             if (QR_LOG_DIR !== false) {

@@ -256,6 +265,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param string $markerId
+         */
         public static function markTime($markerId)

         {

             list($usec, $sec) = explode(" ", microtime());

@@ -410,18 +423,30 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         */
         public static function getWidth($version)

         {

             return self::$capacity[$version][QRCAP_WIDTH];

         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         */
         public static function getRemainder($version)

         {

             return self::$capacity[$version][QRCAP_REMINDER];

         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $size
+         */
         public static function getMinimumVersion($size, $level)

         {

 

@@ -535,6 +560,9 @@ 
         //----------------------------------------------------------------------

         // CACHEABLE!!!

         

+        /**
+         * @param integer $version
+         */
         public static function getEccSpec($version, $level, array &$spec)

         {

             if (count($spec) < 5) {

@@ -857,12 +885,20 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param string $code
+         */
         public static function unserial($code)

         {

             return explode("\n", gzuncompress($code));

         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         */
         public static function newFrame($version)

         {

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

@@ -1236,6 +1272,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         */
         public function encodeBitStream($version)

         {

             try {

@@ -1313,6 +1353,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         */
         public function setVersion($version)

         {

             if($version < 0 || $version > QRSPEC_VERSION_MAX) {

@@ -1351,6 +1395,12 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param QRinput $mode
+         * @param integer $size
+         * @param integer $data
+         */
         public function append($mode, $size, $data)

         {

             try {

@@ -1446,6 +1496,10 @@ 
         ];

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $c
+         */
         public static function lookAnTable($c)

         {

             return (($c > 127)?-1:self::$anTable[$c]);

@@ -1531,6 +1585,10 @@ 
         

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         */
         public function estimateBitStreamSize($version)

         {

             $bits = 0;

@@ -1648,6 +1706,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param QRbitstream $bstream
+         */
         public function appendPaddingBit(&$bstream)

         {

             $bits = $bstream->size();

@@ -1977,6 +2039,10 @@ 
         public $modeHint;

 

         //----------------------------------------------------------------------

+
+        /**
+         * @param QRinput $input
+         */
         public function __construct($dataStr, $input, $modeHint) 

         {

             $this->dataStr  = $dataStr;

@@ -1985,6 +2051,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param string $str
+         */
         public static function isdigitat($str, $pos)

         {    

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

@@ -1994,6 +2064,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param string $str
+         */
         public static function isalnumat($str, $pos)

         {

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

@@ -2114,6 +2188,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @return integer
+         */
         public function eatKanji()

         {

             $p = 0;

@@ -2447,6 +2525,13 @@ 
         public static $items = [];

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $symsize
+         * @param integer $gfpoly
+         * @param integer $fcr
+         * @param integer $prim
+         */
         public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)

         {

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

@@ -2601,6 +2686,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param string $code
+         */
         public static function unserial($code)

         {

             $codeArr = [];

@@ -2661,6 +2750,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $length
+         */
         public function calcN1N3($length)

         {

             $demerit = 0;

@@ -2971,6 +3064,10 @@ 
         public $data; 

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $mask
+         */
         public function encodeMask(QRinput $input, $mask)

         {

             if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {

@@ -3052,6 +3149,11 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         * @param integer $level
+         */
         public function encodeString8bit($string, $version, $level)

         {

             if(string == NULL) {

@@ -3071,6 +3173,12 @@ 
         }

 

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         * @param integer $level
+         * @param boolean $casesensitive
+         */
         public function encodeString($string, $version, $level, $hint, $casesensitive)

         {

 

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/Profile.php

Doc Comments +11 added lines, -9 removed lines

@@ -73,7 +73,7 @@ 
      * supported EAP types from the DB and stores them in the priv_ arrays.
      * 
      * @param int $p_id identifier of the profile in the DB
-     * @param IdP $idp_object optionally, the institution to which this Profile belongs. Saves the construction of the IdP instance. If omitted, an extra query and instantiation is executed to find out.
+     * @param integer $idp_object optionally, the institution to which this Profile belongs. Saves the construction of the IdP instance. If omitted, an extra query and instantiation is executed to find out.
      */
     public function __construct($p_id, $idp_object = 0) {
         debug(3, "--- BEGIN Constructing new Profile object ... ---\n");
@@ -372,6 +372,8 @@ 
      * 
      * @param string device the device identifier string
      * @param string path the path where the new installer can be found
+     * @param string $device
+     * @param string $path
      */
     public function updateCache($device, $path,$mime) {
         $device = DBConnection::escape_value(Profile::$DB_TYPE, $device);
@@ -384,9 +386,9 @@ 
     /**
      * Log a new download for our stats
      * 
-     * @param device the device id string
-     * @param area either admin or user
-     * @return TRUE if incrementing worked, FALSE if not
+     * @param device string device id string
+     * @param area string admin or user
+     * @return boolean if incrementing worked, FALSE if not
      */
     public function incrementDownloadStats($device, $area) {
         $device = DBConnection::escape_value(Profile::$DB_TYPE, $device);
@@ -399,7 +401,7 @@ 
 
     /**
      * Retrieve current download stats from database, either for one specific device or for all devices
-     * @param string $device the device id string
+     * @param integer $device the device id string
      * @return mixed user downloads of this profile; if device is given, returns the counter as int, otherwise an array with devicename => counter
      */
     public function getUserDownloadStats($device = 0) {
@@ -464,7 +466,7 @@ 
      * @param string $attr_name name of the attribute to set
      * @param string $attr_value value of the attribute to set
      * @param int $eap_type identifier of the EAP type in the database. 0 if the attribute is valid for all EAP types.
-     * @param string $device identifier of the device in the databse. Omit the argument if attribute is valid for all devices.
+     * @param integer $device identifier of the device in the databse. Omit the argument if attribute is valid for all devices.
      */
     public function addAttribute($attr_name, $attr_value, $eap_type, $device = 0) {
         $attr_name = DBConnection::escape_value(Profile::$DB_TYPE, $attr_name);
@@ -574,7 +576,7 @@ 
     /** Returns an array of the profile's attributes.
      * 
      * @param string option_name the name of a specific option. If set, only returns option values for this option name
-     * @param eapmethod the EAP type, in array ("OUTER/INNER") notation. If set, returns only attributes which are specific to that EAP type
+     * @param eapmethod integer EAP type, in array ("OUTER/INNER") notation. If set, returns only attributes which are specific to that EAP type
      * @param string device the device ID string. If set, returns only attributes which are specific to that device
      * @return array attributes of the profile
      */
@@ -658,7 +660,7 @@ 
     /**
      * list all devices marking their availabiblity and possible redirects
      *
-     * @param string $locale for text-based attributes, either returns values for the default value, or if specified here, in the locale specified
+     * @param integer $locale for text-based attributes, either returns values for the default value, or if specified here, in the locale specified
      * @return array of device ids display names and their status
      */
     public function listDevices($locale = 0) {
@@ -713,7 +715,7 @@ 
      * as wel as the chosen language.
      * can be called with an optional $eap argument
      * 
-     * @param array $eap if specified, retrieves attributes specific to the given EAP type
+     * @param integer $eap if specified, retrieves attributes specific to the given EAP type
      * @return array list of attributes in collapsed style (index is the attrib name, value is an array of different values)
      */
     public function getCollapsedAttributes($eap = 0) {

Braces +120 added lines, -88 removed lines

@@ -240,8 +240,8 @@ 
 
         $idpoptions = $idp->getAttributes();
 
-        foreach ($idpoptions as $the_attr)
-            $temparray[] = [
+        foreach ($idpoptions as $the_attr) {
+                    $temparray[] = [
                 "name" => $the_attr["name"],
                 "value" => $the_attr["value"],
                 "level" => $the_attr["level"],
@@ -250,30 +250,35 @@ 
                 "device" => NULL,
                 "eapmethod" => NULL,
             ];
+        }
 
         $this->priv_attributes = [];
 
         // check sanity (device and eapmethod are mutually exclusive) and first batch of adding (method level)
 
         foreach ($temparray as $attrib) {
-            if ($attrib["device"] != NULL && $attrib["eapmethod"] != NULL)
-                debug(2, "Sanity check failed - device and eapmethod are set!\n");
+            if ($attrib["device"] != NULL && $attrib["eapmethod"] != NULL) {
+                            debug(2, "Sanity check failed - device and eapmethod are set!\n");
+            }
         }
 
         foreach ($temparray as $attrib) {
-            if ($attrib["device"] != NULL || $attrib["eapmethod"] != NULL)
-                $this->priv_attributes[] = $attrib;
+            if ($attrib["device"] != NULL || $attrib["eapmethod"] != NULL) {
+                            $this->priv_attributes[] = $attrib;
+            }
         }
         // pick all attributes which are profile specific and place into final array if no eap/device-specific exists
 
         foreach ($temparray as $attrib) {
             if ($attrib["level"] == "Profile") {
                 $ignore = "";
-                foreach ($this->priv_attributes as $approved_attrib)
-                    if ($attrib["name"] == $approved_attrib["name"] && $approved_attrib["level"] != "IdP" && $approved_attrib["level"] != "Profile")
+                foreach ($this->priv_attributes as $approved_attrib) {
+                                    if ($attrib["name"] == $approved_attrib["name"] && $approved_attrib["level"] != "IdP" && $approved_attrib["level"] != "Profile")
                         $ignore = "YES";
-                if ($ignore != "YES")
-                    $this->priv_attributes[] = $attrib;
+                }
+                if ($ignore != "YES") {
+                                    $this->priv_attributes[] = $attrib;
+                }
             }
         }
 
@@ -282,11 +287,13 @@ 
         foreach ($temparray as $attrib) {
             if ($attrib["level"] == "IdP") {
                 $ignore = "";
-                foreach ($this->priv_attributes as $approved_attrib)
-                    if ($attrib["name"] == $approved_attrib["name"] && $approved_attrib["level"] != "IdP")
+                foreach ($this->priv_attributes as $approved_attrib) {
+                                    if ($attrib["name"] == $approved_attrib["name"] && $approved_attrib["level"] != "IdP")
                         $ignore = "YES";
-                if ($ignore != "YES")
-                    $this->priv_attributes[] = $attrib;
+                }
+                if ($ignore != "YES") {
+                                    $this->priv_attributes[] = $attrib;
+                }
             }
         }
 
@@ -315,8 +322,9 @@ 
         $exec_query = DBConnection::exec(Profile::$DB_TYPE, "SELECT profile_id FROM profile WHERE realm LIKE '%@$realm'");
         if ($a = mysqli_fetch_object($exec_query)) {
             return $a->profile_id;
-        } else
-            return FALSE;
+        } else {
+                    return FALSE;
+        }
     }
     
     /**
@@ -356,15 +364,15 @@ 
                 if ($lc < $cache->tm) {
                     debug(4, "Installer cached:$cache->download_path\n");
                     return(['cache'=>$cache->download_path,'mime'=>$cache->mime]);
+                } else {
+                                    return NULL;
                 }
-                else
-                    return NULL;
+            } else {
+                            return NULL;
             }
-            else
-                return NULL;
+        } else {
+                    return NULL;
         }
-        else
-            return NULL;
     }
 
     /**
@@ -405,20 +413,23 @@ 
     public function getUserDownloadStats($device = 0) {
         $returnarray = [];
         $numbers_q = DBConnection::exec(Profile::$DB_TYPE, "SELECT device_id, SUM(downloads_user) AS downloads_user FROM downloads WHERE profile_id = $this->identifier GROUP BY device_id");
-        while ($a = mysqli_fetch_object($numbers_q))
-            $returnarray[$a->device_id] = $a->downloads_user;
+        while ($a = mysqli_fetch_object($numbers_q)) {
+                    $returnarray[$a->device_id] = $a->downloads_user;
+        }
         if ($device !== 0) {
-            if (isset($returnarray[$device]))
-                return $returnarray[$device];
-            else
-                return 0;
+            if (isset($returnarray[$device])) {
+                            return $returnarray[$device];
+            } else {
+                            return 0;
+            }
         }
         // we should pretty-print the device names
         $finalarray = [];
         $devlist = Devices::listDevices();
-        foreach ($returnarray as $dev_id => $count)
-            if (isset($devlist[$dev_id]))
+        foreach ($returnarray as $dev_id => $count) {
+                    if (isset($devlist[$dev_id]))
                     $finalarray[$devlist[$dev_id]['display']] = $count;
+        }
         return $finalarray;
     }
 
@@ -434,15 +445,16 @@ 
         if ($device !== 0) {
             $device = DBConnection::escape_value(Profile::$DB_TYPE, $device);
             $devicetext = "AND device_id = '$device'";
+        } else {
+                    $devicetext = "";
         }
-        else
-            $devicetext = "";
         DBConnection::exec(Profile::$DB_TYPE, "DELETE FROM profile_option WHERE profile_id = $this->identifier $devicetext AND eap_method_id = $eap_type_id AND option_name NOT LIKE '%_file'");
         $this->updateFreshness();
         $exec_q = DBConnection::exec(Profile::$DB_TYPE, "SELECT row FROM profile_option WHERE profile_id = $this->identifier $devicetext AND eap_method_id = $eap_type_id");
         $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;
     }
 
@@ -564,9 +576,10 @@ 
         if ($complete_only == 0) {
             return $this->priv_eaptypes;
         } else {
-            foreach ($this->priv_eaptypes as $type)
-                if ($this->isEapTypeDefinitionComplete($type) === true)
+            foreach ($this->priv_eaptypes as $type) {
+                            if ($this->isEapTypeDefinitionComplete($type) === true)
                     $temparray[] = $type;
+            }
             return($temparray);
         }
     }
@@ -583,27 +596,31 @@ 
         $outarray = [];
         $temparray = [];
         if ($eapmethod) {
-            foreach ($this->priv_attributes as $the_attr) 
-                if ($the_attr["eapmethod"] == $eapmethod)
+            foreach ($this->priv_attributes as $the_attr) {
+                            if ($the_attr["eapmethod"] == $eapmethod)
                     $temparray[] = $the_attr;
+            }
         } else
         if ($device) {
-            foreach ($this->priv_attributes as $the_attr)
-                if ($the_attr["device"] == $device)
+            foreach ($this->priv_attributes as $the_attr) {
+                            if ($the_attr["device"] == $device)
                     $temparray[] = $the_attr;
+            }
         };
 
-        foreach ($this->priv_attributes as $the_attr)
-            if ($the_attr["device"] == NULL && $the_attr["eapmethod"] == NULL)
+        foreach ($this->priv_attributes as $the_attr) {
+                    if ($the_attr["device"] == NULL && $the_attr["eapmethod"] == NULL)
                 $temparray[] = $the_attr;
+        }
 
 
         // return only options by one name, if asked for
 
         if ($option_name) {
-            foreach ($temparray as $the_attr)
-                if ($the_attr["name"] == $option_name)
+            foreach ($temparray as $the_attr) {
+                            if ($the_attr["name"] == $option_name)
                     $outarray[] = $the_attr;
+            }
         } else {
             $outarray = $temparray;
         }
@@ -631,15 +648,18 @@ 
                 foreach ($ca_option as $one_ca) {
                     $x509 = new X509();
                     $ca_parsed = $x509->processCertificate($one_ca['value']);
-                    if ($ca_parsed['root'] == 1)
-                        return true;
+                    if ($ca_parsed['root'] == 1) {
+                                            return true;
+                    }
                 }
                 $missing[] = "eap:ca_file";
             }
-            if (count($ca_option) == 0)
-                $missing[] = "eap:ca_file";
-            if (count($cn_option) == 0)
-                $missing[] = "eap:server_name";
+            if (count($ca_option) == 0) {
+                            $missing[] = "eap:ca_file";
+            }
+            if (count($cn_option) == 0) {
+                            $missing[] = "eap:server_name";
+            }
             return $missing;
         } elseif ($eaptype["OUTER"] == PWD) {
             /*
@@ -662,8 +682,9 @@ 
      * @return array of device ids display names and their status
      */
     public function listDevices($locale = 0) {
-        if ($locale == 0)
-            $locale = $this->lang_index;
+        if ($locale == 0) {
+                    $locale = $this->lang_index;
+        }
         $redirect_url = 0;
         $message = 0;
         $returnarray = [];
@@ -679,20 +700,21 @@ 
             $dev = $factory->device;
             $redirect_url = getLocalisedValue($this->getAttributes("device-specific:redirect", 0, $d), $locale);
             $dev_status = AVAILABLE;
-            if(isset($D['options']) && isset($D['options']['message']) && $D['options']['message']) 
-               $message = $D['options']['message'];
-            else
-               $message = 0;
+            if(isset($D['options']) && isset($D['options']['message']) && $D['options']['message']) {
+                           $message = $D['options']['message'];
+            } else {
+                           $message = 0;
+            }
 
             if ($redirect_url === 0) {
                 if(isset($D['options']) && isset($D['options']['redirect']) && $D['options']['redirect']) {
                    $dev_status = HIDDEN;
-                }  else {
+                } else {
                    $eap = $dev->getPreferredEapType($preferred_eap);
                    if ($eap) {
-                       if (isset($EAP_options["eap-specific:customtext"][serialize($eap)]))
-                           $eap_customtext = $EAP_options["eap-specific:customtext"][serialize($eap)];
-                       else {
+                       if (isset($EAP_options["eap-specific:customtext"][serialize($eap)])) {
+                                                  $eap_customtext = $EAP_options["eap-specific:customtext"][serialize($eap)];
+                       } else {
                            $eap_customtext = getLocalisedValue($this->getAttributes("eap-specific:customtext", $eap, 0), $locale);
                            $EAP_options["eap-specific:customtext"][serialize($eap)] = $eap_customtext;
                        }
@@ -725,8 +747,9 @@ 
             $level = $b['level'];
 //            $S[$l] = $z[$l];
             $value = $b['value'];
-            if (!isset($temp[$name][$level]))
-                $temp[$name][$level] = [];
+            if (!isset($temp[$name][$level])) {
+                            $temp[$name][$level] = [];
+            }
             if ($b['flag'] == 'ML') {
                 $v = unserialize($value);
                 $value = [$v['lang'] => $v['content']];
@@ -738,25 +761,29 @@ 
             if ($flags[$name] == 'ML') {
                 $S = [];
                 if (isset($temp[$name]['Profile'])) {
-                    foreach ($temp[$name]['Profile'] as $z)
-                        foreach ($z as $l => $w)
+                    foreach ($temp[$name]['Profile'] as $z) {
+                                            foreach ($z as $l => $w)
                             $S[$l] = $w;
+                    }
                 }
                 if (!$S && isset($temp[$name]['IdP'])) {
-                    foreach ($temp[$name]['IdP'] as $z)
-                        foreach ($z as $l => $w)
+                    foreach ($temp[$name]['IdP'] as $z) {
+                                            foreach ($z as $l => $w)
                             $S[$l] = $w;
+                    }
                 }
                 $out[$name]['langs'] = $S;
-                if (isset($S[$this->lang_index]) || isset($S['C']))
-                    $out[$name][0] = (isset($S[$this->lang_index])) ? $S[$this->lang_index] : $S['C'];
+                if (isset($S[$this->lang_index]) || isset($S['C'])) {
+                                    $out[$name][0] = (isset($S[$this->lang_index])) ? $S[$this->lang_index] : $S['C'];
+                }
             } else {
-                if (isset($temp[$name]['Method']))
-                    $out[$name] = $temp[$name]['Method'];
-                elseif (isset($temp[$name]['Profile']))
-                    $out[$name] = $temp[$name]['Profile'];
-                else
-                    $out[$name] = $temp[$name]['IdP'];
+                if (isset($temp[$name]['Method'])) {
+                                    $out[$name] = $temp[$name]['Method'];
+                } elseif (isset($temp[$name]['Profile'])) {
+                                    $out[$name] = $temp[$name]['Profile'];
+                } else {
+                                    $out[$name] = $temp[$name]['IdP'];
+                }
             }
         }
         return($out);
@@ -794,20 +821,23 @@ 
         $proper_config = FALSE;
         $attribs = $this->getCollapsedAttributes();
         // do we have enough to go live? Check if any of the configured EAP methods is completely configured ...
-        if (sizeof($this->getEapMethodsinOrderOfPreference(1)) > 0)
-            $proper_config = TRUE;
+        if (sizeof($this->getEapMethodsinOrderOfPreference(1)) > 0) {
+                    $proper_config = TRUE;
+        }
         // if not, it could still be that general redirect has been set
         if (!$proper_config) {
-            if (isset($attribs['device-specific:redirect']))
-                $proper_config = TRUE;
+            if (isset($attribs['device-specific:redirect'])) {
+                            $proper_config = TRUE;
+            }
             // TODO: or maybe just a per-device redirect? would be good enough...
         }
         // do we know at least one SSID to configure, or work with wired? If not, it's not ready...
         if (!isset($attribs['media:SSID']) &&
                 !isset($attribs['media:SSID_with_legacy']) &&
                 (!isset(Config::$CONSORTIUM['ssid']) || count(Config::$CONSORTIUM['ssid']) == 0) &&
-                !isset($attribs['media:wired']))
-            $proper_config = FALSE;
+                !isset($attribs['media:wired'])) {
+                    $proper_config = FALSE;
+        }
         return $proper_config;
     }
 
@@ -816,10 +846,11 @@ 
      */
     public function prepShowtime() {
         $proper_config = $this->readyForShowtime();
-        if ($proper_config)
-            DBConnection::exec(Profile::$DB_TYPE, "UPDATE profile SET sufficient_config = TRUE WHERE profile_id = " . $this->identifier);
-        else
-            DBConnection::exec(Profile::$DB_TYPE, "UPDATE profile SET sufficient_config = FALSE WHERE profile_id = " . $this->identifier);
+        if ($proper_config) {
+                    DBConnection::exec(Profile::$DB_TYPE, "UPDATE profile SET sufficient_config = TRUE WHERE profile_id = " . $this->identifier);
+        } else {
+                    DBConnection::exec(Profile::$DB_TYPE, "UPDATE profile SET sufficient_config = FALSE WHERE profile_id = " . $this->identifier);
+        }
         $attribs = $this->getCollapsedAttributes();
         // if not enough info to go live, set FALSE
         // even if enough info is there, admin has the ultimate say: 
@@ -843,10 +874,11 @@ 
         /* echo "<pre>";
           print_r($r);
           echo "</pre>"; */
-        if ($r[0] == "0")
-            return FALSE;
-        else
-            return TRUE;
+        if ($r[0] == "0") {
+                    return FALSE;
+        } else {
+                    return TRUE;
+        }
     }
 
     /**