GEANT / CAT

core/User.php

Spacing +2 added lines, -2 removed lines

@@ -184,7 +184,7 @@ 
                 }
                 $lookFor .= "$name";
             }
-            $finding = preg_match("/^(".$lookFor."):(.*)/", $oneRow->user_id, $matches);
+            $finding = preg_match("/^(" . $lookFor . "):(.*)/", $oneRow->user_id, $matches);
             if ($finding === 0 || $finding === FALSE) {
                 return FALSE;
             }
@@ -206,7 +206,7 @@ 
                 case $providerStrings[3]:
                 case $providerStrings[4]:
                 case $providerStrings[5]:
-                    if (!in_array(User::PROVIDER_STRINGS[$matches[1]],$listOfProviders)) {
+                    if (!in_array(User::PROVIDER_STRINGS[$matches[1]], $listOfProviders)) {
                         $listOfProviders[] = User::PROVIDER_STRINGS[$matches[1]];
                     }
                     break;

web/lib/common/InputValidation.php

Spacing +1 added lines, -1 removed lines

@@ -134,7 +134,7 @@
      */
     public function string($input, $allowWhitespace = FALSE) {
     // always chop out invalid characters, and surrounding whitespace
-    $retvalStep0 =  iconv("UTF-8", "UTF-8//TRANSLIT", $input);
+    $retvalStep0 = iconv("UTF-8", "UTF-8//TRANSLIT", $input);
     if ($retvalStep0 === FALSE) {
         throw new Exception("iconv failure for string sanitisation. With TRANSLIT, this should never happen!");
     }

utils/cleanup.php

Indentation +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
         if (isset($Cache[$entry])) {
             continue;
         }
-       \core\common\Entity::rrmdir($downloads . '/' . $entry);
+        \core\common\Entity::rrmdir($downloads . '/' . $entry);
         print "$entry\n";
     }
     closedir($handle);
@@ -56,7 +56,7 @@ 
         if ($ftime < 3600) {
             continue;
         }
-       \core\common\Entity::rrmdir($downloads . '/' . $entry);
+        \core\common\Entity::rrmdir($downloads . '/' . $entry);
         print "$entry\n";
     }
     closedir($handle);

devices/redirect_dev/Device_RedirectDev.php

Indentation +7 added lines, -7 removed lines

@@ -11,15 +11,15 @@
 namespace devices\redirect_dev;
 
 class Device_RedirectDev extends \core\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->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
-      $this->loggerInstance->debug(4,"RedirectEx called");
+        $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
+        $this->loggerInstance->debug(4,"RedirectEx called");
     }
     public function writeDeviceInfo() {
         $out = "<p>";

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     final public function __construct() {
         parent::__construct();
       $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
-      $this->loggerInstance->debug(4,"RedirectEx called");
+      $this->loggerInstance->debug(4, "RedirectEx called");
     }
     public function writeDeviceInfo() {
         $out = "<p>";

web/lib/admin/PageDecoration.php

Braces +1 added lines, -2 removed lines

@@ -206,8 +206,7 @@
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "accountstatus/");
         } elseif (strrpos($_SERVER['PHP_SELF'], "diag/")) {
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "diag/");
-        }
-            else {
+        } else {
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
         }
 

Spacing +7 added lines, -7 removed lines

@@ -65,7 +65,7 @@ 
                         <select id='lang' name='lang' onchange='this.form.submit()'>";
 
         foreach (CONFIG['LANGUAGES'] as $lang => $value) {
-            $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $value['display'] . "</option> ";
+            $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "") . " >" . $value['display'] . "</option> ";
         }
         $retval .= "</select>";
 
@@ -77,7 +77,7 @@ 
         $retval .= "</form>
                 </div><!--langselection-->";
 
-        $logoUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, (strrpos($_SERVER['PHP_SELF'], "admin/") !== FALSE ? strrpos($_SERVER['PHP_SELF'], "admin/") : strrpos($_SERVER['PHP_SELF'], "/")))."/resources/images/consortium_logo.png";        
+        $logoUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, (strrpos($_SERVER['PHP_SELF'], "admin/") !== FALSE ? strrpos($_SERVER['PHP_SELF'], "admin/") : strrpos($_SERVER['PHP_SELF'], "/"))) . "/resources/images/consortium_logo.png";        
         $retval .= "<div class='consortium_logo'>
                     <img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
                 </div> <!-- consortium_logo -->
@@ -120,7 +120,7 @@ 
         $advancedControls = TRUE;
         switch ($area) {
             case "ADMIN-IDP":
-                $cap2 = sprintf(_("Administrator Interface - Identity Provider"),$this->ui->nomenclature_inst);
+                $cap2 = sprintf(_("Administrator Interface - Identity Provider"), $this->ui->nomenclature_inst);
                 break;
             case "ADMIN-IDP-USERS":
                 $cap2 = sprintf(_("Administrator Interface - %s User Management"), \core\ProfileSilverbullet::PRODUCTNAME);
@@ -132,7 +132,7 @@ 
                 $cap2 = _("Management of User Details");
                 break;
             case "FEDERATION":
-                $cap2 = sprintf(_("Administrator Interface - %s Management"),$this->ui->nomenclature_fed);
+                $cap2 = sprintf(_("Administrator Interface - %s Management"), $this->ui->nomenclature_fed);
                 break;
             case "USER":
                 $cap1 = sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']);
@@ -154,7 +154,7 @@ 
         // content from here on will SCROLL instead of being fixed at the top
         $retval .= "<div class='pagecontent'>"; // closes in footer again
         $retval .= "<div class='trick'>"; // closes in footer again
-        $retval .= "<div id='secondrow' style='border-bottom:5px solid ".CONFIG['APPEARANCE']['colour1']."; min-height:100px;'>
+        $retval .= "<div id='secondrow' style='border-bottom:5px solid " . CONFIG['APPEARANCE']['colour1'] . "; min-height:100px;'>
             <div id='secondarycaptions' style='display:inline-block; float:left'>
                 <h2>$cap2</h2>
             </div><!--secondarycaptions-->";
@@ -199,7 +199,7 @@ 
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
         }
 
-        $cssUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition )."/resources/css/cat.css.php";
+        $cssUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/css/cat.css.php";
         
         $retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
         $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
@@ -227,7 +227,7 @@ 
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
         }
         
-        $logoBase = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition)."/resources/images";
+        $logoBase = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/images";
 
         return "<span id='logos' style='position:fixed; left:50%;'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
               <img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>

core/diag/RFC6614Tests.php

Indentation +10 added lines, -10 removed lines

@@ -246,11 +246,11 @@ 
     }
 
         /**
-     * This function parses a X.509 cert and returns all certificatePolicies OIDs
-     * 
-     * @param array $cert (returned from openssl_x509_parse) 
-     * @return array of OIDs
-     */
+         * This function parses a X.509 cert and returns all certificatePolicies OIDs
+         * 
+         * @param array $cert (returned from openssl_x509_parse) 
+         * @return array of OIDs
+         */
     private function propertyCheckPolicy($cert) {
         $oids = [];
         if ($cert['extensions']['certificatePolicies']) {
@@ -263,11 +263,11 @@ 
         return $oids;
     }
         /**
-     * This function parses a X.509 cert and returns the value of $field
-     * 
-     * @param array $cert (returned from openssl_x509_parse) 
-     * @return string value of the issuer field or ''
-     */
+         * This function parses a X.509 cert and returns the value of $field
+         * 
+         * @param array $cert (returned from openssl_x509_parse) 
+         * @return string value of the issuer field or ''
+         */
     private function getCertificateIssuer($cert) {
         $issuer = '';
         foreach ($cert['issuer'] as $key => $val) {

core/common/OutsideComm.php

Spacing +2 added lines, -2 removed lines

@@ -172,9 +172,9 @@
                 $totalFailures = 0;
                 foreach ($decoded_response['messages'] as $message) {
                     if ($message['status'] == 0) {
-                        $loggerInstance->debug(2, $message['message-id']. ": Success");
+                        $loggerInstance->debug(2, $message['message-id'] . ": Success");
                     } else {
-                        $loggerInstance->debug(2, $message['message-id']. ": Failed (failure code = ".$message['status'].")");
+                        $loggerInstance->debug(2, $message['message-id'] . ": Failed (failure code = " . $message['status'] . ")");
                         $totalFailures++;
                     }
                 }

devices/apple_mobileconfig/mobileconfigSuperclass.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
       <key>PayloadIdentifier</key>
          <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
       <key>PayloadOrganization</key>
-         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
+         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ($this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
       <key>PayloadType</key>
          <string>Configuration</string>
       <key>PayloadUUID</key>
@@ -479,7 +479,7 @@ 
                   <key>PayloadVersion</key>
                      <integer>1</integer>
                 </dict>",
-            "UUID" => $payloadUUID,];
+            "UUID" => $payloadUUID, ];
     }
 
     private function expiryBlock() {

web/skins/classic/basic.php

Spacing +3 added lines, -3 removed lines

@@ -142,7 +142,7 @@ 
     public function listIdPs() {
         $instList = $this->orderIdentityProviders($this->country->identifier);
         $out = '';
-        $out .= sprintf(_("Select your %s"), $this->nomenclature_inst );
+        $out .= sprintf(_("Select your %s"), $this->nomenclature_inst);
         $out .= '<select name="idp" onchange="submit_form(this)">';
         if (!empty($instList)) {
             if (!isset($this->idp)) {
@@ -236,7 +236,7 @@ 
                 }
             }
             $out .= '>' . $disp . '</option>';
-            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ( $oneDevice['redirect'] ? 1 : 0 ) . ';';
+            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ($oneDevice['redirect'] ? 1 : 0) . ';';
             $iterator++;
         }
         $out .= '</select>';
@@ -430,7 +430,7 @@ 
         </script>
     </head>
     <body style="">
-        <?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 $skinObject->findResourceUrl("IMAGES", "consortium_logo.png"); ?>" style="width: 20%; padding-right:20px; padding-top:0px; float:right" alt="logo" />
             <?php