Inspection of "fixing the EAPType setting bug" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 317f14...d27a18 )

by Tomasz

created 2018-01-11 20:34 UTC

Status

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -28,8 +28,8 @@  discard block
 block discarded – undo
 <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
     <div id="heading">
         <?php
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/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 '<img src="' . dirname($_SERVER['SCRIPT_NAME']) . '/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 '<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>';
@@ -43,10 +43,10 @@  discard block
 block discarded – undo
         ?>
     </div> <!-- id="heading" -->
     <div id="main_body" style='padding:20px;'>
-        <h1><?php echo _("This is not the CAT you are looking for.");?></h1>
-        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number");?></p>
+        <h1><?php echo _("This is not the CAT you are looking for."); ?></h1>
+        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number"); ?></p>
         <h2>404</h2>
-        <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang());?></p>
+        <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang()); ?></p>
     </div> <!-- id="main_body" -->
 
         <?php echo $deco->footer();

Please login to merge, or discard this patch.

web/skins/example/index.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -9,7 +9,7 @@
 block discarded – undo
  */
 ?>
 <h1>Example Skin (main user frontpage)</h1>
-<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
+<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
 <p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
 <p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
-<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
+<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>

Please login to merge, or discard this patch.

web/lib/common/InputValidation.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -134,7 +134,7 @@
 block discarded – undo
      */
     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!");
     }

Please login to merge, or discard this patch.

web/admin/overview_federation.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -197,7 +197,7 @@
 block discarded – undo
                 // 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->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "" ) . " " . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "" );
+                echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "") . " " . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "");
                 echo "</td>";
                 // name
                 echo "<td>

Please login to merge, or discard this patch.

devices/redirect_dev/Device_RedirectDev.php 2 patches

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -11,15 +11,15 @@
 block discarded – undo
 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>";

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -19,7 +19,7 @@
 block discarded – undo
     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>";

Please login to merge, or discard this patch.

web/lib/admin/PageDecoration.php 2 patches

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

@@ -206,8 +206,7 @@
 block discarded – undo
             $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'], "/");
         }
 

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -65,7 +65,7 @@  discard block
 block discarded – undo
                         <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>";
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
         $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);
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
                 $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']);
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
         // 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-->";
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
             $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>";
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
             $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>

Please login to merge, or discard this patch.

core/diag/RFC6614Tests.php 1 patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -246,11 +246,11 @@  discard block
 block discarded – undo
     }
 
         /**
-     * 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 @@  discard block
 block discarded – undo
         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) {

Please login to merge, or discard this patch.

core/common/OutsideComm.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -172,9 +172,9 @@
 block discarded – undo
                 $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++;
                     }
                 }

Please login to merge, or discard this patch.

devices/apple_mobileconfig/mobileconfigSuperclass.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -71,7 +71,7 @@  discard block
 block discarded – undo
       <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 @@  discard block
 block discarded – undo
                   <key>PayloadVersion</key>
                      <integer>1</integer>
                 </dict>",
-            "UUID" => $payloadUUID,];
+            "UUID" => $payloadUUID, ];
     }
 
     private function expiryBlock() {

Please login to merge, or discard this patch.

		@@ -206,8 +206,7 @@
		block discarded – undo
206	206	$cutoffPosition = strrpos($_SERVER['PHP_SELF'], "accountstatus/");
207	207	} elseif (strrpos($_SERVER['PHP_SELF'], "diag/")) {
208	208	$cutoffPosition = strrpos($_SERVER['PHP_SELF'], "diag/");
209		- }
210		- else {
	209	+ } else {
211	210	$cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
212	211	}
213	212

		@@ -246,11 +246,11 @@ discard block
		block discarded – undo
246	246	}
247	247
248	248	/**
249		- * This function parses a X.509 cert and returns all certificatePolicies OIDs
250		- *
251		- * @param array $cert (returned from openssl_x509_parse)
252		- * @return array of OIDs
253		- */
	249	+ * This function parses a X.509 cert and returns all certificatePolicies OIDs
	250	+ *
	251	+ * @param array $cert (returned from openssl_x509_parse)
	252	+ * @return array of OIDs
	253	+ */
254	254	private function propertyCheckPolicy($cert) {
255	255	$oids = [];
256	256	if ($cert['extensions']['certificatePolicies']) {
		@@ -263,11 +263,11 @@ discard block
		block discarded – undo
263	263	return $oids;
264	264	}
265	265	/**
266		- * This function parses a X.509 cert and returns the value of $field
267		- *
268		- * @param array $cert (returned from openssl_x509_parse)
269		- * @return string value of the issuer field or ''
270		- */
	266	+ * This function parses a X.509 cert and returns the value of $field
	267	+ *
	268	+ * @param array $cert (returned from openssl_x509_parse)
	269	+ * @return string value of the issuer field or ''
	270	+ */
271	271	private function getCertificateIssuer($cert) {
272	272	$issuer = '';
273	273	foreach ($cert['issuer'] as $key => $val) {

		@@ -172,9 +172,9 @@
		block discarded – undo
172	172	$totalFailures = 0;
173	173	foreach ($decoded_response['messages'] as $message) {
174	174	if ($message['status'] == 0) {
175		- $loggerInstance->debug(2, $message['message-id']. ": Success");
	175	+ $loggerInstance->debug(2, $message['message-id'] . ": Success");
176	176	} else {
177		- $loggerInstance->debug(2, $message['message-id']. ": Failed (failure code = ".$message['status'].")");
	177	+ $loggerInstance->debug(2, $message['message-id'] . ": Failed (failure code = " . $message['status'] . ")");
178	178	$totalFailures++;
179	179	}
180	180	}

		@@ -28,8 +28,8 @@ discard block
		block discarded – undo
28	28	<body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
29	29	<div id="heading">
30	30	<?php
31		- print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
32		- print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
	31	+ print '<img src="' . dirname($_SERVER['SCRIPT_NAME']) . '/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
	32	+ print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>';
33	33	print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1>
34	34	<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>';
35	35	echo '<table id="lang_select"><tr><td>';
		@@ -43,10 +43,10 @@ discard block
		block discarded – undo
43	43	?>
44	44	</div> <!-- id="heading" -->
45	45	<div id="main_body" style='padding:20px;'>
46		- <h1><?php echo _("This is not the CAT you are looking for.");?></h1>
47		- <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number");?></p>
	46	+ <h1><?php echo _("This is not the CAT you are looking for."); ?></h1>
	47	+ <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number"); ?></p>
48	48	<h2>404</h2>
49		- <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang());?></p>
	49	+ <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang()); ?></p>
50	50	</div> <!-- id="main_body" -->
51	51
52	52	<?php echo $deco->footer();

		@@ -9,7 +9,7 @@
		block discarded – undo
9	9	*/
10	10	?>
11	11	<h1>Example Skin (main user frontpage)</h1>
12		-<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
	12	+<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
13	13	<p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
14	14	<p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
15		-<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
	15	+<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>

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

		@@ -197,7 +197,7 @@
		block discarded – undo
197	197	// deployment status; need to dive into profiles for this
198	198	// show happy eyeballs if at least one profile is configured/showtime
199	199	echo "<td>";
200		- echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "" ) . " " . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "" );
	200	+ echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "") . " " . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "");
201	201	echo "</td>";
202	202	// name
203	203	echo "<td>

		@@ -11,15 +11,15 @@
		block discarded – undo
11	11	namespace devices\redirect_dev;
12	12
13	13	class Device_RedirectDev extends \core\DeviceConfig {
14		- /**
15		- * Constructs a Device object.
16		- *
17		- * @final not to be redefined
18		- */
	14	+ /**
	15	+ * Constructs a Device object.
	16	+ *
	17	+ * @final not to be redefined
	18	+ */
19	19	final public function __construct() {
20	20	parent::__construct();
21		- $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
22		- $this->loggerInstance->debug(4,"RedirectEx called");
	21	+ $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
	22	+ $this->loggerInstance->debug(4,"RedirectEx called");
23	23	}
24	24	public function writeDeviceInfo() {
25	25	$out = "<p>";

		@@ -19,7 +19,7 @@
		block discarded – undo
19	19	final public function __construct() {
20	20	parent::__construct();
21	21	$this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
22		- $this->loggerInstance->debug(4,"RedirectEx called");
	22	+ $this->loggerInstance->debug(4, "RedirectEx called");
23	23	}
24	24	public function writeDeviceInfo() {
25	25	$out = "<p>";

		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	<select id='lang' name='lang' onchange='this.form.submit()'>";
66	66
67	67	foreach (CONFIG['LANGUAGES'] as $lang => $value) {
68		- $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $value['display'] . "</option> ";
	68	+ $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "") . " >" . $value['display'] . "</option> ";
69	69	}
70	70	$retval .= "</select>";
71	71
		@@ -123,7 +123,7 @@ discard block
		block discarded – undo
123	123	$advancedControls = TRUE;
124	124	switch ($area) {
125	125	case "ADMIN-IDP":
126		- $cap2 = sprintf(_("Administrator Interface - Identity Provider"),$this->ui->nomenclature_inst);
	126	+ $cap2 = sprintf(_("Administrator Interface - Identity Provider"), $this->ui->nomenclature_inst);
127	127	break;
128	128	case "ADMIN-IDP-USERS":
129	129	$cap2 = sprintf(_("Administrator Interface - %s User Management"), \core\ProfileSilverbullet::PRODUCTNAME);
		@@ -135,7 +135,7 @@ discard block
		block discarded – undo
135	135	$cap2 = _("Management of User Details");
136	136	break;
137	137	case "FEDERATION":
138		- $cap2 = sprintf(_("Administrator Interface - %s Management"),$this->ui->nomenclature_fed);
	138	+ $cap2 = sprintf(_("Administrator Interface - %s Management"), $this->ui->nomenclature_fed);
139	139	break;
140	140	case "USER":
141	141	$cap1 = sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']);
		@@ -157,7 +157,7 @@ discard block
		block discarded – undo
157	157	// content from here on will SCROLL instead of being fixed at the top
158	158	$retval .= "<div class='pagecontent'>"; // closes in footer again
159	159	$retval .= "<div class='trick'>"; // closes in footer again
160		- $retval .= "<div id='secondrow' style='border-bottom:5px solid ".CONFIG['APPEARANCE']['colour1']."; min-height:100px;'>
	160	+ $retval .= "<div id='secondrow' style='border-bottom:5px solid " . CONFIG['APPEARANCE']['colour1'] . "; min-height:100px;'>
161	161	<div id='secondarycaptions' style='display:inline-block; float:left'>
162	162	<h2>$cap2</h2>
163	163	</div><!--secondarycaptions-->";
		@@ -202,7 +202,7 @@ discard block
		block discarded – undo
202	202	$cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
203	203	}
204	204
205		- $cssUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition )."/resources/css/cat.css.php";
	205	+ $cssUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/css/cat.css.php";
206	206
207	207	$retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
208	208	$retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
		@@ -230,7 +230,7 @@ discard block
		block discarded – undo
230	230	$cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
231	231	}
232	232
233		- $logoBase = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition)."/resources/images";
	233	+ $logoBase = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/images";
234	234
235	235	return "<span id='logos' style='position:fixed; left:50%;'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
236	236	<img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>

		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71	<key>PayloadIdentifier</key>
72	72	<string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
73	73	<key>PayloadOrganization</key>
74		- <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>
	74	+ <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>
75	75	<key>PayloadType</key>
76	76	<string>Configuration</string>
77	77	<key>PayloadUUID</key>
		@@ -479,7 +479,7 @@ discard block
		block discarded – undo
479	479	<key>PayloadVersion</key>
480	480	<integer>1</integer>
481	481	</dict>",
482		- "UUID" => $payloadUUID,];
	482	+ "UUID" => $payloadUUID, ];
483	483	}
484	484
485	485	private function expiryBlock() {

GEANT / CAT

Push — master ( 317f14...d27a18 )

Status

Category

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch