GEANT / CAT

devices/xml/XML_TTLS_MSCHAP2.php

Indentation +4 added lines, -4 removed lines

@@ -5,11 +5,11 @@
 
 class Device_XML_TTLS_MSCHAP2 extends Device_XML {
     final public function __construct() {
-      $this->supportedEapMethods  =
+        $this->supportedEapMethods  =
             [
-              EAP::$TTLS_MSCHAP2,
-       ];
-      $this->lang_scope = 'single';
+                EAP::$TTLS_MSCHAP2,
+        ];
+        $this->lang_scope = 'single';
     }
 }
 

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 class Device_XML_PWD extends Device_XML {
     final public function __construct() {
-      $this->supportedEapMethods  =
+      $this->supportedEapMethods =
             [
               EAP::$PWD,
        ];

devices/xml/XML_PWD.php

Indentation +4 added lines, -4 removed lines

@@ -5,11 +5,11 @@
 
 class Device_XML_PWD extends Device_XML {
     final public function __construct() {
-      $this->supportedEapMethods  =
+        $this->supportedEapMethods  =
             [
-              EAP::$PWD,
-       ];
-      $this->lang_scope = 'single';
+                EAP::$PWD,
+        ];
+        $this->lang_scope = 'single';
     }
 }
 

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 class Device_XML_PWD extends Device_XML {
     final public function __construct() {
-      $this->supportedEapMethods  =
+      $this->supportedEapMethods =
             [
               EAP::$PWD,
        ];

devices/xml/Lollipop.php

Indentation +8 added lines, -8 removed lines

@@ -5,15 +5,15 @@
 
 class Device_Lollipop extends Device_XML{
     final public function __construct() {
-      $this->supportedEapMethods  =
+        $this->supportedEapMethods  =
             [
-              EAP::$PEAP_MSCHAP2,
-              EAP::$TTLS_PAP,
-              EAP::$TTLS_MSCHAP2,
-              EAP::$TLS,
-       ];
-      $this->lang_scope = 'single';
-      $this->all_eaps = TRUE;
+                EAP::$PEAP_MSCHAP2,
+                EAP::$TTLS_PAP,
+                EAP::$TTLS_MSCHAP2,
+                EAP::$TLS,
+        ];
+        $this->lang_scope = 'single';
+        $this->all_eaps = TRUE;
     }
 }
 

Spacing +2 added lines, -2 removed lines

@@ -3,9 +3,9 @@
 require_once('DeviceConfig.php');
 require_once('XML.php');
 
-class Device_Lollipop extends Device_XML{
+class Device_Lollipop extends Device_XML {
     final public function __construct() {
-      $this->supportedEapMethods  =
+      $this->supportedEapMethods =
             [
               EAP::$PEAP_MSCHAP2,
               EAP::$TTLS_PAP,

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

config/_config.php

Indentation +3 added lines, -3 removed lines

@@ -8,6 +8,6 @@
 /**
  * 
  */
-  $root = dirname(dirname(__FILE__));
-  include($root."/config/config.php");
-  set_include_path(get_include_path() . PATH_SEPARATOR . "$root/core" . PATH_SEPARATOR . "$root");
\ No newline at end of file
+    $root = dirname(dirname(__FILE__));
+    include($root."/config/config.php");
+    set_include_path(get_include_path() . PATH_SEPARATOR . "$root/core" . PATH_SEPARATOR . "$root");
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -9,5 +9,5 @@
  * 
  */
   $root = dirname(dirname(__FILE__));
-  include($root."/config/config.php");
+  include($root . "/config/config.php");
   set_include_path(get_include_path() . PATH_SEPARATOR . "$root/core" . PATH_SEPARATOR . "$root");
\ No newline at end of file

web/admin/overview_idp.php

Spacing +9 added lines, -9 removed lines

@@ -85,7 +85,7 @@ 
         <div class='infobox' style='text-align:center;'>
             <h2><?php echo _("Institution Download Area QR Code"); ?></h2>
             <?php
-            $displayurl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier;
+            $displayurl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier;
             $uri = "data:image/png;base64," . base64_encode(png_inject_consortium_logo(QRcode::png($displayurl, FALSE, QR_ECLEVEL_Q, 12)));
             $size = getimagesize($uri);
             echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>";
@@ -115,7 +115,7 @@ 
             </td>
             <td>
                 <form action='edit_idp_result.php?inst_id=<?php echo $my_inst->identifier; ?>' method='post' accept-charset='UTF-8'>
-                    <button class='delete' type='submit' name='submitbutton' value='<?php echo BUTTON_DELETE; ?>' onclick="return confirm('<?php echo ( Config::$CONSORTIUM['selfservice_registration'] === NULL ? _("After deleting the IdP, you can not recreate it yourself - you need a new invitation token from the federation administrator!") . " " : "" ) . sprintf(_("Do you really want to delete your IdP %s?"), $my_inst->name); ?>')"><?php echo _("Delete IdP"); ?></button>
+                    <button class='delete' type='submit' name='submitbutton' value='<?php echo BUTTON_DELETE; ?>' onclick="return confirm('<?php echo (Config::$CONSORTIUM['selfservice_registration'] === NULL ? _("After deleting the IdP, you can not recreate it yourself - you need a new invitation token from the federation administrator!") . " " : "") . sprintf(_("Do you really want to delete your IdP %s?"), $my_inst->name); ?>')"><?php echo _("Delete IdP"); ?></button>
                 </form>
 
             </td>
@@ -155,7 +155,7 @@ 
     <?php
     $profiles_for_this_idp = $my_inst->listProfiles();
     if (count($profiles_for_this_idp) == 0) { // no profiles yet.
-        echo "<h2>"._("There are not yet any profiles for your institution.")."</h2>";
+        echo "<h2>" . _("There are not yet any profiles for your institution.") . "</h2>";
     }
 
     // if there is one profile and it is of type Silver Bullet, display a very
@@ -168,12 +168,12 @@ 
             ?>
             <div style='display: table-row; margin-bottom: 20px;'>
                 <div class='profilebox' style='display: table-cell;'>
-                    <h2><?php echo _("eduroam-as-a-Service");?></h2>
-                    <?php printf(_("You can create up to %d users. Their credentials will carry the name <strong>%s</strong>."),200,"opaquehash@$my_inst->identifier-$profile->identifier.".strtolower($my_inst->federation).Config::$CONSORTIUM['silverbullet_realm_suffix']);?>
+                    <h2><?php echo _("eduroam-as-a-Service"); ?></h2>
+                    <?php printf(_("You can create up to %d users. Their credentials will carry the name <strong>%s</strong>."), 200, "opaquehash@$my_inst->identifier-$profile->identifier." . strtolower($my_inst->federation) . Config::$CONSORTIUM['silverbullet_realm_suffix']); ?>
                     <br/>
                     <br/>
                     <form action='edit_silverbullet.php' method='POST'>
-                        <button type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base");?></button>
+                        <button type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
                     </form>
                 </div>
             </div>
@@ -185,7 +185,7 @@ 
         }
     }
     if (count($profiles_for_this_idp) > 0) { // no profiles yet.
-        echo "<h2>"._("Profiles for this institution")."</h2>";
+        echo "<h2>" . _("Profiles for this institution") . "</h2>";
     }
     foreach ($profiles_for_this_idp as $profile_list) {
         echo "<div style='display: table-row; margin-bottom: 20px;'>";
@@ -259,7 +259,7 @@ 
         $has_realm = $profile_list->getAttributes("internal:realm");
         $has_realm = $has_realm[0]['value'];
         echo "<div class='profilemodulebuttons' style='float:right;'>";
-        if (count(Config::$RADIUSTESTS['UDP-hosts']) > 0 || ( count(Config::$RADIUSTESTS['TLS-clientcerts']) > 0 && Config::$RADIUSTESTS['TLS-discoverytag'] != ""))
+        if (count(Config::$RADIUSTESTS['UDP-hosts']) > 0 || (count(Config::$RADIUSTESTS['TLS-clientcerts']) > 0 && Config::$RADIUSTESTS['TLS-discoverytag'] != ""))
             echo "<form action='action_realmcheck.php?inst_id=$my_inst->identifier&amp;profile_id=$profile_list->identifier' method='post' accept-charset='UTF-8'>
                               <button type='submit' name='profile_action' value='check' " . ($has_realm ? "" : "disabled='disabled' title='" . _("The realm can only be checked if you configure the realm!") . "'") . ">
                                   " . _("Check realm reachability") . "
@@ -293,7 +293,7 @@ 
             if (isset($URL['device-specific:redirect']))
                 $displayurl = $URL['device-specific:redirect'][0];
             else
-                $displayurl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://' ) . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier . "&amp;profile=" . $profile_list->identifier;
+                $displayurl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier . "&amp;profile=" . $profile_list->identifier;
             echo "<a href='$displayurl' style='white-space: nowrap; text-align: center;'>";
             $uri = "data:image/png;base64," . base64_encode(png_inject_consortium_logo(QRcode::png($displayurl, FALSE, QR_ECLEVEL_Q, 12)));
             $size = getimagesize($uri);

Braces +42 added lines, -28 removed lines

@@ -28,8 +28,9 @@ 
 
 // delete stored realm
 
-if (isset($_SESSION['check_realm']))
+if (isset($_SESSION['check_realm'])) {
     unset($_SESSION['check_realm']);
+}
 
 
 geo_widget_head($my_inst->federation, $my_inst->name);
@@ -95,15 +96,17 @@ 
         </div>
         <?php
         $loadmap = FALSE;
-        foreach ($idpoptions as $optionname => $optionvalue)
-            if ($optionvalue['name'] == "general:geo_coordinates")
+        foreach ($idpoptions as $optionname => $optionvalue) {
+                    if ($optionvalue['name'] == "general:geo_coordinates")
                 $loadmap = TRUE;
-        if ($loadmap)
-            echo '
+        }
+        if ($loadmap) {
+                    echo '
 <div class="infobox"  style="width:270px;">
 <div id="map" style="width:100%; height:150px"></div>
 </div>
 ';
+        }
         ?>
     </div>
     <table>
@@ -131,8 +134,8 @@ 
     <h2><?php _("Available Support actions"); ?></h2>
     <table>
         <?php
-        if (count(Config::$RADIUSTESTS['UDP-hosts']) > 0 || Config::$RADIUSTESTS['TLS-discoverytag'] != "")
-            echo "<tr>
+        if (count(Config::$RADIUSTESTS['UDP-hosts']) > 0 || Config::$RADIUSTESTS['TLS-discoverytag'] != "") {
+                    echo "<tr>
                         <td>" . _("Check another realm's reachability") . "</td>
                         <td><form method='post' action='action_realmcheck.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'>
                               <input type='text' name='realm' id='realm'>
@@ -140,7 +143,9 @@ 
                             </form>
                         </td>
                     </tr>";
-        if (Config::$CONSORTIUM['name'] == "eduroam") // SW: APPROVED
+        }
+        if (Config::$CONSORTIUM['name'] == "eduroam") {
+            // SW: APPROVED
             echo "<tr>
                         <td>" . _("Check server status of European federations") . "</td>
                         <td>
@@ -149,6 +154,7 @@ 
                            </form>
                         </td>
                     </tr>";
+        }
         ?>
     </table>
     <hr/>
@@ -226,9 +232,10 @@ 
                 $allcomplete = FALSE;
             };
             $attribs = $profile_list->getAttributes();
-            foreach ($attribs as $attrib)
-                if ($attrib['level'] == "Method" && !preg_match("/^internal:/", $attrib['name']))
+            foreach ($attribs as $attrib) {
+                            if ($attrib['level'] == "Method" && !preg_match("/^internal:/", $attrib['name']))
                     $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method level are in effect.") . "'>";
+            }
             $buffer_eaptypediv .= "<br/>";
         }
         $buffer_headline = "<h2 style='overflow:auto;'>";
@@ -236,23 +243,27 @@ 
         $buffer_headline .= "<div style='float:right;'>";
         $sufficient_config = $profile_list->getSufficientConfig();
         $showtime = $profile_list->isShowtime();
-        if ($has_overrides)
-            $buffer_headline .= UI_remark("", _("Option override on profile level is in effect."), TRUE);
-        if (!$allcomplete)
-            $buffer_headline .= UI_error("", _("The information in this profile is incomplete."), TRUE);
-        if ($showtime)
-            $buffer_headline .= UI_okay("", _("This profile is shown on the user download interface."), TRUE);
-        else if ($sufficient_config)
-            $buffer_headline .= UI_warning("", sprintf(_("This profile is NOT shown on the user download interface, even though we have enough information to show. To enable the profile, add the attribute \"%s\" and tick the corresponding box."), display_name("profile:production")), TRUE);
+        if ($has_overrides) {
+                    $buffer_headline .= UI_remark("", _("Option override on profile level is in effect."), TRUE);
+        }
+        if (!$allcomplete) {
+                    $buffer_headline .= UI_error("", _("The information in this profile is incomplete."), TRUE);
+        }
+        if ($showtime) {
+                    $buffer_headline .= UI_okay("", _("This profile is shown on the user download interface."), TRUE);
+        } else if ($sufficient_config) {
+                    $buffer_headline .= UI_warning("", sprintf(_("This profile is NOT shown on the user download interface, even though we have enough information to show. To enable the profile, add the attribute \"%s\" and tick the corresponding box."), display_name("profile:production")), TRUE);
+        }
         $buffer_headline .= "</div>";
 
         $buffer_headline .= sprintf(_("Profile: %s"), $profile_name) . "</h2>";
 
         echo $buffer_headline;
 
-        if (array_search(EAP::$TTLS_PAP, $typelist) !== FALSE && array_search(EAP::$TTLS_GTC, $typelist) === FALSE && array_search(EAP::$PEAP_MSCHAP2, $typelist) === FALSE && array_search(EAP::$TTLS_MSCHAP2, $typelist) === FALSE)
-        /// Hmmm... IdP Supports TTLS-PAP, but not TTLS-GTC nor anything based on MSCHAPv2. That locks out Symbian users; and is easy to circumvent. Tell the admin...
+        if (array_search(EAP::$TTLS_PAP, $typelist) !== FALSE && array_search(EAP::$TTLS_GTC, $typelist) === FALSE && array_search(EAP::$PEAP_MSCHAP2, $typelist) === FALSE && array_search(EAP::$TTLS_MSCHAP2, $typelist) === FALSE) {
+                /// Hmmm... IdP Supports TTLS-PAP, but not TTLS-GTC nor anything based on MSCHAPv2. That locks out Symbian users; and is easy to circumvent. Tell the admin...
             $buffer_eaptypediv .= "<p>" . sprintf(_("Read this <a href='%s'>tip</a>."), "https://confluence.terena.org/display/H2eduroam/eap-types#eap-types-choices") . "</p>";
+        }
 
         $buffer_eaptypediv .= "</div>";
         echo $buffer_eaptypediv;
@@ -260,12 +271,13 @@ 
         $has_realm = $profile_list->getAttributes("internal:realm");
         $has_realm = $has_realm[0]['value'];
         echo "<div class='profilemodulebuttons' style='float:right;'>";
-        if (count(Config::$RADIUSTESTS['UDP-hosts']) > 0 || ( count(Config::$RADIUSTESTS['TLS-clientcerts']) > 0 && Config::$RADIUSTESTS['TLS-discoverytag'] != ""))
-            echo "<form action='action_realmcheck.php?inst_id=$my_inst->identifier&amp;profile_id=$profile_list->identifier' method='post' accept-charset='UTF-8'>
+        if (count(Config::$RADIUSTESTS['UDP-hosts']) > 0 || ( count(Config::$RADIUSTESTS['TLS-clientcerts']) > 0 && Config::$RADIUSTESTS['TLS-discoverytag'] != "")) {
+                    echo "<form action='action_realmcheck.php?inst_id=$my_inst->identifier&amp;profile_id=$profile_list->identifier' method='post' accept-charset='UTF-8'>
                               <button type='submit' name='profile_action' value='check' " . ($has_realm ? "" : "disabled='disabled' title='" . _("The realm can only be checked if you configure the realm!") . "'") . ">
                                   " . _("Check realm reachability") . "
                               </button>
                           </form>";
+        }
         echo "<form action='overview_installers.php?inst_id=$my_inst->identifier&amp;profile_id=$profile_list->identifier' method='post' accept-charset='UTF-8'>
                               <button type='submit' name='profile_action' value='check' " . ($has_eaptypes ? "" : "disabled='disabled'  title='" . _("You have not fully configured any supported EAP types!") . "'") . ">
                                   " . _("Installer Fine-Tuning and Download") . "
@@ -291,10 +303,11 @@ 
         if ($profile_list->isShowtime()) {
             echo "<div style='display: table-cell; text-align:center;'><p><strong>" . _("User Download Link") . "</strong></p>";
             $URL = $profile_list->getCollapsedAttributes();
-            if (isset($URL['device-specific:redirect']))
-                $displayurl = $URL['device-specific:redirect'][0];
-            else
-                $displayurl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://' ) . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier . "&amp;profile=" . $profile_list->identifier;
+            if (isset($URL['device-specific:redirect'])) {
+                            $displayurl = $URL['device-specific:redirect'][0];
+            } else {
+                            $displayurl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://' ) . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier . "&amp;profile=" . $profile_list->identifier;
+            }
             echo "<a href='$displayurl' style='white-space: nowrap; text-align: center;'>";
             $uri = "data:image/png;base64," . base64_encode(png_inject_consortium_logo(QRcode::png($displayurl, FALSE, QR_ECLEVEL_Q, 12)));
             $size = getimagesize($uri);
@@ -307,8 +320,9 @@ 
             echo "<div style='width:20px;'></div>";
             echo "<div style='display: table-cell; min-width:200px;'><p><strong>" . _("User Downloads") . "</strong></p><table>";
             $stats = $profile_list->getUserDownloadStats();
-            foreach ($stats as $dev => $count)
-                echo "<tr><td><strong>$dev</strong></td><td>$count</td></tr>";
+            foreach ($stats as $dev => $count) {
+                            echo "<tr><td><strong>$dev</strong></td><td>$count</td></tr>";
+            }
             echo "</table></div>";
         }
         echo "</div>";

core/EntityWithDBProperties.php

Doc Comments +4 added lines, -1 removed lines

@@ -103,7 +103,7 @@ 
      * This function retrieves the IdP-wide attributes. If called with the optional parameter, only attribute values for the attribute
      * name in $optionName are retrieved; otherwise, all attributes are retrieved.
      *
-     * @param string $optionName optionally, the name of the attribute that is to be retrieved
+     * @param integer $optionName optionally, the name of the attribute that is to be retrieved
      * @return array of arrays of attributes which were set for this IdP
      */
     public function getAttributes($optionName = 0) {
@@ -187,6 +187,9 @@ 
         }
     }
 
+    /**
+     * @param string $level
+     */
     protected function retrieveOptionsFromDatabase($query, $level) {
         $optioninstance = Options::instance();
         $this->attributes = [];

config/config-template.php

Indentation +37 added lines, -37 removed lines

@@ -148,13 +148,13 @@ 
     ];
 
     /**
-      * Configuration for GeoIP2 
-      * Beware, the legacy version does not really work with IPv6 addresses
-      * version: set to 2 if you wish to use GeoIP2, to 1 for the legacy version or set to 0 to turn off geolocation service
-      * geoip2-path-to-autoloader: points to the GeoIP2 autoloader 
-      * geoip2-path-to-db: points to the GeoIP2 city database
-      * @var array
-      */
+     * Configuration for GeoIP2 
+     * Beware, the legacy version does not really work with IPv6 addresses
+     * version: set to 2 if you wish to use GeoIP2, to 1 for the legacy version or set to 0 to turn off geolocation service
+     * geoip2-path-to-autoloader: points to the GeoIP2 autoloader 
+     * geoip2-path-to-db: points to the GeoIP2 city database
+     * @var array
+     */
       
     public static $GEOIP = [
         'version' => 0,
@@ -181,21 +181,21 @@ 
      * @var array
      */
     public static $LANGUAGES = [
-      'ca' => ['display' => 'Català',      'locale' => 'ca_ES.utf8',    'latin_based' => TRUE],
-      'de' => ['display' => 'Deutsch',     'locale' => 'de_DE.utf8',    'latin_based' => TRUE],
-      'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8',    'latin_based' => TRUE],
-      'es' => ['display' => 'Español',     'locale' => 'es_ES.utf8',    'latin_based' => TRUE],
-      'gl' => ['display' => 'Galego',      'locale' => 'gl_ES.utf8',    'latin_based' => TRUE],
-      'hr' => ['display' => 'Hrvatski',    'locale' => 'hr_HR.utf8',    'latin_based' => TRUE],
-      'it' => ['display' => 'Italiano',    'locale' => 'it_IT.utf8',    'latin_based' => TRUE],
-      'nb' => ['display' => 'Norsk',       'locale' => 'nb_NO.utf8',    'latin_based' => TRUE],
-      'pl' => ['display' => 'Polski',      'locale' => 'pl_PL.utf8',    'latin_based' => TRUE],
-      'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8',    'latin_based' => TRUE],
-      'sr' => ['display' => 'Srpski',      'locale' => 'sr_RS@latin',    'latin_based' => TRUE],
-      'fi' => ['display' => 'Suomi',       'locale' => 'fi_FI.utf8',    'latin_based' => TRUE],
-      'el' => ['display' => 'Ελληνικά',    'locale' => 'el_GR.utf8',    'latin_based' => FALSE],
-      'hu' => ['display' => 'Magyar',      'locale' => 'hu_HU.utf8',    'latin_based' => TRUE],
-      'pt' => ['display' => 'Português',   'locale' => 'pt_PT.utf8',    'latin_based' => TRUE],
+        'ca' => ['display' => 'Català',      'locale' => 'ca_ES.utf8',    'latin_based' => TRUE],
+        'de' => ['display' => 'Deutsch',     'locale' => 'de_DE.utf8',    'latin_based' => TRUE],
+        'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8',    'latin_based' => TRUE],
+        'es' => ['display' => 'Español',     'locale' => 'es_ES.utf8',    'latin_based' => TRUE],
+        'gl' => ['display' => 'Galego',      'locale' => 'gl_ES.utf8',    'latin_based' => TRUE],
+        'hr' => ['display' => 'Hrvatski',    'locale' => 'hr_HR.utf8',    'latin_based' => TRUE],
+        'it' => ['display' => 'Italiano',    'locale' => 'it_IT.utf8',    'latin_based' => TRUE],
+        'nb' => ['display' => 'Norsk',       'locale' => 'nb_NO.utf8',    'latin_based' => TRUE],
+        'pl' => ['display' => 'Polski',      'locale' => 'pl_PL.utf8',    'latin_based' => TRUE],
+        'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8',    'latin_based' => TRUE],
+        'sr' => ['display' => 'Srpski',      'locale' => 'sr_RS@latin',    'latin_based' => TRUE],
+        'fi' => ['display' => 'Suomi',       'locale' => 'fi_FI.utf8',    'latin_based' => TRUE],
+        'el' => ['display' => 'Ελληνικά',    'locale' => 'el_GR.utf8',    'latin_based' => FALSE],
+        'hu' => ['display' => 'Magyar',      'locale' => 'hu_HU.utf8',    'latin_based' => TRUE],
+        'pt' => ['display' => 'Português',   'locale' => 'pt_PT.utf8',    'latin_based' => TRUE],
 
 // For the following languages, partial translations exist in Transifex, but
 // they are not complete enough for display. Their Transifex content is not
@@ -244,45 +244,45 @@ 
         ],
 
         'TLS-clientcerts' => [
-          'CA1' => [
+            'CA1' => [
             'status' => 'ACCREDITED',
             'issuerCA' => '/DC=org/DC=pki1/CN=PKI 1',
             'certificates' => [
-              [
+                [
                 'status' => 'CORRECT',
                 'public' => 'ca1-client-cert.pem',
                 'private' => 'ca1-client-key.pem',
                 'expected' => 'PASS'],
-              [
+                [
                 'status' => 'WRONGPOLICY',
                 'public' => 'ca1-nopolicy-cert.pem',
                 'private' => 'ca1-nopolicy-key.key',
                 'expected' => 'FAIL'],
-              [
+                [
                 'status' => 'EXPIRED',
                 'public' => 'ca1-exp.pem',
                 'private' => 'ca1-exp.key',
                 'expected' => 'FAIL'],
-              [
+                [
                 'status' => 'REVOKED',
                 'public' => 'ca1-revoked.pem',
                 'private' => 'ca1-revoked.key',
                 'expected' => 'FAIL'],
             ]
-          ],
-          'CA-N' => [
+            ],
+            'CA-N' => [
             'status' => 'NONACCREDITED',
             'issuerCA' => '/DC=org/DC=pkiN/CN=PKI N',
             'certificates' => [
-               [
+                [
                 'status' => 'CORRECT',
                 'public' => 'caN-client-cert.pem',
                 'private' => 'caN-client-cert.key',
                 'expected' => 'FAIL'],
-               ]
-          ]
-      ],
-      'accreditedCAsURL' => '',
+                ]
+            ]
+        ],
+        'accreditedCAsURL' => '',
     ];
 
     /**
@@ -320,11 +320,11 @@ 
             'db' => 'customer_db',
             'user' => 'customerservice',
             'pass' => '2lame4u'],
-         'enforce-external-sync' => TRUE,
-         /* if you feed your user database from a third-party source and do not want CAT to update it on its own, you can 
+            'enforce-external-sync' => TRUE,
+            /* if you feed your user database from a third-party source and do not want CAT to update it on its own, you can 
           * make it read-only
           */
-         'userdb-readonly' => FALSE,
+            'userdb-readonly' => FALSE,
     ];
 
     /**

Spacing +18 added lines, -18 removed lines

@@ -170,7 +170,7 @@ 
      * pass: password for the username
      * @var array
      */
-    public static $MAILSETTINGS = [ // we always use Submission
+    public static $MAILSETTINGS = [// we always use Submission
         'host' => 'submission.capable.mta',
         'user'=> 'mailuser',
         'pass' => 'mailpass',
@@ -181,21 +181,21 @@ 
      * @var array
      */
     public static $LANGUAGES = [
-      'ca' => ['display' => 'Català',      'locale' => 'ca_ES.utf8',    'latin_based' => TRUE],
-      'de' => ['display' => 'Deutsch',     'locale' => 'de_DE.utf8',    'latin_based' => TRUE],
-      'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8',    'latin_based' => TRUE],
-      'es' => ['display' => 'Español',     'locale' => 'es_ES.utf8',    'latin_based' => TRUE],
-      'gl' => ['display' => 'Galego',      'locale' => 'gl_ES.utf8',    'latin_based' => TRUE],
-      'hr' => ['display' => 'Hrvatski',    'locale' => 'hr_HR.utf8',    'latin_based' => TRUE],
-      'it' => ['display' => 'Italiano',    'locale' => 'it_IT.utf8',    'latin_based' => TRUE],
-      'nb' => ['display' => 'Norsk',       'locale' => 'nb_NO.utf8',    'latin_based' => TRUE],
-      'pl' => ['display' => 'Polski',      'locale' => 'pl_PL.utf8',    'latin_based' => TRUE],
-      'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8',    'latin_based' => TRUE],
-      'sr' => ['display' => 'Srpski',      'locale' => 'sr_RS@latin',    'latin_based' => TRUE],
-      'fi' => ['display' => 'Suomi',       'locale' => 'fi_FI.utf8',    'latin_based' => TRUE],
-      'el' => ['display' => 'Ελληνικά',    'locale' => 'el_GR.utf8',    'latin_based' => FALSE],
-      'hu' => ['display' => 'Magyar',      'locale' => 'hu_HU.utf8',    'latin_based' => TRUE],
-      'pt' => ['display' => 'Português',   'locale' => 'pt_PT.utf8',    'latin_based' => TRUE],
+      'ca' => ['display' => 'Català', 'locale' => 'ca_ES.utf8', 'latin_based' => TRUE],
+      'de' => ['display' => 'Deutsch', 'locale' => 'de_DE.utf8', 'latin_based' => TRUE],
+      'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8', 'latin_based' => TRUE],
+      'es' => ['display' => 'Español', 'locale' => 'es_ES.utf8', 'latin_based' => TRUE],
+      'gl' => ['display' => 'Galego', 'locale' => 'gl_ES.utf8', 'latin_based' => TRUE],
+      'hr' => ['display' => 'Hrvatski', 'locale' => 'hr_HR.utf8', 'latin_based' => TRUE],
+      'it' => ['display' => 'Italiano', 'locale' => 'it_IT.utf8', 'latin_based' => TRUE],
+      'nb' => ['display' => 'Norsk', 'locale' => 'nb_NO.utf8', 'latin_based' => TRUE],
+      'pl' => ['display' => 'Polski', 'locale' => 'pl_PL.utf8', 'latin_based' => TRUE],
+      'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8', 'latin_based' => TRUE],
+      'sr' => ['display' => 'Srpski', 'locale' => 'sr_RS@latin', 'latin_based' => TRUE],
+      'fi' => ['display' => 'Suomi', 'locale' => 'fi_FI.utf8', 'latin_based' => TRUE],
+      'el' => ['display' => 'Ελληνικά', 'locale' => 'el_GR.utf8', 'latin_based' => FALSE],
+      'hu' => ['display' => 'Magyar', 'locale' => 'hu_HU.utf8', 'latin_based' => TRUE],
+      'pt' => ['display' => 'Português', 'locale' => 'pt_PT.utf8', 'latin_based' => TRUE],
 
 // For the following languages, partial translations exist in Transifex, but
 // they are not complete enough for display. Their Transifex content is not
@@ -350,9 +350,9 @@ 
      * NSIS version - with version 3 UTF installers will be created
      * see also $PATHS['makensis']
      */
-    public static $NSIS_VERSION = 2 ;
+    public static $NSIS_VERSION = 2;
 
-    public static $SUPERADMINS =  [
+    public static $SUPERADMINS = [
         'eptid:someuser',
         'http://sommeopenid.example/anotheruser',
         'I do not care about security!',

web/admin/edit_profile.php

Spacing +15 added lines, -15 removed lines

@@ -317,14 +317,14 @@ 
             <tr>
                 <!-- checkbox for "verify-->
                 <td>
-                    <span id='verify_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='verify_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Verify user input to contain realm suffix:"); ?>
                     </span>
                 </td>
                 <td>
                     <input type='checkbox' <?php
-                        echo ($verify != FALSE ? "checked" : "" );
-                        echo ($realm == "" ? "disabled" : "" );
+                        echo ($verify != FALSE ? "checked" : "");
+                        echo ($realm == "" ? "disabled" : "");
                         ?> name='verify_support' onclick='
                                 if (this.form.elements["verify_support"].checked != true) {
                                     this.form.elements["hint_support"].setAttribute("disabled", "disabled");
@@ -332,48 +332,48 @@ 
                                     this.form.elements["hint_support"].removeAttribute("disabled");
                                 }
                                 ;'/>
-                    <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Prefill user input with realm suffix:"); ?>
                     </span>
-                    <input type='checkbox' <?php echo ($verify == FALSE ? "disabled" : "" ); ?> name='hint_support' <?php echo ( $hint != FALSE ? "checked" : "" ); ?> />
+                    <input type='checkbox' <?php echo ($verify == FALSE ? "disabled" : ""); ?> name='hint_support' <?php echo ($hint != FALSE ? "checked" : ""); ?> />
                 </td>
             </tr>
             <tr>
 
                 <!-- checkbox and input field for anonymity support, available only when realm is known-->
                 <td>
-                    <span id='anon_support_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='anon_support_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Enable Anonymous Outer Identity:"); ?>
                     </span>
                 </td>
                 <td>
-                    <input type='checkbox' <?php echo ($use_anon != FALSE ? "checked" : "" ) . ($realm == "" ? " disabled" : "" ); ?> name='anon_support' onclick='
+                    <input type='checkbox' <?php echo ($use_anon != FALSE ? "checked" : "") . ($realm == "" ? " disabled" : ""); ?> name='anon_support' onclick='
                             if (this.form.elements["anon_support"].checked != true) {
                                 this.form.elements["anon_local"].setAttribute("disabled", "disabled");
                             } else {
                                 this.form.elements["anon_local"].removeAttribute("disabled");
                             }
                             ;'/>
-                    <input type='text' <?php echo ($checkuser_outer == FALSE ? "disabled" : "" ); ?> name='anon_local' value='$anon_local'/>
+                    <input type='text' <?php echo ($checkuser_outer == FALSE ? "disabled" : ""); ?> name='anon_local' value='$anon_local'/>
                 </td>    
             </tr>
             <tr>
 
                 <!-- checkbox and input field for check realm outer id, available only when realm is known-->
                 <td>
-                    <span id='checkuser_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='checkuser_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Use special Outer Identity for realm checks:"); ?>
                     </span>
                 </td>
                 <td>
-                    <input type='checkbox' <?php echo ($checkuser_outer != FALSE ? "checked" : "" ) . ($realm == "" ? " disabled" : "" ); ?> name='checkuser_support' onclick='
+                    <input type='checkbox' <?php echo ($checkuser_outer != FALSE ? "checked" : "") . ($realm == "" ? " disabled" : ""); ?> name='checkuser_support' onclick='
                             if (this.form.elements["checkuser_support"].checked != true) {
                                 this.form.elements["checkuser_local"].setAttribute("disabled", "disabled");
                             } else {
                                 this.form.elements["checkuser_local"].removeAttribute("disabled");
                             }
                             ;'/>
-                    <input type='text' <?php echo ($checkuser_outer == FALSE ? "disabled" : "" ); ?> name='checkuser_local' value='$checkuser_value'/>
+                    <input type='text' <?php echo ($checkuser_outer == FALSE ? "disabled" : ""); ?> name='checkuser_local' value='$checkuser_value'/>
                 </td>
             </tr>
         </table>
@@ -388,14 +388,14 @@ 
     <p>
 
         <?php
-        echo "<span id='redirect_label' style='" . ($realm == "" ? "color:#999999" : "" ) . "'><label for='redirect'>" . _("Redirect end users to own web page:") . "</label></span>
-                          <input type='checkbox'  name='redirect' id='redirect' " . ($blacklisted === FALSE ? "" : "checked " ) . "onclick='
+        echo "<span id='redirect_label' style='" . ($realm == "" ? "color:#999999" : "") . "'><label for='redirect'>" . _("Redirect end users to own web page:") . "</label></span>
+                          <input type='checkbox'  name='redirect' id='redirect' " . ($blacklisted === FALSE ? "" : "checked ") . "onclick='
                               if (this.form.elements[\"redirect\"].checked != true) {
                                 this.form.elements[\"redirect_target\"].setAttribute(\"disabled\", \"disabled\");
                               } else {
                                 this.form.elements[\"redirect_target\"].removeAttribute(\"disabled\");
                               };'/>
-                          <input type='text' name='redirect_target' " . ($blacklisted !== FALSE ? "value='$blacklisted'" : "disabled" ) . "/>";
+                          <input type='text' name='redirect_target' " . ($blacklisted !== FALSE ? "value='$blacklisted'" : "disabled") . "/>";
         ?>
     </p>
 
@@ -411,7 +411,7 @@ 
     function priority($eapType, $isenabled, $priority) {
         echo "<td><select id='$eapType-priority' name='$eapType-priority' " . (!$isenabled ? "disabled='disabled'" : "") . ">";
         for ($a = 1; $a < 7; $a = $a + 1)
-            echo "<option id='$eapType-$a' value='$a' " . ( $isenabled && $a == $priority ? "selected" : "" ) . ">$a</option>";
+            echo "<option id='$eapType-$a' value='$a' " . ($isenabled && $a == $priority ? "selected" : "") . ">$a</option>";
         echo "</select></td>";
     }
 

Braces +64 added lines, -43 removed lines

@@ -175,10 +175,11 @@ 
     ?>
     <h1>
         <?php
-        if ($wizard_style)
-            echo _("Step 3: Defining a user group profile");
-        else
-            printf(_("Edit profile '%s' ..."), $prefill_name);
+        if ($wizard_style) {
+                    echo _("Step 3: Defining a user group profile");
+        } else {
+                    printf(_("Edit profile '%s' ..."), $prefill_name);
+        }
         ?>
     </h1>
     <div class='infobox'>
@@ -221,8 +222,9 @@ 
             <strong><?php echo _("General Profile properties"); ?></strong>
         </legend>
         <?php
-        if ($wizard_style)
-            echo "<p>" . _("We will now define a profile for your user group(s).  You can add as many profiles as you like by choosing the appropriate button on the end of the page. After we are done, the wizard is finished and you will be taken to the main IdP administration page.") . "</p>";
+        if ($wizard_style) {
+                    echo "<p>" . _("We will now define a profile for your user group(s).  You can add as many profiles as you like by choosing the appropriate button on the end of the page. After we are done, the wizard is finished and you will be taken to the main IdP administration page.") . "</p>";
+        }
         ?>
         <h3><?php echo _("Profile Name and RADIUS realm"); ?></h3>
         <?php
@@ -230,8 +232,9 @@ 
             echo "<p>" . _("First of all we need a name for the profile. This will be displayed to end users, so you may want to choose a descriptive name like 'Professors', 'Students of the Faculty of Bioscience', etc.") . "</p>";
             echo "<p>" . _("Optionally, you can provide a longer descriptive text about who this profile is for. If you specify it, it will be displayed on the download page after the user has selected the profile name in the list.") . "</p>";
             echo "<p>" . _("You can also tell us your RADIUS realm. ");
-            if (count(Config::$RADIUSTESTS['UDP-hosts']) > 0 || Config::$RADIUSTESTS['TLS-discoverytag'] != "")
-                printf(_("This is useful if you want to use the sanity check module later, which tests reachability of your realm in the %s infrastructure. "), CONFIG::$CONSORTIUM['name']);
+            if (count(Config::$RADIUSTESTS['UDP-hosts']) > 0 || Config::$RADIUSTESTS['TLS-discoverytag'] != "") {
+                            printf(_("This is useful if you want to use the sanity check module later, which tests reachability of your realm in the %s infrastructure. "), CONFIG::$CONSORTIUM['name']);
+            }
             echo _("It is required to enter the realm name if you want to support anonymous outer identities (see below).") . "</p>";
         }
         ?>
@@ -242,9 +245,10 @@ 
             if ($edit_mode) {
                 $existing_attribs = $my_profile->getAttributes();
 
-                foreach ($existing_attribs as $existing_attribute)
-                    if ($existing_attribute['level'] == "Profile")
+                foreach ($existing_attribs as $existing_attribute) {
+                                    if ($existing_attribute['level'] == "Profile")
                         $prepopulate[] = $existing_attribute;
+                }
             }
             add_option("profile", $prepopulate);
             ?>
@@ -382,8 +386,9 @@ 
     <h3><?php echo _("Installer Download Location"); ?></h3>
 
     <?php
-    if ($wizard_style)
-        echo "<p>" . _("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).") . "</p>";
+    if ($wizard_style) {
+            echo "<p>" . _("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).") . "</p>";
+    }
     ?>
     <p>
 
@@ -403,15 +408,17 @@ 
 <fieldset class="option_container">
     <legend><strong><?php echo _("Supported EAP types"); ?></strong></legend>
     <?php
-    if ($wizard_style)
-        echo "<p>" . _("Now, we need to know which EAP types your IdP supports. If you support multiple EAP types, you can assign every type a priority (1=highest). This tool will always generate an automatic installer for the EAP type with the highest priority; only if the user's device can't use that EAP type, we will use an EAP type further down in the list.") . "</p>";
+    if ($wizard_style) {
+            echo "<p>" . _("Now, we need to know which EAP types your IdP supports. If you support multiple EAP types, you can assign every type a priority (1=highest). This tool will always generate an automatic installer for the EAP type with the highest priority; only if the user's device can't use that EAP type, we will use an EAP type further down in the list.") . "</p>";
+    }
     ?>
     <?php
 
     function priority($eapType, $isenabled, $priority) {
         echo "<td><select id='$eapType-priority' name='$eapType-priority' " . (!$isenabled ? "disabled='disabled'" : "") . ">";
-        for ($a = 1; $a < 7; $a = $a + 1)
-            echo "<option id='$eapType-$a' value='$a' " . ( $isenabled && $a == $priority ? "selected" : "" ) . ">$a</option>";
+        for ($a = 1; $a < 7; $a = $a + 1) {
+                    echo "<option id='$eapType-$a' value='$a' " . ( $isenabled && $a == $priority ? "selected" : "" ) . ">$a</option>";
+        }
         echo "</select></td>";
     }
 
@@ -420,18 +427,20 @@ 
 
         $eapoptions = [];
 
-        foreach ($idpwideoptions as $option)
-            if ($option['level'] == "IdP" && preg_match('/^eap/', $option['name']))
+        foreach ($idpwideoptions as $option) {
+                    if ($option['level'] == "IdP" && preg_match('/^eap/', $option['name']))
                 $eapoptions[] = $option['name'];
+        }
 
         $eapoptions = array_count_values($eapoptions);
 
         if (count($eapoptions) > 0) {
             echo "<strong>" . _("EAP options inherited from Global level:") . "</strong><br />";
-            foreach ($eapoptions as $optionname => $count)
-            /// option count and enumeration
+            foreach ($eapoptions as $optionname => $count) {
+                        /// option count and enumeration
             /// Example: "(3x) Server Name"
                 printf(_("(%dx) %s") . "<br />", $count, display_name($optionname));
+            }
         }
 
         echo "</div></td>";
@@ -446,10 +455,11 @@ 
     foreach ($methods as $a) {
         $display = display_name($a);
         $enabled = FALSE;
-        if ($edit_mode)
-            foreach ($prefill_methods as $prio => $value) {
+        if ($edit_mode) {
+                    foreach ($prefill_methods as $prio => $value) {
                 if (display_name($a) == display_name($value)) {
                     $enabled = TRUE;
+        }
                     $countactive = $prio + 1;
                 }
             }
@@ -488,8 +498,9 @@ 
                         <?php
                         foreach ($methods as $a) {
                             $display = display_name($a);
-                            if (!isset($D[display_name($a)]))
-                                print '<li class="eap1">' . display_name($a) . "</li>\n";
+                            if (!isset($D[display_name($a)])) {
+                                                            print '<li class="eap1">' . display_name($a) . "</li>\n";
+                            }
                         }
                         ?>
                     </ol>
@@ -513,13 +524,15 @@ 
         <?php
         $idp_options = $my_inst->getAttributes();
         $has_support_options = [];
-        foreach ($idp_options as $idp_option)
-            if (preg_match("/^support:/", $idp_option['name']))
+        foreach ($idp_options as $idp_option) {
+                    if (preg_match("/^support:/", $idp_option['name']))
                 $has_support_options[$idp_option['name']] = "SET";
+        }
         if (count($has_support_options) > 0) {
             $text = "<ul>";
-            foreach ($has_support_options as $key => $value)
-                $text .= "<li><strong>" . display_name($key) . "</strong></li>";
+            foreach ($has_support_options as $key => $value) {
+                            $text .= "<li><strong>" . display_name($key) . "</strong></li>";
+            }
             $text .= "</ul>";
             printf(ngettext("The option %s is already defined IdP-wide. If you set it here on profile level, this setting will override the IdP-wide one.", "The options %s are already defined IdP-wide. If you set them here on profile level, these settings will override the IdP-wide ones.", count($has_support_options)), $text);
         }
@@ -530,9 +543,10 @@ 
         $prepopulate = [];
         if ($edit_mode) {
             $existing_attribs = $my_profile->getAttributes();
-            foreach ($existing_attribs as $existing_attribute)
-                if ($existing_attribute['level'] == "Profile")
+            foreach ($existing_attribs as $existing_attribute) {
+                            if ($existing_attribute['level'] == "Profile")
                     $prepopulate[] = $existing_attribute;
+            }
         }
         add_option("support", $prepopulate);
         ?>
@@ -544,13 +558,15 @@ 
     <p>
         <?php
         $has_eap_options = [];
-        foreach ($idp_options as $idp_option)
-            if (preg_match("/^eap:/", $idp_option['name']))
+        foreach ($idp_options as $idp_option) {
+                    if (preg_match("/^eap:/", $idp_option['name']))
                 $has_eap_options[$idp_option['name']] = "SET";
+        }
         if (count($has_eap_options) > 0) {
             $text = "<ul>";
-            foreach ($has_eap_options as $key => $value)
-                $text .= "<li><strong>" . display_name($key) . "</strong></li>";
+            foreach ($has_eap_options as $key => $value) {
+                            $text .= "<li><strong>" . display_name($key) . "</strong></li>";
+            }
             $text .= "</ul>";
             printf(ngettext("The option %s is already defined IdP-wide. If you set it here on profile level, this setting will override the IdP-wide one.", "The options %s are already defined IdP-wide. If you set them here on profile level, these settings will override the IdP-wide ones.", count($has_eap_options)), $text);
         }
@@ -561,9 +577,10 @@ 
         $prepopulate = [];
         if ($edit_mode) {
             $existing_attribs = $my_profile->getAttributes();
-            foreach ($existing_attribs as $existing_attribute)
-                if ($existing_attribute['level'] == "Profile")
+            foreach ($existing_attribs as $existing_attribute) {
+                            if ($existing_attribute['level'] == "Profile")
                     $prepopulate[] = $existing_attribute;
+            }
         }
         add_option("eap", $prepopulate);
         ?>
@@ -576,13 +593,15 @@ 
         <?php
         $idp_options = $my_inst->getAttributes();
         $has_support_options = array();
-        foreach ($idp_options as $idp_option)
-            if (preg_match("/^media:/", $idp_option['name']))
+        foreach ($idp_options as $idp_option) {
+                    if (preg_match("/^media:/", $idp_option['name']))
                 $has_support_options[$idp_option['name']] = "SET";
+        }
         if (count($has_support_options) > 0) {
             $text = "<ul>";
-            foreach ($has_support_options as $key => $value)
-                $text .= "<li><strong>" . display_name($key) . "</strong></li>";
+            foreach ($has_support_options as $key => $value) {
+                            $text .= "<li><strong>" . display_name($key) . "</strong></li>";
+            }
             $text .= "</ul>";
             printf(ngettext("The option %s is already defined IdP-wide. If you set it here on profile level, this setting will override the IdP-wide one.", "The options %s are already defined IdP-wide. If you set them here on profile level, these settings will override the IdP-wide ones.", count($has_support_options)), $text);
         }
@@ -593,16 +612,18 @@ 
         $prepopulate = array();
         if ($edit_mode) {
             $existing_attribs = $my_profile->getAttributes();
-            foreach ($existing_attribs as $existing_attribute)
-                if ($existing_attribute['level'] == "Profile")
+            foreach ($existing_attribs as $existing_attribute) {
+                            if ($existing_attribute['level'] == "Profile")
                     $prepopulate[] = $existing_attribute;
+            }
         }
         add_option("media", $prepopulate);
         ?>
     </table>
     <button type='button' class='newoption' onclick='addDefaultMediaOptions()'><?php echo _("Add new option"); ?></button></fieldset>
 <?php
-if ($wizard_style)
+if ($wizard_style) {
     echo "<p>" . _("When you are sure that everything is correct, please click on 'Save data' and you will be taken to your IdP Dashboard page.") . "</p>";
+}
 echo "<p><button type='submit' name='submitbutton' value='" . BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_idp.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>";
 footer();