Inspection of "don't allow unvetted input to transpire to the log" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Push — release_2_1 ( adef88...954e67 )

by Stefan

created 2022-08-10 12:50 UTC

Status

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

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
 <head>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
 <link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
-<title><?php echo config\Master::APPEARANCE['productname'];?> Copyright and Licensing</title>
+<title><?php echo config\Master::APPEARANCE['productname']; ?> Copyright and Licensing</title>
 </head>
 <body>
 <div id="wrap">
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
             <div id="user_page" style="display:block">
                 <?php echo $divs->divPagetitle(config\Master::APPEARANCE['productname']." Copyright and Licensing", ""); ?>
                 <div style="padding:20px">
-            <?php require dirname(dirname(__DIR__)) . "/copyright.inc.php"; ?>
+            <?php require dirname(dirname(__DIR__))."/copyright.inc.php"; ?>
                 </div>
             </div>
         </div>

Please login to merge, or discard this patch.

web/skins/example/accountstatus.php 1 patch

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

@@ -16,12 +16,12 @@
 block discarded – undo
  * License: see the web/copyright.inc.php file in the file structure or
  *          <base_url>/copyright.php after deploying the software
  */?>
-<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>)</h1>
-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
+<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>)</h1>
+<img alt='Consortium logo' 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 alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
-<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>
+<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
 <pre>
-    <?php print_r($statusInfo);?>
+    <?php print_r($statusInfo); ?>
 </pre>

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

@@ -20,7 +20,7 @@
 block discarded – undo
  */
 ?>
 <h1>Example Skin (main user frontpage)</h1>
-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
+<img alt='Consortium logo' 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 alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>

Please login to merge, or discard this patch.

web/tou.php 1 patch

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

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
  * @package UserGUI
  * 
  */
-require dirname(dirname(__FILE__)) . "/config/_config.php";
+require dirname(dirname(__FILE__))."/config/_config.php";
 $loggerInstance = new \core\common\Logging();
 $langObject = new \core\common\Language();
 $cat = new \core\CAT();
@@ -51,9 +51,9 @@  discard block
 block discarded – undo
     <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
         <img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="padding-right:20px; padding-top:20px; float:right" alt="logo" />
 
-        <div id="motd"><?php print ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
+        <div id="motd"><?php print (isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
 
-        <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
+        <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
         <div id="tou">
             <?php
             require "user/tou.php";
@@ -61,11 +61,11 @@  discard block
 block discarded – undo
         </div>
         <div>
             <table style='width:100%'>
-                <caption><?php echo "Legalese";?></caption>
+                <caption><?php echo "Legalese"; ?></caption>
                 <tr>
-                    <th class='wai-invisible' scope='col'><?php echo "Copyright";?></th>
-                    <th class='wai-invisible' scope='col'><?php echo "Privacy Notice";?></th>
-                    <th class='wai-invisible' scope='col'><?php echo "Attribution";?></th>
+                    <th class='wai-invisible' scope='col'><?php echo "Copyright"; ?></th>
+                    <th class='wai-invisible' scope='col'><?php echo "Privacy Notice"; ?></th>
+                    <th class='wai-invisible' scope='col'><?php echo "Attribution"; ?></th>
                 </tr>
                 <tr>
                     <td style='padding-left:20px; padding-right:20px; text-align:left; vertical-align:top;'>
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
                     </td>
                     <?php
                     if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {
-                        $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),\config\ConfAssistant::CONSORTIUM['name']) . "</a></td>";
+                        $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['name'])."</a></td>";
                     }
                     ?>
                     <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>

Please login to merge, or discard this patch.

web/admin/action_generate_zone.php 1 patch

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

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
     "nl" => "_radsec._tcp.eduroam.nl.",
     ];
     foreach ($cat->getSuperglueZone() as $oneEntry) {
-        foreach (explode(',',$oneEntry['inst_realm']) as $oneRealm) {
+        foreach (explode(',', $oneEntry['inst_realm']) as $oneRealm) {
             $target = "_radsec._somewhere.eduroam.org";
             foreach ($NROs as $tld => $nroTarget) {
                 if (preg_match("/$tld$/", $oneRealm)) {

Please login to merge, or discard this patch.

core/CAT.php 1 patch

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

@@ -105,28 +105,28 @@
 block discarded – undo
         parent::__construct();
         common\Entity::intoThePotatoes();
 
-        $this->catVersionString = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>") . "</a>";
+        $this->catVersionString = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
         if (CAT::RELEASE_VERSION) {
             $major = CAT::VERSION_MAJOR;
             $minor = CAT::VERSION_MINOR;
             $patch = CAT::VERSION_PATCH;
             $extra = CAT::VERSION_EXTRA;
             $temp_version = "CAT-$major.$minor";
-            $branch = "release_$major" . "_$minor";
+            $branch = "release_$major"."_$minor";
             if (CAT::VERSION_PATCH != 0) {
                 $temp_version .= ".$patch";
             }
             if (CAT::VERSION_EXTRA != "") {
                 $temp_version .= "-$extra";
             }
-            $this->catVersionString = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
+            $this->catVersionString = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
         }
         $product = \config\Master::APPEARANCE['productname'];
         $minYear = self::COPYRIGHT_MIN_YEAR;
         $maxYear = self::COPYRIGHT_MAX_YEAR;
         $holder = self::COPYRIGHT_HOLDER;
         $consortia = self::COPYRIGHT_CONSORTIA;
-        $this->catCopyright = "$product - " . $this->catVersionString . " &copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
+        $this->catCopyright = "$product - ".$this->catVersionString." &copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
 
 
         /* Federations are created in DB with bootstrapFederation, and listed via listFederations

Please login to merge, or discard this patch.

web/admin/sanity_tests.php 1 patch

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

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $Tests = [
     'Directories',
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
 
 $uiElements = new \web\lib\admin\UIElements();
 
-if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL" ) {
+if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
     $Tests[] = 'Makensis';
     $Tests[] = 'Makensis=>NSISmodules';
 }

Please login to merge, or discard this patch.

config/Diagnostics-template.php 1 patch

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

@@ -34,13 +34,13 @@
 block discarded – undo
  */
 class Diagnostics
 {
-         /**
-         * Various paths.
-         * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
-         * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
-         *   See also NSIS_VERSION further down
-         * @var array
-         */
+            /**
+             * Various paths.
+             * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
+             * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
+             *   See also NSIS_VERSION further down
+             * @var array
+             */
         const PATHS = [
             'c_rehash' => 'c_rehash',
             'eapol_test' => 'eapol_test',

Please login to merge, or discard this patch.

core/ProfileRADIUS.php 1 patch

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

@@ -105,9 +105,9 @@  discard block
 block discarded – undo
 
         $attributesLowLevel = array_merge($this->deviceLevelAttributes, $this->eapLevelAttributes);
 
-        $this->loggerInstance->debug(5, "Device-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
-        $this->loggerInstance->debug(5, "EAP-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
-        $this->loggerInstance->debug(5, "All low-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
+        $this->loggerInstance->debug(5, "Device-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
+        $this->loggerInstance->debug(5, "EAP-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
+        $this->loggerInstance->debug(5, "All low-Level Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
 
         // now fetch and merge profile-level attributes if not already set on deeper level
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
             }
         }
 
-        $this->loggerInstance->debug(5, "Merged Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
+        $this->loggerInstance->debug(5, "Merged Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
 
         // now, fetch and merge IdP-wide attributes
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
         // add the internal attribute to that effect
         
         if (isset($this->attributes['media:openroaming_always'])) {
-            $this->attributes = array_merge($this->attributes, $this->addInternalAttributes([ "internal:openroaming" => TRUE ] ));
+            $this->attributes = array_merge($this->attributes, $this->addInternalAttributes(["internal:openroaming" => TRUE]));
         }
         
         $this->loggerInstance->debug(3, "--- END Constructing new Profile object ... ---\n");
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
                 "row" => $attributeQuery->row,
                 "flag" => $optinfo['flag'],
                 "device" => ($devicesOrEAPMethods == "DEVICES" ? $attributeQuery->deviceormethod : NULL),
-                "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep() )];
+                "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep())];
         }
         return $temparray;
     }
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
      */
     public function setAnonymousIDSupport($shallwe)
     {
-        $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
+        $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
     }
 
     /** Toggle special username for realm checks
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
      * @return void
      */
     public function setRealmCheckUser($shallwe, $localpart = NULL) {
-        $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
+        $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
         if ($localpart !== NULL) {
             $this->databaseHandle->exec("UPDATE profile SET checkuser_value = ? WHERE profile_id = $this->identifier", "s", $localpart);
         }
@@ -334,8 +334,8 @@  discard block
 block discarded – undo
      */
     public function setInputVerificationPreference($verify, $hint)
     {
-        $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = " . ($verify === true ? "1" : "0") .
-                ", hint_userinput_suffix = " . ($hint === true ? "1" : "0") .
+        $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = ".($verify === true ? "1" : "0").
+                ", hint_userinput_suffix = ".($hint === true ? "1" : "0").
                 " WHERE profile_id = $this->identifier");
     }
 

Please login to merge, or discard this patch.

		@@ -105,28 +105,28 @@
		block discarded – undo
105	105	parent::__construct();
106	106	common\Entity::intoThePotatoes();
107	107
108		- $this->catVersionString = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>") . "</a>";
	108	+ $this->catVersionString = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
109	109	if (CAT::RELEASE_VERSION) {
110	110	$major = CAT::VERSION_MAJOR;
111	111	$minor = CAT::VERSION_MINOR;
112	112	$patch = CAT::VERSION_PATCH;
113	113	$extra = CAT::VERSION_EXTRA;
114	114	$temp_version = "CAT-$major.$minor";
115		- $branch = "release_$major" . "_$minor";
	115	+ $branch = "release_$major"."_$minor";
116	116	if (CAT::VERSION_PATCH != 0) {
117	117	$temp_version .= ".$patch";
118	118	}
119	119	if (CAT::VERSION_EXTRA != "") {
120	120	$temp_version .= "-$extra";
121	121	}
122		- $this->catVersionString = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
	122	+ $this->catVersionString = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
123	123	}
124	124	$product = \config\Master::APPEARANCE['productname'];
125	125	$minYear = self::COPYRIGHT_MIN_YEAR;
126	126	$maxYear = self::COPYRIGHT_MAX_YEAR;
127	127	$holder = self::COPYRIGHT_HOLDER;
128	128	$consortia = self::COPYRIGHT_CONSORTIA;
129		- $this->catCopyright = "$product - " . $this->catVersionString . " © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
	129	+ $this->catCopyright = "$product - ".$this->catVersionString." © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
130	130
131	131
132	132	/* Federations are created in DB with bootstrapFederation, and listed via listFederations

		@@ -105,9 +105,9 @@ discard block
		block discarded – undo
105	105
106	106	$attributesLowLevel = array_merge($this->deviceLevelAttributes, $this->eapLevelAttributes);
107	107
108		- $this->loggerInstance->debug(5, "Device-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
109		- $this->loggerInstance->debug(5, "EAP-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
110		- $this->loggerInstance->debug(5, "All low-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
	108	+ $this->loggerInstance->debug(5, "Device-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
	109	+ $this->loggerInstance->debug(5, "EAP-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
	110	+ $this->loggerInstance->debug(5, "All low-Level Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
111	111
112	112	// now fetch and merge profile-level attributes if not already set on deeper level
113	113
		@@ -137,7 +137,7 @@ discard block
		block discarded – undo
137	137	}
138	138	}
139	139
140		- $this->loggerInstance->debug(5, "Merged Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
	140	+ $this->loggerInstance->debug(5, "Merged Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
141	141
142	142	// now, fetch and merge IdP-wide attributes
143	143
		@@ -152,7 +152,7 @@ discard block
		block discarded – undo
152	152	// add the internal attribute to that effect
153	153
154	154	if (isset($this->attributes['media:openroaming_always'])) {
155		- $this->attributes = array_merge($this->attributes, $this->addInternalAttributes([ "internal:openroaming" => TRUE ] ));
	155	+ $this->attributes = array_merge($this->attributes, $this->addInternalAttributes(["internal:openroaming" => TRUE]));
156	156	}
157	157
158	158	$this->loggerInstance->debug(3, "--- END Constructing new Profile object ... ---\n");
		@@ -200,7 +200,7 @@ discard block
		block discarded – undo
200	200	"row" => $attributeQuery->row,
201	201	"flag" => $optinfo['flag'],
202	202	"device" => ($devicesOrEAPMethods == "DEVICES" ? $attributeQuery->deviceormethod : NULL),
203		- "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep() )];
	203	+ "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep())];
204	204	}
205	205	return $temparray;
206	206	}
		@@ -309,7 +309,7 @@ discard block
		block discarded – undo
309	309	*/
310	310	public function setAnonymousIDSupport($shallwe)
311	311	{
312		- $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
	312	+ $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
313	313	}
314	314
315	315	/** Toggle special username for realm checks
		@@ -319,7 +319,7 @@ discard block
		block discarded – undo
319	319	* @return void
320	320	*/
321	321	public function setRealmCheckUser($shallwe, $localpart = NULL) {
322		- $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
	322	+ $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
323	323	if ($localpart !== NULL) {
324	324	$this->databaseHandle->exec("UPDATE profile SET checkuser_value = ? WHERE profile_id = $this->identifier", "s", $localpart);
325	325	}
		@@ -334,8 +334,8 @@ discard block
		block discarded – undo
334	334	*/
335	335	public function setInputVerificationPreference($verify, $hint)
336	336	{
337		- $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = " . ($verify === true ? "1" : "0") .
338		- ", hint_userinput_suffix = " . ($hint === true ? "1" : "0") .
	337	+ $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = ".($verify === true ? "1" : "0").
	338	+ ", hint_userinput_suffix = ".($hint === true ? "1" : "0").
339	339	" WHERE profile_id = $this->identifier");
340	340	}
341	341

		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	<head>
25	25	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
26	26	<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
27		-<title><?php echo config\Master::APPEARANCE['productname'];?> Copyright and Licensing</title>
	27	+<title><?php echo config\Master::APPEARANCE['productname']; ?> Copyright and Licensing</title>
28	28	</head>
29	29	<body>
30	30	<div id="wrap">
		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	<div id="user_page" style="display:block">
36	36	<?php echo $divs->divPagetitle(config\Master::APPEARANCE['productname']." Copyright and Licensing", ""); ?>
37	37	<div style="padding:20px">
38		- <?php require dirname(dirname(__DIR__)) . "/copyright.inc.php"; ?>
	38	+ <?php require dirname(dirname(__DIR__))."/copyright.inc.php"; ?>
39	39	</div>
40	40	</div>
41	41	</div>

		@@ -16,12 +16,12 @@
		block discarded – undo
16	16	* License: see the web/copyright.inc.php file in the file structure or
17	17	* <base_url>/copyright.php after deploying the software
18	18	*/?>
19		-<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>)</h1>
20		-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
	19	+<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>)</h1>
	20	+<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
21	21	<p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
22	22	<p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
23		-<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
24		-<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
	23	+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>
	24	+<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
25	25	<pre>
26		- <?php print_r($statusInfo);?>
	26	+ <?php print_r($statusInfo); ?>
27	27	</pre>

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

		@@ -27,7 +27,7 @@ discard block
		block discarded – undo
27	27	* @package UserGUI
28	28	*
29	29	*/
30		-require dirname(dirname(__FILE__)) . "/config/_config.php";
	30	+require dirname(dirname(__FILE__))."/config/_config.php";
31	31	$loggerInstance = new \core\common\Logging();
32	32	$langObject = new \core\common\Language();
33	33	$cat = new \core\CAT();
		@@ -51,9 +51,9 @@ discard block
		block discarded – undo
51	51	<body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
52	52	<img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="padding-right:20px; padding-top:20px; float:right" alt="logo" />
53	53
54		- <div id="motd"><?php print ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
	54	+ <div id="motd"><?php print (isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
55	55
56		- <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
	56	+ <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
57	57	<div id="tou">
58	58	<?php
59	59	require "user/tou.php";
		@@ -61,11 +61,11 @@ discard block
		block discarded – undo
61	61	</div>
62	62	<div>
63	63	<table style='width:100%'>
64		- <caption><?php echo "Legalese";?></caption>
	64	+ <caption><?php echo "Legalese"; ?></caption>
65	65	<tr>
66		- <th class='wai-invisible' scope='col'><?php echo "Copyright";?></th>
67		- <th class='wai-invisible' scope='col'><?php echo "Privacy Notice";?></th>
68		- <th class='wai-invisible' scope='col'><?php echo "Attribution";?></th>
	66	+ <th class='wai-invisible' scope='col'><?php echo "Copyright"; ?></th>
	67	+ <th class='wai-invisible' scope='col'><?php echo "Privacy Notice"; ?></th>
	68	+ <th class='wai-invisible' scope='col'><?php echo "Attribution"; ?></th>
69	69	</tr>
70	70	<tr>
71	71	<td style='padding-left:20px; padding-right:20px; text-align:left; vertical-align:top;'>
		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	</td>
74	74	<?php
75	75	if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {
76		- $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),\config\ConfAssistant::CONSORTIUM['name']) . "</a></td>";
	76	+ $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['name'])."</a></td>";
77	77	}
78	78	?>
79	79	<td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>

		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	*/
27	27	?>
28	28	<?php
29		-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
	29	+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
30	30
31	31	$auth = new \web\lib\admin\Authentication();
32	32	$deco = new \web\lib\admin\PageDecoration();
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	"nl" => "_radsec._tcp.eduroam.nl.",
76	76	];
77	77	foreach ($cat->getSuperglueZone() as $oneEntry) {
78		- foreach (explode(',',$oneEntry['inst_realm']) as $oneRealm) {
	78	+ foreach (explode(',', $oneEntry['inst_realm']) as $oneRealm) {
79	79	$target = "_radsec._somewhere.eduroam.org";
80	80	foreach ($NROs as $tld => $nroTarget) {
81	81	if (preg_match("/$tld$/", $oneRealm)) {

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	* <base_url>/copyright.php after deploying the software
20	20	*/
21	21
22		-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
	22	+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
23	23
24	24	$Tests = [
25	25	'Directories',
		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43
44	44	$uiElements = new \web\lib\admin\UIElements();
45	45
46		-if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" \|\| \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL" ) {
	46	+if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" \|\| \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
47	47	$Tests[] = 'Makensis';
48	48	$Tests[] = 'Makensis=>NSISmodules';
49	49	}

		@@ -34,13 +34,13 @@
		block discarded – undo
34	34	*/
35	35	class Diagnostics
36	36	{
37		- /**
38		- * Various paths.
39		- * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
40		- * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
41		- * See also NSIS_VERSION further down
42		- * @var array
43		- */
	37	+ /**
	38	+ * Various paths.
	39	+ * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
	40	+ * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
	41	+ * See also NSIS_VERSION further down
	42	+ * @var array
	43	+ */
44	44	const PATHS = [
45	45	'c_rehash' => 'c_rehash',
46	46	'eapol_test' => 'eapol_test',

GEANT / CAT

Push — release_2_1 ( adef88...954e67 )

Status

Category

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

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 +8 added lines, -8 removed lines patch added patch discarded remove patch

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

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

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

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

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