GEANT / CAT

core/Profile.php

Doc Comments +11 added lines, -9 removed lines

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

Braces +4 added lines, -8 removed lines

@@ -643,8 +643,7 @@ 
                     if ($eap) {
                         if (isset($eAPOptions["eap-specific:customtext"][serialize($eap)])) {
                             $eap_customtext = $eAPOptions["eap-specific:customtext"][serialize($eap)];
-                        }
-                        else {
+                        } else {
                             $eap_customtext = getLocalisedValue($this->getAttributes("eap-specific:customtext", $eap, 0), $locale);
                             $eAPOptions["eap-specific:customtext"][serialize($eap)] = $eap_customtext;
                         }
@@ -711,11 +710,9 @@ 
             } else {
                 if (isset($temp[$name]['Method'])) {
                     $out[$name] = $temp[$name]['Method'];
-                }
-                elseif (isset($temp[$name]['Profile'])) {
+                } elseif (isset($temp[$name]['Profile'])) {
                     $out[$name] = $temp[$name]['Profile'];
-                }
-                else {
+                } else {
                     $out[$name] = $temp[$name]['IdP'];
                 }
             }
@@ -772,8 +769,7 @@ 
         $properConfig = $this->readyForShowtime();
         if ($properConfig) {
             DBConnection::exec($this->databaseType, "UPDATE profile SET sufficient_config = TRUE WHERE profile_id = " . $this->identifier);
-        }
-        else {
+        } else {
             DBConnection::exec($this->databaseType, "UPDATE profile SET sufficient_config = FALSE WHERE profile_id = " . $this->identifier);
         }
         $attribs = $this->getCollapsedAttributes();

devices/chromebook/chromebook.php

Spacing +3 added lines, -3 removed lines

@@ -170,13 +170,13 @@
         // define CA certificates
         foreach ($this->attributes['internal:CAs'][0] as $ca) {
             // strip -----BEGIN CERTIFICATE----- and -----END CERTIFICATE-----
-            debug(2,$ca['pem']);
+            debug(2, $ca['pem']);
             $caSanitized = substr($ca['pem'], 27, strlen($ca['pem']) - 27 - 25 - 1);
-            debug(2,$caSanitized."\n");
+            debug(2, $caSanitized . "\n");
             // remove \n
             $caSanitized = str_replace("\n", "", $caSanitized);
             $jsonArray["Certificates"][] = ["GUID" => "{" . $ca['uuid'] . "}", "Type" => "Authority", "X509" => $caSanitized];
-            debug(2,$caSanitized."\n");
+            debug(2, $caSanitized . "\n");
         }
                 
         $outputJson = json_encode($jsonArray, JSON_PRETTY_PRINT);

Braces +15 added lines, -10 removed lines

@@ -108,8 +108,9 @@ 
         $outerId = 0;
         if (isset($this->attributes['internal:use_anon_outer']) && $this->attributes['internal:use_anon_outer'][0] == "1" && isset($this->attributes['internal:realm'])) {
             $outerId = "@" . $this->attributes['internal:realm'][0];
-            if (isset($this->attributes['internal:anon_local_value']))
-                $outerId = $this->attributes['internal:anon_local_value'][0] . $outerId;
+            if (isset($this->attributes['internal:anon_local_value'])) {
+                            $outerId = $this->attributes['internal:anon_local_value'][0] . $outerId;
+            }
         }
         
         // define networks
@@ -117,26 +118,30 @@ 
             $networkUuid = uuid($prefix, $ssid);
             $eapPrettyprint = EAP::eapDisplayName($this->selected_eap);
             // ONC has its own enums, and guess what, they don't always match
-            if ($eapPrettyprint["OUTER"] == "PEAP" && $eapPrettyprint["INNER"] == "MSCHAPV2")
-                // the dictionary entry EAP-MSCHAPv2 does not work. Setting MSCHAPv2 does. (ChromeOS 50)
+            if ($eapPrettyprint["OUTER"] == "PEAP" && $eapPrettyprint["INNER"] == "MSCHAPV2") {
+                            // the dictionary entry EAP-MSCHAPv2 does not work. Setting MSCHAPv2 does. (ChromeOS 50)
                 $eapPrettyprint["INNER"] = "MSCHAPv2";
+            }
             if ($eapPrettyprint["OUTER"] == "TTLS" && $eapPrettyprint["INNER"] == "MSCHAPV2") {
                 $eapPrettyprint["OUTER"] = "EAP-TTLS";
                 $eapPrettyprint["INNER"] = "MSCHAPv2";
             }
-            if ($eapPrettyprint["OUTER"] == "TLS")
-                $eapPrettyprint["OUTER"] = "EAP-TLS";
+            if ($eapPrettyprint["OUTER"] == "TLS") {
+                            $eapPrettyprint["OUTER"] = "EAP-TLS";
+            }
             // define EAP properties
 
             $eaparray = array("Outer" => $eapPrettyprint["OUTER"]);
-            if ($eapPrettyprint["INNER"] == "MSCHAPv2")
-                $eaparray["Inner"] = $eapPrettyprint["INNER"];
+            if ($eapPrettyprint["INNER"] == "MSCHAPv2") {
+                            $eaparray["Inner"] = $eapPrettyprint["INNER"];
+            }
             $eaparray["SaveCredentials"] = true;
             $eaparray["ServerCARefs"] = $caRefs; // maybe takes just one CA?
             $eaparray["UseSystemCAs"] = false;
                     
-            if ($outerId)
-                $eaparray["AnonymousIdentity"] = "$outerId";
+            if ($outerId) {
+                            $eaparray["AnonymousIdentity"] = "$outerId";
+            }
             
             $jsonArray["NetworkConfigurations"][] = [
                 "GUID" => $networkUuid,

devices/apple_mobileconfig/mobileconfig_superclass.php

Spacing +2 added lines, -2 removed lines

@@ -129,7 +129,7 @@ 
       <key>PayloadIdentifier</key>
          <string>" . mobileconfig_superclass::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
       <key>PayloadOrganization</key>
-         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
+         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ($this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
       <key>PayloadType</key>
          <string>Configuration</string>
       <key>PayloadUUID</key>
@@ -285,7 +285,7 @@ 
         } else {
             $retval .= "hs20";
         }
-        $retval .="</string>
+        $retval .= "</string>
                <key>PayloadOrganization</key>
                   <string>" . $this->massagedConsortium . ".1x-config.org</string>
                <key>PayloadType</key>

core/Federation.php

Spacing +6 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
             }
             $numberQuery = DBConnection::exec("INST", $query);
             while ($queryResult = mysqli_fetch_object($numberQuery)) {
-                $dataArray[$deviceArray['display']] = ["ADMIN" => ( $queryResult->admin === NULL ? "0" : $queryResult->admin), "USER" => ($queryResult->user === NULL ? "0" : $queryResult->user)];
+                $dataArray[$deviceArray['display']] = ["ADMIN" => ($queryResult->admin === NULL ? "0" : $queryResult->admin), "USER" => ($queryResult->user === NULL ? "0" : $queryResult->user)];
                 $grossAdmin = $grossAdmin + $queryResult->admin;
                 $grossUser = $grossUser + $queryResult->user;
             }
@@ -83,19 +83,19 @@ 
                     if ($device == "TOTAL") {
                         continue;
                     }
-                    $retstring .= "<tr><td>$device</td><td>".$numbers['ADMIN']."</td><td>".$numbers['USER']."</td></tr>";
+                    $retstring .= "<tr><td>$device</td><td>" . $numbers['ADMIN'] . "</td><td>" . $numbers['USER'] . "</td></tr>";
                 }
-                $retstring .= "<tr><td><strong>TOTAL</strong></td><td><strong>".$data['TOTAL']['ADMIN']."</strong></td><td><strong>".$data['TOTAL']['USER']."</strong></td></tr>";
+                $retstring .= "<tr><td><strong>TOTAL</strong></td><td><strong>" . $data['TOTAL']['ADMIN'] . "</strong></td><td><strong>" . $data['TOTAL']['USER'] . "</strong></td></tr>";
                 break;
             case "XML":
-                $retstring .= "<federation id='" . ( $federationid == NULL ? "ALL" : $federationid ) . "' ts='".date("Y-m-d") . "T" . date("H:i:s")."'>\n";
+                $retstring .= "<federation id='" . ($federationid == NULL ? "ALL" : $federationid) . "' ts='" . date("Y-m-d") . "T" . date("H:i:s") . "'>\n";
                 foreach ($data as $device => $numbers) {
                     if ($device == "TOTAL") {
                         continue;
                     }
-                    $retstring .= "  <device name='" . $device . "'>\n    <downloads group='admin'>".$numbers['ADMIN']."</downloads>\n    <downloads group='user'>".$numbers['USER']."</downloads>\n  </device>";
+                    $retstring .= "  <device name='" . $device . "'>\n    <downloads group='admin'>" . $numbers['ADMIN'] . "</downloads>\n    <downloads group='user'>" . $numbers['USER'] . "</downloads>\n  </device>";
                 }
-                $retstring .= "<total>\n  <downloads group='admin'>".$data['TOTAL']['ADMIN']."</downloads>\n  <downloads group='user'>".$data['TOTAL']['USER']."</downloads>\n</total>\n";
+                $retstring .= "<total>\n  <downloads group='admin'>" . $data['TOTAL']['ADMIN'] . "</downloads>\n  <downloads group='user'>" . $data['TOTAL']['USER'] . "</downloads>\n</total>\n";
                 $retstring .= "</federation>";
                 break;
             default:

web/admin/inc/common.inc.php

Braces +12 added lines, -8 removed lines

@@ -121,16 +121,20 @@
     ];
 
     $retval = "";
-    if (!$omittabletags)
-        $retval .= "<tr><td>";
+    if (!$omittabletags) {
+            $retval .= "<tr><td>";
+    }
     $caption = $caption !== 0 ? $caption : $UI_messages[$level]['text'];
     $retval .= "<img class='icon' src='" . $UI_messages[$level]['icon'] . "' alt='" . $caption . "' title='" . $caption . "'/>";
-    if (!$omittabletags)
-        $retval .= "</td><td>";
-    if ($text !== 0)
-        $retval .= $text;
-    if (!$omittabletags)
-        $retval .= "</td></tr>";
+    if (!$omittabletags) {
+            $retval .= "</td><td>";
+    }
+    if ($text !== 0) {
+            $retval .= $text;
+    }
+    if (!$omittabletags) {
+            $retval .= "</td></tr>";
+    }
     return $retval;
 }