GEANT / CAT

web/admin/overview_federation.php

Spacing +1 added lines, -1 removed lines

@@ -188,7 +188,7 @@
                 // deployment status; need to dive into profiles for this
                 // show happy eyeballs if at least one profile is configured/showtime                    
                 echo "<td>";
-                echo ($idp_instance->isOneProfileConfigured() ? "C" : "" ) . " " . ($idp_instance->isOneProfileShowtime() ? "V" : "" );
+                echo ($idp_instance->isOneProfileConfigured() ? "C" : "") . " " . ($idp_instance->isOneProfileShowtime() ? "V" : "");
                 echo "</td>";
                 // get the coarse status overview
                 $status = $idp_instance->getAllProfileStatusOverview();

web/admin/inc/option_html.inc.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
     $optioninfo = Options::instance();
 
-    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
         $number = 0;
         foreach ($prepopulate as $option) {
             if (preg_match("/$class:/", $option['name']) && !preg_match("/(profile:QR-user|user:fedadmin)/", $option['name'])) {

web/admin/inc/sendinvite.inc.php

Spacing +1 added lines, -2 removed lines

@@ -172,8 +172,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) . "
 

web/admin/inc/option_parse.inc.php

Spacing +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
     $leftNum = (int) preg_replace($pat, $rep, $left);
     $rightNum = (int) preg_replace($pat, $rep, $right);
     return ($left != $leftNum && $right != $rightNum) ?
-            $leftNum - $rightNum :
-            strcmp($left, $right);
+            $leftNum - $rightNum : strcmp($left, $right);
 }
 
 function postProcessValidAttributes($options, &$good, &$bad) {

web/admin/action_enrollment.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     $checkval = "OK-NEW";
 }
 
-if (!isset($_GET['token']) || ( $checkval != "OK-NEW" && $checkval != "OK-EXISTING")) {
+if (!isset($_GET['token']) || ($checkval != "OK-NEW" && $checkval != "OK-EXISTING")) {
     pageheader(_("Error creating new IdP binding!"), "ADMIN-IDP");
     echo "<h1>" . _("Error creating new IdP binding!") . "</h1>";
     if ($checkval == "FAIL-ALREADYCONSUMED") {

web/user/API.php

Spacing +13 added lines, -13 removed lines

@@ -23,19 +23,19 @@
 }
 
 $action = $_REQUEST['action'];
-$id = ( isset($_REQUEST['id']) ? $_REQUEST['id'] : FALSE );
-$device = ( isset($_REQUEST['device']) ? $_REQUEST['device'] : FALSE );
-$lang = ( isset($_REQUEST['lang']) ? $_REQUEST['lang'] : FALSE );
-$idp = ( isset($_REQUEST['idp']) ? $_REQUEST['idp'] : FALSE );
-$profile = ( isset($_REQUEST['profile']) ? $_REQUEST['profile'] : FALSE );
-$federation = ( isset($_REQUEST['federation']) ? $_REQUEST['federation'] : FALSE );
-$disco = ( isset($_REQUEST['disco']) ? $_REQUEST['disco'] : FALSE );
-$width = ( isset($_REQUEST['width']) ? $_REQUEST['width'] : 0 );
-$height = ( isset($_REQUEST['height']) ? $_REQUEST['height'] : 0 );
-$sort = ( isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 0 );
-$location = ( isset($_REQUEST['location']) ? $_REQUEST['location'] : 0 );
-$api_version = ( isset($_REQUEST['api_version']) ? $_REQUEST['api_version'] : 1 );
-$generatedfor = ( isset($_REQUEST['generatedfor']) ? $_REQUEST['generatedfor'] : 'user' );
+$id = (isset($_REQUEST['id']) ? $_REQUEST['id'] : FALSE);
+$device = (isset($_REQUEST['device']) ? $_REQUEST['device'] : FALSE);
+$lang = (isset($_REQUEST['lang']) ? $_REQUEST['lang'] : FALSE);
+$idp = (isset($_REQUEST['idp']) ? $_REQUEST['idp'] : FALSE);
+$profile = (isset($_REQUEST['profile']) ? $_REQUEST['profile'] : FALSE);
+$federation = (isset($_REQUEST['federation']) ? $_REQUEST['federation'] : FALSE);
+$disco = (isset($_REQUEST['disco']) ? $_REQUEST['disco'] : FALSE);
+$width = (isset($_REQUEST['width']) ? $_REQUEST['width'] : 0);
+$height = (isset($_REQUEST['height']) ? $_REQUEST['height'] : 0);
+$sort = (isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 0);
+$location = (isset($_REQUEST['location']) ? $_REQUEST['location'] : 0);
+$api_version = (isset($_REQUEST['api_version']) ? $_REQUEST['api_version'] : 1);
+$generatedfor = (isset($_REQUEST['generatedfor']) ? $_REQUEST['generatedfor'] : 'user');
 
 /* in order to provide bacwards compatibility, both $id and new named arguments are supported.
   Support for $id will be removed in the futute

web/copyright.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         <div id="heading">
             <?php
             print '<img src="resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
-            print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
+            print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>';
             print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("%s Copyright and Licensing"), CONFIG['APPEARANCE']['productname']) . '</h1>
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>';
             echo '<table id="lang_select"><tr><td>';

web/tou.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
     <div id="heading">
         <?php
         print '<img src="resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
-        print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
+        print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>';
         print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1>
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>';
         echo '<table id="lang_select"><tr><td>';

web/admin/inc/manageDBLink.inc.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,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");
 }