GEANT / CAT

web/admin/overview_user.php

Braces +24 added lines, -18 removed lines

@@ -54,22 +54,26 @@ 
     </div>
     <div>
         <?php
-        if (!Config::$DB['userdb-readonly'])
-            echo "<a href='edit_user.php'><button>" . _("Edit User Details") . "</button></a>";
+        if (!Config::$DB['userdb-readonly']) {
+                    echo "<a href='edit_user.php'><button>" . _("Edit User Details") . "</button></a>";
+        }
 
-        if ($user->isFederationAdmin())
-            echo "<form action='overview_federation.php' method='GET' accept-charset='UTF-8'><button type='submit'>" . _('Click here to manage your federations') . "</button></form>";
-        if ($user->isSuperadmin())
-            echo "<form action='112365365321.php' method='GET' accept-charset='UTF-8'><button type='submit'>" . _('Click here to access the superadmin page') . "</button></form>";
+        if ($user->isFederationAdmin()) {
+                    echo "<form action='overview_federation.php' method='GET' accept-charset='UTF-8'><button type='submit'>" . _('Click here to manage your federations') . "</button></form>";
+        }
+        if ($user->isSuperadmin()) {
+                    echo "<form action='112365365321.php' method='GET' accept-charset='UTF-8'><button type='submit'>" . _('Click here to access the superadmin page') . "</button></form>";
+        }
         ?>
     </div>
     <?php
     $has_inst = $inst_mgmt->listInstitutionsByAdmin($_SESSION['user']);
 
-    if (Config::$CONSORTIUM['name'] == 'eduroam')
-        $helptext = "&nbsp;<h3 style='display:inline;'>" . sprintf(_("(Need help? Refer to the <a href='%s'>IdP administrator manual</a>)"),"https://wiki.geant.org/x/SwB_AQ")."</h3>";
-    else
-        $helptext = "";
+    if (Config::$CONSORTIUM['name'] == 'eduroam') {
+            $helptext = "&nbsp;<h3 style='display:inline;'>" . sprintf(_("(Need help? Refer to the <a href='%s'>IdP administrator manual</a>)"),"https://wiki.geant.org/x/SwB_AQ")."</h3>";
+    } else {
+            $helptext = "";
+    }
 
     if (sizeof($has_inst) > 0) {
         // we need to run the Federation constructor
@@ -121,25 +125,27 @@ 
                         }
                     } else { // don't list self
                         unset($admins[$number]);
-                        if ($username['LEVEL'] == "FED")
-                            $i_am_blessed = TRUE;
+                        if ($username['LEVEL'] == "FED") {
+                                                    $i_am_blessed = TRUE;
+                        }
                     }
                 }
                 $number_of_other_admins = count($admins); // only the unnamed remain
-                if ($number_of_other_admins > 0)
-                    echo ngettext("other user", "other users", $number_of_other_admins);
+                if ($number_of_other_admins > 0) {
+                                    echo ngettext("other user", "other users", $number_of_other_admins);
+                }
                 // foreach ($the_inst->owner() as $admin)
                 // if ($admin != $_SESSION['user'])
                 // echo $admin . "<br/>";
                 echo "</td><td>";
-                if ($i_am_blessed)
-                    echo "<div style='white-space: nowrap;'><form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $the_inst->identifier . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'><button type='submit'>" . _("Add/Remove Administrators") . "</button></form></div>";
+                if ($i_am_blessed) {
+                                    echo "<div style='white-space: nowrap;'><form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $the_inst->identifier . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'><button type='submit'>" . _("Add/Remove Administrators") . "</button></form></div>";
+                }
                 echo "</td></tr>";
             }
         }
         echo "</table>";
-    }
-    else {
+    } else {
         echo "<h2>" . _("You are not managing any institutions.") . "</h2>";
     };
     if (Config::$CONSORTIUM['selfservice_registration'] === NULL) {

web/admin/edit_profile_result.php

Braces +24 added lines, -14 removed lines

@@ -48,25 +48,29 @@ 
 // extended input checks
 
 $realm = FALSE;
-if (isset($_POST['realm']) && $_POST['realm'] != "")
+if (isset($_POST['realm']) && $_POST['realm'] != "") {
     $realm = valid_Realm($_POST['realm']);
+}
 
 $anon = FALSE;
-if (isset($_POST['anon_support']))
+if (isset($_POST['anon_support'])) {
     $anon = valid_boolean($_POST['anon_support']);
+}
 
 $anon_local = "anonymous";
 if (isset($_POST['anon_local'])) {
     $anon_local = valid_string_db($_POST['anon_local']);
 } else if ($my_profile !== FALSE) { // get the old anon outer id from DB. People don't appreciate "forgetting" it when unchecking anon id
     $local = $my_profile->getAttributes("internal:anon_local_value");
-    if (isset($local[0]))
-        $anon_local = $local[0]['value'];
-}
+    if (isset($local[0])) {
+            $anon_local = $local[0]['value'];
+    }
+    }
 
 $checkuser = FALSE;
-if (isset($_POST['checkuser_support']))
+if (isset($_POST['checkuser_support'])) {
     $checkuser = valid_boolean($_POST['checkuser_support']);
+}
 
 $checkuser_name = "anonymous";
 if (isset($_POST['checkuser_local'])) {
@@ -77,15 +81,18 @@ 
 
 $verify = FALSE;
 $hint = FALSE;
-if (isset($_POST['verify_support']))
+if (isset($_POST['verify_support'])) {
     $verify = valid_boolean($_POST['checkuser_support']);
-if (isset($_POST['hint_support']))
+}
+if (isset($_POST['hint_support'])) {
     $hint = valid_boolean($_POST['hint_support']);
+}
 
 
 $redirect = FALSE;
-if (isset($_POST['redirect']))
+if (isset($_POST['redirect'])) {
     $redirect = valid_boolean($_POST['redirect']);
+}
 
 // did the user submit info? If so, submit to DB and go on to the 'dashboard' or 'next profile' page.
 // if not, what is he doing on this page anyway!
@@ -113,8 +120,9 @@ 
     if ($realm != FALSE) {
         $profile->setRealm($anon_local . "@" . $realm);
         echo UI_okay(sprintf(_("Realm: <strong>%s</strong>"), $realm));
-    } else
-        $profile->setRealm("");
+    } else {
+            $profile->setRealm("");
+    }
     // set anon ID, if submitted
     if ($anon != FALSE) {
         if ($realm == FALSE) {
@@ -190,9 +198,10 @@ 
                 echo UI_okay(_("Supported EAP Type: ") . "<strong>" . display_name($a) . "</strong>");
             } else {
                 $warntext = "";
-                if (is_array($eapcompleteness))
-                    foreach ($eapcompleteness as $item)
+                if (is_array($eapcompleteness)) {
+                                    foreach ($eapcompleteness as $item)
                         $warntext .= "<strong>" . display_name($item) . "</strong> ";
+                }
                 echo UI_warning(sprintf(_("Supported EAP Type: <strong>%s</strong> is missing required information %s !"), display_name($a), $warntext) . "<br/>" . _("The EAP type was added to the profile, but you need to complete the missing information before we can produce installers for you."));
             }
         }
@@ -207,9 +216,10 @@ 
     <button type='submit'><?php echo _("Continue to dashboard"); ?></button>
 </form>
 <?php
-if (count($profile->getEapMethodsinOrderOfPreference(1)) > 0)
+if (count($profile->getEapMethodsinOrderOfPreference(1)) > 0) {
     echo "<form method='post' action='overview_installers.php?inst_id=$my_inst->identifier&profile_id=$profile->identifier' accept-charset='UTF-8'>
         <button type='submit'>" . _("Continue to Installer Fine-Tuning and Download") . "</button>
     </form>";
+}
 footer();
 ?>
\ No newline at end of file

web/admin/overview_installers.php

Braces +5 added lines, -4 removed lines

@@ -125,9 +125,9 @@ 
                     } else {
                         echo "<td class='compat_secondary'></td>";
                     }
+                } else {
+                                    echo "<td class='compat_unsupported'></td>";
                 }
-                else
-                    echo "<td class='compat_unsupported'></td>";
             }
             echo "</tr>";
         }
@@ -144,8 +144,9 @@ 
     <?php
     if (count($footnotes)) {
         echo "<p><strong>" . _("Footnotes:") . "</strong></p><table>";
-        foreach ($footnotes as $number => $text)
-            echo "<tr><td>($number) - </td><td>$text</td></tr>";
+        foreach ($footnotes as $number => $text) {
+                    echo "<tr><td>($number) - </td><td>$text</td></tr>";
+        }
         echo "</table>";
     }
     ?>

web/admin/edit_profile.php

Braces +69 added lines, -47 removed lines

@@ -157,9 +157,10 @@ 
     if (count($blacklisted) > 0) {
         $blacklisted = unserialize($blacklisted[0]['value']);
         $blacklisted = $blacklisted['content'];
-    } else
-        $blacklisted = FALSE;
-} else {
+    } else {
+            $blacklisted = FALSE;
+    }
+    } else {
     $wizard_style = TRUE;
     $edit_mode = FALSE;
 }
@@ -173,10 +174,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'>
@@ -219,8 +221,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
@@ -228,8 +231,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>";
         }
         ?>
@@ -240,9 +244,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);
             ?>
@@ -349,8 +354,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>
 
@@ -370,15 +376,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($eap_type, $isenabled, $priority) {
             echo "<td><select id='$eap_type-priority' name='$eap_type-priority' " . (!$isenabled ? "disabled='disabled'" : "") . ">";
-            for ($a = 1; $a < 7; $a = $a + 1)
-                echo "<option id='$eap_type-$a' value='$a' " . ( $isenabled && $a == $priority ? "selected" : "" ) . ">$a</option>";
+            for ($a = 1; $a < 7; $a = $a + 1) {
+                            echo "<option id='$eap_type-$a' value='$a' " . ( $isenabled && $a == $priority ? "selected" : "" ) . ">$a</option>";
+            }
             echo "</select></td>";
         }
 
@@ -387,18 +395,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>";
@@ -413,10 +423,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;
                     }
                 }
@@ -455,8 +466,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>
@@ -480,13 +492,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);
             }
@@ -497,9 +511,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);
             ?>
@@ -511,13 +526,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);
             }
@@ -528,9 +545,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);
             ?>
@@ -543,13 +561,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);
             }
@@ -560,17 +580,19 @@ 
             $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)
-        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>";
+    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();
     ?>

web/admin/API.php

Braces +17 added lines, -11 removed lines

@@ -46,9 +46,10 @@ 
     exit(1);
 }
 
-foreach (Config::$CONSORTIUM['registration_API_keys'] as $key => $fed_name)
+foreach (Config::$CONSORTIUM['registration_API_keys'] as $key => $fed_name) {
     if ($_POST['APIKEY'] == $key) {
         $mode = "API";
+}
         $federation = $fed_name;
         $checkval = "OK-NEW";
     }
@@ -84,16 +85,18 @@ 
         // POST, but I need to do some sanitising first.
         // TODO For 1.1, make sure that pSF gets is field as a parameter, not implicitly via POST
         $original_post = $_POST;
-        foreach ($_POST['option'] as $optindex => $optname)
-            if (!preg_match("/^general:/",$optname) && !preg_match("/^support:/",$optname) && !preg_match("/^eap:/",$optname))
+        foreach ($_POST['option'] as $optindex => $optname) {
+                    if (!preg_match("/^general:/",$optname) && !preg_match("/^support:/",$optname) && !preg_match("/^eap:/",$optname))
                 unset($_POST['option'][$optindex]);
+        }
         // now process all inst-wide options    
         processSubmittedFields($idp, [],0,0,TRUE);
         $_POST = $original_post;
         // same thing for profile options
-        foreach ($_POST['option'] as $optindex => $optname)
-            if (!preg_match("/^profile:/",$optname) || $optname == "profile:QR-user")
+        foreach ($_POST['option'] as $optindex => $optname) {
+                    if (!preg_match("/^profile:/",$optname) || $optname == "profile:QR-user")
                 unset($_POST['option'][$optindex]);
+        }
         // if we do have profile-level options - create a profile and fill in the values!
         if (count($_POST['option']) > 0) {
             $newprofile = $idp->newProfile();
@@ -106,16 +109,19 @@ 
             foreach ($_POST['option'] as $optindex => $optname) {
                 switch ($optname) {
                     case "profile-api:anon":
-                        if (isset($_POST['value'][$optindex."-0"]))
-                                $theanonid = valid_string_db($_POST['value'][$optindex."-0"]);
+                        if (isset($_POST['value'][$optindex."-0"])) {
+                                                        $theanonid = valid_string_db($_POST['value'][$optindex."-0"]);
+                        }
                         break;
                     case "profile-api:realm":
-                        if (isset($_POST['value'][$optindex."-0"]) && valid_Realm($_POST['value'][$optindex."-0"]))
-                                $therealm = $_POST['value'][$optindex."-0"];
+                        if (isset($_POST['value'][$optindex."-0"]) && valid_Realm($_POST['value'][$optindex."-0"])) {
+                                                        $therealm = $_POST['value'][$optindex."-0"];
+                        }
                         break;
                     case "profile-api:useanon":
-                        if (isset($_POST['value'][$optindex."-3"]) && valid_boolean($_POST['value'][$optindex."-3"]) == "on")
-                                $use_anon = TRUE;
+                        if (isset($_POST['value'][$optindex."-3"]) && valid_boolean($_POST['value'][$optindex."-3"]) == "on") {
+                                                        $use_anon = TRUE;
+                        }
                         break;
                     case "profile-api:eaptype":
                         $pref = 0;

web/admin/112365365321.php

Braces +14 added lines, -9 removed lines

@@ -47,8 +47,9 @@ 
 }
 $user = new User((!in_array("I do not care about security!", Config::$SUPERADMINS) ? $_SESSION['user'] : "UNIDENTIFIED"));
 
-if (!in_array($user->identifier, Config::$SUPERADMINS) && !in_array("I do not care about security!", Config::$SUPERADMINS))
+if (!in_array($user->identifier, Config::$SUPERADMINS) && !in_array("I do not care about security!", Config::$SUPERADMINS)) {
     header("Location: overview_user.php");
+}
 
 $cat = pageheader("By. Your. Command.","SUPERADMIN", FALSE); // no auth in pageheader; we did our own before
 
@@ -61,8 +62,9 @@ 
             </legend>
 <?php
             if (isset($_POST['admin_action'])) {
-               if($_POST['admin_action'] == BUTTON_SANITY_TESTS)
-                        include("sanity_tests.php");
+               if($_POST['admin_action'] == BUTTON_SANITY_TESTS) {
+                                       include("sanity_tests.php");
+               }
             }
 ?>
 <button type="submit" name="admin_action" value="<?php echo BUTTON_SANITY_TESTS; ?>">Run configuration check</button>
@@ -77,10 +79,11 @@ 
                 <strong>Administrative actions</strong>
             </legend>
             <?php
-            if (isset($_POST['admin_action']))
-                switch ($_POST['admin_action']) {
+            if (isset($_POST['admin_action'])) {
+                            switch ($_POST['admin_action']) {
                     case BUTTON_PURGECACHE:
                         $result = DBConnection::exec("INST", "UPDATE downloads SET download_path = NULL");
+            }
                     // we do NOT break here - after the DB deletion comes the normal
                     // filesystem cleanup
                     case BUTTON_DELETE:
@@ -99,11 +102,13 @@ 
 
                             /* This is the correct way to loop over the directory. */
                             while (false !== ($entry = readdir($handle))) {
-                                if ($entry === '.' || $entry === '..')
-                                    continue;
+                                if ($entry === '.' || $entry === '..') {
+                                                                    continue;
+                                }
                                 $ftime = $tm - filemtime($downloads . '/' . $entry);
-                                if ($ftime < 3600)
-                                    continue;
+                                if ($ftime < 3600) {
+                                                                    continue;
+                                }
                                 if (isset($Cache[$entry])) {
 //          print "Keep: $entry\n";
                                     continue;

web/admin/inc/geo_widget.php

Braces +3 added lines, -2 removed lines

@@ -280,8 +280,8 @@ 
     echo "<fieldset class='option_container'>
         <legend><strong>". _("Location")."</strong></legend>";
 
-    if ($wizard)
-            echo "<p>".
+    if ($wizard) {
+                echo "<p>".
             _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.").
                  "</p>
                      <ul>".
@@ -292,6 +292,7 @@ 
                      <strong>".
                     _("We will use the coordinates as indicated by the marker for geolocation.").
                     "</strong>";
+    }
         if ($additional) {
             echo _("You can enter an <strong>additional</strong> location here. You can see the already defined locations in the 'General Information' field.");
         }

web/admin/inc/common.inc.php

Braces +65 added lines, -45 removed lines

@@ -81,8 +81,9 @@ 
         $DisplayNames[_("SSID (with WPA/TKIP)")] = "media:SSID_with_legacy";
     }
 
-    if (!empty(Config::$CONSORTIUM['interworking-consortium-oi']) && count(Config::$CONSORTIUM['interworking-consortium-oi']) > 0)
-        $DisplayNames[_("Additional HS20 Consortium OI")] = "media:consortium_OI";
+    if (!empty(Config::$CONSORTIUM['interworking-consortium-oi']) && count(Config::$CONSORTIUM['interworking-consortium-oi']) > 0) {
+            $DisplayNames[_("Additional HS20 Consortium OI")] = "media:consortium_OI";
+    }
     $DisplayNames[_("HS20 Consortium OI")] = "media:consortium_OI";
 
     $find = array_search($input, $DisplayNames);
@@ -96,8 +97,9 @@ 
 
 function tooltip($input) {
     $descriptions = [];
-    if (count(Config::$CONSORTIUM['ssid']) > 0)
-        $descriptions[sprintf(_("This attribute can be set if you want to configure an additional SSID besides the default SSIDs for %s. It is almost always a bad idea not to use the default SSIDs. The only exception is if you have premises with an overlap of the radio signal with another %s hotspot. Typical misconceptions about additional SSIDs include: I want to have a local SSID for my own users. It is much better to use the default SSID and separate user groups with VLANs. That approach has two advantages: 1) your users will configure %s properly because it is their everyday SSID; 2) if you use a custom name and advertise this one as extra secure, your users might at some point roam to another place which happens to have the same SSID name. They might then be misled to believe that they are connecting to an extra secure network while they are not."), Config::$CONSORTIUM['name'], Config::$CONSORTIUM['name'], Config::$CONSORTIUM['name'])] = "media:SSID";
+    if (count(Config::$CONSORTIUM['ssid']) > 0) {
+            $descriptions[sprintf(_("This attribute can be set if you want to configure an additional SSID besides the default SSIDs for %s. It is almost always a bad idea not to use the default SSIDs. The only exception is if you have premises with an overlap of the radio signal with another %s hotspot. Typical misconceptions about additional SSIDs include: I want to have a local SSID for my own users. It is much better to use the default SSID and separate user groups with VLANs. That approach has two advantages: 1) your users will configure %s properly because it is their everyday SSID; 2) if you use a custom name and advertise this one as extra secure, your users might at some point roam to another place which happens to have the same SSID name. They might then be misled to believe that they are connecting to an extra secure network while they are not."), Config::$CONSORTIUM['name'], Config::$CONSORTIUM['name'], Config::$CONSORTIUM['name'])] = "media:SSID";
+    }
 
     $find = array_search($input, $descriptions);
 
@@ -118,16 +120,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;
 }
 
@@ -236,8 +242,9 @@ 
     if ($optiontype == "eap:ca_file") {
         // echo "Checking $optiontype with file $filename";
         $cert = X509::processCertificate($filename);
-        if ($cert)
-            return TRUE;
+        if ($cert) {
+                    return TRUE;
+        }
         // echo "Error! The certificate seems broken!";
         return FALSE;
     }
@@ -250,8 +257,9 @@ 
         $filetype = $info->buffer($filename, FILEINFO_MIME_TYPE);
 
         // we only take plain text files in UTF-8!
-        if ( $filetype == "text/plain" && iconv("UTF-8", "UTF-8", $filename) !== FALSE)
-            return TRUE;
+        if ( $filetype == "text/plain" && iconv("UTF-8", "UTF-8", $filename) !== FALSE) {
+                    return TRUE;
+        }
     }
 
     return FALSE;
@@ -261,23 +269,26 @@ 
 
     $reference = valid_DB_reference($ref);
 
-    if ($reference == FALSE)
-        return;
+    if ($reference == FALSE) {
+            return;
+    }
     
     // the data is either public (just give it away) or not; in this case, only
     // release if the data belongs to admin himself
     if ($checkpublic) {
         // we might be called without session context (filepreview) so get the
         // context if needed
-        if (session_status() != PHP_SESSION_ACTIVE)
-            session_start();
+        if (session_status() != PHP_SESSION_ACTIVE) {
+                    session_start();
+        }
         $owners = DBConnection::isDataRestricted($reference["table"], $reference["rowindex"]);
 
         $owners_condensed = [];
         
         if ($owners !== FALSE) { // see if we're authenticated and owners of the data
-            foreach ($owners as $oneowner)
-                $owners_condensed[] = $oneowner['ID'];
+            foreach ($owners as $oneowner) {
+                            $owners_condensed[] = $oneowner['ID'];
+            }
             if (!isAuthenticated()) {
                 return FALSE; // admin-only, but we are not an admin
             } elseif (array_search($_SESSION['user'], $owners_condensed) === FALSE) {
@@ -289,51 +300,59 @@ 
     }
 
     $blob = DBConnection::fetchRawDataByIndex($reference["table"], $reference["rowindex"]);
-    if (!$blob)
-        return FALSE;
+    if (!$blob) {
+            return FALSE;
+    }
     return $blob;
 }
 
 function display_size($number) {
-    if ($number > 1024 * 1024)
-        return round($number / 1024 / 1024, 2) . " MiB";
-    if ($number > 1024)
-        return round($number / 1024, 2) . " KiB";
+    if ($number > 1024 * 1024) {
+            return round($number / 1024 / 1024, 2) . " MiB";
+    }
+    if ($number > 1024) {
+            return round($number / 1024, 2) . " KiB";
+    }
     return $number . " B";
 }
 
 function previewCAinHTML($ca_reference) {
     $found = preg_match("/^ROWID-.*/", $ca_reference);
-    if (!$found)
-        return "<div>" . _("Error, ROWID expected.") . "</div>";
+    if (!$found) {
+            return "<div>" . _("Error, ROWID expected.") . "</div>";
+    }
 
     $ca_blob = base64_decode(getBlobFromDB($ca_reference, FALSE));
 
     $func = new X509;
     $details = $func->processCertificate($ca_blob);
-    if ($details === FALSE)
-        return _("There was an error processing the certificate!");
+    if ($details === FALSE) {
+            return _("There was an error processing the certificate!");
+    }
 
     $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
     $details['name'] = preg_replace('/\//', "", $details['name']);
     $certstatus = ( $details['root'] == 1 ? "R" : "I");
-    if ($details['ca'] == 0 && $details['root'] != 1)
-        return "<div class='ca-summary' style='background-color:red'><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:maroon;  border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . _("This is a <strong>SERVER</strong> certificate!") . "<br/>" . $details['name'] . "</div>";
-    else
-        return "<div class='ca-summary'                                ><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:#0000ff; border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>" . $details['name'] . "</div>";
-}
+    if ($details['ca'] == 0 && $details['root'] != 1) {
+            return "<div class='ca-summary' style='background-color:red'><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:maroon;  border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . _("This is a <strong>SERVER</strong> certificate!") . "<br/>" . $details['name'] . "</div>";
+    } else {
+            return "<div class='ca-summary'                                ><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:#0000ff; border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>" . $details['name'] . "</div>";
+    }
+    }
 
 function previewImageinHTML($image_reference) {
     $found = preg_match("/^ROWID-.*/", $image_reference);
-    if (!$found)
-        return "<div>" . _("Error, ROWID expected.") . "</div>";
+    if (!$found) {
+            return "<div>" . _("Error, ROWID expected.") . "</div>";
+    }
     return "<img style='max-width:150px' src='inc/filepreview.php?id=" . $image_reference . "' alt='" . _("Preview of logo file") . "'/>";
 }
 
 function previewInfoFileinHTML($file_reference) {
     $found = preg_match("/^ROWID-.*/", $file_reference);
-    if (!$found)
-        return _("<div>Error, ROWID expected, got $file_reference.</div>");
+    if (!$found) {
+            return _("<div>Error, ROWID expected, got $file_reference.</div>");
+    }
 
     $file_blob = unserialize(getBlobFromDB($file_reference, FALSE));
     $file_blob = base64_decode($file_blob['content']);
@@ -360,10 +379,11 @@ 
                 /* echo "<pre>";
                   print_r($taggedarray);
                   echo "</pre>"; */
-                if ($taggedarray['lang'] == 'C')
-                    $language = _("default/other languages");
-                else
-                    $language = Config::$LANGUAGES[$taggedarray['lang']]['display'];
+                if ($taggedarray['lang'] == 'C') {
+                                    $language = _("default/other languages");
+                } else {
+                                    $language = Config::$LANGUAGES[$taggedarray['lang']]['display'];
+                }
                 $content = $taggedarray["content"];
             } else {
                 $language = "";

web/admin/inc/manageAdmins.inc.php

Braces +34 added lines, -25 removed lines

@@ -45,9 +45,10 @@ 
 $is_admin_with_blessing = FALSE;
 $owners = $my_inst->owner();
 foreach ($owners as $oneowner) {
-    if ($oneowner['ID'] == $_SESSION['user'] && $oneowner['LEVEL'] == "FED")
-        $is_admin_with_blessing = TRUE;
-}
+    if ($oneowner['ID'] == $_SESSION['user'] && $oneowner['LEVEL'] == "FED") {
+            $is_admin_with_blessing = TRUE;
+    }
+    }
 
 // if none of the two, send the user away
 
@@ -65,8 +66,9 @@ 
             $ownermgmt->removeAdminFromIdP($my_inst, $_POST['admin_id']);
             // if the user deleted himself, go back to overview page. Otherwise, just stay here and display the remaining owners
             // we don't decide about that here; it's done by JS magic in the calling button
-            if ($_POST['admin_id'] == $_SESSION['user'])
-                header("Location: $dest");
+            if ($_POST['admin_id'] == $_SESSION['user']) {
+                            header("Location: $dest");
+            }
         } else {
             echo "Fatal Error: asked to delete an administrator, but no administrator ID was given!";
             exit(1);
@@ -91,12 +93,13 @@ 
 if (isset($_GET['invitation'])) {
     echo "<div class='ca-summary' style='position:relative;'><table>";
 
-    if ($_GET['invitation'] == "SUCCESS")
-        echo UI_remark(_("The invitation email was sent successfully."), _("The invitation email was sent."));
-    else if ($_GET['invitation'] == "FAILURE")
-        echo UI_error(_("The invitation email could not be sent!"), _("The invitation email could not be sent!"));
-    else
-        echo UI_error(_("Error: unknown result code of invitation!?!"), _("Unknown result!"));
+    if ($_GET['invitation'] == "SUCCESS") {
+            echo UI_remark(_("The invitation email was sent successfully."), _("The invitation email was sent."));
+    } else if ($_GET['invitation'] == "FAILURE") {
+            echo UI_error(_("The invitation email could not be sent!"), _("The invitation email could not be sent!"));
+    } else {
+            echo UI_error(_("Error: unknown result code of invitation!?!"), _("Unknown result!"));
+    }
 
     echo "</table></div>";
 }
@@ -119,20 +122,22 @@ 
     foreach ($my_inst->owner() as $oneowner) {
         $ownerinfo = new User($oneowner['ID']);
         $ownername = $ownerinfo->getAttributes("user:realname");
-        if (count($ownername) > 0)
-            $prettyprint = $ownername[0]['value'];
-        else
-            $prettyprint = _("User without name");
+        if (count($ownername) > 0) {
+                    $prettyprint = $ownername[0]['value'];
+        } else {
+                    $prettyprint = _("User without name");
+        }
         echo "
             <tr>
               <td>
                  <strong>$prettyprint</strong>
                  <br/>";
 
-        if ($oneowner['MAIL'] != "SELF-APPOINTED")
-            printf(_("(originally invited as %s)"), $oneowner['MAIL']);
-        else
-            echo _("(self-appointed)");
+        if ($oneowner['MAIL'] != "SELF-APPOINTED") {
+                    printf(_("(originally invited as %s)"), $oneowner['MAIL']);
+        } else {
+                    echo _("(self-appointed)");
+        }
 
         echo "</td>
               <td>
@@ -153,8 +158,9 @@ 
 if (count($pending_invites) > 0) {
     echo "<strong>" . _("Pending invitations for this IdP") . "</strong>";
     echo "<table>";
-    foreach ($pending_invites as $invitee)
-        echo "<tr><td>$invitee</td></tr>";
+    foreach ($pending_invites as $invitee) {
+            echo "<tr><td>$invitee</td></tr>";
+    }
     echo "</table>";
 }
 ?>
@@ -167,14 +173,17 @@ 
 if ($is_fed_admin) {
     $is_admin_himself = FALSE;
     foreach ($owners as $oneowner) {
-        if ($oneowner['ID'] == $_SESSION['user'])
-            $is_admin_himself = TRUE;
+        if ($oneowner['ID'] == $_SESSION['user']) {
+                    $is_admin_himself = TRUE;
+        }
     }
 
-    if (!$is_admin_himself) echo "<form action='inc/manageAdmins.inc.php?inst_id=$my_inst->identifier' method='post' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
+    if (!$is_admin_himself) {
+        echo "<form action='inc/manageAdmins.inc.php?inst_id=$my_inst->identifier' method='post' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
     <button type='submit' name='submitbutton' value='" . BUTTON_TAKECONTROL . "'>" . _("Take control of this institution") . "</button>
 </form>";
-}
+    }
+    }
 ?>
 <hr/>
 <form action='inc/manageAdmins.inc.php?inst_id=<?php echo $my_inst->identifier; ?>' method='post' accept-charset='UTF-8'>