GEANT / CAT

web/admin/inc/option_parse.inc.php

Braces +76 added lines, -58 removed lines

@@ -29,16 +29,19 @@ 
 // Step 1a: parse the arrays for text-based input
 
     if (isset($_POST)) {
-        if (isset($_POST['option']))
-            foreach ($_POST['option'] as $opt_id => $optname)
+        if (isset($_POST['option'])) {
+                    foreach ($_POST['option'] as $opt_id => $optname)
                 $a[$opt_id] = $optname;
-        if (isset($_POST['value']))
-            foreach ($_POST['value'] as $opt_id => $optvalue)
+        }
+        if (isset($_POST['value'])) {
+                    foreach ($_POST['value'] as $opt_id => $optvalue)
                 $a[$opt_id] = $optvalue;
+        }
     }
-    if (isset($_FILES) && isset($_FILES['value']) && isset($_FILES['value']['tmp_name']))
-        foreach ($_FILES['value']['tmp_name'] as $opt_id => $optfileref)
+    if (isset($_FILES) && isset($_FILES['value']) && isset($_FILES['value']['tmp_name'])) {
+            foreach ($_FILES['value']['tmp_name'] as $opt_id => $optfileref)
             $a[$opt_id] = $optfileref;
+    }
 
     /*    ksort($a);
       echo "<pre>This is what we got:";
@@ -61,29 +64,33 @@ 
             if ($optioninfo["flag"] == "ML") {
                 if (isset($a["$obj_id-lang"])) {
                     $raw_lang = $a["$obj_id-lang"];
-                    if ($raw_lang == "") // user forgot to select a language
+                    if ($raw_lang == "") {
+                        // user forgot to select a language
                         $lang = "C";
-                    else
-                        $lang = $raw_lang;
-                }
-                else {
+                    } else {
+                                            $lang = $raw_lang;
+                    }
+                } else {
                     $bad[] = $obj_value;
                     continue;
                 }
                 // did we get a C language? set corresponding value to TRUE
-                if ($lang == "C")
-                    $multilang_attribs_with_C[$obj_value] = TRUE;
-                else // did we get a C earlier - fine, don't touch the array. Otherwise, set FALSE
-                if (!isset($multilang_attribs_with_C[$obj_value]) || $multilang_attribs_with_C[$obj_value] != TRUE)
-                    $multilang_attribs_with_C[$obj_value] = FALSE;
-            } else
-                $lang = "";
+                if ($lang == "C") {
+                                    $multilang_attribs_with_C[$obj_value] = TRUE;
+                } else // did we get a C earlier - fine, don't touch the array. Otherwise, set FALSE
+                if (!isset($multilang_attribs_with_C[$obj_value]) || $multilang_attribs_with_C[$obj_value] != TRUE) {
+                                    $multilang_attribs_with_C[$obj_value] = FALSE;
+                }
+            } else {
+                            $lang = "";
+            }
             $content = "";
             switch ($optioninfo["type"]) {
                 case "string":
-                    if (isset($a["$obj_id-0"]) && $a["$obj_id-0"] != "")
-                        if ($obj_value == "media:consortium_OI") {
+                    if (isset($a["$obj_id-0"]) && $a["$obj_id-0"] != "") {
+                                            if ($obj_value == "media:consortium_OI") {
                             $content = valid_consortium_oi($a["$obj_id-0"]);
+                    }
                             if ($content === FALSE) {
                                 $bad[] = $obj_value;
                                 continue 2;
@@ -94,25 +101,23 @@ 
                                 $bad[] = $obj_value;
                                 continue 2;
                             }
-                        }
-                            else {
+                        } else {
                             $content = valid_string_db($a["$obj_id-0"]);
-                        }
-                    else {
+                        } else {
                         continue 2;
                     }
                     break;
                 case "text":
-                    if (isset($a["$obj_id-1"]) && $a["$obj_id-1"] != "")
-                        $content = valid_string_db($a["$obj_id-1"], 1);
-                    else {
+                    if (isset($a["$obj_id-1"]) && $a["$obj_id-1"] != "") {
+                                            $content = valid_string_db($a["$obj_id-1"], 1);
+                    } else {
                         continue 2;
                     }
                     break;
                 case "coordinates":
-                    if (isset($a["$obj_id-1"]) && $a["$obj_id-1"] != "")
-                        $content = valid_coord_serialized($a["$obj_id-1"]);
-                    else {
+                    if (isset($a["$obj_id-1"]) && $a["$obj_id-1"] != "") {
+                                            $content = valid_coord_serialized($a["$obj_id-1"]);
+                    } else {
                         continue 2;
                     }
                     break;
@@ -129,13 +134,14 @@ 
                             continue 2;
                         }
                         $content = base64_encode($content);
-                    } else
-                        continue 2;
+                    } else {
+                                            continue 2;
+                    }
                     break;
                 case "boolean":
-                    if (isset($a["$obj_id-3"]) && $a["$obj_id-3"] != "")
-                        $content = valid_boolean($a["$obj_id-3"]);
-                    else {
+                    if (isset($a["$obj_id-3"]) && $a["$obj_id-3"] != "") {
+                                            $content = valid_boolean($a["$obj_id-3"]);
+                    } else {
                         continue 2;
                     }
                     break;
@@ -146,15 +152,18 @@ 
             if ($lang != "" && preg_match("/^ROWID-.*-([0-9]+)/", $content) == 0) { // new value, encode as language array
                 // add the new option with lang 
                 $options[] = ["$obj_value" => serialize(["lang" => $lang, "content" => $content])];
-            } else // just store it (could be a literal value or a ROWID reference)
+            } else {
+                // just store it (could be a literal value or a ROWID reference)
                 $options[] = ["$obj_value" => $content];
+            }
         }
     }
 
-    foreach ($options as $option)
-        foreach ($option as $optname => $optvalue)
+    foreach ($options as $option) {
+            foreach ($option as $optname => $optvalue)
             if ($optname != "eap:ca_url" && $optname != "general:logo_url")
                 $good[] = $optname;
+    }
 
     /*
       echo "<pre>";
@@ -165,10 +174,11 @@ 
 // Step 2: now we have clean input data. Some attributes need special care
 //         2a: if we got eap:ca_url, convert it to eap:ca_file
 
-    foreach ($options as $k => $iterate_option)
-        foreach ($iterate_option as $name => $value) {
+    foreach ($options as $k => $iterate_option) {
+            foreach ($iterate_option as $name => $value) {
             if ($name == "eap:ca_url" && $value != "") {
                 $content = downloadFile($value);
+    }
                 unset($options[$k]);
                 if (check_upload_sanity("eap:ca_file", $content)) {
                     $content = base64_encode($content);
@@ -181,10 +191,11 @@ 
         }
 
 //       2aa: spliteap:ca_file into components
-    foreach ($options as $k => $iterate_option)
-        foreach ($iterate_option as $name => $value) {
+    foreach ($options as $k => $iterate_option) {
+            foreach ($iterate_option as $name => $value) {
             if ($name == "eap:ca_file" && $value != "" && !preg_match('/^ROWID-/', $value)) {
                 $content = base64_decode($value);
+    }
                 unset($options[$k]);
                 $ca_files = X509::splitCertificate($content);
                 foreach ($ca_files as $ca_file) {
@@ -194,17 +205,19 @@ 
         }
 
 //          2b:if we got general:logo_url, convert it to general:logo_file
-    foreach ($options as $k => $iterate_option)
-        foreach ($iterate_option as $name => $value) {
+    foreach ($options as $k => $iterate_option) {
+            foreach ($iterate_option as $name => $value) {
             if ($name == "general:logo_url" && $value != "") {
                 $bindata = downloadFile($value);
+    }
                 unset($options[$k]);
                 if (check_upload_sanity("general:logo_file", $bindata)) {
                     $good[] = "general:logo_url";
 
                     $options[] = ["general:logo_file" => base64_encode($bindata)];
-                } else
-                    $bad[] = "general:logo_url";
+                } else {
+                                    $bad[] = "general:logo_url";
+                }
             }
         }
 
@@ -227,9 +240,10 @@ 
 // finally, some attributes are in the DB and were only called by reference
 // keep those which are still referenced, throw the rest away
 
-    foreach ($options as $iterate_option)
-        foreach ($iterate_option as $name => $value) {
+    foreach ($options as $iterate_option) {
+            foreach ($iterate_option as $name => $value) {
             $optiontype = $optioninfo_object->optionType($name);
+    }
             if ($optiontype["type"] == "file" && preg_match("/^ROWID-.*-([0-9]+)/", $value, $retval)) {
                 unset($killlist[$retval[1]]);
                 continue;
@@ -237,10 +251,11 @@ 
             if ($object instanceof IdP || $object instanceof User || $object instanceof Federation) {
                 $object->addAttribute($name, $value);
             } elseif ($object instanceof Profile) {
-                if ($device === 0)
-                    $object->addAttribute($name, $value, $eaptype);
-                else
-                    $object->addAttribute($name, $value, $eaptype, $device);
+                if ($device === 0) {
+                                    $object->addAttribute($name, $value, $eaptype);
+                } else {
+                                    $object->addAttribute($name, $value, $eaptype, $device);
+                }
             }
         }
 
@@ -248,18 +263,21 @@ 
         // don't do your own table - only the <tr>s here
         // list all attributes that were set correctly
         $list = array_count_values($good);
-        foreach ($list as $name => $count)
-        /// number of times attribute is present, and its name
+        foreach ($list as $name => $count) {
+                /// number of times attribute is present, and its name
         /// Example: "5x Support E-Mail"
             echo UI_okay(sprintf(_("%dx %s"), $count, display_name($name)));
+        }
         // list all atributes that had errors
         $list = array_count_values($bad);
-        foreach ($list as $name => $count)
-            echo UI_error(sprintf(_("%dx %s"), $count, display_name($name)));
+        foreach ($list as $name => $count) {
+                    echo UI_error(sprintf(_("%dx %s"), $count, display_name($name)));
+        }
         // list multilang without default
-        foreach ($multilang_attribs_with_C as $attrib_name => $isitsetornot)
-            if ($isitsetornot == FALSE)
+        foreach ($multilang_attribs_with_C as $attrib_name => $isitsetornot) {
+                    if ($isitsetornot == FALSE)
                 echo UI_warning(sprintf(_("You did not set a 'default language' value for %s. This means we can only display this string for installers which are <strong>exactly</strong> in the language you configured. For the sake of all other languages, you may want to edit the profile again and populate the 'default/other' language field."), display_name($attrib_name)));
+        }
     }
     return $killlist;
 }

web/admin/inc/manageDBLink.inc.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 // if we have a pushed close button, submit attributes and send user back to the overview page
 // if external DB sync is disabled globally, the user never gets to this page. If he came here *anyway* -> send him back immediately.
-if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == BUTTON_CLOSE ) || Config::$DB['enforce-external-sync'] == FALSE)
+if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == BUTTON_CLOSE) || Config::$DB['enforce-external-sync'] == FALSE)
     header("Location: ../overview_federation.php");
 
 // if not, must operate on a proper IdP

Braces +34 added lines, -23 removed lines

@@ -25,8 +25,9 @@ 
 
 // if we have a pushed close button, submit attributes and send user back to the overview page
 // if external DB sync is disabled globally, the user never gets to this page. If he came here *anyway* -> send him back immediately.
-if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == BUTTON_CLOSE ) || Config::$DB['enforce-external-sync'] == FALSE)
+if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == BUTTON_CLOSE ) || Config::$DB['enforce-external-sync'] == FALSE) {
     header("Location: ../overview_federation.php");
+}
 
 // if not, must operate on a proper IdP
 $my_inst = valid_IdP($_GET['inst_id']);
@@ -48,8 +49,9 @@ 
 
 if (isset($_POST['submitbutton']) && $_POST['submitbutton'] == BUTTON_SAVE) {
     // someone clever pushed the button without selecting an inst?
-    if (!isset($_POST['inst_link']))
-        header("Location: ../overview_federation.php");
+    if (!isset($_POST['inst_link'])) {
+            header("Location: ../overview_federation.php");
+    }
     // okay, he did sumbit an inst. It's either a (string) handle from a promising 
     // candidate, or "other" as selected from the drop-down list
     if ($_POST['inst_link'] != "other") {
@@ -78,10 +80,11 @@ 
 
         foreach ($names as $name) {
             $thename = unserialize($name['value']);
-            if ($thename['lang'] == "C")
-                $language = "default/other";
-            else
-                $language = Config::$LANGUAGES[$thename['lang']]['display'];
+            if ($thename['lang'] == "C") {
+                            $language = "default/other";
+            } else {
+                            $language = Config::$LANGUAGES[$thename['lang']]['display'];
+            }
 
             echo "<tr><td>" . sprintf(_("Institution Name (%s)"), $language) . "</td><td>" . $thename['content'] . "</td></tr>";
         }
@@ -91,8 +94,9 @@ 
         foreach ($admins as $admin) {
             $user = new User($admin['ID']);
             $username = $user->getAttributes("user:realname");
-            if (count($username) == 0)
-                $username[0]['value'] = _("Unnamed User");
+            if (count($username) == 0) {
+                            $username[0]['value'] = _("Unnamed User");
+            }
             echo "<tr><td>" . _("Administrator [invited as]") . "</td><td>" . $username[0]['value'] . " [" . $admin['MAIL'] . "]</td></tr>";
         }
         echo "</table>";
@@ -101,10 +105,12 @@ 
         // right-hand side: external DB
         $extinfo = $my_inst->getExternalDBEntityDetails();
         echo "<table>";
-        foreach ($extinfo['names'] as $lang => $name)
-            echo "<tr><td>" . sprintf(_("Institution Name (%s)"), $lang) . "</td><td>$name</td>";
-        foreach ($extinfo['admins'] as $number => $admin_details)
-            echo "<tr><td>" . _("Administrator email") . "</td><td>" . $admin_details['email'] . "</td></tr>";
+        foreach ($extinfo['names'] as $lang => $name) {
+                    echo "<tr><td>" . sprintf(_("Institution Name (%s)"), $lang) . "</td><td>$name</td>";
+        }
+        foreach ($extinfo['admins'] as $number => $admin_details) {
+                    echo "<tr><td>" . _("Administrator email") . "</td><td>" . $admin_details['email'] . "</td></tr>";
+        }
         echo "</table>";
         // end of right-hand side
         echo "</td></tr></table>";
@@ -116,17 +122,20 @@ 
         $candidates = $my_inst->getExternalDBSyncCandidates();
         echo "<br/><form name='form-link-inst' action='inc/manageDBLink.inc.php?inst_id=$my_inst->identifier' method='post' accept-charset='UTF-8'>";
         printf(_("Please select an entity from the %s DB which corresponds to this CAT institution."), Config::$CONSORTIUM['name']) . " ";
-        if (count($candidates) > 0)
-            printf(_("Particularly promising entries (names in CAT and %s DB are a 100%% match) are on top of the list."), Config::$CONSORTIUM['name']);
+        if (count($candidates) > 0) {
+                    printf(_("Particularly promising entries (names in CAT and %s DB are a 100%% match) are on top of the list."), Config::$CONSORTIUM['name']);
+        }
         echo "<table><tr><th>" . _("Link to this entity?") . "</th><th>" . _("Name of the institution") . "</th><th>" . _("Administrators") . "</th></tr>";
         foreach ($candidates as $candidate) {
             $info = Federation::getExternalDBEntityDetails($candidate);
             echo "<tr><td><input type='radio' name='inst_link' value='$candidate' onclick='document.getElementById(\"submit\").disabled = false;'>$candidate</input></td><td>";
-            foreach ($info['names'] as $lang => $name)
-                echo "[$lang] $name<br/>";
+            foreach ($info['names'] as $lang => $name) {
+                            echo "[$lang] $name<br/>";
+            }
             echo "</td><td>";
-            foreach ($info['admins'] as $number => $admin_details)
-                echo "[E-Mail] " . $admin_details['email'] . "<br/>";
+            foreach ($info['admins'] as $number => $admin_details) {
+                            echo "[E-Mail] " . $admin_details['email'] . "<br/>";
+            }
             echo "</td></tr>";
             $temparray[] = $candidate;
         }
@@ -147,8 +156,9 @@ 
             echo "</select></td></tr>";
         }
         // issue a big red warning if there are no link candidates at all in the federation
-        if (empty($buffer) && empty($candidates))
-            echo "<tr><td style='color:#ff0000' colspan='2'>There are no unmapped institutions in the external database for this federation!</td></tr>";
+        if (empty($buffer) && empty($candidates)) {
+                    echo "<tr><td style='color:#ff0000' colspan='2'>There are no unmapped institutions in the external database for this federation!</td></tr>";
+        }
         echo "</table><button type='submit' name='submitbutton' id='submit' value='" . BUTTON_SAVE . "' disabled >" . _("Create Link") . "</button></form>";
     }
     ?>
@@ -160,8 +170,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>";
 }
 ?>

web/admin/inc/auth.inc.php

Braces +5 added lines, -4 removed lines

@@ -59,10 +59,11 @@
 
     $url = $_SERVER['HTTP_HOST'] . substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/inc/logout.php")) . "/logout_check.php";
 
-    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on")
-        $url = "https://" . $url;
-    else
-        $url = "http://" . $url;
+    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on") {
+            $url = "https://" . $url;
+    } else {
+            $url = "http://" . $url;
+    }
 
     $as->logout([
         'ReturnTo' => $url,

web/admin/inc/sendinvite.inc.php

Indentation +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
         $message .= wordwrap(_("Additional message from your federation administrator:"),72) . "
 ---------------------------------
 "
-                  . wordwrap($customtext[0]['value'],72) . "
+                    . wordwrap($customtext[0]['value'],72) . "
 ---------------------------------
 
 ";

Spacing +4 added lines, -5 removed lines

@@ -130,17 +130,17 @@ 
 // then, send out the mail
 $message = _("Hello,") . "
     
-" . wordwrap($introtext, 72)  . "
+" . wordwrap($introtext, 72) . "
     
 ";
 
 if ($new_idp_authorized_fedadmin) { // see if we are supposed to add a custom message
     $customtext = $federation->getAttributes('fed:custominvite');
     if (count($customtext) > 0)
-        $message .= wordwrap(_("Additional message from your federation administrator:"),72) . "
+        $message .= wordwrap(_("Additional message from your federation administrator:"), 72) . "
 ---------------------------------
 "
-                  . wordwrap($customtext[0]['value'],72) . "
+                  . wordwrap($customtext[0]['value'], 72) . "
 ---------------------------------
 
 ";
@@ -158,8 +158,7 @@ 
         _("and enter the invitation token") . "
     $newtoken
 " . ( /* $new_idp_authorized_fedadmin */ FALSE ?
-                wordwrap(_("manually. If you reply to this mail, you will reach the federation administrators of your federation."), 72) :
-                wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")) ) . "
+                wordwrap(_("manually. If you reply to this mail, you will reach the federation administrators of your federation."), 72) : wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")) ) . "
 
 " . wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72) . "
 

Braces +31 added lines, -19 removed lines

@@ -24,8 +24,9 @@ 
     $fed_privs = $user_object->getAttributes("user:fedadmin");
     // a new IdP was requested and all the required parameters are there
         foreach ($fed_privs as $onefed) {
-            if (strtolower($onefed['value']) == strtolower($country))
-                return TRUE;
+            if (strtolower($onefed['value']) == strtolower($country)) {
+                            return TRUE;
+            }
         }
         echo "<p>" . _("Something's wrong... you want to create a new institution, but are not a federation admin for the federation it should be in!") . "</p>";
         exit(1);
@@ -40,8 +41,9 @@ 
 $new_idp_authorized_fedadmin = FALSE;
 
 // check if the user is authenticated, and we have a valid mail address
-if (!isset($_SESSION['user']) || !isset($_POST['mailaddr']))
+if (!isset($_SESSION['user']) || !isset($_POST['mailaddr'])) {
     exit(1);
+}
 
 $newmailaddress = valid_string_db($_POST['mailaddr']);
 $newcountry = "";
@@ -58,8 +60,9 @@ 
     $is_owner = FALSE;
     $owners = $idp->owner();
     foreach ($owners as $oneowner) {
-        if ($oneowner['ID'] == $_SESSION['user'] && $oneowner['LEVEL'] == "FED")
-            $is_owner = TRUE;
+        if ($oneowner['ID'] == $_SESSION['user'] && $oneowner['LEVEL'] == "FED") {
+                    $is_owner = TRUE;
+        }
     }
     // check if he is (also) federation admin for the federation this IdP is in. His invitations have more blessing then.
     $fedadmin = $user_object->isFederationAdmin($idp->federation);
@@ -99,14 +102,17 @@ 
         // see if the inst name is defined in the currently set language; if not, pick its English name; if N/A, pick the last in the list
         $ourlang = CAT::get_lang();
         $prettyprintname = "";
-        foreach ($extinfo['names'] as $lang => $name)
-            if ($lang == $ourlang)
+        foreach ($extinfo['names'] as $lang => $name) {
+                    if ($lang == $ourlang)
                 $prettyprintname = $name;
-        if ($prettyprintname == "" && isset($extinfo['names']['en']))
-            $prettyprintname = $extinfo['names']['en'];
-        if ($prettyprintname == "")
-            foreach ($extinfo['names'] as $name)
+        }
+        if ($prettyprintname == "" && isset($extinfo['names']['en'])) {
+                    $prettyprintname = $extinfo['names']['en'];
+        }
+        if ($prettyprintname == "") {
+                    foreach ($extinfo['names'] as $name)
                 $prettyprintname = $name;
+        }
         // fill the rest of the text
         $introtext = sprintf(_("a %s operator has invited you to manage the IdP  \"%s\"."), Config::$CONSORTIUM['name'], $prettyprintname) . " " . sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X", time() + 86400));
         $redirect_destination = "../overview_federation.php?";
@@ -124,8 +130,9 @@ 
 }
 // are we on https?
 $proto = "http://";
-if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on")
+if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on") {
     $proto = "https://";
+}
 
 // then, send out the mail
 $message = _("Hello,") . "
@@ -136,15 +143,16 @@ 
 
 if ($new_idp_authorized_fedadmin) { // see if we are supposed to add a custom message
     $customtext = $federation->getAttributes('fed:custominvite');
-    if (count($customtext) > 0)
-        $message .= wordwrap(_("Additional message from your federation administrator:"),72) . "
+    if (count($customtext) > 0) {
+            $message .= wordwrap(_("Additional message from your federation administrator:"),72) . "
 ---------------------------------
 "
                   . wordwrap($customtext[0]['value'],72) . "
 ---------------------------------
 
 ";
-}
+    }
+    }
 
 $message .= wordwrap(_("To enlist as an administrator for that IdP, please click on the following link:"), 72) . "
     
@@ -192,8 +200,9 @@ 
         // $mail->addReplyTo($fedadmin->getAttributes("user:email")['value'], $fedadmin->getAttributes("user:realname")['value']);
     }
 }
-if (isset(Config::$APPEARANCE['invitation-bcc-mail']) && Config::$APPEARANCE['invitation-bcc-mail'] !== NULL)
+if (isset(Config::$APPEARANCE['invitation-bcc-mail']) && Config::$APPEARANCE['invitation-bcc-mail'] !== NULL) {
     $mail->addBCC(Config::$APPEARANCE['invitation-bcc-mail']);
+}
 
 // all addresses are wrapped in a string, but PHPMailer needs a structured list of addressees
 // sigh... so convert as needed
@@ -201,21 +210,24 @@ 
 $recipients = explode(", ", $newmailaddress);
 
 // fill the destinations in PHPMailer API
-foreach ($recipients as $recipient)
+foreach ($recipients as $recipient) {
     $mail->addAddress($recipient);
+}
 
 // what do we want to say?
 $mail->Subject = sprintf(_("%s: you have been invited to manage an IdP"), Config::$APPEARANCE['productname']);
 $mail->Body = $message;
 
-if (isset(Config::$CONSORTIUM['certfilename'], Config::$CONSORTIUM['keyfilename'], Config::$CONSORTIUM['keypass']))
+if (isset(Config::$CONSORTIUM['certfilename'], Config::$CONSORTIUM['keyfilename'], Config::$CONSORTIUM['keypass'])) {
     $mail->sign(Config::$CONSORTIUM['certfilename'], Config::$CONSORTIUM['keyfilename'], Config::$CONSORTIUM['keypass']);
+}
 
 $sent = $mail->send();
 
 // invalidate the token immediately if the mail could not be sent!
-if (!$sent)
+if (!$sent) {
     $mgmt->invalidateToken($newtoken);
+}
 $status = ($sent ? "SUCCESS" : "FAILURE");
 header("Location: $redirect_destination" . "invitation=$status");
 ?>

web/admin/inc/option_xhr.inc.php

Switch Indentation +27 added lines, -27 removed lines

@@ -25,33 +25,33 @@
     $list = $optioninfo->availableOptions($_GET["class"]);
 
     switch ($_GET['class']) {
-    case "general":
-        $blacklist_item = array_search("general:geo_coordinates", $list);
-        if ($blacklist_item !== FALSE) {
-            unset($list[$blacklist_item]);
-            $list = array_values($list);
-        }
-        break;
-    case "user":
-        $blacklist_item = array_search("user:fedadmin", $list);
-        if ($blacklist_item !== FALSE) {
-            unset($list[$blacklist_item]);
-            $list = array_values($list);
-        }
-        break;
-    case "eap":
-    case "support":
-    case "profile":
-    case "media":
-    case "fed":
-            $list = array_values($list);
-        break;
-    case "device-specific":
-    case "eap-specific":
-        break;
-    default:
-        debug(1,"Unknown type of option!");
-        exit(1);
+        case "general":
+            $blacklist_item = array_search("general:geo_coordinates", $list);
+            if ($blacklist_item !== FALSE) {
+                unset($list[$blacklist_item]);
+                $list = array_values($list);
+            }
+            break;
+        case "user":
+            $blacklist_item = array_search("user:fedadmin", $list);
+            if ($blacklist_item !== FALSE) {
+                unset($list[$blacklist_item]);
+                $list = array_values($list);
+            }
+            break;
+        case "eap":
+        case "support":
+        case "profile":
+        case "media":
+        case "fed":
+                $list = array_values($list);
+            break;
+        case "device-specific":
+        case "eap-specific":
+            break;
+        default:
+            debug(1,"Unknown type of option!");
+            exit(1);
     }
     // echo "<pre>".print_r($list)."</pre>";
 

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     case "eap-specific":
         break;
     default:
-        debug(1,"Unknown type of option!");
+        debug(1, "Unknown type of option!");
         exit(1);
     }
     // echo "<pre>".print_r($list)."</pre>";

web/admin/inc/filepreview.php

Braces +12 added lines, -8 removed lines

@@ -26,24 +26,28 @@
     // shouldn't throw E_NOTICE
     if (@unserialize($blob) !== FALSE) { // an array? must be lang-tagged content
         $blob = unserialize($blob);
-        if (!isset($blob['content']))
-            return;
+        if (!isset($blob['content'])) {
+                    return;
+        }
         $blob = base64_decode($blob['content']);
     } else {
         $blob = base64_decode($blob);
     }
 
-    if ($blob === FALSE)
-        return;
+    if ($blob === FALSE) {
+            return;
+    }
 
     // Set data type and caching for 30 days
     $info = new finfo();
     $filetype = $info->buffer($blob, FILEINFO_MIME_TYPE);
     header("Content-type: " . $filetype);
-    if ($filetype == "text/rtf" || $filetype == "application/rtf")
-        header("Content-Disposition: attachment; filename='download.rtf'");
-    if ($filetype == "text/plain")
-        header("Content-Disposition: attachment; filename='download.txt'");
+    if ($filetype == "text/rtf" || $filetype == "application/rtf") {
+            header("Content-Disposition: attachment; filename='download.rtf'");
+    }
+    if ($filetype == "text/plain") {
+            header("Content-Disposition: attachment; filename='download.txt'");
+    }
     header("Cache-Control: must-revalidate");
     $offset = 60 * 60 * 24 * 30;
     $ExpStr = "Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT";

web/admin/inc/option_html.inc.php

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
     // print_r($prepopulate);
     $optioninfo = Options::instance();
     // print_r($prepopulate);
-    if (is_array($prepopulate) && ( count($prepopulate) > 1 || $class == "device-specific" || $class == "eap-specific") ) { // editing... fill with values
+    if (is_array($prepopulate) && (count($prepopulate) > 1 || $class == "device-specific" || $class == "eap-specific")) { // editing... fill with values
         $a = 0;
         foreach ($prepopulate as $option)
             if (preg_match("/$class:/", $option['name']) && !preg_match("/(profile:QR-user|user:fedadmin)/", $option['name'])) {
@@ -102,16 +102,16 @@ 
         $a = 0;
         foreach ($list as $key => $value) {
             $listtype = $optioninfo->optionType($value);
-            $retval .="<option id='option-S$rowid-v-$value' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ";
+            $retval .= "<option id='option-S$rowid-v-$value' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ";
             if ($a == $defaultselect) {
                 $retval .= "selected='selected'";
                 $activelisttype = $listtype;
             }
-            $retval .=">" . display_name($value). "</option>";
+            $retval .= ">" . display_name($value) . "</option>";
             $a++;
         }
-        $retval .="</select></td>";
-        $retval .="<td>
+        $retval .= "</select></td>";
+        $retval .= "<td>
           <select style='display:" . ($activelisttype["flag"] == "ML" ? "block" : "none") . "' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect'>
             <option value='' name='select_language' selected>" . _("select language") . "</option>
             <option value='C' name='all_languages'>" . _("default/other languages") . "</option>";
@@ -171,7 +171,7 @@ 
                 $global_location_count++;
                 $location_index = $global_location_count;
                 $link = "<button id='location_b_$global_location_count' class='location_button'>" . _("Click to see location") . " $global_location_count</button>";
-                $retval .="<input readonly style='display:none' type='text' name='value[S$rowid-1]' id='S" . $rowid . "-input-text' value='$prefill'>$link";
+                $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-1]' id='S" . $rowid . "-input-text' value='$prefill'>$link";
                 break;
             case "file":
                 $retval .= "<input readonly type='text' name='value[S$rowid-1]' id='S" . $rowid . "-input-string' style='display:none' value='" . urlencode($content) . "'>";
@@ -191,10 +191,10 @@ 
                 };
                 break;
             case "string":
-                $retval .= "<strong>$content</strong><input type='hidden' name='value[S$rowid-0]' id='S" . $rowid . "-input-string' value=\"".htmlspecialchars($content)."\" style='display:block'>";
+                $retval .= "<strong>$content</strong><input type='hidden' name='value[S$rowid-0]' id='S" . $rowid . "-input-string' value=\"" . htmlspecialchars($content) . "\" style='display:block'>";
                 break;
             case "text":
-                $retval .= "<strong>$content</strong><input type='hidden' name='value[S$rowid-1]' id='S" . $rowid . "-input-text' value=\"".htmlspecialchars($content)."\" style='display:block'>";
+                $retval .= "<strong>$content</strong><input type='hidden' name='value[S$rowid-1]' id='S" . $rowid . "-input-text' value=\"" . htmlspecialchars($content) . "\" style='display:block'>";
                 break;
             case "boolean":
                 if ($content == "on")
@@ -213,7 +213,7 @@ 
         };
         $retval .= "</td>";
     }
-    $retval .="
+    $retval .= "
 
        <td>
           <button type='button' class='delete' onclick='deleteOption(" . $location_index . ",\"option-S" . $rowid . "\")'>-</button>

Braces +16 added lines, -12 removed lines

@@ -20,9 +20,10 @@ 
     // print_r($prepopulate);
     if (is_array($prepopulate) && ( count($prepopulate) > 1 || $class == "device-specific" || $class == "eap-specific") ) { // editing... fill with values
         $a = 0;
-        foreach ($prepopulate as $option)
-            if (preg_match("/$class:/", $option['name']) && !preg_match("/(profile:QR-user|user:fedadmin)/", $option['name'])) {
+        foreach ($prepopulate as $option) {
+                    if (preg_match("/$class:/", $option['name']) && !preg_match("/(profile:QR-user|user:fedadmin)/", $option['name'])) {
                 $optiontypearray = $optioninfo->optionType($option['name']);
+        }
                 debug(5, "About to execute optiontext with PREFILL!\n");
                 echo optiontext($a, [$option['name']], ($optiontypearray["type"] == "file" ? 'ROWID-' . $option['level'] . '-' . $option['row'] : $option['value']));
             }
@@ -52,8 +53,9 @@ 
         echo "</pre>"; */
         // add as many options as there are different option types
 
-        foreach (array_keys($list) as $key)
-            echo optiontext($key, $list);
+        foreach (array_keys($list) as $key) {
+                    echo optiontext($key, $list);
+        }
     }
 }
 
@@ -154,10 +156,11 @@ 
                 $content = $prefill;
             }
             $language;
-            if ($taggedarray['lang'] == 'C')
-                $language = _("(default/other languages)");
-            else
-                $language = "(" . strtoupper($taggedarray['lang']) . ")";
+            if ($taggedarray['lang'] == 'C') {
+                            $language = _("(default/other languages)");
+            } else {
+                            $language = "(" . strtoupper($taggedarray['lang']) . ")";
+            }
             $retval .= $language;
             $retval .= "<input type='hidden' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect' value='" . $taggedarray["lang"] . "' style='display:block'>";
         } else {
@@ -197,12 +200,13 @@ 
                 $retval .= "<strong>$content</strong><input type='hidden' name='value[S$rowid-1]' id='S" . $rowid . "-input-text' value=\"".htmlspecialchars($content)."\" style='display:block'>";
                 break;
             case "boolean":
-                if ($content == "on")
-                /// Device assessment is "on"
+                if ($content == "on") {
+                                /// Device assessment is "on"
                     $display_option = _("on");
-                else
-                /// Device assessment is "off"
+                } else {
+                                /// Device assessment is "off"
                     $display_option = _("off");
+                }
                 $retval .= "<strong>$display_option</strong><input type='hidden' name='value[S$rowid-3]' id='S" . $rowid . "-input-boolean' value='$content' style='display:block'>";
                 break;
             default:

web/admin/inc/manageNewInst.inc.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
                 $entities = $thefed->listExternalEntities(TRUE);
 
                 foreach ($entities as $v) {
-                echo "<option id='".$v['contactlist']."' value='" . $v['ID'] . "'>[" . $fed_value['value'] . "] " . $v['name'] . "</option>";
+                echo "<option id='" . $v['contactlist'] . "' value='" . $v['ID'] . "'>[" . $fed_value['value'] . "] " . $v['name'] . "</option>";
             }
             }
 
@@ -110,9 +110,9 @@ 
         </tr>
     </table>
     <hr/>
-    <button type='submit' name='submitbutton' value='<?php echo BUTTON_SAVE;?>'><?php echo _("Send invitation"); ?></button>
+    <button type='submit' name='submitbutton' value='<?php echo BUTTON_SAVE; ?>'><?php echo _("Send invitation"); ?></button>
 </form>
 <br/>
 <form action='inc/manageNewInst.inc.php' method='post' accept-charset='UTF-8'>
-    <button type='submit' name='submitbutton' value='<?php echo BUTTON_CLOSE;?>'><?php echo _("Close"); ?></button>
+    <button type='submit' name='submitbutton' value='<?php echo BUTTON_CLOSE; ?>'><?php echo _("Close"); ?></button>
 </form>

Braces +5 added lines, -3 removed lines

@@ -23,8 +23,9 @@ 
 
 // if we have a pushed close button, submit attributes and send user back to the overview page
 
-if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == BUTTON_CLOSE))
+if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == BUTTON_CLOSE)) {
     header("Location: ../overview_federation.php");
+}
 
 $cat = new CAT();
 $cat->set_locale("web_admin");
@@ -93,9 +94,10 @@ 
                 <select id='country' name='country'>
                     <?php
                     foreach ($cat->printCountryList() as $iso_code => $country) {
-                        foreach ($feds as $fed_value)
-                            if (strtoupper($fed_value['value']) == strtoupper($iso_code))
+                        foreach ($feds as $fed_value) {
+                                                    if (strtoupper($fed_value['value']) == strtoupper($iso_code))
                                 echo "<option value='$iso_code'>$country</option>";
+                        }
                     }
                     ?>
                 </select>

web/admin/inc/toggleRedirect.inc.php

Braces +7 added lines, -4 removed lines

@@ -49,9 +49,11 @@ 
     $eaptype = unserialize(stripslashes($_POST['eaptype']));
     // is this an actual EAP type we know of?
     $eap_id = EAP::EAPMethodIdFromArray($eaptype);
-    if ($eap_id === FALSE) // oh-oh, unexpected malformed input. Goodbye.
+    if ($eap_id === FALSE) {
+        // oh-oh, unexpected malformed input. Goodbye.
         exit(1);
-}
+    }
+    }
 
 // there is either one or the other. If both are set, something's fishy.
 
@@ -107,8 +109,9 @@ 
         $interesting_attribs = [];
 
         foreach ($attribs as $attrib) {
-            if ($attrib['level'] == "Method" && preg_match('/^' . $keyword . ':/', $attrib['name']))
-                $interesting_attribs[] = $attrib;
+            if ($attrib['level'] == "Method" && preg_match('/^' . $keyword . ':/', $attrib['name'])) {
+                            $interesting_attribs[] = $attrib;
+            }
         }
         // print_r($interesting_attribs);
         add_option($keyword, $interesting_attribs);