GEANT / CAT

core/DBConnection.php

Doc Comments +3 added lines

@@ -134,6 +134,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 +177,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'");
+        }
     }
 
 }
\ No newline at end of file

core/IdP.php

Doc Comments +1 added lines, -1 removed lines

@@ -224,7 +224,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($this->databaseType, "INSERT INTO profile (inst_id) VALUES($this->identifier)");

Indentation +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
      */
     private $external_db_syncstate;
     
-   /**
+    /**
      * The shortname of this IdP's federation
      * @var string 
      */
@@ -110,10 +110,10 @@ 
             }
         }
         $this->attributes[] = ["name" => "internal:country", 
-                                         "value" => $this->federation, 
-                                         "level" => "IdP", 
-                                         "row" => 0, 
-                                         "flag" => NULL];
+                                            "value" => $this->federation, 
+                                            "level" => "IdP", 
+                                            "row" => 0, 
+                                            "flag" => NULL];
 
         $this->name = getLocalisedValue($this->getAttributes('general:instname'), CAT::get_lang());
         debug(3, "--- END Constructing new IdP object ... ---\n");

Braces +65 added lines, -46 removed lines

@@ -128,8 +128,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($this->databaseType, $query);
         $returnarray = [];
         while ($a = mysqli_fetch_object($allProfiles)) {
@@ -144,24 +145,27 @@ 
         // migration phase: are there NULLs in the profile list sufficient_config column?
         // if so, run prepShowtime on all profiles
         $needTreatment = DBConnection::exec($this->databaseType, "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($this->databaseType, "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($this->databaseType, "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;
+        }
         
     }
     
@@ -169,16 +173,21 @@ 
         $allProfiles = DBConnection::exec($this->databaseType, "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;
     }
@@ -191,8 +200,9 @@ 
     public function owner() {
         $returnarray = [];
         $admins = DBConnection::exec($this->databaseType, "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;
     }
 
@@ -230,10 +240,11 @@ 
         DBConnection::exec($this->databaseType, "INSERT INTO profile (inst_id) VALUES($this->identifier)");
         $identifier = DBConnection::lastID($this->databaseType);
 
-        if ($identifier > 0)
-            return new Profile($identifier, $this);
-        else
-            return NULL;
+        if ($identifier > 0) {
+                    return new Profile($identifier, $this);
+        } else {
+                    return NULL;
+        }
     }
 
     /**
@@ -241,13 +252,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($this->databaseType, "DELETE FROM ownership WHERE institution_id = $this->identifier");
         DBConnection::exec($this->databaseType, "DELETE FROM institution_option WHERE institution_id = $this->identifier");
@@ -286,13 +299,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($this->databaseType, "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);
@@ -302,12 +317,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;
@@ -347,10 +364,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) {
@@ -358,8 +376,9 @@ 
         if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
             $already_used = DBConnection::exec($this->databaseType, "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($this->databaseType, "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($this->databaseType, "UPDATE institution SET external_db_id = '$identifier', external_db_syncstate = " . EXTERNAL_DB_SYNCSTATE_SYNCED . " WHERE inst_id = $this->identifier");
+            }
         }
     }
 }
\ No newline at end of file

core/Profile.php

Doc Comments +14 added lines, -12 removed lines

@@ -59,7 +59,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");
@@ -358,6 +358,8 @@ 
      * 
      * @param string device the device identifier string
      * @param string path the path where the new installer can be found
+     * @param string $device
+     * @param string $path
      */
     public function updateCache($device, $path,$mime) {
         $escapedDevice = DBConnection::escape_value($this->databaseType, $device);
@@ -370,9 +372,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($this->databaseType, $device);
@@ -385,7 +387,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) {
@@ -412,10 +414,10 @@ 
      * adds an attribute to this profile; not the usual function from EntityWithDBProperties
      * because this class also has per-EAP-type and per-device sub-settings
      *
-     * @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 string $attrName name of the attribute to set
+     * @param string $attrValue value of the attribute to set
+     * @param integer $eapType identifier of the EAP type in the database. 0 if the attribute is valid for all EAP types.
+     * @param integer $device identifier of the device in the databse. Omit the argument if attribute is valid for all devices.
      */
     public function addAttribute($attrName, $attrValue, $eapType, $device = 0) {
         $escapedAttrName = DBConnection::escape_value(Profile::$DB_TYPE, $attrName);
@@ -525,7 +527,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
      */
@@ -609,7 +611,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) {
@@ -664,7 +666,7 @@ 
      * as wel as the chosen language.
      * can be called with an optional $eap argument
      * 
-     * @param array $eap if specified, retrieves attributes specific to the given EAP type
+     * @param integer $eap if specified, retrieves attributes specific to the given EAP type
      * @return array list of attributes in collapsed style (index is the attrib name, value is an array of different values)
      */
     public function getCollapsedAttributes($eap = 0) {

Spacing +13 added lines, -13 removed lines

@@ -112,7 +112,7 @@ 
                 $temparray[] = [
                     "name" => $a->option_name,
                     "value" => $a->option_value,
-                    "level" => ($a->device_id == NULL && $a->method == 0 ? "Profile" : "Method" ),
+                    "level" => ($a->device_id == NULL && $a->method == 0 ? "Profile" : "Method"),
                     "row" => $a->row,
                     "device" => $a->device_id,
                     "flag" => $optinfo['flag'],
@@ -133,8 +133,8 @@ 
 
                 $temparray[] = [
                     "name" => $a->option_name,
-                    "value" => ( $lang == "" ? $content : serialize(['lang' => $lang, 'content' => $content])),
-                    "level" => ($a->device_id == NULL && $a->method == 0 ? "Profile" : "Method" ),
+                    "value" => ($lang == "" ? $content : serialize(['lang' => $lang, 'content' => $content])),
+                    "level" => ($a->device_id == NULL && $a->method == 0 ? "Profile" : "Method"),
                     "row" => $a->row,
                     "flag" => $optinfo['flag'],
                     "device" => $a->device_id,
@@ -346,7 +346,7 @@ 
             if ($lc = mysqli_fetch_object($exec_update)->last_change) {
                 if ($lc < $cache->tm) {
                     debug(4, "Installer cached:$cache->download_path\n");
-                    $returnValue = ['cache'=>$cache->download_path,'mime'=>$cache->mime];
+                    $returnValue = ['cache'=>$cache->download_path, 'mime'=>$cache->mime];
                 }
             }
         }
@@ -359,7 +359,7 @@ 
      * @param string device the device identifier string
      * @param string path the path where the new installer can be found
      */
-    public function updateCache($device, $path,$mime) {
+    public function updateCache($device, $path, $mime) {
         $escapedDevice = DBConnection::escape_value($this->databaseType, $device);
         $escapedPath   = DBConnection::escape_value($this->databaseType, $path);
         DBConnection::exec($this->databaseType, "INSERT INTO downloads (profile_id,device_id,download_path,mime,lang,installer_time) 
@@ -422,7 +422,7 @@ 
         $escapedAttrValue = DBConnection::escape_value(Profile::$DB_TYPE, $attrValue);
         
         DBConnection::exec($this->databaseType, "INSERT INTO $this->entityOptionTable ($this->entityIdColumn, option_name, option_value, eap_method_id" . ($device !== 0 ? ",device_id" : "") . ") 
-                          VALUES(". $this->identifier . ", '$escapedAttrName', '$escapedAttrValue', $eapType" . ($device !== 0 ? ",'". DBConnection::escape_value($this->databaseType, $device) . "'" : "" ) . ")");
+                          VALUES(". $this->identifier . ", '$escapedAttrName', '$escapedAttrValue', $eapType" . ($device !== 0 ? ",'" . DBConnection::escape_value($this->databaseType, $device) . "'" : "") . ")");
         $this->updateFreshness();
     }
 
@@ -475,20 +475,20 @@ 
      * @param string $localpart the username
      *
      */
-    public function setRealmCheckUser($shallwe,$localpart = NULL) {
+    public function setRealmCheckUser($shallwe, $localpart = NULL) {
         DBConnection::exec($this->databaseType, 
                 "UPDATE profile SET checkuser_outer = " . ($shallwe == true ? "1" : "0") . 
-                ( $localpart !== NULL ? ", checkuser_value = '$localpart' " : "") .
+                ($localpart !== NULL ? ", checkuser_value = '$localpart' " : "") .
                 " WHERE profile_id = $this->identifier");
     }
 
     /** should username be verified or even prefilled?
      * 
      */
-    public function setInputVerificationPreference($verify,$hint) {
+    public function setInputVerificationPreference($verify, $hint) {
         DBConnection::exec($this->databaseType, 
                 "UPDATE profile SET verify_userinput_suffix = " . ($verify == true ? "1" : "0") . 
-                ", hint_userinput_suffix = ". ($hint == true ? "1" : "0") .
+                ", hint_userinput_suffix = " . ($hint == true ? "1" : "0") .
                 " WHERE profile_id = $this->identifier");
     }
     
@@ -630,15 +630,15 @@ 
             $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']) 
+            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']) {
+                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)]))

Braces +109 added lines, -78 removed lines

@@ -232,8 +232,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"],
@@ -242,28 +242,33 @@ 
                 "device" => NULL,
                 "eapmethod" => NULL,
             ];
+        }
 
         // 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->attributes[] = $attrib;
+            if ($attrib["device"] != NULL || $attrib["eapmethod"] != NULL) {
+                            $this->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->attributes as $approved_attrib)
-                    if ($attrib["name"] == $approved_attrib["name"] && $approved_attrib["level"] != "IdP" && $approved_attrib["level"] != "Profile")
+                foreach ($this->attributes as $approved_attrib) {
+                                    if ($attrib["name"] == $approved_attrib["name"] && $approved_attrib["level"] != "IdP" && $approved_attrib["level"] != "Profile")
                         $ignore = "YES";
-                if ($ignore != "YES")
-                    $this->attributes[] = $attrib;
+                }
+                if ($ignore != "YES") {
+                                    $this->attributes[] = $attrib;
+                }
             }
         }
 
@@ -272,11 +277,13 @@ 
         foreach ($temparray as $attrib) {
             if ($attrib["level"] == "IdP") {
                 $ignore = "";
-                foreach ($this->attributes as $approved_attrib)
-                    if ($attrib["name"] == $approved_attrib["name"] && $approved_attrib["level"] != "IdP")
+                foreach ($this->attributes as $approved_attrib) {
+                                    if ($attrib["name"] == $approved_attrib["name"] && $approved_attrib["level"] != "IdP")
                         $ignore = "YES";
-                if ($ignore != "YES")
-                    $this->attributes[] = $attrib;
+                }
+                if ($ignore != "YES") {
+                                    $this->attributes[] = $attrib;
+                }
             }
         }
 
@@ -305,8 +312,9 @@ 
         $exec_query = DBConnection::exec($this->databaseType, "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;
+        }
     }
     
     /**
@@ -391,20 +399,23 @@ 
     public function getUserDownloadStats($device = 0) {
         $returnarray = [];
         $numbers_q = DBConnection::exec($this->databaseType, "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;
     }
 
@@ -515,9 +526,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);
         }
     }
@@ -534,27 +546,31 @@ 
         $outarray = [];
         $temparray = [];
         if ($eapmethod) {
-            foreach ($this->attributes as $the_attr) 
-                if ($the_attr["eapmethod"] == $eapmethod)
+            foreach ($this->attributes as $the_attr) {
+                            if ($the_attr["eapmethod"] == $eapmethod)
                     $temparray[] = $the_attr;
+            }
         } else
         if ($device) {
-            foreach ($this->attributes as $the_attr)
-                if ($the_attr["device"] == $device)
+            foreach ($this->attributes as $the_attr) {
+                            if ($the_attr["device"] == $device)
                     $temparray[] = $the_attr;
+            }
         };
 
-        foreach ($this->attributes as $the_attr)
-            if ($the_attr["device"] == NULL && $the_attr["eapmethod"] == NULL)
+        foreach ($this->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;
         }
@@ -582,15 +598,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 || $eaptype["INNER"] == NE_SILVERBULLET) {
             /*
@@ -613,8 +632,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 = [];
@@ -630,20 +650,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;
                        }
@@ -676,8 +697,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']];
@@ -689,25 +711,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);
@@ -745,20 +771,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;
     }
 
@@ -767,10 +796,11 @@ 
      */
     public function prepShowtime() {
         $proper_config = $this->readyForShowtime();
-        if ($proper_config)
-            DBConnection::exec($this->databaseType, "UPDATE profile SET sufficient_config = TRUE WHERE profile_id = " . $this->identifier);
-        else
-            DBConnection::exec($this->databaseType, "UPDATE profile SET sufficient_config = FALSE WHERE profile_id = " . $this->identifier);
+        if ($proper_config) {
+                    DBConnection::exec($this->databaseType, "UPDATE profile SET sufficient_config = TRUE WHERE profile_id = " . $this->identifier);
+        } else {
+                    DBConnection::exec($this->databaseType, "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: 
@@ -794,10 +824,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;
+        }
     }
 
     /**

core/User.php

Braces +17 added lines, -11 removed lines

@@ -109,14 +109,16 @@ 
     public function isFederationAdmin($federation = 0) {
         $feds = $this->getAttributes("user:fedadmin");
         if ($federation === 0) {
-            if (count($feds) == 0)
-                return FALSE;
-            else
-                return TRUE;
+            if (count($feds) == 0) {
+                            return FALSE;
+            } else {
+                            return TRUE;
+            }
         } else {
             foreach ($feds as $fed) {
-                if (strtoupper($fed['value']) == strtoupper($federation))
-                    return TRUE;
+                if (strtoupper($fed['value']) == strtoupper($federation)) {
+                                    return TRUE;
+                }
             }
             return FALSE;
         }
@@ -139,9 +141,10 @@ 
     */
     public function isIdPOwner($idp) {
        $temp = new IdP($idp);
-       foreach ($temp->owner() as $oneowner)
-            if ($oneowner['ID'] == $this->identifier)
+       foreach ($temp->owner() as $oneowner) {
+                   if ($oneowner['ID'] == $this->identifier)
                 return TRUE;
+       }
        return FALSE;
     }
 
@@ -165,16 +168,19 @@ 
         $mail->addReplyTo(Config::$APPEARANCE['support-contact']['mail'], Config::$APPEARANCE['productname'] . " " ._("Feedback"));
         
         $mailaddr = $this->getAttributes("user:email");
-        if (count($mailaddr) == 0) // we don't know his mail address
+        if (count($mailaddr) == 0) {
+            // we don't know his mail address
             return FALSE;
+        }
         
         $mail->addAddress($mailaddr[0]["value"]);
         
         // what do we want to say?
         $mail->Subject = $subject;
         $mail->Body = $content;
-        if (isset(Config::$CONSORTIUM['certfilename'], Config::$CONSORTIUM['keyfilename'], Config::$CONSORTIUM['keypass']))
-            $mail->sign(Config::$CONSORTIUM['certfilename'], Config::$CONSORTIUM['keyfilename'], Config::$CONSORTIUM['keypass']);
+        if (isset(Config::$CONSORTIUM['certfilename'], Config::$CONSORTIUM['keyfilename'], Config::$CONSORTIUM['keypass'])) {
+                    $mail->sign(Config::$CONSORTIUM['certfilename'], Config::$CONSORTIUM['keyfilename'], Config::$CONSORTIUM['keypass']);
+        }
 
 
         $sent = $mail->send();

core/DeviceFactory.php

Indentation +10 added lines, -10 removed lines

@@ -46,7 +46,7 @@ 
      */
     public function __construct($blueprint) {
 
-      $Dev = Devices::listDevices();
+        $Dev = Devices::listDevices();
         if(isset($Dev[$blueprint])) {
             if($Dev[$blueprint]['directory'] && $Dev[$blueprint]['module'])
                 require_once("devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php");
@@ -60,15 +60,15 @@ 
         } else {
             error("unknown devicename:$blueprint");
         }
-       $this->device->module_path = CAT::$root.'/devices/'.$Dev[$blueprint]['directory'];
-       $this->device->signer = isset($Dev[$blueprint]['signer']) ? $Dev[$blueprint]['signer'] : 0; 
-       $this->device->device_id = $blueprint;
-       $options = Devices::$Options;
-       if(isset($Dev[$blueprint]['options'])) {
-          $Opt = $Dev[$blueprint]['options'];
-          foreach ($Opt as $option => $value)
+        $this->device->module_path = CAT::$root.'/devices/'.$Dev[$blueprint]['directory'];
+        $this->device->signer = isset($Dev[$blueprint]['signer']) ? $Dev[$blueprint]['signer'] : 0; 
+        $this->device->device_id = $blueprint;
+        $options = Devices::$Options;
+        if(isset($Dev[$blueprint]['options'])) {
+            $Opt = $Dev[$blueprint]['options'];
+            foreach ($Opt as $option => $value)
             $options[$option] = $value;
-       }
-       $this->device->options = $options;
+        }
+        $this->device->options = $options;
     }
 }
\ No newline at end of file

core/Federation.php

Braces +69 added lines, -47 removed lines

@@ -58,8 +58,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 ";
@@ -69,8 +70,9 @@ 
             $retstring .= ($astablerows ? "<tr>" : "  <device name='" . $device_array['display'] . "'>\n");
             $admin_query = DBConnection::exec($this->databaseType, $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'>");
@@ -82,16 +84,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;
     }
@@ -431,8 +435,9 @@ 
         $escapedLevel = DBConnection::escape_value($this->databaseType, $level);
         $escapedMail = DBConnection::escape_value($this->databaseType, $mail);
 
-        if ($escapedOwnerId != "PENDING")
-            DBConnection::exec($this->databaseType, "INSERT INTO ownership (user_id,institution_id, blesslevel, orig_mail) VALUES('$escapedOwnerId', $identifier, '$escapedLevel', '$escapedMail')");
+        if ($escapedOwnerId != "PENDING") {
+                    DBConnection::exec($this->databaseType, "INSERT INTO ownership (user_id,institution_id, blesslevel, orig_mail) VALUES('$escapedOwnerId', $identifier, '$escapedLevel', '$escapedMail')");
+        }
         return $identifier;
     }
 
@@ -471,13 +476,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->name) . "'");
-        else
-            $admins = DBConnection::exec("USER", "SELECT user_id FROM user_options WHERE option_name = 'user:fedadmin' AND option_value = '" . strtoupper($this->name) . "'");
+        } else {
+                    $admins = DBConnection::exec("USER", "SELECT user_id FROM user_options WHERE option_name = 'user:fedadmin' AND option_value = '" . strtoupper($this->name) . "'");
+        }
 
-        while ($a = mysqli_fetch_object($admins))
-            $returnarray[] = $a->user_id;
+        while ($a = mysqli_fetch_object($admins)) {
+                    $returnarray[] = $a->user_id;
+        }
         return $returnarray;
     }
 
@@ -485,10 +493,11 @@ 
         $returnarray = [];
         $countrysuffix = "";
         
-        if ($this->name != "")
-            $countrysuffix = " WHERE country = '" . strtolower($this->name) . "'";
-        else
-            $countrysuffix = "";
+        if ($this->name != "") {
+                    $countrysuffix = " WHERE country = '" . strtolower($this->name) . "'";
+        } else {
+                    $countrysuffix = "";
+        }
         
         if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
             $usedarray = [];
@@ -501,15 +510,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
@@ -533,8 +545,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
@@ -553,10 +566,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)) {
@@ -590,14 +604,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
@@ -610,25 +626,30 @@ 
         while ($a = mysqli_fetch_object($allIDPs)) {
             $O = explode('---', $a->options);
             $A = [];
-            if (isset($geo))
-                unset($geo);
-            if (isset($names))
-                $names = [];
+            if (isset($geo)) {
+                            unset($geo);
+            }
+            if (isset($names)) {
+                            $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]];
                 }
             }
@@ -638,8 +659,9 @@ 
                 $name = getLocalisedValue($names, CAT::get_lang());
             }
             $A['title'] = $name;
-            if (isset($geo))
-                $A['geo'] = $geo;
+            if (isset($geo)) {
+                            $A['geo'] = $geo;
+            }
             $returnarray[] = $A;
         }
         return $returnarray;

core/DeviceConfig.php

Indentation +421 added lines, -421 removed lines

@@ -6,10 +6,10 @@ 
 ?>
 <?php
 /**
-  * This file defines the abstract Device class
-  *
-  * @package ModuleWriting
-  */
+ * This file defines the abstract Device class
+ *
+ * @package ModuleWriting
+ */
 
 /**
  * 
@@ -46,10 +46,10 @@ 
  */
 
 abstract class DeviceConfig {
-   /**
-    * stores the path to the temporary working directory for a module instance
-    * @var string $FPATH
-    */
+    /**
+     * stores the path to the temporary working directory for a module instance
+     * @var string $FPATH
+     */
     public $FPATH;
 
     /**
@@ -58,390 +58,390 @@ 
      */
     public $specialities;
 
-   /**
+    /**
      * device module constructor should be defined by each module, but if it is not, then here is a default one
      */
 
-      public function __construct() {
-      $this->supportedEapMethods  = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP];
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
+        public function __construct() {
+        $this->supportedEapMethods  = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP];
+        debug(4,"This device supports the following EAP methods: ");
+        debug(4,$this->supportedEapMethods);
     }
 
 
-   /**
-    * Set up working environment for a device module
-    *
-    * Sets up the device module environment taking into account the actual profile
-    * selected by the user in the GUI. The selected profile is passed as the
-    * Profile $profile argumant.
-    *
-    * This method needs to be called after the device instance has been created (the GUI class does that)
-    *
-    * setup performs the following tasks:
-    * - collect profile attributes and pass them as the attributes property;
-    * - create the temporary working directory
-    * - process CA certificates and store them as 'internal:CAs' attribute
-    * - process and save optional info files and store references to them in
-    *   'internal:info_file' attribute
-    * @param Profile $profile the profile object which will be passed by the caller
-    * @final not to be redefined
-    */
+    /**
+     * Set up working environment for a device module
+     *
+     * Sets up the device module environment taking into account the actual profile
+     * selected by the user in the GUI. The selected profile is passed as the
+     * Profile $profile argumant.
+     *
+     * This method needs to be called after the device instance has been created (the GUI class does that)
+     *
+     * setup performs the following tasks:
+     * - collect profile attributes and pass them as the attributes property;
+     * - create the temporary working directory
+     * - process CA certificates and store them as 'internal:CAs' attribute
+     * - process and save optional info files and store references to them in
+     *   'internal:info_file' attribute
+     * @param Profile $profile the profile object which will be passed by the caller
+     * @final not to be redefined
+     */
     final public function setup(Profile $profile) {
-       debug(4,"module setup start\n");
-       if(! $profile instanceof Profile) {
-          debug(2,"No profile has been set\n");
-          error("No profile has been set");
-          exit;
-       }
-       $this->attributes = $this->getProfileAttributes($profile);
-       if(! $this->selected_eap) {
-          error("No EAP type specified.");
-          exit;
-       }
-       // create temporary directory, its full path will be saved in $this->FPATH;
-       $T = createTemporaryDirectory('installer');
-       $this->FPATH = $T['dir'];
-       mkdir($T['dir'].'/tmp');
-       chdir($T['dir'].'/tmp');
-       $CAs = [];
-       if(isset($this->attributes['eap:ca_file'])) {
-       foreach ($this->attributes['eap:ca_file'] as $ca) {
-          if($c = X509::processCertificate($ca))
-             $CAs[] = $c;
-          }
-          $this->attributes['internal:CAs'][0]=$CAs;
-       }
-       if(isset($this->attributes['support:info_file'])) {
-          $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'] = 
-             $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();
-       $this->lang_index = CAT::get_lang();
-       // phpMD says the below is not needed. Wow.
-       // $idp = new IdP($profile->institution);
-       $olddomain = CAT::set_locale("core");
-       $this->support_email_substitute = sprintf(_("your local %s support"),Config::$CONSORTIUM['name']);
-       $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;
-       $this->installerBasename = $this->getInstallerBasename();
+        debug(4,"module setup start\n");
+        if(! $profile instanceof Profile) {
+            debug(2,"No profile has been set\n");
+            error("No profile has been set");
+            exit;
+        }
+        $this->attributes = $this->getProfileAttributes($profile);
+        if(! $this->selected_eap) {
+            error("No EAP type specified.");
+            exit;
+        }
+        // create temporary directory, its full path will be saved in $this->FPATH;
+        $T = createTemporaryDirectory('installer');
+        $this->FPATH = $T['dir'];
+        mkdir($T['dir'].'/tmp');
+        chdir($T['dir'].'/tmp');
+        $CAs = [];
+        if(isset($this->attributes['eap:ca_file'])) {
+        foreach ($this->attributes['eap:ca_file'] as $ca) {
+            if($c = X509::processCertificate($ca))
+                $CAs[] = $c;
+            }
+            $this->attributes['internal:CAs'][0]=$CAs;
+        }
+        if(isset($this->attributes['support:info_file'])) {
+            $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'] = 
+                $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();
+        $this->lang_index = CAT::get_lang();
+        // phpMD says the below is not needed. Wow.
+        // $idp = new IdP($profile->institution);
+        $olddomain = CAT::set_locale("core");
+        $this->support_email_substitute = sprintf(_("your local %s support"),Config::$CONSORTIUM['name']);
+        $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;
+        $this->installerBasename = $this->getInstallerBasename();
     }
 
-  /**
-    * Selects the preferred eap method based on profile EAP configuration and device EAP capabilities
-    *
-    * @param array eap_array an array of eap methods supported by a given device
-    * @return the best matching EAP type for the profile; or 0 if no match was found
-    */   
-   public function getPreferredEapType($eap_array) {
-     foreach ($eap_array as $eap) {
-         if(in_array($eap,$this->supportedEapMethods)) {
+    /**
+     * Selects the preferred eap method based on profile EAP configuration and device EAP capabilities
+     *
+     * @param array eap_array an array of eap methods supported by a given device
+     * @return the best matching EAP type for the profile; or 0 if no match was found
+     */   
+    public function getPreferredEapType($eap_array) {
+        foreach ($eap_array as $eap) {
+            if(in_array($eap,$this->supportedEapMethods)) {
             $this->selected_eap = $eap;
             debug(4,"Selected EAP:");
             debug(4,$eap);
             return($eap);
-         }
-     }
-     return(0);
-   }
-  /**
-    * prepare usage information for the installer
-    * every device module should override this method
-    *
-    * @return String HTML text to be displayed
-    */ 
-   public function writeDeviceInfo() {
-     return _("Sorry, this should not happen - no additional information is available");
-   }
-
-  /**
-    *  Copy a file from the module location to the temporary directory.
-    *
-    * If the second argument is provided then the file will be saved under the name 
-    * taken form this argument. If only one parameter is given, source and destination
-    * filenames are the same
-    * Source file can be located either in the Files subdirectory or in the sibdirectory of Files
-    * 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
-    *
-    * @return bool result of the copy operation
-    * @final not to be redefined
-    */
-   final protected function copyFile($source_name, $output_name = 0) {
-      if  ( $output_name === 0)
+            }
+        }
+        return(0);
+    }
+    /**
+     * prepare usage information for the installer
+     * every device module should override this method
+     *
+     * @return String HTML text to be displayed
+     */ 
+    public function writeDeviceInfo() {
+        return _("Sorry, this should not happen - no additional information is available");
+    }
+
+    /**
+     *  Copy a file from the module location to the temporary directory.
+     *
+     * If the second argument is provided then the file will be saved under the name 
+     * taken form this argument. If only one parameter is given, source and destination
+     * filenames are the same
+     * Source file can be located either in the Files subdirectory or in the sibdirectory of Files
+     * 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
+     *
+     * @return bool result of the copy operation
+     * @final not to be redefined
+     */
+    final protected function copyFile($source_name, $output_name = 0) {
+        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 {
+        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 {
         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(4,"Copying $source to $output_name\n");
+        $result = copy($source,"$output_name");
+        if(! $result )
         debug(2,"fileCopy($source_name, $output_name) failed\n");
-      return($result); 
-   }
-
-
-  /**
-    *  Copy a file from the module location to the temporary directory aplying transcoding.
-    *
-    * Transcoding is only required for Windows installers, and no Unicode support
-    * in NSIS (NSIS version below 3)
-    * Trancoding is only applied if the third optional parameter is set and nonzero
-    * If Config::$NSIS_VERSION is set to 3 or more, no transcoding will be applied
-    * regardless of the third parameter value.
-    * If the second argument is provided and is not equal to 0, then the file will be
-    * saved under the name taken from this argument.
-    * If only one parameter is given or the second is equal to 0, source and destination
-    * filenames are the same.
-    * The third 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.
-    * Source file can be located either in the Files subdirectory or in the sibdirectory of Files
-    * 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
-    *
-    * @final not to be redefined
-    */
-
-   final protected function translateFile($source_name, $output_name = 0, $encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
+        return($result); 
+    }
+
+
+    /**
+     *  Copy a file from the module location to the temporary directory aplying transcoding.
+     *
+     * Transcoding is only required for Windows installers, and no Unicode support
+     * in NSIS (NSIS version below 3)
+     * Trancoding is only applied if the third optional parameter is set and nonzero
+     * If Config::$NSIS_VERSION is set to 3 or more, no transcoding will be applied
+     * regardless of the third parameter value.
+     * If the second argument is provided and is not equal to 0, then the file will be
+     * saved under the name taken from this argument.
+     * If only one parameter is given or the second is equal to 0, source and destination
+     * filenames are the same.
+     * The third 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.
+     * Source file can be located either in the Files subdirectory or in the sibdirectory of Files
+     * 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
+     *
+     * @final not to be redefined
+     */
+
+    final protected function translateFile($source_name, $output_name = 0, $encoding = 0) {
+        if(Config::$NSIS_VERSION >= 3)
         $encoding = 0;
-      if  ( $output_name === 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;
-      include($source);
-      $output = ob_get_clean();
-      if($encoding) {
+        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;
+        include($source);
+        $output = ob_get_clean();
+        if($encoding) {
         $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$output);
         if($output_c)
-           $output = $output_c;
-      }
-      $f = fopen("$output_name","w");
-      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");
-   }
-
-
-  /**
-    * Transcode a string adding double quotes escaping
-    *
-    * Transcoding is only required for Windows installers, and no Unicode support
-    * in NSIS (NSIS version below 3)
-    * Trancoding is only applied if the third optional parameter is set and nonzero
-    * If Config::$NSIS_VERSION is set to 3 or more, no transcoding will be applied
-    * regardless of the second parameter value.
-    * 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
-    */
-
-   final protected function translateString($source_string,$encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
+            $output = $output_c;
+        }
+        $f = fopen("$output_name","w");
+        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");
+    }
+
+
+    /**
+     * Transcode a string adding double quotes escaping
+     *
+     * Transcoding is only required for Windows installers, and no Unicode support
+     * in NSIS (NSIS version below 3)
+     * Trancoding is only applied if the third optional parameter is set and nonzero
+     * If Config::$NSIS_VERSION is set to 3 or more, no transcoding will be applied
+     * regardless of the second parameter value.
+     * 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
+     */
+
+    final protected function translateString($source_string,$encoding = 0) {
+        if(Config::$NSIS_VERSION >= 3)
         $encoding = 0;
-      if($encoding)
+        if($encoding)
         $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$source_string);
-      else
+        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;
-   }
-
-
-  /**
-   * Save certificate files in either DER or PEM format
-   *
-   * Certificate files will be saved in the module working directory.
-   * @param string $format  only "der" and "pem" are currently allowed
-   * @return array an array of arrays or FALSE on error
-   * saved certificate file names are avalable under the 'file' index
-   * additional array entries are indexed as 'sha1', 'md5', and 'root'.
-   * sha1 and md5 are correcponding certificate hashes
-   * root is set to 1 for the CA roor certicicate and 0 otherwise
-  */ 
-   final protected function saveCertificateFiles($format) {
-     if($format == 'der' || $format == 'pam') {
-       $i = 0;
-       $CA_files = [];
-       $ca_array = $this->attributes['internal:CAs'][0];
-       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")
+        if($output_c) 
+            $source_string  = str_replace('"','$\\"',$output_c);
+        else
+            debug(2,"Failed to convert string $source_string\n");
+        return $source_string;
+    }
+
+
+    /**
+     * Save certificate files in either DER or PEM format
+     *
+     * Certificate files will be saved in the module working directory.
+     * @param string $format  only "der" and "pem" are currently allowed
+     * @return array an array of arrays or FALSE on error
+     * saved certificate file names are avalable under the 'file' index
+     * additional array entries are indexed as 'sha1', 'md5', and 'root'.
+     * sha1 and md5 are correcponding certificate hashes
+     * root is set to 1 for the CA roor certicicate and 0 otherwise
+     */ 
+    final protected function saveCertificateFiles($format) {
+        if($format == 'der' || $format == 'pam') {
+        $i = 0;
+        $CA_files = [];
+        $ca_array = $this->attributes['internal:CAs'][0];
+        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
+            else
             fwrite($f,$CA['der']);
-         fclose($f);
-         $C = [];
-         $C['file'] = "cert-$i.crt";
-         $C['sha1'] = $CA['sha1'];
-         $C['md5'] = $CA['md5'];
-         $C['root'] = $CA['root'];
-         $CA_files[] = $C;
-         $i++;
-       }
-       return($CA_files);
-     } else {
-       debug(2, 'incorrect format value specified');
-       return(FALSE);
-     }
+            fclose($f);
+            $C = [];
+            $C['file'] = "cert-$i.crt";
+            $C['sha1'] = $CA['sha1'];
+            $C['md5'] = $CA['md5'];
+            $C['root'] = $CA['root'];
+            $CA_files[] = $C;
+            $i++;
+        }
+        return($CA_files);
+        } else {
+        debug(2, 'incorrect format value specified');
+        return(FALSE);
+        }
       
-   }
-
-   /**
-    * Generate installer filename base.
-    * Device module should use this name adding an extension.
-    * Normally the device identifier follows the Consortium name.
-    * The sting taken for the device identifier equals (by default) to the index in the listDevices array,
-    * but can be overriden with the 'device_id' device option.
-    */
-   private function getInstallerBasename() {
-      $replace_pattern = '/[ ()\/\'"]+/';
-      debug(4,"getInstallerBasename1:".$this->attributes['general:instname'][0]."\n");
-      $inst = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['general:instname'][0]));
-      debug(4,"getInstallerBasename2:$inst\n");
-      $Inst_a = explode('_',$inst);
-      if(count($Inst_a) > 2) {
-         $inst = '';
-         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) {
-         if(!empty($this->attributes['profile:name']) && ! empty($this->attributes['profile:name'][0])) {
-             $prof = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['profile:name'][0]));
-             $prof = preg_replace('/_+$/','',$prof);
-             return $c_name. '-'. $this->getDeviceId() . $inst .'-'. $prof;
-         }
-      }
-      return $c_name. '-'. $this->getDeviceId() . $inst;
-  }
-
-  private function getDeviceId() {
+    }
+
+    /**
+     * Generate installer filename base.
+     * Device module should use this name adding an extension.
+     * Normally the device identifier follows the Consortium name.
+     * The sting taken for the device identifier equals (by default) to the index in the listDevices array,
+     * but can be overriden with the 'device_id' device option.
+     */
+    private function getInstallerBasename() {
+        $replace_pattern = '/[ ()\/\'"]+/';
+        debug(4,"getInstallerBasename1:".$this->attributes['general:instname'][0]."\n");
+        $inst = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['general:instname'][0]));
+        debug(4,"getInstallerBasename2:$inst\n");
+        $Inst_a = explode('_',$inst);
+        if(count($Inst_a) > 2) {
+            $inst = '';
+            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) {
+            if(!empty($this->attributes['profile:name']) && ! empty($this->attributes['profile:name'][0])) {
+                $prof = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['profile:name'][0]));
+                $prof = preg_replace('/_+$/','',$prof);
+                return $c_name. '-'. $this->getDeviceId() . $inst .'-'. $prof;
+            }
+        }
+        return $c_name. '-'. $this->getDeviceId() . $inst;
+    }
+
+    private function getDeviceId() {
     $d_id = $this->device_id;
     if(isset($this->options['device_id'])) 
-      $d_id = $this->options['device_id'];
+        $d_id = $this->options['device_id'];
     if($d_id !== '')
-      $d_id .= '-';
+        $d_id .= '-';
     return $d_id;
-  }
+    }
 
 
-  private function getSSIDs() {
+    private function getSSIDs() {
     $S['add']=[];
     $S['del']=[];
     if (isset(Config::$CONSORTIUM['ssid'])) {
-       foreach (Config::$CONSORTIUM['ssid'] as $ssid) {
+        foreach (Config::$CONSORTIUM['ssid'] as $ssid) {
         if(isset(Config::$CONSORTIUM['tkipsupport']) && Config::$CONSORTIUM['tkipsupport'] == TRUE)
-          $S['add'][$ssid] = 'TKIP';
+            $S['add'][$ssid] = 'TKIP';
         else {
-          $S['add'][$ssid] = 'AES';
-          $S['del'][$ssid] = 'TKIP';
+            $S['add'][$ssid] = 'AES';
+            $S['del'][$ssid] = 'TKIP';
+        }
         }
-       }
     }
     if(isset($this->attributes['media:SSID'])) {
-      $SSID = $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';
+        $SSID = $this->attributes['media:SSID_with_legacy'];
+        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';
+        $SSID = $this->attributes['media:remove_SSID'];
+        foreach($SSID as $ssid)
+            $S['del'][$ssid] = 'DEL';
     }
     return $S;
-  }
+    }
 
-  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)
+    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)
             $OIs[] = $new_oi;
-      return $OIs;
-  }
+        return $OIs;
+    }
   
-  /**
-   * An array with shorthand definitions for MIME types
-   * @var array
-   */
-  private $mime_extensions = [
-     'text/plain' => 'txt',
-     'text/rtf' => 'rtf',
-     'application/pdf' =>'pdf',
-  ];
-
-  private function saveLogoFile($Logos) {
+    /**
+     * An array with shorthand definitions for MIME types
+     * @var array
+     */
+    private $mime_extensions = [
+        'text/plain' => 'txt',
+        'text/rtf' => 'rtf',
+        'application/pdf' =>'pdf',
+    ];
+
+    private function saveLogoFile($Logos) {
     $i=0;
     $returnarray= [];
     foreach ($Logos as $blob) {
-      $finfo = new finfo(FILEINFO_MIME_TYPE);
-      $mime = $finfo->buffer($blob);
-      if(preg_match('/^image\/(.*)/',$mime,$m))
+        $finfo = new finfo(FILEINFO_MIME_TYPE);
+        $mime = $finfo->buffer($blob);
+        if(preg_match('/^image\/(.*)/',$mime,$m))
         $ext = $m[1];
-      else
+        else
         $ext = 'unsupported';
-      debug(4,"saveLogoFile: $mime : $ext\n");
-      $f_name = 'logo-'.$i.'.'.$ext;
-      $f = fopen($f_name,"w");
-      if(! $f) {
-          debug(2,"saveLogoFile failed for: $f_name\n");
-          die("problem opening the file\n");
-      }
-      fwrite($f,$blob);
-      fclose($f);
-      $returnarray[]= ['name'=>$f_name,'mime'=>$ext];
-      $i++;
+        debug(4,"saveLogoFile: $mime : $ext\n");
+        $f_name = 'logo-'.$i.'.'.$ext;
+        $f = fopen($f_name,"w");
+        if(! $f) {
+            debug(2,"saveLogoFile failed for: $f_name\n");
+            die("problem opening the file\n");
+        }
+        fwrite($f,$blob);
+        fclose($f);
+        $returnarray[]= ['name'=>$f_name,'mime'=>$ext];
+        $i++;
     }
     return($returnarray);
-  }
+    }
 
 
-  private function saveInfoFile($blob) {
+    private function saveInfoFile($blob) {
     $finfo = new finfo(FILEINFO_MIME_TYPE);
     $mime = $finfo->buffer($blob);
     $ext = isset($this->mime_extensions[$mime]) ? $this->mime_extensions[$mime] : 'usupported';
@@ -451,43 +451,43 @@ 
     fwrite($f,$blob);
     fclose($f);
     return(['name'=>'local-info.'.$ext,'mime'=>$ext]);
-  }
-
-  private function getProfileAttributes(Profile $profile) {
-     $eaps = $profile->getEapMethodsinOrderOfPreference(1);
-     if($eap = $this->getPreferredEapType($eaps)) {
-          $a = $profile->getCollapsedAttributes($eap);
-          $a['eap'] = $eap;
-          $a['all_eaps'] = $eaps;
-          return($a);
-     } else {
-       error("No supported eap types found for this profile.");
-       return(FALSE);
-  }
-  }
+    }
+
+    private function getProfileAttributes(Profile $profile) {
+        $eaps = $profile->getEapMethodsinOrderOfPreference(1);
+        if($eap = $this->getPreferredEapType($eaps)) {
+            $a = $profile->getCollapsedAttributes($eap);
+            $a['eap'] = $eap;
+            $a['all_eaps'] = $eaps;
+            return($a);
+        } else {
+        error("No supported eap types found for this profile.");
+        return(FALSE);
+    }
+    }
 /**
-  * dumps attributes for debugging purposes
-  *
-  * dumpAttibutes method is supplied for debuging purposes, it simply dumps the attribute array
-  * to a file with name passed in the attribute.
-  * @param string $file the output file name
-  */
-  protected function dumpAttibutes($file) {
+     * dumps attributes for debugging purposes
+     *
+     * dumpAttibutes method is supplied for debuging purposes, it simply dumps the attribute array
+     * to a file with name passed in the attribute.
+     * @param string $file the output file name
+     */
+    protected function dumpAttibutes($file) {
         ob_start();
         print_r($this->attributes);
         $output = ob_get_clean();
         $f = fopen($file,"w");
         fwrite($f,$output);
         fclose($f);
-  }
+    }
 /** 
- * placeholder for the main device method
- *
- */
+     * placeholder for the main device method
+     *
+     */
 
-  protected function writeInstaller() {
-     return("download path");
-  }
+    protected function writeInstaller() {
+        return("download path");
+    }
 
 /**
  * Array passing all options to the device module.
@@ -521,75 +521,75 @@ 
  * @see X509::processCertificate()
  * @var array $attributes
  */
-  public $attributes;
+    public $attributes;
 /**
-  * stores the path to the module source location and is used 
-  * by copyFile and translateFile
-  * the only reason for it to be a public variable ies that it is set by the DeviceFactory class
-  * module_path should not be used by module drivers.
-  * @var string 
-  */
-  public $module_path;
+     * stores the path to the module source location and is used 
+     * by copyFile and translateFile
+     * the only reason for it to be a public variable ies that it is set by the DeviceFactory class
+     * module_path should not be used by module drivers.
+     * @var string 
+     */
+    public $module_path;
 
 /**
  * The optimal EAP type
  *
  */ 
 /**
-  * optimal EAP method selected given profile and device
-  * @var EAP::constant
-  */
-  public $selected_eap;
+ * optimal EAP method selected given profile and device
+ * @var EAP::constant
+ */
+    public $selected_eap;
 /**
-  * the path to the profile signing program
-  * device modules which require signing should use this property to exec the signer
-  * the signer program must accept two arguments - input and output file names
-  * the signer program mus operate in the local directory and filenames are relative to this
-  * directory
-  *
-  *@var string
-  */
-  public $sign;
-  public $signer;
+     * the path to the profile signing program
+     * device modules which require signing should use this property to exec the signer
+     * the signer program must accept two arguments - input and output file names
+     * the signer program mus operate in the local directory and filenames are relative to this
+     * directory
+     *
+     *@var string
+     */
+    public $sign;
+    public $signer;
 /**
- * the string referencing the language (index ot the Config::$LANGUAGES array).
- * It is set to the current language and may be used by the device module to
- * set its language
- *
- *@var string
- */
-  public $lang_index;
-  /**
-   * The string identifier of the device (don't show this to users)
-   * @var string
-   */
-  public $device_id;
-
-  /**
-   * See devices-template.php for a list of available options
-   * @var array
-   */
-  public $options;
-
-  /**
-   * This string will be shown if no support email was configured by the admin
-   * 
-   * @var string 
-   */
-  public static $support_email_substitute;
-
-  /**
-   * This string will be shown if no support URL was configured by the admin
-   * 
-   * @var string 
-   */
-  public static $support_url_substitute;
-
-  /**
-   * This string should be used by all installer modules to set the 
-   * installer file basename.
-   *
-   * @var string 
-   */
-  public static $installerBasename;
+     * the string referencing the language (index ot the Config::$LANGUAGES array).
+     * It is set to the current language and may be used by the device module to
+     * set its language
+     *
+     *@var string
+     */
+    public $lang_index;
+    /**
+     * The string identifier of the device (don't show this to users)
+     * @var string
+     */
+    public $device_id;
+
+    /**
+     * See devices-template.php for a list of available options
+     * @var array
+     */
+    public $options;
+
+    /**
+     * This string will be shown if no support email was configured by the admin
+     * 
+     * @var string 
+     */
+    public static $support_email_substitute;
+
+    /**
+     * This string will be shown if no support URL was configured by the admin
+     * 
+     * @var string 
+     */
+    public static $support_url_substitute;
+
+    /**
+     * This string should be used by all installer modules to set the 
+     * installer file basename.
+     *
+     * @var string 
+     */
+    public static $installerBasename;
 }
\ No newline at end of file

core/UserAPI.php

Indentation +391 added lines, -391 removed lines

@@ -52,7 +52,7 @@ 
  *  link - the path name of the resulting installer
  *  mime - the mimetype of the installer
  */
-  public function generateInstaller($device,$prof_id, $generated_for = "user") {
+    public function generateInstaller($device,$prof_id, $generated_for = "user") {
     $this->set_locale("devices");
     $Dev = Devices::listDevices();
     $Config = $Dev[$device];
@@ -61,93 +61,93 @@ 
     $attribs = $profile->getCollapsedAttributes();
     // test if the profile is production-ready and if not if the authenticated user is an owner
     if (!isset($attribs['profile:production']) || (isset($attribs['profile:production']) && $attribs['profile:production'][0] != "on")) {
-       debug(4,"Attempt to download a non-production ready installer fir profile: $prof_id\n");
-       require_once(Config::$AUTHENTICATION['ssp-path-to-autoloader']);
-       $as = new SimpleSAML_Auth_Simple(Config::$AUTHENTICATION['ssp-authsource']);
-       if($as->isAuthenticated()) {
-          $user_object = new User($_SESSION['user']);
-          if($user_object->isIdPOwner($profile->institution)) {
-              debug(4, "User is the owner - allowing access\n");
-          } else {
-             debug(2, "User not an owner of a non-production profile - access forbidden\n");
-       header("HTTP/1.0 403 Not Authorized");
-             return;
-          }
-       } else {
-          debug(2, "User NOT authenticated, rejecting request for a non-production installer\n");
-          header("HTTP/1.0 403 Not Authorized");
-          return;
-       }
+        debug(4,"Attempt to download a non-production ready installer fir profile: $prof_id\n");
+        require_once(Config::$AUTHENTICATION['ssp-path-to-autoloader']);
+        $as = new SimpleSAML_Auth_Simple(Config::$AUTHENTICATION['ssp-authsource']);
+        if($as->isAuthenticated()) {
+            $user_object = new User($_SESSION['user']);
+            if($user_object->isIdPOwner($profile->institution)) {
+                debug(4, "User is the owner - allowing access\n");
+            } else {
+                debug(2, "User not an owner of a non-production profile - access forbidden\n");
+        header("HTTP/1.0 403 Not Authorized");
+                return;
+            }
+        } else {
+            debug(2, "User NOT authenticated, rejecting request for a non-production installer\n");
+            header("HTTP/1.0 403 Not Authorized");
+            return;
+        }
     }
     $a = [];
     $a['profile'] = $prof_id;
     $a['device'] = $device;
     if( (isset(Devices::$Options['no_cache']) && Devices::$Options['no_cache'] ) || ( isset($Config['options']['no_cache']) && $Config['options']['no_cache'] ))
-      $this->i_path = FALSE;
+        $this->i_path = FALSE;
     else {
-      $cache = $profile->testCache($device);
-      $this->i_path = $cache['cache'];
+        $cache = $profile->testCache($device);
+        $this->i_path = $cache['cache'];
     }
     if($this->i_path && is_file($this->i_path)) { 
-      debug(4,"Using cached installer for: $device\n");
-      $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
-      $a['mime'] = $cache['mime'];
+        debug(4,"Using cached installer for: $device\n");
+        $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
+        $a['mime'] = $cache['mime'];
     } else {
-      $factory = new DeviceFactory($device);
-      $dev = $factory->device;
-      if(isset($dev)) {
-         $dev->setup($profile);
-         $installer = $dev->writeInstaller();
-         $i_path = $dev->FPATH.'/tmp/'.$installer;
-         if($i_path && is_file($i_path)) {
-         if(isset($dev->options['mime']))
-               $a['mime'] = $dev->options['mime'];
-         else {
-           $info = new finfo();
-           $a['mime'] = $info->file($i_path, FILEINFO_MIME_TYPE);
-         }
-         $this->i_path = $dev->FPATH.'/'.$installer;
-         rename($i_path, $this->i_path);
-         $profile->updateCache($device,$this->i_path,$a['mime']);
+        $factory = new DeviceFactory($device);
+        $dev = $factory->device;
+        if(isset($dev)) {
+            $dev->setup($profile);
+            $installer = $dev->writeInstaller();
+            $i_path = $dev->FPATH.'/tmp/'.$installer;
+            if($i_path && is_file($i_path)) {
+            if(isset($dev->options['mime']))
+                $a['mime'] = $dev->options['mime'];
+            else {
+            $info = new finfo();
+            $a['mime'] = $info->file($i_path, FILEINFO_MIME_TYPE);
+            }
+            $this->i_path = $dev->FPATH.'/'.$installer;
+            rename($i_path, $this->i_path);
+            $profile->updateCache($device,$this->i_path,$a['mime']);
 //         rrmdir($dev->FPATH.'/tmp');
-         debug(4,"Generated installer: ".$this->i_path.": for: $device\n");
-         $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
-         } else {
-         debug(2,"Installer generation failed for: $prof_id:$device:".CAT::get_lang()."\n");
-         $a['link'] = 0;
-         }
-      } 
+            debug(4,"Generated installer: ".$this->i_path.": for: $device\n");
+            $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
+            } else {
+            debug(2,"Installer generation failed for: $prof_id:$device:".CAT::get_lang()."\n");
+            $a['link'] = 0;
+            }
+        } 
     }
     $this->set_locale("web_user");
     return($a);
- }
+    }
 
- /**
-  * interface to Devices::listDevices() 
-  */
- public function listDevices($show_hidden = 0) {
+    /**
+     * interface to Devices::listDevices() 
+     */
+    public function listDevices($show_hidden = 0) {
     $Dev = Devices::listDevices();
     $R = [];
     $ct = 0;
     if($show_hidden !== 0 && $show_hidden != 1)
-      return;
+        return;
     foreach ($Dev as $device => $D) {
-      if(isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0)
-         continue;
-      $ct ++;
-      if($this->version == 1)
-         $D['device'] = $device;
-      else
-         $D['device'] = $device;
-      $group = isset($D['group']) ? $D['group'] : 'other';
-      if (! isset($R[$group]))
-         $R[$group] = [];
-      $R[$group][$device] = $D;
-    }
-   return $R;
- }
-
- public function deviceInfo($device,$prof_id) {
+        if(isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0)
+            continue;
+        $ct ++;
+        if($this->version == 1)
+            $D['device'] = $device;
+        else
+            $D['device'] = $device;
+        $group = isset($D['group']) ? $D['group'] : 'other';
+        if (! isset($R[$group]))
+            $R[$group] = [];
+        $R[$group][$device] = $D;
+    }
+    return $R;
+    }
+
+    public function deviceInfo($device,$prof_id) {
     $this->set_locale("devices");
     $out = 0;
     $profile = new Profile($prof_id);
@@ -155,11 +155,11 @@ 
     $dev = $factory->device;
     if(isset($dev)) {
 //       $dev->setup($profile);
-       $out = $dev->writeDeviceInfo();
-   }
+        $out = $dev->writeDeviceInfo();
+    }
     $this->set_locale("web_user");
     echo $out;
- }
+    }
 
 /**
  * Prepare the support data for a given profile
@@ -173,23 +173,23 @@ 
  * - description
  * - devices - an array of device names and their statuses (for a given profile)
  */
- public function profileAttributes($prof_id) {
+    public function profileAttributes($prof_id) {
     $this->set_locale("devices");
-      $profile = new Profile($prof_id);
-      $attr = $profile->getCollapsedAttributes();
-      $a = [];
-      if(isset($attr['support:email']))
-         $a['local_email'] = $attr['support:email'][0];
-      if(isset($attr['support:phone']))
-         $a['local_phone'] = $attr['support:phone'][0];
-      if(isset($attr['support:url']))
-         $a['local_url'] = $attr['support:url'][0];
-      if(isset($attr['profile:description']))
-         $a['description'] = $attr['profile:description'][0];
-      $a['devices'] = $profile->listDevices();
-      $this->set_locale("web_user");
-      return($a);
- }
+        $profile = new Profile($prof_id);
+        $attr = $profile->getCollapsedAttributes();
+        $a = [];
+        if(isset($attr['support:email']))
+            $a['local_email'] = $attr['support:email'][0];
+        if(isset($attr['support:phone']))
+            $a['local_phone'] = $attr['support:phone'][0];
+        if(isset($attr['support:url']))
+            $a['local_url'] = $attr['support:url'][0];
+        if(isset($attr['profile:description']))
+            $a['description'] = $attr['profile:description'][0];
+        $a['devices'] = $profile->listDevices();
+        $this->set_locale("web_user");
+        return($a);
+    }
 
 /*
    this method needs to be used with care, it could give wrong results in some
@@ -201,13 +201,13 @@ 
     $file= $F['file'];
     $file = substr($file,strlen(dirname(__DIR__)));
     while(substr($file,0,1) == '/')
-       $file = substr($file,1);
+        $file = substr($file,1);
     $n = count(explode('/',$file));
     $out = $_SERVER['SCRIPT_NAME'];
     for ($i= 0; $i < $n; $i++)
-      $out = dirname($out);
+        $out = dirname($out);
     if ($out == '/')
-      $out = '';
+        $out = '';
     $s = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ? 'https' : 'http';
     $s .= '://'.$_SERVER['HTTP_HOST'] . $out;
     return $s;
@@ -215,29 +215,29 @@ 
 
 /* JSON functions */
 
-  public function return_json($data,$status=1) {
-     $return_array = [];
-     $return_array['status'] = $status;
-     $return_array['data'] = $data;
-     $return_array['tou'] =  "Please consult Terms of Use at: ".$this->GetRootURL()."/tou.php";
-     return(json_encode($return_array));
-  }
+    public function return_json($data,$status=1) {
+        $return_array = [];
+        $return_array['status'] = $status;
+        $return_array['data'] = $data;
+        $return_array['tou'] =  "Please consult Terms of Use at: ".$this->GetRootURL()."/tou.php";
+        return(json_encode($return_array));
+    }
 
 /**
-  * Return the list of supported languages.
-  *
-  * 
-  */
-  public function JSON_listLanguages() {
-     $return_array = [];
-     foreach(Config::$LANGUAGES as $id => $val){
-       if($this->version == 1)
-          $return_array[] = ['id'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
-       else
-          $return_array[] = ['lang'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
-     }
-     echo $this->return_json($return_array);
-  }
+ * Return the list of supported languages.
+ *
+ * 
+ */
+    public function JSON_listLanguages() {
+        $return_array = [];
+        foreach(Config::$LANGUAGES as $id => $val){
+        if($this->version == 1)
+            $return_array[] = ['id'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
+        else
+            $return_array[] = ['lang'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * Return the list of countiers with configured IdPs
@@ -245,17 +245,17 @@ 
  * @return string JSON encoded data
  */
 
-  public function JSON_listCountries() {
-     $FED = $this->printCountryList(1);
-     $return_array = [];
-     foreach ($FED as $id => $val) {
-       if($this->version == 1)
-          $return_array[] = ['id'=>$id,'display'=>$val];
-       else
-          $return_array[] = ['federation'=>$id,'display'=>$val];
-     }
-     echo $this->return_json($return_array);
-  }
+    public function JSON_listCountries() {
+        $FED = $this->printCountryList(1);
+        $return_array = [];
+        foreach ($FED as $id => $val) {
+        if($this->version == 1)
+            $return_array[] = ['id'=>$id,'display'=>$val];
+        else
+            $return_array[] = ['federation'=>$id,'display'=>$val];
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * Return the list of IdPs in a given country
@@ -264,17 +264,17 @@ 
  * @return string JSON encoded data
  */
 
-  public function JSON_listIdentityProviders($country) {
-     $idps = Federation::listAllIdentityProviders(1,$country);
-     $return_array = [];
-     foreach ($idps as $idp) {
+    public function JSON_listIdentityProviders($country) {
+        $idps = Federation::listAllIdentityProviders(1,$country);
+        $return_array = [];
+        foreach ($idps as $idp) {
         if($this->version == 1)
-           $return_array[] = ['id'=>$idp['entityID'],'display'=>$idp['title']];
+            $return_array[] = ['id'=>$idp['entityID'],'display'=>$idp['title']];
         else
-           $return_array[] = ['idp'=>$idp['entityID'],'display'=>$idp['title']];
-     }
-     echo $this->return_json($return_array);
-  }
+            $return_array[] = ['idp'=>$idp['entityID'],'display'=>$idp['title']];
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * return the list of all active IdPs
@@ -283,18 +283,18 @@ 
  * @return string JSON encoded data
  */
 
-  public function JSON_listIdentityProvidersForDisco() {
-     $idps = Federation::listAllIdentityProviders(1);
-     $return_array = [];
-     foreach ($idps as $idp) {
+    public function JSON_listIdentityProvidersForDisco() {
+        $idps = Federation::listAllIdentityProviders(1);
+        $return_array = [];
+        foreach ($idps as $idp) {
         if($this->version == 1)
-           $idp['id'] = $idp['entityID'];
-         else
-           $idp['idp'] = $idp['entityID'];
+            $idp['id'] = $idp['entityID'];
+            else
+            $idp['idp'] = $idp['entityID'];
         $return_array[] = $idp;
-      }
-     echo json_encode($return_array);
-  }
+        }
+        echo json_encode($return_array);
+    }
 
 
 
@@ -306,17 +306,17 @@ 
  */
 
 
-  public function JSON_orderIdentityProviders($country,$L=NULL) {
-     $idps = $this->orderIdentityProviders($country,$L);
-     $return_array = [];
-     foreach ($idps as $idp) {
+    public function JSON_orderIdentityProviders($country,$L=NULL) {
+        $idps = $this->orderIdentityProviders($country,$L);
+        $return_array = [];
+        foreach ($idps as $idp) {
         if($this->version == 1)
-           $return_array[] = ['id'=>$idp['id'],'display'=>$idp['title']];
+            $return_array[] = ['id'=>$idp['id'],'display'=>$idp['title']];
         else
-           $return_array[] = ['idp'=>$idp['id'],'display'=>$idp['title']];
-     }
-     echo $this->return_json($return_array);
-  }
+            $return_array[] = ['idp'=>$idp['id'],'display'=>$idp['title']];
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * Produce a list of profiles available for a given IdP
@@ -324,31 +324,31 @@ 
  * @param int $idp_id the IdP identifier
  * @return string JSON encoded data
  */
-  public function JSON_listProfiles($idp_id,$sort = 0) {
-     $this->set_locale("web_user");
-     $return_array = [];
-     try {     
-         $idp = new IdP($idp_id);
-     }
-     catch (Exception $fail) {
+    public function JSON_listProfiles($idp_id,$sort = 0) {
+        $this->set_locale("web_user");
+        $return_array = [];
+        try {     
+            $idp = new IdP($idp_id);
+        }
+        catch (Exception $fail) {
         echo $this->return_json($return_array,0);
         return;
-     }
-     $l = 0;
-     $logo = $idp->getAttributes('general:logo_file');
-     if($logo)
-       $l = 1;
-     $profiles = $idp->listProfiles(1);
-     if($sort == 1)
+        }
+        $l = 0;
+        $logo = $idp->getAttributes('general:logo_file');
+        if($logo)
+        $l = 1;
+        $profiles = $idp->listProfiles(1);
+        if($sort == 1)
         usort($profiles,"profile_sort");
-     foreach ($profiles as $P) {
-       if($this->version == 1)
-          $return_array[] = ['id'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
-       else
-          $return_array[] = ['profile'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
-     }
-     echo $this->return_json($return_array);
-  }
+        foreach ($profiles as $P) {
+        if($this->version == 1)
+            $return_array[] = ['id'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
+        else
+            $return_array[] = ['profile'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * Return the list of devices available for the given profile
@@ -356,34 +356,34 @@ 
  * @param int $profile_id the Profile identifier
  * @return string JSON encoded data
  */
-  public function JSON_listDevices($profile_id) {
-     $this->set_locale("web_user");
-     $return_array = [];
-     $a = $this->profileAttributes($profile_id);
-     $thedevices = $a['devices'];
-     if(!isset($profile_redirect) || ! $profile_redirect) {
-         $profile_redirect = 0;
-         foreach ($thedevices as $D) {
-              if(isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden'])
-                   continue;
-              $disp = $D['display'];
-              if($this->version == 1) {
-                 if($D['id'] === '0') {
-                     $profile_redirect = 1;
-                     $disp = $c;
-                 }
+    public function JSON_listDevices($profile_id) {
+        $this->set_locale("web_user");
+        $return_array = [];
+        $a = $this->profileAttributes($profile_id);
+        $thedevices = $a['devices'];
+        if(!isset($profile_redirect) || ! $profile_redirect) {
+            $profile_redirect = 0;
+            foreach ($thedevices as $D) {
+                if(isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden'])
+                    continue;
+                $disp = $D['display'];
+                if($this->version == 1) {
+                    if($D['id'] === '0') {
+                        $profile_redirect = 1;
+                        $disp = $c;
+                    }
                 $return_array[] = ['id'=>$D['id'], 'display'=>$disp, 'status'=>$D['status'], 'redirect'=>$D['redirect']];
-             } else {
-                 if($D['device'] === '0') {
-                     $profile_redirect = 1;
-                     $disp = $c;
-                 }
+                } else {
+                    if($D['device'] === '0') {
+                        $profile_redirect = 1;
+                        $disp = $c;
+                    }
                 $return_array[] = ['device'=>$D['id'], 'display'=>$disp, 'status'=>$D['status'], 'redirect'=>$D['redirect']];
-             }
-         }
+                }
+            }
 
-  }
-  echo $this->return_json($return_array);
+    }
+    echo $this->return_json($return_array);
 }
   
 /**
@@ -393,7 +393,7 @@ 
  * @param int $prof_id profile identifier
  * @return string JSON encoded data
  */
-  public function JSON_generateInstaller($device,$prof_id) {
+    public function JSON_generateInstaller($device,$prof_id) {
     debug(4,"JSON::generateInstaller arguments: $device,$prof_id\n");
     $o = $this->generateInstaller($device,$prof_id);
     debug(4,"output from GUI::generateInstaller:");
@@ -401,7 +401,7 @@ 
     debug(4,json_encode($o));
 //    header('Content-type: application/json; utf-8');
     echo $this->return_json($o);
- }
+    }
 
 /**
  * Generate and send the installer
@@ -411,14 +411,14 @@ 
  * @return binary installerFile
  */
 
- public function downloadInstaller($device,$prof_id,$generated_for='user') {
+    public function downloadInstaller($device,$prof_id,$generated_for='user') {
     debug(4,"downloadInstaller arguments: $device,$prof_id,$generated_for\n");
     $o = $this->generateInstaller($device,$prof_id);
     debug(4,"output from GUI::generateInstaller:");
     debug(4,$o);
     if(! $o['link']) {
-       header("HTTP/1.0 404 Not Found");
-       return;
+        header("HTTP/1.0 404 Not Found");
+        return;
     }
     $profile = new Profile($prof_id);
     $profile->incrementDownloadStats($device, $generated_for);
@@ -431,242 +431,242 @@ 
     ob_clean();
     flush();
     readfile($file);
- }
+    }
 /**
- * Get and prepare logo file 
- *
- * When called for DiscoJuice, first check if file cache exists
- * If not then generate the file and save it in the cache
- * @param int $idp_id IdP identifier
- * @param int $disco flag turning on image generation for DiscoJuice
- * @param int $width, $height  maximum width and height of the generated image 
- * if one of these is 0 then it is treated as no upper bound
- *
- */
+     * Get and prepare logo file 
+     *
+     * When called for DiscoJuice, first check if file cache exists
+     * If not then generate the file and save it in the cache
+     * @param int $idp_id IdP identifier
+     * @param int $disco flag turning on image generation for DiscoJuice
+     * @param int $width, $height  maximum width and height of the generated image 
+     * if one of these is 0 then it is treated as no upper bound
+     *
+     */
+
+    public function sendLogo($idp_id, $disco=FALSE, $width=0, $height=0) {
+    $ExpStr = '';
+    $resize = 0;
+    if(($width || $height) && is_numeric($width) && is_numeric($height)) {
+        $resize = 1;
+        if($height == 0)
+            $height = 10000;
+        if($width == 0)
+            $width = 10000;
+        $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
+    } elseif($disco == 1) {
+        $width = 120;
+        $height = 40;
+        $resize = 1;
+        $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
+    }
 
- public function sendLogo($idp_id, $disco=FALSE, $width=0, $height=0) {
-   $ExpStr = '';
-   $resize = 0;
-   if(($width || $height) && is_numeric($width) && is_numeric($height)) {
-       $resize = 1;
-       if($height == 0)
-          $height = 10000;
-       if($width == 0)
-          $width = 10000;
-       $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
-   } elseif($disco == 1) {
-       $width = 120;
-       $height = 40;
-       $resize = 1;
-       $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
-   }
-
-   if($resize && is_file($logo_file)){
-      debug(4,"Using cached logo $logo_file for: $idp_id\n");
-      $blob = file_get_contents($logo_file);
-      $filetype = 'image/png';
-   }
-   else {
-      $idp = new IdP($idp_id);
-      $at = $idp->getAttributes('general:logo_file');
-      $blob =  $at[0]['value'];
-      $info = new finfo();
-      $filetype = $info->buffer($blob, FILEINFO_MIME_TYPE);
-      $offset = 60 * 60 * 24 * 30;
-      $ExpStr = "Expires: " . gmdate( "D, d M Y H:i:s", time() + $offset ) . " GMT";
-      if($resize) {
-         $filetype = 'image/png';
-         $image = new Imagick();
-         $image->readImageBlob($blob);
-         if( $image->setImageFormat('PNG')) {
-           $image->thumbnailImage($width,$height,1);
-           $blob = $image->getImageBlob();
-           debug(4,"Writing cached logo $logo_file for: $idp_id\n");
-           file_put_contents($logo_file,$blob);
-         }
-         else
-           $blob = "XXXXXX";
-      }
-   }
-   header( "Content-type: ".$filetype );
-   header( "Cache-Control:max-age=36000, must-revalidate" );
-   header( $ExpStr );
-   echo $blob;
- }
-
- public function locateUser() {
-   $host = $_SERVER['REMOTE_ADDR'];
-   $record = geoip_record_by_name($host);
-   if($record) {
-     $result = ['status' => 'ok'];
-     $result['country'] = $record['country_code'];
+    if($resize && is_file($logo_file)){
+        debug(4,"Using cached logo $logo_file for: $idp_id\n");
+        $blob = file_get_contents($logo_file);
+        $filetype = 'image/png';
+    }
+    else {
+        $idp = new IdP($idp_id);
+        $at = $idp->getAttributes('general:logo_file');
+        $blob =  $at[0]['value'];
+        $info = new finfo();
+        $filetype = $info->buffer($blob, FILEINFO_MIME_TYPE);
+        $offset = 60 * 60 * 24 * 30;
+        $ExpStr = "Expires: " . gmdate( "D, d M Y H:i:s", time() + $offset ) . " GMT";
+        if($resize) {
+            $filetype = 'image/png';
+            $image = new Imagick();
+            $image->readImageBlob($blob);
+            if( $image->setImageFormat('PNG')) {
+            $image->thumbnailImage($width,$height,1);
+            $blob = $image->getImageBlob();
+            debug(4,"Writing cached logo $logo_file for: $idp_id\n");
+            file_put_contents($logo_file,$blob);
+            }
+            else
+            $blob = "XXXXXX";
+        }
+    }
+    header( "Content-type: ".$filetype );
+    header( "Cache-Control:max-age=36000, must-revalidate" );
+    header( $ExpStr );
+    echo $blob;
+    }
+
+    public function locateUser() {
+    $host = $_SERVER['REMOTE_ADDR'];
+    $record = geoip_record_by_name($host);
+    if($record) {
+        $result = ['status' => 'ok'];
+        $result['country'] = $record['country_code'];
 //  the two lines below are a dirty hack to take of the error in naming the UK federation
-     if($result['country'] == 'GB')
-         $result['country'] = 'UK';
-     $result['region'] = $record['region'];
-     $result['geo'] = ['lat' => (float)$record['latitude'] , 'lon' => (float)$record['longitude']];
-   } else {
-     $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
-   }
-   return($result);
- }
-
-
- public function locateUser2() {
-   require_once Config::$GEOIP['geoip2-path-to-autoloader'];
-   $reader = new Reader(Config::$GEOIP['geoip2-path-to-db']);
-   $host = $_SERVER['REMOTE_ADDR'];
-   try {
-      $record = $reader->city($host);
-   } catch (Exception $e) {
-      $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
-      return($result);
-   }
-   $result = ['status' => 'ok'];
-   $result['country'] = $record->country->isoCode;
+        if($result['country'] == 'GB')
+            $result['country'] = 'UK';
+        $result['region'] = $record['region'];
+        $result['geo'] = ['lat' => (float)$record['latitude'] , 'lon' => (float)$record['longitude']];
+    } else {
+        $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
+    }
+    return($result);
+    }
+
+
+    public function locateUser2() {
+    require_once Config::$GEOIP['geoip2-path-to-autoloader'];
+    $reader = new Reader(Config::$GEOIP['geoip2-path-to-db']);
+    $host = $_SERVER['REMOTE_ADDR'];
+    try {
+        $record = $reader->city($host);
+    } catch (Exception $e) {
+        $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
+        return($result);
+    }
+    $result = ['status' => 'ok'];
+    $result['country'] = $record->country->isoCode;
 //  the two lines below are a dirty hack to take of the error in naming the UK federation
-   if($result['country'] == 'GB')
-       $result['country'] = 'UK';
-   $result['region'] = $record->continent->name;
+    if($result['country'] == 'GB')
+        $result['country'] = 'UK';
+    $result['region'] = $record->continent->name;
 
-   $result['geo'] = ['lat' => (float)$record->location->latitude , 'lon' => (float)$record->location->longitude];
-   return($result);
- }
+    $result['geo'] = ['lat' => (float)$record->location->latitude , 'lon' => (float)$record->location->longitude];
+    return($result);
+    }
 
 public function JSON_locateUser() {
     header('Content-type: application/json; utf-8');
    
     if(empty(Config::$GEOIP['version']) || Config::$GEOIP['version'] == 0)
-      echo json_encode(['status' => 'error', 'error' =>'Geolocation not supported']);
+        echo json_encode(['status' => 'error', 'error' =>'Geolocation not supported']);
     if(Config::$GEOIP['version'] == 1)
-      echo json_encode($this->locateUser());
+        echo json_encode($this->locateUser());
     if(Config::$GEOIP['version'] == 2)
-      echo json_encode($this->locateUser2());
+        echo json_encode($this->locateUser2());
 }
 
 /**
  * Produce support data prepared within {@link GUI::profileAttributes()}
  * @return string JSON encoded data
  */
-  public function JSON_profileAttributes($prof_id) {
+    public function JSON_profileAttributes($prof_id) {
 //    header('Content-type: application/json; utf-8');
     echo $this->return_json($this->profileAttributes($prof_id));
-  }
+    }
 
 /**
-  * Calculate the distence in km between two points given their
-  * geo coordinates.
-  * @param array $P1 - first point as an 'lat', 'lon' array 
-  * @param array $P2 - second point as an 'lat', 'lon' array 
-  * @return float distance in km
-  */
+ * Calculate the distence in km between two points given their
+ * geo coordinates.
+ * @param array $P1 - first point as an 'lat', 'lon' array 
+ * @param array $P2 - second point as an 'lat', 'lon' array 
+ * @return float distance in km
+ */
 private function geoDistance($P1,$P2) {
 
-  $dist = sin(deg2rad($P1['lat'])) * sin(deg2rad($P2['lat'])) +  
+    $dist = sin(deg2rad($P1['lat'])) * sin(deg2rad($P2['lat'])) +  
          cos(deg2rad($P1['lat'])) * cos(deg2rad($P2['lat'])) * cos(deg2rad($P1['lon'] - $P2['lon']));
-  $dist = rad2deg(acos($dist)) * 60 * 1.1852 ;
-  return(round($dist));
+    $dist = rad2deg(acos($dist)) * 60 * 1.1852 ;
+    return(round($dist));
 }
 
 /**
-  * Order active identity providers according to their distance and name
-  * @param array $L - current location
-  * @return array $IdPs -  list of arrays ('id', 'name');
-  */
+ * Order active identity providers according to their distance and name
+ * @param array $L - current location
+ * @return array $IdPs -  list of arrays ('id', 'name');
+ */
 
 public function orderIdentityProviders($country,$L=NULL) {
-     $idps = Federation::listAllIdentityProviders(1,$country);
-
-  if(is_null($L)) {
-     $U = $this->locateUser();
-     if($U['status'] == 'ok') {
-     $L = $U['geo'];
-     } else {
-       $L = ['lat'=>"90",'lon'=>"0"];
-     }
-  }
-  $T=[];
-  $R=[];
-     foreach ($idps as $idp) {
+        $idps = Federation::listAllIdentityProviders(1,$country);
+
+    if(is_null($L)) {
+        $U = $this->locateUser();
+        if($U['status'] == 'ok') {
+        $L = $U['geo'];
+        } else {
+        $L = ['lat'=>"90",'lon'=>"0"];
+        }
+    }
+    $T=[];
+    $R=[];
+        foreach ($idps as $idp) {
         $T[$idp['entityID']] = $idp['title'];
         $dist = 10000;
         if(isset($idp['geo'])) {
-          $G=$idp['geo'];
-          if(isset($G['lon'])) {
-             $d1 = $this->geoDistance($L,$G); 
-             if( $d1 < $dist)
+            $G=$idp['geo'];
+            if(isset($G['lon'])) {
+                $d1 = $this->geoDistance($L,$G); 
+                if( $d1 < $dist)
                 $dist = $d1;
-          } else {
+            } else {
             foreach ($G as $g) {
-             $d1 = $this->geoDistance($L,$g); 
-             if( $d1 < $dist)
+                $d1 = $this->geoDistance($L,$g); 
+                if( $d1 < $dist)
                 $dist = $d1;
             }
-          }
+            }
         }
-       if($dist > 100)
-         $dist=10000;
-      $d = sprintf("%06d",$dist);
-      $R[$idp['entityID']] = $d." ".$idp['title'];
-     }
-     asort($R);
-     foreach (array_keys($R) as $r) {
-      if($this->version == 1)
-         $outarray[] = ['id'=>$r, 'title'=>$T[$r]];
-      else
-         $outarray[] = ['idp'=>$r, 'title'=>$T[$r]];
-      }
-     return($outarray);
+        if($dist > 100)
+            $dist=10000;
+        $d = sprintf("%06d",$dist);
+        $R[$idp['entityID']] = $d." ".$idp['title'];
+        }
+        asort($R);
+        foreach (array_keys($R) as $r) {
+        if($this->version == 1)
+            $outarray[] = ['id'=>$r, 'title'=>$T[$r]];
+        else
+            $outarray[] = ['idp'=>$r, 'title'=>$T[$r]];
+        }
+        return($outarray);
 }
 
 /**
-  * Detect the best device driver form the browser
-  *
-  * Detects the operating system and returns its id 
-  * display name and group membership (as in devices.php)
-  * @return array indexed by 'id', 'display', 'group'
-  */
+ * Detect the best device driver form the browser
+ *
+ * Detects the operating system and returns its id 
+ * display name and group membership (as in devices.php)
+ * @return array indexed by 'id', 'display', 'group'
+ */
 
 public function detectOS() {
-   $Dev = Devices::listDevices();
-   if( isset($_REQUEST['device']) && isset($Dev[$_REQUEST['device']]) && (!isset($device['options']['hidden']) || $device['options']['hidden'] == 0)) {
-      $dev_id = $_REQUEST['device'];
-      $device = $Dev[$dev_id];
-      if($this->version == 1)
-         return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
-      else
-         return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
-   }
-   $browser = $_SERVER['HTTP_USER_AGENT'];
-   debug(4,"HTTP_USER_AGENT=$browser\n");
-   foreach ($Dev as $dev_id => $device) {
-     if(!isset($device['match']))
+    $Dev = Devices::listDevices();
+    if( isset($_REQUEST['device']) && isset($Dev[$_REQUEST['device']]) && (!isset($device['options']['hidden']) || $device['options']['hidden'] == 0)) {
+        $dev_id = $_REQUEST['device'];
+        $device = $Dev[$dev_id];
+        if($this->version == 1)
+            return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+        else
+            return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+    }
+    $browser = $_SERVER['HTTP_USER_AGENT'];
+    debug(4,"HTTP_USER_AGENT=$browser\n");
+    foreach ($Dev as $dev_id => $device) {
+        if(!isset($device['match']))
         continue;
-     if(preg_match('/'.$device['match'].'/',$browser)) {
-       if(!isset($device['options']['hidden']) || $device['options']['hidden'] == 0) {
-          debug(4,"Browser_id: $dev_id\n");
-          if($this->version == 1)
-             return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
-          else
-             return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
-       }
-       else {
-         debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
-         return(false);
-       }
-     }
-   }
-   debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
-   return(false);
+        if(preg_match('/'.$device['match'].'/',$browser)) {
+        if(!isset($device['options']['hidden']) || $device['options']['hidden'] == 0) {
+            debug(4,"Browser_id: $dev_id\n");
+            if($this->version == 1)
+                return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+            else
+                return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+        }
+        else {
+            debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
+            return(false);
+        }
+        }
+    }
+    debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
+    return(false);
 }
 
 public function JSON_detectOS() {
-     $return_array=$this->detectOS();
-     if($return_array)
+        $return_array=$this->detectOS();
+        if($return_array)
         $status = 1;
-     else
+        else
         $status = 0;
-     echo $this->return_json($return_array,$status);
+        echo $this->return_json($return_array,$status);
 }
 
 
@@ -676,5 +676,5 @@ 
   
 }
 function profile_sort($P1,$P2) {
-   return strcasecmp($P1->name, $P2->name);
+    return strcasecmp($P1->name, $P2->name);
 } 
\ No newline at end of file

Spacing +150 added lines, -150 removed lines

@@ -52,21 +52,21 @@ 
  *  link - the path name of the resulting installer
  *  mime - the mimetype of the installer
  */
-  public function generateInstaller($device,$prof_id, $generated_for = "user") {
+  public function generateInstaller($device, $prof_id, $generated_for = "user") {
     $this->set_locale("devices");
     $Dev = Devices::listDevices();
     $Config = $Dev[$device];
-    debug(4,"installer:$device:$prof_id\n");
+    debug(4, "installer:$device:$prof_id\n");
     $profile = new Profile($prof_id);
     $attribs = $profile->getCollapsedAttributes();
     // test if the profile is production-ready and if not if the authenticated user is an owner
     if (!isset($attribs['profile:production']) || (isset($attribs['profile:production']) && $attribs['profile:production'][0] != "on")) {
-       debug(4,"Attempt to download a non-production ready installer fir profile: $prof_id\n");
+       debug(4, "Attempt to download a non-production ready installer fir profile: $prof_id\n");
        require_once(Config::$AUTHENTICATION['ssp-path-to-autoloader']);
        $as = new SimpleSAML_Auth_Simple(Config::$AUTHENTICATION['ssp-authsource']);
-       if($as->isAuthenticated()) {
+       if ($as->isAuthenticated()) {
           $user_object = new User($_SESSION['user']);
-          if($user_object->isIdPOwner($profile->institution)) {
+          if ($user_object->isIdPOwner($profile->institution)) {
               debug(4, "User is the owner - allowing access\n");
           } else {
              debug(2, "User not an owner of a non-production profile - access forbidden\n");
@@ -82,38 +82,38 @@ 
     $a = [];
     $a['profile'] = $prof_id;
     $a['device'] = $device;
-    if( (isset(Devices::$Options['no_cache']) && Devices::$Options['no_cache'] ) || ( isset($Config['options']['no_cache']) && $Config['options']['no_cache'] ))
+    if ((isset(Devices::$Options['no_cache']) && Devices::$Options['no_cache']) || (isset($Config['options']['no_cache']) && $Config['options']['no_cache']))
       $this->i_path = FALSE;
     else {
       $cache = $profile->testCache($device);
       $this->i_path = $cache['cache'];
     }
-    if($this->i_path && is_file($this->i_path)) { 
-      debug(4,"Using cached installer for: $device\n");
-      $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
+    if ($this->i_path && is_file($this->i_path)) { 
+      debug(4, "Using cached installer for: $device\n");
+      $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=" . CAT::get_lang() . "&profile=$prof_id&device=$device&generatedfor=$generated_for";
       $a['mime'] = $cache['mime'];
     } else {
       $factory = new DeviceFactory($device);
       $dev = $factory->device;
-      if(isset($dev)) {
+      if (isset($dev)) {
          $dev->setup($profile);
          $installer = $dev->writeInstaller();
-         $i_path = $dev->FPATH.'/tmp/'.$installer;
-         if($i_path && is_file($i_path)) {
-         if(isset($dev->options['mime']))
+         $i_path = $dev->FPATH . '/tmp/' . $installer;
+         if ($i_path && is_file($i_path)) {
+         if (isset($dev->options['mime']))
                $a['mime'] = $dev->options['mime'];
          else {
            $info = new finfo();
            $a['mime'] = $info->file($i_path, FILEINFO_MIME_TYPE);
          }
-         $this->i_path = $dev->FPATH.'/'.$installer;
+         $this->i_path = $dev->FPATH . '/' . $installer;
          rename($i_path, $this->i_path);
-         $profile->updateCache($device,$this->i_path,$a['mime']);
+         $profile->updateCache($device, $this->i_path, $a['mime']);
 //         rrmdir($dev->FPATH.'/tmp');
-         debug(4,"Generated installer: ".$this->i_path.": for: $device\n");
-         $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
+         debug(4, "Generated installer: " . $this->i_path . ": for: $device\n");
+         $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=" . CAT::get_lang() . "&profile=$prof_id&device=$device&generatedfor=$generated_for";
          } else {
-         debug(2,"Installer generation failed for: $prof_id:$device:".CAT::get_lang()."\n");
+         debug(2, "Installer generation failed for: $prof_id:$device:" . CAT::get_lang() . "\n");
          $a['link'] = 0;
          }
       } 
@@ -129,31 +129,31 @@ 
     $Dev = Devices::listDevices();
     $R = [];
     $ct = 0;
-    if($show_hidden !== 0 && $show_hidden != 1)
+    if ($show_hidden !== 0 && $show_hidden != 1)
       return;
     foreach ($Dev as $device => $D) {
-      if(isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0)
+      if (isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0)
          continue;
-      $ct ++;
-      if($this->version == 1)
+      $ct++;
+      if ($this->version == 1)
          $D['device'] = $device;
       else
          $D['device'] = $device;
       $group = isset($D['group']) ? $D['group'] : 'other';
-      if (! isset($R[$group]))
+      if (!isset($R[$group]))
          $R[$group] = [];
       $R[$group][$device] = $D;
     }
    return $R;
  }
 
- public function deviceInfo($device,$prof_id) {
+ public function deviceInfo($device, $prof_id) {
     $this->set_locale("devices");
     $out = 0;
     $profile = new Profile($prof_id);
     $factory = new DeviceFactory($device);
     $dev = $factory->device;
-    if(isset($dev)) {
+    if (isset($dev)) {
 //       $dev->setup($profile);
        $out = $dev->writeDeviceInfo();
    }
@@ -178,13 +178,13 @@ 
       $profile = new Profile($prof_id);
       $attr = $profile->getCollapsedAttributes();
       $a = [];
-      if(isset($attr['support:email']))
+      if (isset($attr['support:email']))
          $a['local_email'] = $attr['support:email'][0];
-      if(isset($attr['support:phone']))
+      if (isset($attr['support:phone']))
          $a['local_phone'] = $attr['support:phone'][0];
-      if(isset($attr['support:url']))
+      if (isset($attr['support:url']))
          $a['local_url'] = $attr['support:url'][0];
-      if(isset($attr['profile:description']))
+      if (isset($attr['profile:description']))
          $a['description'] = $attr['profile:description'][0];
       $a['devices'] = $profile->listDevices();
       $this->set_locale("web_user");
@@ -196,30 +196,30 @@ 
    cicumstances
 */
 private function GetRootURL() {
-    $backtrace =  debug_backtrace();
+    $backtrace = debug_backtrace();
     $F = array_pop($backtrace);
-    $file= $F['file'];
-    $file = substr($file,strlen(dirname(__DIR__)));
-    while(substr($file,0,1) == '/')
-       $file = substr($file,1);
-    $n = count(explode('/',$file));
+    $file = $F['file'];
+    $file = substr($file, strlen(dirname(__DIR__)));
+    while (substr($file, 0, 1) == '/')
+       $file = substr($file, 1);
+    $n = count(explode('/', $file));
     $out = $_SERVER['SCRIPT_NAME'];
-    for ($i= 0; $i < $n; $i++)
+    for ($i = 0; $i < $n; $i++)
       $out = dirname($out);
     if ($out == '/')
       $out = '';
     $s = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ? 'https' : 'http';
-    $s .= '://'.$_SERVER['HTTP_HOST'] . $out;
+    $s .= '://' . $_SERVER['HTTP_HOST'] . $out;
     return $s;
 }
 
 /* JSON functions */
 
-  public function return_json($data,$status=1) {
+  public function return_json($data, $status = 1) {
      $return_array = [];
      $return_array['status'] = $status;
      $return_array['data'] = $data;
-     $return_array['tou'] =  "Please consult Terms of Use at: ".$this->GetRootURL()."/tou.php";
+     $return_array['tou'] = "Please consult Terms of Use at: " . $this->GetRootURL() . "/tou.php";
      return(json_encode($return_array));
   }
 
@@ -230,11 +230,11 @@ 
   */
   public function JSON_listLanguages() {
      $return_array = [];
-     foreach(Config::$LANGUAGES as $id => $val){
-       if($this->version == 1)
-          $return_array[] = ['id'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
+     foreach (Config::$LANGUAGES as $id => $val) {
+       if ($this->version == 1)
+          $return_array[] = ['id'=>$id, 'display'=>$val['display'], 'locale'=>$val['locale']];
        else
-          $return_array[] = ['lang'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
+          $return_array[] = ['lang'=>$id, 'display'=>$val['display'], 'locale'=>$val['locale']];
      }
      echo $this->return_json($return_array);
   }
@@ -249,10 +249,10 @@ 
      $FED = $this->printCountryList(1);
      $return_array = [];
      foreach ($FED as $id => $val) {
-       if($this->version == 1)
-          $return_array[] = ['id'=>$id,'display'=>$val];
+       if ($this->version == 1)
+          $return_array[] = ['id'=>$id, 'display'=>$val];
        else
-          $return_array[] = ['federation'=>$id,'display'=>$val];
+          $return_array[] = ['federation'=>$id, 'display'=>$val];
      }
      echo $this->return_json($return_array);
   }
@@ -265,13 +265,13 @@ 
  */
 
   public function JSON_listIdentityProviders($country) {
-     $idps = Federation::listAllIdentityProviders(1,$country);
+     $idps = Federation::listAllIdentityProviders(1, $country);
      $return_array = [];
      foreach ($idps as $idp) {
-        if($this->version == 1)
-           $return_array[] = ['id'=>$idp['entityID'],'display'=>$idp['title']];
+        if ($this->version == 1)
+           $return_array[] = ['id'=>$idp['entityID'], 'display'=>$idp['title']];
         else
-           $return_array[] = ['idp'=>$idp['entityID'],'display'=>$idp['title']];
+           $return_array[] = ['idp'=>$idp['entityID'], 'display'=>$idp['title']];
      }
      echo $this->return_json($return_array);
   }
@@ -287,7 +287,7 @@ 
      $idps = Federation::listAllIdentityProviders(1);
      $return_array = [];
      foreach ($idps as $idp) {
-        if($this->version == 1)
+        if ($this->version == 1)
            $idp['id'] = $idp['entityID'];
          else
            $idp['idp'] = $idp['entityID'];
@@ -306,14 +306,14 @@ 
  */
 
 
-  public function JSON_orderIdentityProviders($country,$L=NULL) {
-     $idps = $this->orderIdentityProviders($country,$L);
+  public function JSON_orderIdentityProviders($country, $L = NULL) {
+     $idps = $this->orderIdentityProviders($country, $L);
      $return_array = [];
      foreach ($idps as $idp) {
-        if($this->version == 1)
-           $return_array[] = ['id'=>$idp['id'],'display'=>$idp['title']];
+        if ($this->version == 1)
+           $return_array[] = ['id'=>$idp['id'], 'display'=>$idp['title']];
         else
-           $return_array[] = ['idp'=>$idp['id'],'display'=>$idp['title']];
+           $return_array[] = ['idp'=>$idp['id'], 'display'=>$idp['title']];
      }
      echo $this->return_json($return_array);
   }
@@ -324,28 +324,28 @@ 
  * @param int $idp_id the IdP identifier
  * @return string JSON encoded data
  */
-  public function JSON_listProfiles($idp_id,$sort = 0) {
+  public function JSON_listProfiles($idp_id, $sort = 0) {
      $this->set_locale("web_user");
      $return_array = [];
      try {     
          $idp = new IdP($idp_id);
      }
      catch (Exception $fail) {
-        echo $this->return_json($return_array,0);
+        echo $this->return_json($return_array, 0);
         return;
      }
      $l = 0;
      $logo = $idp->getAttributes('general:logo_file');
-     if($logo)
+     if ($logo)
        $l = 1;
      $profiles = $idp->listProfiles(1);
-     if($sort == 1)
-        usort($profiles,"profile_sort");
+     if ($sort == 1)
+        usort($profiles, "profile_sort");
      foreach ($profiles as $P) {
-       if($this->version == 1)
-          $return_array[] = ['id'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
+       if ($this->version == 1)
+          $return_array[] = ['id'=>$P->identifier, 'display'=>$P->name, 'idp_name'=>$P->inst_name, 'logo'=>$l]; 
        else
-          $return_array[] = ['profile'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
+          $return_array[] = ['profile'=>$P->identifier, 'display'=>$P->name, 'idp_name'=>$P->inst_name, 'logo'=>$l]; 
      }
      echo $this->return_json($return_array);
   }
@@ -361,20 +361,20 @@ 
      $return_array = [];
      $a = $this->profileAttributes($profile_id);
      $thedevices = $a['devices'];
-     if(!isset($profile_redirect) || ! $profile_redirect) {
+     if (!isset($profile_redirect) || !$profile_redirect) {
          $profile_redirect = 0;
          foreach ($thedevices as $D) {
-              if(isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden'])
+              if (isset($D['options']) && isset($D['options']['hidden']) && $D['options']['hidden'])
                    continue;
               $disp = $D['display'];
-              if($this->version == 1) {
-                 if($D['id'] === '0') {
+              if ($this->version == 1) {
+                 if ($D['id'] === '0') {
                      $profile_redirect = 1;
                      $disp = $c;
                  }
                 $return_array[] = ['id'=>$D['id'], 'display'=>$disp, 'status'=>$D['status'], 'redirect'=>$D['redirect']];
              } else {
-                 if($D['device'] === '0') {
+                 if ($D['device'] === '0') {
                      $profile_redirect = 1;
                      $disp = $c;
                  }
@@ -393,12 +393,12 @@ 
  * @param int $prof_id profile identifier
  * @return string JSON encoded data
  */
-  public function JSON_generateInstaller($device,$prof_id) {
-    debug(4,"JSON::generateInstaller arguments: $device,$prof_id\n");
-    $o = $this->generateInstaller($device,$prof_id);
-    debug(4,"output from GUI::generateInstaller:");
-    debug(4,$o);
-    debug(4,json_encode($o));
+  public function JSON_generateInstaller($device, $prof_id) {
+    debug(4, "JSON::generateInstaller arguments: $device,$prof_id\n");
+    $o = $this->generateInstaller($device, $prof_id);
+    debug(4, "output from GUI::generateInstaller:");
+    debug(4, $o);
+    debug(4, json_encode($o));
 //    header('Content-type: application/json; utf-8');
     echo $this->return_json($o);
  }
@@ -411,12 +411,12 @@ 
  * @return binary installerFile
  */
 
- public function downloadInstaller($device,$prof_id,$generated_for='user') {
-    debug(4,"downloadInstaller arguments: $device,$prof_id,$generated_for\n");
-    $o = $this->generateInstaller($device,$prof_id);
-    debug(4,"output from GUI::generateInstaller:");
-    debug(4,$o);
-    if(! $o['link']) {
+ public function downloadInstaller($device, $prof_id, $generated_for = 'user') {
+    debug(4, "downloadInstaller arguments: $device,$prof_id,$generated_for\n");
+    $o = $this->generateInstaller($device, $prof_id);
+    debug(4, "output from GUI::generateInstaller:");
+    debug(4, $o);
+    if (!$o['link']) {
        header("HTTP/1.0 404 Not Found");
        return;
     }
@@ -424,9 +424,9 @@ 
     $profile->incrementDownloadStats($device, $generated_for);
     $file = $this->i_path;
     $filetype = $o['mime'];
-    debug(4,"installer MIME type:$filetype\n");
-    header("Content-type: ".$filetype);
-    header('Content-Disposition: inline; filename="'.basename($file).'"');
+    debug(4, "installer MIME type:$filetype\n");
+    header("Content-type: " . $filetype);
+    header('Content-Disposition: inline; filename="' . basename($file) . '"');
     header('Content-Length: ' . filesize($file));
     ob_clean();
     flush();
@@ -444,67 +444,67 @@ 
  *
  */
 
- public function sendLogo($idp_id, $disco=FALSE, $width=0, $height=0) {
+ public function sendLogo($idp_id, $disco = FALSE, $width = 0, $height = 0) {
    $ExpStr = '';
    $resize = 0;
-   if(($width || $height) && is_numeric($width) && is_numeric($height)) {
+   if (($width || $height) && is_numeric($width) && is_numeric($height)) {
        $resize = 1;
-       if($height == 0)
+       if ($height == 0)
           $height = 10000;
-       if($width == 0)
+       if ($width == 0)
           $width = 10000;
-       $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
-   } elseif($disco == 1) {
+       $logo_file = CAT::$root . '/web/downloads/logos/' . $idp_id . '_' . $width . '_' . $height . '.png';
+   } elseif ($disco == 1) {
        $width = 120;
        $height = 40;
        $resize = 1;
-       $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
+       $logo_file = CAT::$root . '/web/downloads/logos/' . $idp_id . '_' . $width . '_' . $height . '.png';
    }
 
-   if($resize && is_file($logo_file)){
-      debug(4,"Using cached logo $logo_file for: $idp_id\n");
+   if ($resize && is_file($logo_file)) {
+      debug(4, "Using cached logo $logo_file for: $idp_id\n");
       $blob = file_get_contents($logo_file);
       $filetype = 'image/png';
    }
    else {
       $idp = new IdP($idp_id);
       $at = $idp->getAttributes('general:logo_file');
-      $blob =  $at[0]['value'];
+      $blob = $at[0]['value'];
       $info = new finfo();
       $filetype = $info->buffer($blob, FILEINFO_MIME_TYPE);
       $offset = 60 * 60 * 24 * 30;
-      $ExpStr = "Expires: " . gmdate( "D, d M Y H:i:s", time() + $offset ) . " GMT";
-      if($resize) {
+      $ExpStr = "Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT";
+      if ($resize) {
          $filetype = 'image/png';
          $image = new Imagick();
          $image->readImageBlob($blob);
-         if( $image->setImageFormat('PNG')) {
-           $image->thumbnailImage($width,$height,1);
+         if ($image->setImageFormat('PNG')) {
+           $image->thumbnailImage($width, $height, 1);
            $blob = $image->getImageBlob();
-           debug(4,"Writing cached logo $logo_file for: $idp_id\n");
-           file_put_contents($logo_file,$blob);
+           debug(4, "Writing cached logo $logo_file for: $idp_id\n");
+           file_put_contents($logo_file, $blob);
          }
          else
            $blob = "XXXXXX";
       }
    }
-   header( "Content-type: ".$filetype );
-   header( "Cache-Control:max-age=36000, must-revalidate" );
-   header( $ExpStr );
+   header("Content-type: " . $filetype);
+   header("Cache-Control:max-age=36000, must-revalidate");
+   header($ExpStr);
    echo $blob;
  }
 
  public function locateUser() {
    $host = $_SERVER['REMOTE_ADDR'];
    $record = geoip_record_by_name($host);
-   if($record) {
+   if ($record) {
      $result = ['status' => 'ok'];
      $result['country'] = $record['country_code'];
 //  the two lines below are a dirty hack to take of the error in naming the UK federation
-     if($result['country'] == 'GB')
+     if ($result['country'] == 'GB')
          $result['country'] = 'UK';
      $result['region'] = $record['region'];
-     $result['geo'] = ['lat' => (float)$record['latitude'] , 'lon' => (float)$record['longitude']];
+     $result['geo'] = ['lat' => (float) $record['latitude'], 'lon' => (float) $record['longitude']];
    } else {
      $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
    }
@@ -525,22 +525,22 @@ 
    $result = ['status' => 'ok'];
    $result['country'] = $record->country->isoCode;
 //  the two lines below are a dirty hack to take of the error in naming the UK federation
-   if($result['country'] == 'GB')
+   if ($result['country'] == 'GB')
        $result['country'] = 'UK';
    $result['region'] = $record->continent->name;
 
-   $result['geo'] = ['lat' => (float)$record->location->latitude , 'lon' => (float)$record->location->longitude];
+   $result['geo'] = ['lat' => (float) $record->location->latitude, 'lon' => (float) $record->location->longitude];
    return($result);
  }
 
 public function JSON_locateUser() {
     header('Content-type: application/json; utf-8');
    
-    if(empty(Config::$GEOIP['version']) || Config::$GEOIP['version'] == 0)
+    if (empty(Config::$GEOIP['version']) || Config::$GEOIP['version'] == 0)
       echo json_encode(['status' => 'error', 'error' =>'Geolocation not supported']);
-    if(Config::$GEOIP['version'] == 1)
+    if (Config::$GEOIP['version'] == 1)
       echo json_encode($this->locateUser());
-    if(Config::$GEOIP['version'] == 2)
+    if (Config::$GEOIP['version'] == 2)
       echo json_encode($this->locateUser2());
 }
 
@@ -560,11 +560,11 @@ 
   * @param array $P2 - second point as an 'lat', 'lon' array 
   * @return float distance in km
   */
-private function geoDistance($P1,$P2) {
+private function geoDistance($P1, $P2) {
 
   $dist = sin(deg2rad($P1['lat'])) * sin(deg2rad($P2['lat'])) +  
          cos(deg2rad($P1['lat'])) * cos(deg2rad($P2['lat'])) * cos(deg2rad($P1['lon'] - $P2['lon']));
-  $dist = rad2deg(acos($dist)) * 60 * 1.1852 ;
+  $dist = rad2deg(acos($dist)) * 60 * 1.1852;
   return(round($dist));
 }
 
@@ -574,44 +574,44 @@ 
   * @return array $IdPs -  list of arrays ('id', 'name');
   */
 
-public function orderIdentityProviders($country,$L=NULL) {
-     $idps = Federation::listAllIdentityProviders(1,$country);
+public function orderIdentityProviders($country, $L = NULL) {
+     $idps = Federation::listAllIdentityProviders(1, $country);
 
-  if(is_null($L)) {
+  if (is_null($L)) {
      $U = $this->locateUser();
-     if($U['status'] == 'ok') {
+     if ($U['status'] == 'ok') {
      $L = $U['geo'];
      } else {
-       $L = ['lat'=>"90",'lon'=>"0"];
+       $L = ['lat'=>"90", 'lon'=>"0"];
      }
   }
-  $T=[];
-  $R=[];
+  $T = [];
+  $R = [];
      foreach ($idps as $idp) {
         $T[$idp['entityID']] = $idp['title'];
         $dist = 10000;
-        if(isset($idp['geo'])) {
-          $G=$idp['geo'];
-          if(isset($G['lon'])) {
-             $d1 = $this->geoDistance($L,$G); 
-             if( $d1 < $dist)
+        if (isset($idp['geo'])) {
+          $G = $idp['geo'];
+          if (isset($G['lon'])) {
+             $d1 = $this->geoDistance($L, $G); 
+             if ($d1 < $dist)
                 $dist = $d1;
           } else {
             foreach ($G as $g) {
-             $d1 = $this->geoDistance($L,$g); 
-             if( $d1 < $dist)
+             $d1 = $this->geoDistance($L, $g); 
+             if ($d1 < $dist)
                 $dist = $d1;
             }
           }
         }
-       if($dist > 100)
-         $dist=10000;
-      $d = sprintf("%06d",$dist);
-      $R[$idp['entityID']] = $d." ".$idp['title'];
+       if ($dist > 100)
+         $dist = 10000;
+      $d = sprintf("%06d", $dist);
+      $R[$idp['entityID']] = $d . " " . $idp['title'];
      }
      asort($R);
      foreach (array_keys($R) as $r) {
-      if($this->version == 1)
+      if ($this->version == 1)
          $outarray[] = ['id'=>$r, 'title'=>$T[$r]];
       else
          $outarray[] = ['idp'=>$r, 'title'=>$T[$r]];
@@ -629,44 +629,44 @@ 
 
 public function detectOS() {
    $Dev = Devices::listDevices();
-   if( isset($_REQUEST['device']) && isset($Dev[$_REQUEST['device']]) && (!isset($device['options']['hidden']) || $device['options']['hidden'] == 0)) {
+   if (isset($_REQUEST['device']) && isset($Dev[$_REQUEST['device']]) && (!isset($device['options']['hidden']) || $device['options']['hidden'] == 0)) {
       $dev_id = $_REQUEST['device'];
       $device = $Dev[$dev_id];
-      if($this->version == 1)
-         return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+      if ($this->version == 1)
+         return(['id'=>$dev_id, 'display'=>$device['display'], 'group'=>$device['group']]);
       else
-         return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+         return(['device'=>$dev_id, 'display'=>$device['display'], 'group'=>$device['group']]);
    }
    $browser = $_SERVER['HTTP_USER_AGENT'];
-   debug(4,"HTTP_USER_AGENT=$browser\n");
+   debug(4, "HTTP_USER_AGENT=$browser\n");
    foreach ($Dev as $dev_id => $device) {
-     if(!isset($device['match']))
+     if (!isset($device['match']))
         continue;
-     if(preg_match('/'.$device['match'].'/',$browser)) {
-       if(!isset($device['options']['hidden']) || $device['options']['hidden'] == 0) {
-          debug(4,"Browser_id: $dev_id\n");
-          if($this->version == 1)
-             return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+     if (preg_match('/' . $device['match'] . '/', $browser)) {
+       if (!isset($device['options']['hidden']) || $device['options']['hidden'] == 0) {
+          debug(4, "Browser_id: $dev_id\n");
+          if ($this->version == 1)
+             return(['id'=>$dev_id, 'display'=>$device['display'], 'group'=>$device['group']]);
           else
-             return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+             return(['device'=>$dev_id, 'display'=>$device['display'], 'group'=>$device['group']]);
        }
        else {
-         debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
+         debug(2, "Unrecognised system: " . $_SERVER['HTTP_USER_AGENT'] . "\n");
          return(false);
        }
      }
    }
-   debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
+   debug(2, "Unrecognised system: " . $_SERVER['HTTP_USER_AGENT'] . "\n");
    return(false);
 }
 
 public function JSON_detectOS() {
-     $return_array=$this->detectOS();
-     if($return_array)
+     $return_array = $this->detectOS();
+     if ($return_array)
         $status = 1;
      else
         $status = 0;
-     echo $this->return_json($return_array,$status);
+     echo $this->return_json($return_array, $status);
 }
 
 
@@ -675,6 +675,6 @@ 
 private $i_path;
   
 }
-function profile_sort($P1,$P2) {
+function profile_sort($P1, $P2) {
    return strcasecmp($P1->name, $P2->name);
 } 
\ No newline at end of file

devices/ms/Vista7.php

Indentation +135 added lines, -135 removed lines

@@ -26,66 +26,66 @@ 
  */
 class Device_Vista7 extends WindowsCommon {
     final public function __construct() {
-      $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$PWD];
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
-      $this->specialities['anon_id'][serialize(EAP::$PEAP_MSCHAP2)] = _("Anonymous identities do not use the realm as specified in the profile - it is derived from the suffix of the user's username input instead.");
+        $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$PWD];
+        debug(4,"This device supports the following EAP methods: ");
+        debug(4,$this->supportedEapMethods);
+        $this->specialities['anon_id'][serialize(EAP::$PEAP_MSCHAP2)] = _("Anonymous identities do not use the realm as specified in the profile - it is derived from the suffix of the user's username input instead.");
     }
 
-  public function writeInstaller() {
-      $dom = textdomain(NULL);
-      textdomain("devices");
-   // create certificate files and save their names in $CA_files arrary
-     $CA_files = $this->saveCertificateFiles('der');
+    public function writeInstaller() {
+        $dom = textdomain(NULL);
+        textdomain("devices");
+    // create certificate files and save their names in $CA_files arrary
+        $CA_files = $this->saveCertificateFiles('der');
 
-     $SSIDs = $this->attributes['internal:SSID'];
-     $delSSIDs = $this->attributes['internal:remove_SSID'];
-     $this->prepareInstallerLang();
-     $set_wired = isset($this->attributes['media:wired'][0]) && $this->attributes['media:wired'][0] == 'on' ? 1 : 0;
+        $SSIDs = $this->attributes['internal:SSID'];
+        $delSSIDs = $this->attributes['internal:remove_SSID'];
+        $this->prepareInstallerLang();
+        $set_wired = isset($this->attributes['media:wired'][0]) && $this->attributes['media:wired'][0] == 'on' ? 1 : 0;
 //   create a list of profiles to be deleted after installation
-     $delProfiles = [];
-     foreach ($delSSIDs as $ssid => $cipher) {
-         if($cipher == 'DEL') 
-          $delProfiles[] = $ssid;
-         if($cipher == 'TKIP') 
-          $delProfiles[] = $ssid.' (TKIP)';
-     }
-
-     if ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap == EAP::$PWD || $this->selected_eap == EAP::$TTLS_PAP) {
-       $WindowsProfile = [];
-       $eap_config = $this->prepareEapConfig($this->attributes);
-       $i = 0;
-       foreach ($SSIDs as $ssid => $cipher) {
-          if($cipher == 'TKIP') {
-             $WindowsProfile[$i] = $this->writeWLANprofile ($ssid.' (TKIP)',$ssid,'WPA','TKIP',$eap_config,$i);
-             $i++;
-          }
-          $WindowsProfile[$i] = $this->writeWLANprofile ($ssid,$ssid,'WPA2','AES',$eap_config,$i);
-          $i++;
-       }
-       if($set_wired) {
-         $this->writeLANprofile($eap_config);
-       }
-     } else {
-       error("  this EAP type is not handled yet");
-       return;
-     }
+        $delProfiles = [];
+        foreach ($delSSIDs as $ssid => $cipher) {
+            if($cipher == 'DEL') 
+            $delProfiles[] = $ssid;
+            if($cipher == 'TKIP') 
+            $delProfiles[] = $ssid.' (TKIP)';
+        }
+
+        if ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap == EAP::$PWD || $this->selected_eap == EAP::$TTLS_PAP) {
+        $WindowsProfile = [];
+        $eap_config = $this->prepareEapConfig($this->attributes);
+        $i = 0;
+        foreach ($SSIDs as $ssid => $cipher) {
+            if($cipher == 'TKIP') {
+                $WindowsProfile[$i] = $this->writeWLANprofile ($ssid.' (TKIP)',$ssid,'WPA','TKIP',$eap_config,$i);
+                $i++;
+            }
+            $WindowsProfile[$i] = $this->writeWLANprofile ($ssid,$ssid,'WPA2','AES',$eap_config,$i);
+            $i++;
+        }
+        if($set_wired) {
+            $this->writeLANprofile($eap_config);
+        }
+        } else {
+        error("  this EAP type is not handled yet");
+        return;
+        }
     debug(4,"WindowsProfile"); debug(4,$WindowsProfile);
     
     $this->writeProfilesNSH($WindowsProfile, $CA_files,$set_wired);
     $this->writeAdditionalDeletes($delProfiles);
     $this->copyFiles($this->selected_eap);
     if(isset($this->attributes['internal:logo_file']))
-       $this->combineLogo($this->attributes['internal:logo_file']);
+        $this->combineLogo($this->attributes['internal:logo_file']);
     $this->writeMainNSH($this->selected_eap,$this->attributes);
     $this->compileNSIS();
     $installer_path = $this->signInstaller($this->attributes); 
 
     textdomain($dom);
     return($installer_path);  
-  }
+    }
 
-  public function writeDeviceInfo() {
+    public function writeDeviceInfo() {
     $ssid_ct=count($this->attributes['internal:SSID']);
     $out = "<p>";
     $out .= sprintf(_("%s installer will be in the form of an EXE file. It will configure %s on your device, by creating wireless network profiles.<p>When you click the download button, the installer will be saved by your browser. Copy it to the machine you want to configure and execute."),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['name']);
@@ -97,12 +97,12 @@ 
             $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
         $i = 0;
         foreach ($this->attributes['internal:SSID'] as $ssid=>$v) {
-           if(! in_array($ssid, Config::$CONSORTIUM['ssid'])) {
-             if($i > 0)
-           $out .= ", ";
-         $i++;
-         $out .= "<strong>$ssid</strong>";
-       }
+            if(! in_array($ssid, Config::$CONSORTIUM['ssid'])) {
+                if($i > 0)
+            $out .= ", ";
+            $i++;
+            $out .= "<strong>$ssid</strong>";
+        }
     }
     $out .= "<p>";
     }
@@ -115,21 +115,21 @@ 
         $out .= "<p>";
         $out .= _("When you are connecting to the network for the first time, Windows will pop up a login box, where you should enter your user name and password. This information will be saved so that you will reconnect to the network automatically each time you are in the range.");
         if($ssid_ct > 1) {
-             $out .= "<p>";
-             $out .= _("You will be required to enter the same credentials for each of the configured notworks:")." ";
-             $i = 0;
+                $out .= "<p>";
+                $out .= _("You will be required to enter the same credentials for each of the configured notworks:")." ";
+                $i = 0;
             foreach ($this->attributes['internal:SSID'] as $ssid=>$v) {
-                 if($i > 0)
-                   $out .= ", ";
-                 $i++;
-                 $out .= "<strong>$ssid</strong>";
+                    if($i > 0)
+                    $out .= ", ";
+                    $i++;
+                    $out .= "<strong>$ssid</strong>";
             }
     }
 
-   }
+    }
 
-   }
-  return($out);
+    }
+    return($out);
 }
 
 private function prepareEapConfig($attr) {
@@ -137,25 +137,25 @@ 
     $w7_ext = '';
     $eap = $this->selected_eap;
     if ($eap != EAP::$TLS && $eap != EAP::$PEAP_MSCHAP2 && $eap != EAP::$PWD && $eap != EAP::$TTLS_PAP) {
-      debug(2,"this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
-      error("this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
-     return;
+        debug(2,"this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
+        error("this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
+        return;
+    }
+    $use_anon = $attr['internal:use_anon_outer'] [0];
+    $realm = $attr['internal:realm'] [0];
+    if ($use_anon) {
+        $outer_user = $attr['internal:anon_local_value'][0];
     }
-   $use_anon = $attr['internal:use_anon_outer'] [0];
-   $realm = $attr['internal:realm'] [0];
-   if ($use_anon) {
-     $outer_user = $attr['internal:anon_local_value'][0];
-   }
 //   $servers = preg_quote(implode(';',$attr['eap:server_name']));
-   $servers = implode(';',$attr['eap:server_name']);
-   $ca_array = $attr['internal:CAs'][0];
-   $author_id = "0";
-   if( $eap == EAP::$TTLS_PAP) {
-      $author_id = "17236";
-      $servers = implode('</ServerName><ServerName>',$attr['eap:server_name']);
-   }
-
-  $profile_file_contents = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
+    $servers = implode(';',$attr['eap:server_name']);
+    $ca_array = $attr['internal:CAs'][0];
+    $author_id = "0";
+    if( $eap == EAP::$TTLS_PAP) {
+        $author_id = "17236";
+        $servers = implode('</ServerName><ServerName>',$attr['eap:server_name']);
+    }
+
+    $profile_file_contents = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
 <EapMethod>
 <Type xmlns="http://www.microsoft.com/provisioning/EapCommon">'.
     $this->selected_eap["OUTER"] .'</Type>
@@ -166,7 +166,7 @@ 
 ';
 
 
-   if( $eap == EAP::$TTLS_PAP) {
+    if( $eap == EAP::$TTLS_PAP) {
 $profile_file_contents .= '
 <Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
 <EAPIdentityProviderList xmlns="urn:ietf:params:xml:ns:yang:ietf-eap-metadata">
@@ -201,14 +201,14 @@ 
 $profile_file_contents .= '<ServerSideCredential>
 ';
 
-   foreach ($ca_array as $ca) {
+    foreach ($ca_array as $ca) {
       
-      $profile_file_contents .= '<CA><format>PEM</format><cert-data>';
-      $profile_file_contents .= base64_encode($ca['der']);
-      $profile_file_contents .= '</cert-data></CA>
+        $profile_file_contents .= '<CA><format>PEM</format><cert-data>';
+        $profile_file_contents .= base64_encode($ca['der']);
+        $profile_file_contents .= '</cert-data></CA>
 ';
-   }
-   $profile_file_contents .= "<ServerName>$servers</ServerName>\n";
+    }
+    $profile_file_contents .= "<ServerName>$servers</ServerName>\n";
 
 $profile_file_contents .= '
 </ServerSideCredential>
@@ -228,7 +228,7 @@ 
 }
 
 elseif( $eap == EAP::$TLS) {
-  $profile_file_contents .= '
+    $profile_file_contents .= '
 
 <Config xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1" 
   xmlns:eapTls="http://www.microsoft.com/provisioning/EapTlsConnectionPropertiesV1">
@@ -244,14 +244,14 @@ 
 if($ca_array) {
 foreach ($ca_array as $CA)
     if($CA['root'])
-       $profile_file_contents .= "<eapTls:TrustedRootCA>".$CA['sha1']."</eapTls:TrustedRootCA>\n";
+        $profile_file_contents .= "<eapTls:TrustedRootCA>".$CA['sha1']."</eapTls:TrustedRootCA>\n";
 }
 $profile_file_contents .= '</eapTls:ServerValidation>
 ';
 if(isset($attr['eap-specific:tls_use_other_id']) && $attr['eap-specific:tls_use_other_id'][0] == 'on')
-   $profile_file_contents .= '<eapTls:DifferentUsername>true</eapTls:DifferentUsername>';
+    $profile_file_contents .= '<eapTls:DifferentUsername>true</eapTls:DifferentUsername>';
 else
-   $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
+    $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
 $profile_file_contents .= '
 </eapTls:EapType>
 </baseEap:Eap>
@@ -259,9 +259,9 @@ 
 ';
 } elseif ( $eap == EAP::$PEAP_MSCHAP2) {
 if(isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on')
-   $nea = 'true';
+    $nea = 'true';
 else
-   $nea = 'false';
+    $nea = 'false';
 $vista_ext = '<Config xmlns:eapUser="http://www.microsoft.com/provisioning/EapUserPropertiesV1" 
 xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1" 
   xmlns:msPeap="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV1" 
@@ -275,7 +275,7 @@ 
 if($ca_array) {
 foreach ($ca_array as $CA)
     if($CA['root'])
-       $vista_ext .= "<msPeap:TrustedRootCA>".$CA['sha1']."</msPeap:TrustedRootCA>\n";
+        $vista_ext .= "<msPeap:TrustedRootCA>".$CA['sha1']."</msPeap:TrustedRootCA>\n";
 }
 $vista_ext .= '</msPeap:ServerValidation>
 <msPeap:FastReconnect>true</msPeap:FastReconnect> 
@@ -329,7 +329,7 @@ 
 </Config>
 ';
 } elseif ( $eap == EAP::$PWD) {
-   $profile_file_contents .= '<ConfigBlob></ConfigBlob>';
+    $profile_file_contents .= '<ConfigBlob></ConfigBlob>';
 } 
 
 
@@ -351,7 +351,7 @@ 
 /**
  * produce PEAP and TLS configuration files for Vista and Windows 7
  */
-  private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
+    private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
 $profile_file_contents = '<?xml version="1.0"?>
 <WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
 <name>'.$wlan_profile_name.'</name>
@@ -391,9 +391,9 @@ 
 ';
 
 if(! is_dir('w7'))
-  mkdir('w7');
+    mkdir('w7');
 if(! is_dir('vista'))
-  mkdir('vista');
+    mkdir('vista');
 $xml_f_name = "vista/wlan_prof-$i.xml";
 $xml_f = fopen($xml_f_name,'w');
 fwrite($xml_f,$profile_file_contents. $eap_config['vista']. $closing) ;
@@ -423,9 +423,9 @@ 
 </LANProfile>
 ';
 if(! is_dir('w7'))
-  mkdir('w7');
+    mkdir('w7');
 if(! is_dir('vista'))
-  mkdir('vista');
+    mkdir('vista');
 $xml_f_name = "vista/lan_prof.xml";
 $xml_f = fopen($xml_f_name,'w');
 fwrite($xml_f,$profile_file_contents. $eap_config['vista']. $closing) ;
@@ -438,16 +438,16 @@ 
 
 private function glueServerNames($server_list) {
 //print_r($server_list);
- $A0 =  array_reverse(explode('.',array_shift($server_list)));
- $B = $A0;
- if($server_list) {
-   foreach($server_list as $a) {
-   $A= array_reverse(explode('.',$a));
-   $B = array_intersect_assoc($A0,$A);
-   $A0 = $B;
-   }
-  }
-  return(implode('.',array_reverse($B)));
+    $A0 =  array_reverse(explode('.',array_shift($server_list)));
+    $B = $A0;
+    if($server_list) {
+    foreach($server_list as $a) {
+    $A= array_reverse(explode('.',$a));
+    $B = array_intersect_assoc($A0,$A);
+    $A0 = $B;
+    }
+    }
+    return(implode('.',array_reverse($B)));
 }
 
 
@@ -502,7 +502,7 @@ 
 ';
 
 if(isset($this->attributes['media:wired'][0]) && $attr['media:wired'][0] == 'on')
-  $fcontents .= '!define WIRED
+    $fcontents .= '!define WIRED
 ';
 
 $f = fopen('main.nsh','w');
@@ -514,8 +514,8 @@ 
 private function writeProfilesNSH($P,$ca_array,$wired=0) {
 debug(4,"writeProfilesNSH");
 debug(4,$P);
-  $fcontents = '';
-  foreach($P as $p) 
+    $fcontents = '';
+    foreach($P as $p) 
     $fcontents .= "!insertmacro define_wlan_profile $p\n";
   
 $f = fopen('profiles.nsh','w');
@@ -526,8 +526,8 @@ 
 $f = fopen('certs.nsh','w');
 if($ca_array) {
 foreach ($ca_array as $CA) {
-      $store = $CA['root'] ? "root" : "ca";
-      $fcontents .= '!insertmacro install_ca_cert "'.$CA['file'].'" "'.$CA['sha1'].'" "'.$store."\"\n";
+        $store = $CA['root'] ? "root" : "ca";
+        $fcontents .= '!insertmacro install_ca_cert "'.$CA['file'].'" "'.$CA['sha1'].'" "'.$store."\"\n";
     }
 fwrite($f, $fcontents);
 }
@@ -537,33 +537,33 @@ 
 private function copyFiles ($eap) {
 debug(4,"copyFiles start\n");
 debug(4,"code_page=".$this->code_page."\n");
-   $result;
-   $result = $this->copyFile('wlan_test.exe');
-   $result = $this->copyFile('check_wired.cmd');
-   $result = $this->copyFile('install_wired.cmd');
-   $result = $this->copyFile('setEAPCred.exe');
-   $result = $this->copyFile('base64.nsh');
-   $result = $this->copyFile('cat_bg.bmp');
-   $result = $result && $this->copyFile('cat32.ico');
-   $result = $result && $this->copyFile('cat_150.bmp');
-   $this->translateFile('common.inc','common.nsh',$this->code_page);
-   if( $eap["OUTER"] == TTLS)  {
-     $result = $this->copyFile('GPL3.rtf');
-     $result = $result && $this->copyFile('ArnesLinkEn32.msi');
-     $result = $result && $this->copyFile('ArnesLinkEn64.msi');
-     $result = $result && $this->copyFile('dump_arneslink_profile.cmd');
-     $result = $result && $this->copyFile('install_arneslink_profile.cmd');
-     $this->translateFile('arnes_link.inc','cat.NSI',$this->code_page);
-   } elseif($eap["OUTER"] == PWD) {
-     $this->translateFile('pwd.inc','cat.NSI',$this->code_page);
-     $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x32.msi');
-     $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x64.msi');
+    $result;
+    $result = $this->copyFile('wlan_test.exe');
+    $result = $this->copyFile('check_wired.cmd');
+    $result = $this->copyFile('install_wired.cmd');
+    $result = $this->copyFile('setEAPCred.exe');
+    $result = $this->copyFile('base64.nsh');
+    $result = $this->copyFile('cat_bg.bmp');
+    $result = $result && $this->copyFile('cat32.ico');
+    $result = $result && $this->copyFile('cat_150.bmp');
+    $this->translateFile('common.inc','common.nsh',$this->code_page);
+    if( $eap["OUTER"] == TTLS)  {
+        $result = $this->copyFile('GPL3.rtf');
+        $result = $result && $this->copyFile('ArnesLinkEn32.msi');
+        $result = $result && $this->copyFile('ArnesLinkEn64.msi');
+        $result = $result && $this->copyFile('dump_arneslink_profile.cmd');
+        $result = $result && $this->copyFile('install_arneslink_profile.cmd');
+        $this->translateFile('arnes_link.inc','cat.NSI',$this->code_page);
+    } elseif($eap["OUTER"] == PWD) {
+        $this->translateFile('pwd.inc','cat.NSI',$this->code_page);
+        $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x32.msi');
+        $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x64.msi');
     } else {
-     $this->translateFile('peap_tls.inc','cat.NSI',$this->code_page);
-     $result = 1;
+        $this->translateFile('peap_tls.inc','cat.NSI',$this->code_page);
+        $result = 1;
     }
 debug(4,"copyFiles end\n");
-   return($result);
+    return($result);
 }
 
 }
\ No newline at end of file