GEANT / CAT

web/admin/edit_profile.php

Spacing +15 added lines, -15 removed lines

@@ -315,49 +315,49 @@ 
             <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" : "" ); ?> name='verify_support' onclick='
+                    <input type='checkbox' <?php 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");
                             } else {
                                 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>
                 <?php
                 // checkbox and input field for anonymity support, available only when realm is known
-                echo "<td><span id='anon_support_label' style='" . ($realm == "" ? "color:#999999" : "" ) . "'>" . _("Enable Anonymous Outer Identity:") . "</span></td>
-                <td><input type='checkbox' " . ($use_anon != FALSE ? "checked" : "" ) . ($realm == "" ? "disabled" : "" ) . " name='anon_support' onclick='
+                echo "<td><span id='anon_support_label' style='" . ($realm == "" ? "color:#999999" : "") . "'>" . _("Enable Anonymous Outer Identity:") . "</span></td>
+                <td><input type='checkbox' " . ($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' " . ($checkuser_outer == FALSE ? "disabled" : "" ) . " name='anon_local' value='$anon_local'/></td>";
+                           <input type='text' " . ($checkuser_outer == FALSE ? "disabled" : "") . " name='anon_local' value='$anon_local'/></td>";
                 ?>
                 </tr>
                 <tr>
                     <?php
                 // checkbox and input field for check realm outer id, available only when realm is known
-                echo "<td><span id='checkuser_label' style='" . ($realm == "" ? "color:#999999" : "" ) . "'>" . _("Use special Outer Identity for realm checks:") . "</span></td>
-                <td><input type='checkbox' " . ($checkuser_outer != FALSE ? "checked" : "" ) . ($realm == "" ? "disabled" : "" ) . " name='checkuser_support' onclick='
+                echo "<td><span id='checkuser_label' style='" . ($realm == "" ? "color:#999999" : "") . "'>" . _("Use special Outer Identity for realm checks:") . "</span></td>
+                <td><input type='checkbox' " . ($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' " . ($checkuser_outer == FALSE ? "disabled" : "" ) . " name='checkuser_local' value='$checkuser_value'/></td>";
+                           <input type='text' " . ($checkuser_outer == FALSE ? "disabled" : "") . " name='checkuser_local' value='$checkuser_value'/></td>";
                 ?>
                 </tr>
         </table>
@@ -373,14 +373,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>
 
@@ -396,7 +396,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 +68 added lines, -46 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);
             ?>
@@ -367,8 +372,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>
 
@@ -388,15 +394,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>";
     }
 
@@ -405,18 +413,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>";
@@ -431,10 +441,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;
                 }
             }
@@ -473,8 +484,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>
@@ -498,13 +510,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);
         }
@@ -515,9 +529,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);
         ?>
@@ -529,13 +544,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);
         }
@@ -546,9 +563,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);
         ?>
@@ -561,13 +579,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);
         }
@@ -578,16 +598,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();