Inspection of "don't use constants so SC doesn't freak out" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 5de0a8...b99617 )

by Stefan

created 2019-04-25 07:13 UTC

Status

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

@@ -66,13 +66,13 @@  discard block
 block discarded – undo
         $retval = "<div class='sidebar'><p>";
 
         if ($advancedControls) {
-            $retval .= "<strong>" . _("You are:") . "</strong> ".$_SESSION['name']
+            $retval .= "<strong>"._("You are:")."</strong> ".$_SESSION['name']
             ."<br/>
               <br/>
-              <a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_user.php'>" . _("Go to your Profile page") . "</a> 
-              <a href='" . \core\CAT::getRootUrlPath() . "/admin/inc/logout.php'>" . _("Logout") . "</a> ";
+              <a href='" . \core\CAT::getRootUrlPath()."/admin/overview_user.php'>"._("Go to your Profile page")."</a> 
+              <a href='" . \core\CAT::getRootUrlPath()."/admin/inc/logout.php'>"._("Logout")."</a> ";
         }
-        $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/'>" . _("Start page") . "</a>
+        $retval .= "<a href='".\core\CAT::getRootUrlPath()."/'>"._("Start page")."</a>
             </p>
         </div> <!-- sidebar -->";
         \core\common\Entity::outOfThePotatoes();
@@ -96,23 +96,23 @@  discard block
 block discarded – undo
                     <h1>$cap1</h1>
                 </div><!--header_captions-->
                 <div id='langselection' style='padding-top:20px; padding-left:10px;'>
-                    <form action='$place' method='GET' accept-charset='UTF-8'>" . _("View this page in") . "&nbsp;
+                    <form action='$place' method='GET' accept-charset='UTF-8'>"._("View this page in")."&nbsp;
                         <select id='lang' name='lang' onchange='this.form.submit()'>";
 
         foreach (\config\Master::LANGUAGES as $lang => $getValue) {
-            $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $getValue['display'] . "</option> ";
+            $retval .= "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "")." >".$getValue['display']."</option> ";
         }
         $retval .= "</select>";
 
         foreach ($_GET as $getVar => $getValue) {
             $filterValue = filter_input(INPUT_GET, $getVar, FILTER_SANITIZE_STRING);
             if ($getVar != "lang" && $getValue != "") {
-                $retval .= "<input type='hidden' name='" . htmlspecialchars($getVar) . "' value='" . htmlspecialchars($filterValue) . "'>";
+                $retval .= "<input type='hidden' name='".htmlspecialchars($getVar)."' value='".htmlspecialchars($filterValue)."'>";
             }
         }
         $retval .= "</form>
                 </div><!--langselection-->";
-        $logoUrl = \core\CAT::getRootUrlPath() . "/resources/images/consortium_logo.png";
+        $logoUrl = \core\CAT::getRootUrlPath()."/resources/images/consortium_logo.png";
         $retval .= "<div class='consortium_logo'>
                     <img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
                 </div> <!-- consortium_logo -->
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
 
         if (isset(\config\Master::APPEARANCE['MOTD']) && \config\Master::APPEARANCE['MOTD'] != "") {
             $retval .= "<div id='header_MOTD' style='display:inline-block; padding-left:20px;vertical-align:top;'>
-              <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD'] . "</p>
+              <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD']."</p>
               </div><!--header_MOTD-->";
         }
         $retval .= $this->sidebar($advancedControls);
@@ -231,9 +231,9 @@  discard block
 block discarded – undo
           <html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'>
           <head lang='$ourlocale'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
-        $cssUrl = \core\CAT::getRootUrlPath() . "/resources/css/cat.css.php";
+        $cssUrl = \core\CAT::getRootUrlPath()."/resources/css/cat.css.php";
         $retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
-        $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
+        $retval .= "<title>".htmlspecialchars($pagetitle)."</title>";
         return $retval;
     }
 
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
             // we may need to jump up one dir if we are either in admin/ or accountstatus/
             // (accountstatus courtesy of my good mood. It's userspace not admin space so
             // it shouldn't be using this function any more.)
-            $logoBase = \core\CAT::getRootUrlPath() . "/resources/images";
+            $logoBase = \core\CAT::getRootUrlPath()."/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>
               <span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";
@@ -269,9 +269,9 @@  discard block
 block discarded – undo
             <table style='width:100%'>
                 <tr>
                     <td style='padding-left:20px; padding-right:20px; text-align:left; vertical-align:top;'>
-                        " . $cat->catCopyright . "</td>";
+                        " . $cat->catCopyright."</td>";
         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['display_name']) . "</a></td>";
+            $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['display_name'])."</a></td>";
         }
         $retval .= "            <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>";
 

Please login to merge, or discard this patch.

core/CAT.php 1 patch

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

@@ -103,23 +103,23 @@  discard block
 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) {
-            $temp_version = "CAT-" . CAT::VERSION_MAJOR . "." . CAT::VERSION_MINOR;
-            $branch = "release_" . CAT::VERSION_MAJOR . "_" . CAT::VERSION_MINOR;
+            $temp_version = "CAT-".CAT::VERSION_MAJOR.".".CAT::VERSION_MINOR;
+            $branch = "release_".CAT::VERSION_MAJOR."_".CAT::VERSION_MINOR;
             if (CAT::VERSION_PATCH != 0) {
-                $temp_version .= "." . CAT::VERSION_PATCH;
+                $temp_version .= ".".CAT::VERSION_PATCH;
             }
             if (CAT::VERSION_EXTRA != "") {
-                $temp_version .= "-" . CAT::VERSION_EXTRA;
+                $temp_version .= "-".CAT::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);
         }
         $minYear = self::COPYRIGHT_MIN_YEAR;
         $maxYear = self::COPYRIGHT_MAX_YEAR;
         $holder = self::COPYRIGHT_HOLDER;
         $consortia = self::COPYRIGHT_CONSORTIA;
-        $this->catCopyright = \config\Master::APPEARANCE['productname'] . " - " . $this->catVersionString . " &copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
+        $this->catCopyright = \config\Master::APPEARANCE['productname']." - ".$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
@@ -611,7 +611,7 @@  discard block
 block discarded – undo
      * @return \core\ExternalEduroamDBData|\core\ExternalNothing
      */
     public static function determineExternalConnection() {
-        if(\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") {
+        if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") {
             return new ExternalEduroamDBData();
         }
         return new ExternalNothing();

Please login to merge, or discard this patch.

		@@ -66,13 +66,13 @@ discard block
		block discarded – undo
66	66	$retval = "<div class='sidebar'><p>";
67	67
68	68	if ($advancedControls) {
69		- $retval .= "<strong>" . _("You are:") . "</strong> ".$_SESSION['name']
	69	+ $retval .= "<strong>"._("You are:")."</strong> ".$_SESSION['name']
70	70	."<br/>
71	71	<br/>
72		- <a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_user.php'>" . _("Go to your Profile page") . "</a>
73		- <a href='" . \core\CAT::getRootUrlPath() . "/admin/inc/logout.php'>" . _("Logout") . "</a> ";
	72	+ <a href='" . \core\CAT::getRootUrlPath()."/admin/overview_user.php'>"._("Go to your Profile page")."</a>
	73	+ <a href='" . \core\CAT::getRootUrlPath()."/admin/inc/logout.php'>"._("Logout")."</a> ";
74	74	}
75		- $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/'>" . _("Start page") . "</a>
	75	+ $retval .= "<a href='".\core\CAT::getRootUrlPath()."/'>"._("Start page")."</a>
76	76	</p>
77	77	</div> <!-- sidebar -->";
78	78	\core\common\Entity::outOfThePotatoes();
		@@ -96,23 +96,23 @@ discard block
		block discarded – undo
96	96	<h1>$cap1</h1>
97	97	</div><!--header_captions-->
98	98	<div id='langselection' style='padding-top:20px; padding-left:10px;'>
99		- <form action='$place' method='GET' accept-charset='UTF-8'>" . _("View this page in") . "
	99	+ <form action='$place' method='GET' accept-charset='UTF-8'>"._("View this page in")."
100	100	<select id='lang' name='lang' onchange='this.form.submit()'>";
101	101
102	102	foreach (\config\Master::LANGUAGES as $lang => $getValue) {
103		- $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $getValue['display'] . "</option> ";
	103	+ $retval .= "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "")." >".$getValue['display']."</option> ";
104	104	}
105	105	$retval .= "</select>";
106	106
107	107	foreach ($_GET as $getVar => $getValue) {
108	108	$filterValue = filter_input(INPUT_GET, $getVar, FILTER_SANITIZE_STRING);
109	109	if ($getVar != "lang" && $getValue != "") {
110		- $retval .= "<input type='hidden' name='" . htmlspecialchars($getVar) . "' value='" . htmlspecialchars($filterValue) . "'>";
	110	+ $retval .= "<input type='hidden' name='".htmlspecialchars($getVar)."' value='".htmlspecialchars($filterValue)."'>";
111	111	}
112	112	}
113	113	$retval .= "</form>
114	114	</div><!--langselection-->";
115		- $logoUrl = \core\CAT::getRootUrlPath() . "/resources/images/consortium_logo.png";
	115	+ $logoUrl = \core\CAT::getRootUrlPath()."/resources/images/consortium_logo.png";
116	116	$retval .= "<div class='consortium_logo'>
117	117	<img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
118	118	</div> <!-- consortium_logo -->
		@@ -205,7 +205,7 @@ discard block
		block discarded – undo
205	205
206	206	if (isset(\config\Master::APPEARANCE['MOTD']) && \config\Master::APPEARANCE['MOTD'] != "") {
207	207	$retval .= "<div id='header_MOTD' style='display:inline-block; padding-left:20px;vertical-align:top;'>
208		- <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD'] . "</p>
	208	+ <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD']."</p>
209	209	</div><!--header_MOTD-->";
210	210	}
211	211	$retval .= $this->sidebar($advancedControls);
		@@ -231,9 +231,9 @@ discard block
		block discarded – undo
231	231	<html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'>
232	232	<head lang='$ourlocale'>
233	233	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
234		- $cssUrl = \core\CAT::getRootUrlPath() . "/resources/css/cat.css.php";
	234	+ $cssUrl = \core\CAT::getRootUrlPath()."/resources/css/cat.css.php";
235	235	$retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
236		- $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
	236	+ $retval .= "<title>".htmlspecialchars($pagetitle)."</title>";
237	237	return $retval;
238	238	}
239	239
		@@ -247,7 +247,7 @@ discard block
		block discarded – undo
247	247	// we may need to jump up one dir if we are either in admin/ or accountstatus/
248	248	// (accountstatus courtesy of my good mood. It's userspace not admin space so
249	249	// it shouldn't be using this function any more.)
250		- $logoBase = \core\CAT::getRootUrlPath() . "/resources/images";
	250	+ $logoBase = \core\CAT::getRootUrlPath()."/resources/images";
251	251	return "<span id='logos' style='position:fixed; left:50%;'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
252	252	<img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>
253	253	<span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";
		@@ -269,9 +269,9 @@ discard block
		block discarded – undo
269	269	<table style='width:100%'>
270	270	<tr>
271	271	<td style='padding-left:20px; padding-right:20px; text-align:left; vertical-align:top;'>
272		- " . $cat->catCopyright . "</td>";
	272	+ " . $cat->catCopyright."</td>";
273	273	if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {
274		- $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),\config\ConfAssistant::CONSORTIUM['display_name']) . "</a></td>";
	274	+ $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['display_name'])."</a></td>";
275	275	}
276	276	$retval .= " <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>";
277	277

		@@ -103,23 +103,23 @@ discard block
		block discarded – undo
103	103	parent::__construct();
104	104	common\Entity::intoThePotatoes();
105	105
106		- $this->catVersionString = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>") . "</a>";
	106	+ $this->catVersionString = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
107	107	if (CAT::RELEASE_VERSION) {
108		- $temp_version = "CAT-" . CAT::VERSION_MAJOR . "." . CAT::VERSION_MINOR;
109		- $branch = "release_" . CAT::VERSION_MAJOR . "_" . CAT::VERSION_MINOR;
	108	+ $temp_version = "CAT-".CAT::VERSION_MAJOR.".".CAT::VERSION_MINOR;
	109	+ $branch = "release_".CAT::VERSION_MAJOR."_".CAT::VERSION_MINOR;
110	110	if (CAT::VERSION_PATCH != 0) {
111		- $temp_version .= "." . CAT::VERSION_PATCH;
	111	+ $temp_version .= ".".CAT::VERSION_PATCH;
112	112	}
113	113	if (CAT::VERSION_EXTRA != "") {
114		- $temp_version .= "-" . CAT::VERSION_EXTRA;
	114	+ $temp_version .= "-".CAT::VERSION_EXTRA;
115	115	}
116		- $this->catVersionString = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
	116	+ $this->catVersionString = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
117	117	}
118	118	$minYear = self::COPYRIGHT_MIN_YEAR;
119	119	$maxYear = self::COPYRIGHT_MAX_YEAR;
120	120	$holder = self::COPYRIGHT_HOLDER;
121	121	$consortia = self::COPYRIGHT_CONSORTIA;
122		- $this->catCopyright = \config\Master::APPEARANCE['productname'] . " - " . $this->catVersionString . " © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
	122	+ $this->catCopyright = \config\Master::APPEARANCE['productname']." - ".$this->catVersionString." © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
123	123
124	124
125	125	/* Federations are created in DB with bootstrapFederation, and listed via listFederations
		@@ -611,7 +611,7 @@ discard block
		block discarded – undo
611	611	* @return \core\ExternalEduroamDBData\|\core\ExternalNothing
612	612	*/
613	613	public static function determineExternalConnection() {
614		- if(\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") {
	614	+ if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") {
615	615	return new ExternalEduroamDBData();
616	616	}
617	617	return new ExternalNothing();

GEANT / CAT

Push — master ( 5de0a8...b99617 )

Status

Category

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

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