GEANT / CAT

web/admin/overview_installers.php

Spacing +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
                         // see if we want to add a footnote: anon_id
                         $anon = $my_profile->getAttributes("internal:use_anon_outer");
                         $anon = $anon[0]['value'];
-                        if ( $anon !== "" && isset($factory->device->specialities['anon_id'])) {
+                        if ($anon !== "" && isset($factory->device->specialities['anon_id'])) {
                             if (isset($factory->device->specialities['anon_id'][serialize($method)])) {
                                 $footnotetext = $factory->device->specialities['anon_id'][serialize($method)];
                                 $display_footnote = TRUE;
@@ -150,7 +150,7 @@ 
     }
     ?>
     <form method='post' action='overview_idp.php?inst_id=<?php echo $my_inst->identifier; ?>' accept-charset='UTF-8'>
-        <button type='submit' name='submitbutton' value='<?php echo BUTTON_CLOSE;?>'>
+        <button type='submit' name='submitbutton' value='<?php echo BUTTON_CLOSE; ?>'>
             <?php echo _("Return to dashboard"); ?>
         </button>
     </form>

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/API.php

Spacing +35 added lines, -35 removed lines

@@ -30,7 +30,7 @@ 
 
 function return_error($code, $description) {
     echo "<CAT-API-Response>\n";
-    echo "  <error>\n    <code>".$code."</code>\n    <description>$description</description>\n  </error>\n";
+    echo "  <error>\n    <code>" . $code . "</code>\n    <description>$description</description>\n  </error>\n";
     echo "</CAT-API-Response>\n";
 }
 
@@ -42,7 +42,7 @@ 
 }
 
 if (!isset($_POST['APIKEY'])) {
-    return_error(ERROR_NO_APIKEY,"POST did not contain an APIKEY");
+    return_error(ERROR_NO_APIKEY, "POST did not contain an APIKEY");
     exit(1);
 }
 
@@ -54,25 +54,25 @@ 
     }
 
 if ($checkval == "FAIL") {
-    return_error(ERROR_INVALID_APIKEY,"APIKEY is invalid");
+    return_error(ERROR_INVALID_APIKEY, "APIKEY is invalid");
     exit(1);
 }
     
 // it's a valid admin; what does he want to do?
 
 if (!isset($_POST['ACTION'])) {
-    return_error(ERROR_NO_ACTION,"POST did not contain the desired ACTION");
+    return_error(ERROR_NO_ACTION, "POST did not contain the desired ACTION");
     exit(1);
 }
 
 $sanitised_action = valid_string_db($_POST['ACTION']);
 
-switch($sanitised_action) {
+switch ($sanitised_action) {
     case 'NEWINST':
         // fine... we need two parameters for that:
         // mail address, inst name
         if (!isset($_POST['NEWINST_PRIMARYADMIN'])) {
-            return_error(ERROR_MISSING_PARAMETER,"POST missed at least one required parameter (NEWINST_PRIMARYADMIN)");
+            return_error(ERROR_MISSING_PARAMETER, "POST missed at least one required parameter (NEWINST_PRIMARYADMIN)");
             exit(1);
         }
         // alright: create the IdP, fill in attributes
@@ -85,14 +85,14 @@ 
         // 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))
+            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);
+        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")
+            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) {
@@ -106,44 +106,44 @@ 
             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")
+                        if (isset($_POST['value'][$optindex . "-3"]) && valid_boolean($_POST['value'][$optindex . "-3"]) == "on")
                                 $use_anon = TRUE;
                         break;
                     case "profile-api:eaptype":
                         $pref = 0;
-                        if (isset($_POST['value'][$optindex."-0"]) && 
-                            is_numeric($_POST['value'][$optindex."-0"]) && 
-                            $_POST['value'][$optindex."-0"] >= 1 &&
-                            $_POST['value'][$optindex."-0"] <= 7 ) {
-                                switch ($_POST['value'][$optindex."-0"]) {
+                        if (isset($_POST['value'][$optindex . "-0"]) && 
+                            is_numeric($_POST['value'][$optindex . "-0"]) && 
+                            $_POST['value'][$optindex . "-0"] >= 1 &&
+                            $_POST['value'][$optindex . "-0"] <= 7) {
+                                switch ($_POST['value'][$optindex . "-0"]) {
                                     case 1:
-                                        $newprofile->addSupportedEapMethod (EAP::$TTLS_PAP, $pref);
+                                        $newprofile->addSupportedEapMethod(EAP::$TTLS_PAP, $pref);
                                         break;
                                     case 2:
-                                        $newprofile->addSupportedEapMethod (EAP::$PEAP_MSCHAP2, $pref);
+                                        $newprofile->addSupportedEapMethod(EAP::$PEAP_MSCHAP2, $pref);
                                         break;
                                     case 3:
-                                        $newprofile->addSupportedEapMethod (EAP::$TLS, $pref);
+                                        $newprofile->addSupportedEapMethod(EAP::$TLS, $pref);
                                         break;
                                     case 4:
-                                        $newprofile->addSupportedEapMethod (EAP::$FAST_GTC, $pref);
+                                        $newprofile->addSupportedEapMethod(EAP::$FAST_GTC, $pref);
                                         break;
                                     case 5:
-                                        $newprofile->addSupportedEapMethod (EAP::$TTLS_GTC, $pref);
+                                        $newprofile->addSupportedEapMethod(EAP::$TTLS_GTC, $pref);
                                         break;
                                     case 6:
-                                        $newprofile->addSupportedEapMethod (EAP::$TTLS_MSCHAP2, $pref);
+                                        $newprofile->addSupportedEapMethod(EAP::$TTLS_MSCHAP2, $pref);
                                         break;
                                     case 7:
-                                        $newprofile->addSupportedEapMethod (EAP::$PWD, $pref);
+                                        $newprofile->addSupportedEapMethod(EAP::$PWD, $pref);
                                         break;
                                 }
                                 $pref = $pref + 1;
@@ -154,9 +154,9 @@ 
                 }
             }
             if ($therealm != "") {
-                $newprofile->setRealm ($theanonid."@".$therealm);
+                $newprofile->setRealm($theanonid . "@" . $therealm);
                 if ($use_anon) {
-                    $newprofile->setAnonymousIDSupport (true);
+                    $newprofile->setAnonymousIDSupport(true);
                 }
             }
             // re-instantiate $profile, we need to do completion checks and need fresh data for isEapTypeDefinitionComplete()
@@ -169,30 +169,30 @@ 
         // and send it back to the caller
         $URL = "https://" . $_SERVER['SERVER_NAME'] . dirname($_SERVER['SCRIPT_NAME']) . "/action_enrollment.php?token=$newtoken";
         echo "<CAT-API-Response>\n";
-        echo "  <success action='NEWINST'>\n    <enrollment_URL>$URL</enrollment_URL>\n    <inst_unique_id>".$idp->identifier."</inst_unique_id>\n  </success>\n";
+        echo "  <success action='NEWINST'>\n    <enrollment_URL>$URL</enrollment_URL>\n    <inst_unique_id>" . $idp->identifier . "</inst_unique_id>\n  </success>\n";
         echo "</CAT-API-Response>\n";
             exit(0);
         break;
     case 'ADMINCOUNT':
         if (!isset($_POST['INST_IDENTIFIER'])) {
-            return_error(ERROR_MISSING_PARAMETER,"Parameter missing (INST_IDENTIFIER)");
+            return_error(ERROR_MISSING_PARAMETER, "Parameter missing (INST_IDENTIFIER)");
             exit(1);
         }
         $wannabeidp = valid_IdP($_POST['INST_IDENTIFIER']);
-        if (! $wannabeidp instanceof IdP) {
-            return_error(ERROR_INVALID_PARAMETER,"Parameter invalid (INST_IDENTIFIER)");
+        if (!$wannabeidp instanceof IdP) {
+            return_error(ERROR_INVALID_PARAMETER, "Parameter invalid (INST_IDENTIFIER)");
             exit(1);
         }
         if (strtoupper($wannabeidp->federation) != strtoupper($federation)) {
-            return_error(ERROR_INVALID_PARAMETER,"Parameter invalid (INST_IDENTIFIER)");
+            return_error(ERROR_INVALID_PARAMETER, "Parameter invalid (INST_IDENTIFIER)");
             exit(1);
         }
         echo "<CAT-API-Response>\n";
-        echo "  <success action='ADMINCOUNT'>\n    <number_of_admins>".count($wannabeidp->owner())."</number_of_admins>\n  </success>\n";        
+        echo "  <success action='ADMINCOUNT'>\n    <number_of_admins>" . count($wannabeidp->owner()) . "</number_of_admins>\n  </success>\n";        
         echo "</CAT-API-Response>\n";
             exit(0);
         break;
     default:
-        return_error(ERROR_INVALID_ACTION,"POST contained an unknown ACTION");
+        return_error(ERROR_INVALID_ACTION, "POST contained an unknown ACTION");
         exit(1);
 }
\ No newline at end of file

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

Indentation +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
     authenticate();
     $no_security = 0;
 } else {
-   $no_security = 1;
+    $no_security = 1;
 }
 $user = new User((!in_array("I do not care about security!", Config::$SUPERADMINS) ? $_SESSION['user'] : "UNIDENTIFIED"));
 
@@ -61,16 +61,16 @@ 
             </legend>
 <?php
             if (isset($_POST['admin_action'])) {
-               if($_POST['admin_action'] == BUTTON_SANITY_TESTS)
+                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>
 </fieldset>
 <?php if($no_security) {
-     print "<h2 style='color: red'>In order to do more you need to configure the SUPERADMIN section  in config/config.php and login as one.</h2>";
+        print "<h2 style='color: red'>In order to do more you need to configure the SUPERADMIN section  in config/config.php and login as one.</h2>";
 
-   } else {
+    } else {
 ?>
         <fieldset class="option_container">
             <legend>

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 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
+$cat = pageheader("By. Your. Command.", "SUPERADMIN", FALSE); // no auth in pageheader; we did our own before
 
 ?>
     <h1>By. Your. Command.</h1>
@@ -61,13 +61,13 @@ 
             </legend>
 <?php
             if (isset($_POST['admin_action'])) {
-               if($_POST['admin_action'] == BUTTON_SANITY_TESTS)
+               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>
 </fieldset>
-<?php if($no_security) {
+<?php if ($no_security) {
      print "<h2 style='color: red'>In order to do more you need to configure the SUPERADMIN section  in config/config.php and login as one.</h2>";
 
    } else {

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

Indentation +1 added lines, -1 removed lines

@@ -283,7 +283,7 @@
     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>
+                    "</p>
                      <ul>".
                         _("<li>Drag the marker in the map to your place, or</li>
 <li>enter your street address in the field below for lookup, or</li>

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

Spacing +13 added lines, -13 removed lines

@@ -71,19 +71,19 @@ 
          *
          */
         function locator_magic() {
-            geocoder.geocode({'address':\"$inst_name\", 'region':\"".strtolower($inst_country)."\"},
+            geocoder.geocode({'address':\"$inst_name\", 'region':\"" . strtolower($inst_country) . "\"},
             function(r,status) {
                 if(status != google.maps.GeocoderStatus.OK) {
-                    locate_country(\"".Federation::$federationList[strtoupper($inst_country)]."\");
+                    locate_country(\"".Federation::$federationList[strtoupper($inst_country)] . "\");
                 } else {
                     var i;
                     for(i = 0; i < r.length; i++) {
                         Addr = getAddressElements(r[i].address_components);
-                        if(Addr.country == \"". strtoupper($inst_country)."\")
+                        if(Addr.country == \"". strtoupper($inst_country) . "\")
                         break;
                     }
-                    if(Addr.country != \"". strtoupper($inst_country)."\")
-                    locate_country(\"". Federation::$federationList[strtoupper($inst_country)]."\");
+                    if(Addr.country != \"". strtoupper($inst_country) . "\")
+                    locate_country(\"". Federation::$federationList[strtoupper($inst_country)] . "\");
                     else {
                         addMarker(r[i].geometry.location,15,null);
                     }
@@ -96,7 +96,7 @@ 
          */
         function markerClicked(m) {
             info_window.close();
-            var t = \"". _("This is location ")."\"+m.info;
+            var t = \"". _("This is location ") . "\"+m.info;
             info_window.setContent(t);
             info_window.setPosition(m.getPosition());
             info_window.open(map,m);
@@ -175,7 +175,7 @@ 
         function getAddressLocation() {
             var city = $('#address').val();
             if(city == '') {
-                alert(\""._("nothing entered in the address field")."\");
+                alert(\""._("nothing entered in the address field") . "\");
                 return false;
             }
             geocoder.geocode( { 'address': city}, function(results, status) {
@@ -195,7 +195,7 @@ 
          * trigger geolocation
          */
         function locateMe() {
-            $('#address').val(\"". _("locating")."\");
+            $('#address').val(\"". _("locating") . "\");
             navigator.geolocation.getCurrentPosition(locate_succes,locate_fail,{maximumAge:3600000, timeout:5000});
         }
 
@@ -278,19 +278,19 @@ 
 
 function geo_widget_body($wizard, $additional) {
     echo "<fieldset class='option_container'>
-        <legend><strong>". _("Location")."</strong></legend>";
+        <legend><strong>". _("Location") . "</strong></legend>";
 
     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.").
+            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>".
                         _("<li>Drag the marker in the map to your place, or</li>
 <li>enter your street address in the field below for lookup, or</li>
-<li>use the 'Locate Me!' button</li>").
+<li>use the 'Locate Me!' button</li>") .
                     "</ul>
                      <strong>".
-                    _("We will use the coordinates as indicated by the marker for geolocation.").
+                    _("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/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,20 +210,23 @@ 
 $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");
\ No newline at end of file

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

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:

Spacing +10 added lines, -10 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'])) {
@@ -112,16 +112,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>";
@@ -182,7 +182,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) . "'>";
@@ -202,13 +202,13 @@ 
                 };
                 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 "integer":
-                $retval .= "<strong>$content</strong><input type='hidden' name='value[S$rowid-4]' id='S" . $rowid . "-input-integer' value=\"".htmlspecialchars($content)."\" style='display:block'>";
+                $retval .= "<strong>$content</strong><input type='hidden' name='value[S$rowid-4]' id='S" . $rowid . "-input-integer' 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")
@@ -227,7 +227,7 @@ 
         };
         $retval .= "</td>";
     }
-    $retval .="
+    $retval .= "
 
        <td>
           <button type='button' class='delete' onclick='deleteOption(" . $location_index . ",\"option-S" . $rowid . "\")'>-</button>