GEANT / CAT

devices/linux/Linux.php

Spacing +2 added lines, -2 removed lines

@@ -188,8 +188,8 @@
 # will be the default value prompted to the user
 
     private function printFunctions() {
-        $url = (isset($this->attributes['support:url'][0]) && $this->attributes['support:url'][0] ) ? $this->attributes['support:url'][0] : $this->support_url_substitute;
-        $support = (isset($this->attributes['support:email'][0]) && $this->attributes['support:email'][0] ) ? $this->attributes['support:email'][0] : $this->support_email_substitute;
+        $url = (isset($this->attributes['support:url'][0]) && $this->attributes['support:url'][0]) ? $this->attributes['support:url'][0] : $this->support_url_substitute;
+        $support = (isset($this->attributes['support:email'][0]) && $this->attributes['support:email'][0]) ? $this->attributes['support:email'][0] : $this->support_email_substitute;
         $out = '
 my_name=$0
 

web/basic.php

Spacing +2 added lines, -2 removed lines

@@ -233,7 +233,7 @@ 
                 }
             }
             $out .= '>' . $disp . '</option>';
-            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ( $oneDevice['redirect'] ? 1 : 0 ) . ';';
+            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ($oneDevice['redirect'] ? 1 : 0) . ';';
             $iterator++;
         }
         $out .= '</select>';
@@ -429,7 +429,7 @@ 
 $loggerInstance->debug(4, "SERVER\n");
 $loggerInstance->debug(4, $_SERVER);
 ?>
-<?php print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>'; ?>
+<?php print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>'; ?>
         <form name="my_form" method="POST" action="<?php echo $_SERVER['SCRIPT_NAME'] ?>" accept-charset='UTF-8'>
             <img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="width: 20%; padding-right:20px; padding-top:0px; float:right" alt="logo" />
 <?php

devices/xml/XML.php

Spacing +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
         $objs = [];
         if ($this->langScope === 'global') {
             foreach ($attributeList['langs'] as $language => $value) {
-                $language = ( $language === 'C' ? 'any' : $language );
+                $language = ($language === 'C' ? 'any' : $language);
                 $obj = new $class_name();
                 $obj->setValue($value);
                 $obj->setAttributes(['lang' => $language]);
@@ -172,7 +172,7 @@ 
                 $P = $attr['profile:name']['langs'];
             }
             foreach ($instNameLangs as $language => $value) {
-                $language = ( $language === 'C' ? 'any' : $language );
+                $language = ($language === 'C' ? 'any' : $language);
                 $displayname = new DisplayName();
                 if (isset($P)) {
                     $p = isset($P[$language]) ? $P[$language] : $P['C'];

devices/ms/Vista7.php

Spacing +2 added lines, -2 removed lines

@@ -501,8 +501,8 @@
 
         $fcontents .= ';--------------------------------
 !define ORGANISATION "' . $this->translateString($attr['general:instname'][0], $this->code_page) . '"
-!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->code_page)) . '"
-!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) . '"
+!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->code_page)) . '"
+!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) . '"
 
 !ifdef TLS
 ';

devices/ms/W8.php

Spacing +2 added lines, -2 removed lines

@@ -501,8 +501,8 @@
 
         $fcontents .= ';--------------------------------
 !define ORGANISATION "' . $this->translateString($attr['general:instname'][0], $this->code_page) . '"
-!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->code_page)) . '"
-!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) . '"
+!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->code_page)) . '"
+!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) . '"
 
 !ifdef TLS
 ';

devices/redirect_dev/RedirectDev.php

Indentation +7 added lines, -7 removed lines

@@ -2,15 +2,15 @@
 require_once('DeviceConfig.php');
 
 class Device_RedirectDev extends DeviceConfig {
-   /**
-    * Constructs a Device object.
-    *
-    * @final not to be redefined
-    */
+    /**
+     * Constructs a Device object.
+     *
+     * @final not to be redefined
+     */
     final public function __construct() {
         parent::__construct();
-      $this->supportedEapMethods  = [EAPTYPE_NONE];
-      $this->loggerInstance->debug(4,"RedirectEx called");
+        $this->supportedEapMethods  = [EAPTYPE_NONE];
+        $this->loggerInstance->debug(4,"RedirectEx called");
     }
     public function writeDeviceInfo() {
         $out = "<p>";

Spacing +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
     */
     final public function __construct() {
         parent::__construct();
-      $this->supportedEapMethods  = [EAPTYPE_NONE];
-      $this->loggerInstance->debug(4,"RedirectEx called");
+      $this->supportedEapMethods = [EAPTYPE_NONE];
+      $this->loggerInstance->debug(4, "RedirectEx called");
     }
     public function writeDeviceInfo() {
         $out = "<p>";

core/CAT.php

Spacing +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
      */
     static public function get_lang() {
         if (self::$LANG === '')
-            list(self::$LANG, ) = self::set_lang();
+            list(self::$LANG,) = self::set_lang();
         return self::$LANG;
     }
 

core/ProfileRADIUS.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,7 @@ 
 
         $this->realm = $profileQuery->realm;
 
-        $localValueIfAny = (preg_match('/@/', $this->realm) ? substr($this->realm, 0, strpos($this->realm, '@')) : "anonymous" );
+        $localValueIfAny = (preg_match('/@/', $this->realm) ? substr($this->realm, 0, strpos($this->realm, '@')) : "anonymous");
 
         $internalAttributes = [
             "internal:profile_count" => $this->idpNumberOfProfiles,
@@ -179,7 +179,7 @@ 
 
                 $temparray[] = [
                     "name" => $attributeQuery->option_name,
-                    "value" => ( $decodedAttribute['lang'] == "" ? $decodedAttribute['content'] : serialize($decodedAttribute)),
+                    "value" => ($decodedAttribute['lang'] == "" ? $decodedAttribute['content'] : serialize($decodedAttribute)),
                     "level" => "Method",
                     "row" => $attributeQuery->row,
                     "flag" => $optinfo['flag'],
@@ -262,7 +262,7 @@ 
      */
     public function setRealmCheckUser($shallwe, $localpart = NULL) {
         $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = " . ($shallwe === true ? "1" : "0") .
-                ( $localpart !== NULL ? ", checkuser_value = '$localpart' " : "") .
+                ($localpart !== NULL ? ", checkuser_value = '$localpart' " : "") .
                 " WHERE profile_id = $this->identifier");
     }
 

core/UserAPI.php

Spacing +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
             if (isset($deviceProperties['options']['hidden']) && $deviceProperties['options']['hidden'] && $showHidden == 0) {
                 continue;
             }
-            $count ++;
+            $count++;
             if ($this->version == 1) {
                 $deviceProperties['device'] = $device;
             } else {