Inspection of "no reason to live in the past - 2.4 is the current..." - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Setup Failed

Branch — release_2_1 (fc3642)

by Stefan

created 2022-08-08 14:25 UTC

Status

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

@@ -88,24 +88,24 @@  discard block
 block discarded – undo
         $reqAuthenticator = random_bytes(16);
         $packetIdentifier = random_bytes(1);
         // construct Status-Server packet
-        $prePacket = RFC5997Tests::PACKET_TYPE_STATUS_SERVER .
-                $packetIdentifier .
-                RFC5997Tests::PACKET_LENGTH .
-                $reqAuthenticator .
-                RFC5997Tests::ATTRIBUTE_NAS_IDENTIFIER .
-                RFC5997Tests::LENGTH_NAS_IDENTIFIER .
+        $prePacket = RFC5997Tests::PACKET_TYPE_STATUS_SERVER.
+                $packetIdentifier.
+                RFC5997Tests::PACKET_LENGTH.
+                $reqAuthenticator.
+                RFC5997Tests::ATTRIBUTE_NAS_IDENTIFIER.
+                RFC5997Tests::LENGTH_NAS_IDENTIFIER.
                 RFC5997Tests::VALUE_NAS_IDENTIFIER;
-        $sigPacket = $prePacket .
-                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR .
-                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR .
+        $sigPacket = $prePacket.
+                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR.
+                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR.
                 "\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0";
-        $authPacket = $prePacket .
-                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR .
-                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR .
+        $authPacket = $prePacket.
+                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR.
+                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR.
                 hash_hmac("md5", $sigPacket, $this->secret, TRUE);
         $connectErrorNumber = 0;
         $connectErrorString = "";
-        $netHandle = fsockopen("udp://" . $this->ipAddr, $this->port, $connectErrorNumber, $connectErrorString, RFC5997Tests::CONNECTION_TIMEOUT);
+        $netHandle = fsockopen("udp://".$this->ipAddr, $this->port, $connectErrorNumber, $connectErrorString, RFC5997Tests::CONNECTION_TIMEOUT);
         if ($netHandle === FALSE) {
             throw new Exception("Unable to establish UDP socket resource. Error number was $connectErrorNumber, '$connectErrorString'");
         }
@@ -123,11 +123,11 @@  discard block
 block discarded – undo
             return AbstractTest::RETVAL_INVALID;
         }
         // check the response authenticator to prevent spoofing.
-        $sigResponse = RFC5997Tests::PACKET_TYPE_ACCESS_ACCEPT .
-                $packetIdentifier .
-                $read[2] . $read[3] .
-                $reqAuthenticator .
-                substr($read, 20) .
+        $sigResponse = RFC5997Tests::PACKET_TYPE_ACCESS_ACCEPT.
+                $packetIdentifier.
+                $read[2].$read[3].
+                $reqAuthenticator.
+                substr($read, 20).
                 $this->secret;
         $expected = hash("md5", $sigResponse, TRUE);
         if ($expected != substr($read, 4, 16)) {

Please login to merge, or discard this patch.

web/lib/user/Gui.php 1 patch

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

@@ -52,10 +52,10 @@
 block discarded – undo
         $ourlocale = $this->languageInstance->getLang();
         header("Content-Type:text/html;charset=utf-8");
         echo "<!DOCTYPE html>
-          <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale . "'>
-          <head lang='" . $ourlocale . "'>
+          <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale."'>
+          <head lang='" . $ourlocale."'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
-        echo "<title>" . htmlspecialchars($pagetitle) . "</title>";
+        echo "<title>".htmlspecialchars($pagetitle)."</title>";
         echo '<script type="text/javascript">ie_version = 0;</script>
 <!--[if IE]>
 <script type="text/javascript">ie_version=1;</script>

Please login to merge, or discard this patch.

web/skins/modern/user/cat_info.php 1 patch

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

@@ -31,7 +31,7 @@  discard block
 block discarded – undo
  * the receiving end to strip this marker and not add the title by itself.
  *
  */
-require_once dirname(dirname(dirname((dirname(dirname(__FILE__)))))) . "/config/_config.php";
+require_once dirname(dirname(dirname((dirname(dirname(__FILE__))))))."/config/_config.php";
 
 $Gui = new \web\lib\user\Gui();
 
@@ -41,46 +41,46 @@  discard block
 block discarded – undo
 $subpage = $_REQUEST['subpage'];
 switch ($page) {
     case 'about':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php";
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/about_cat.inc.php";
         $out = "<div class='padding'>$out</div>";
         break;
     case 'tou':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php";
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/tou.inc.php";
         $out = "no_title<div>
            <h1>
-         " . $Tou['title'] . "
+         " . $Tou['title']."
     </h1>
-<div id='tou_1'>" . $Tou['subtitle'] .
-                $Tou['short'] . "
+<div id='tou_1'>" . $Tou['subtitle'].
+                $Tou['short']."
 </div>
 <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
 <div id='tou_2' style='display:none; padding-top:20px'>" .
-                $Tou['full'] . "
+                $Tou['full']."
 </div>
 </div>
 ";
         break;
     case 'help':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/faq.inc.php";
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/faq.inc.php";
         switch ($subpage) {
             case 'contact':
             case 'idp_not_listed':
             case 'device_not_listed':
             case 'what_is_eduroam':
-                $out = "no_title<div><h1>" . _("Help") . "</h1>";
+                $out = "no_title<div><h1>"._("Help")."</h1>";
                 foreach ($Faq as $faqItem) {
                     if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
-                        $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                        $out .= "" . $faqItem['text'] . "</div>\n";
+                        $out .= "<div><h3>".$faqItem['title']."</h3>\n";
+                        $out .= "".$faqItem['text']."</div>\n";
                     }
                 }
                 $out .= "</div>";
                 break;
             case 'faq':
-                $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>";
+                $out = "no_title<div><h1>"._("Frequently Asked Questions")."</h1>";
                 foreach ($Faq as $faqItem) {
-                    $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                    $out .= "" . $faqItem['text'] . "</div>\n";
+                    $out .= "<div><h3>".$faqItem['title']."</h3>\n";
+                    $out .= "".$faqItem['text']."</div>\n";
                 }
                 $out .= "</div>";
                 break;
@@ -104,15 +104,15 @@  discard block
 block discarded – undo
                     $rn = uniqid();
                     $_SESSION['remindIdP'] = $rn;
                     $out .= "<input type='hidden' id='remindIdPs' value='$rn'>";
-                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>" . _("Login") . "</button>";
-                    $out .= "<br/><br/><p>" . _("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.") . "</p>";
-                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>" . _("Get IdP Reminder") . "</button>";
+                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>"._("Login")."</button>";
+                    $out .= "<br/><br/><p>"._("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.")."</p>";
+                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>"._("Get IdP Reminder")."</button>";
                     $out .= "<div id='remindIdPd'><span id='remindIdPh'></span><ul id='remindIdPl'></ul></div>";
                     $out = "<div  class='padding'>$out</div>";
                 }
                 break;
             case 'develop':
-                include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/devel.inc.php";
+                include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/devel.inc.php";
                 $out = "<div class='padding'>$out</div>";
                 break;
         }

Please login to merge, or discard this patch.

web/diag/processSociopath.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(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 \core\CAT::sessionStart();
 $loggerInstance = new \core\common\Logging();
 $loggerInstance->debug(4, "Sociopath test\n");
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
         return NULL;
     }
     $loggerInstance->debug(4, $_SESSION['EVIDENCE']['QUESTIONSASKED']);
-    $loggerInstance->debug(4, "\nAnswer question " . $QNUM . "\n");
+    $loggerInstance->debug(4, "\nAnswer question ".$QNUM."\n");
     switch ($answer) {
         case 1:
             $loggerInstance->debug(4, "Revaluate with FALSE");

Please login to merge, or discard this patch.

web/diag/magicTelepath.php 1 patch

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

@@ -19,10 +19,10 @@
 block discarded – undo
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 $realm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING);
-$visited = filter_input(INPUT_GET,'visited', FILTER_SANITIZE_STRING);
-$nro = filter_input(INPUT_GET,'nro', FILTER_SANITIZE_STRING);
+$visited = filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING);
+$nro = filter_input(INPUT_GET, 'nro', FILTER_SANITIZE_STRING);
 \core\CAT::sessionStart();
 $languageObject = new core\common\Language();
 $languageObject->setTextDomain("diagonstics");

Please login to merge, or discard this patch.

web/user/remindIdP.php 1 patch

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

@@ -19,7 +19,7 @@
 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";
 
 \core\CAT::sessionStart();
 

Please login to merge, or discard this patch.

web/lib/admin/MapOpenLayers.php 1 patch

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

@@ -83,7 +83,7 @@  discard block
 block discarded – undo
         
 // use HTML5 geolocation
         function locateMe() {
-            $('#address').val(\"" . _("locating") . "\");
+            $('#address').val(\"" . _("locating")."\");
             navigator.geolocation.getCurrentPosition(locate_succes,locate_fail,{maximumAge:3600000, timeout:5000});
         }
         
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
                 view.fit(extent, {padding: [10, 0, 10, 0]});
             } else {
                 view.setCenter([0,0]);
-                locate_country('" . $cat->knownFederations[strtoupper($this->fedName)] . "'); // use the federation code to locate the country
+                locate_country('" . $cat->knownFederations[strtoupper($this->fedName)]."'); // use the federation code to locate the country
                 map.setView(view);
             }
             view.setMaxZoom(20);
@@ -227,14 +227,14 @@  discard block
 block discarded – undo
         function getAddressLocation() {
             var city = $('#address').val();
             if(city == '') {
-                alert(\"" . _("nothing entered in the address field") . "\");
+                alert(\"" . _("nothing entered in the address field")."\");
                 return false;
             }
             city = city.replace(/\s*,\s*/g,',+');
             city = city.replace(/ +/,'+');
             $.get(addressService+'?format=json&addressdetails=0&q='+city, '',  function(data) {
                 if (data[0] === undefined) {
-                    alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.") . "');
+                    alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.")."');
                     return;
                 }
                 showTmpPointer(data[0].lon, data[0].lat);
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
         if ($this->readOnly) {
             return "<div id='map' class='locationmap'></div><script>generateMap('map')</script>";
         } else {
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . "<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>" . $this->htmlPostEdit(FALSE);
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml()."<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>".$this->htmlPostEdit(FALSE);
         }
     }
 
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
         // we don't need this parameter in this subclass
         unset($coords);
         \core\common\Entity::intoThePotatoes();
-        $retval = "<button id='location_b_" . $number . "' class='location_button'>" . _("Click to see location") . " $number</button>";
+        $retval = "<button id='location_b_".$number."' class='location_button'>"._("Click to see location")." $number</button>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
      */
     private function findLocationHtml() {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<p>" . _("Address:") . " <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>" . _("Find address") . "</button> <button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
+        $retval = "<p>"._("Address:")." <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>"._("Find address")."</button> <button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

Please login to merge, or discard this patch.

web/lib/admin/Authentication.php 1 patch

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

@@ -121,7 +121,7 @@
 block discarded – undo
         if ($trailerPosition !== FALSE) {
             $base = substr($scriptself, 0, $trailerPosition);
             if ($base !== FALSE) {
-                $url = "//$servername" . $base . "/logout_check.php";
+                $url = "//$servername".$base."/logout_check.php";
             }
         }
 

Please login to merge, or discard this patch.

web/lib/admin/AbstractMap.php 1 patch

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

@@ -136,19 +136,19 @@  discard block
 block discarded – undo
     protected function htmlPreEdit($wizardMode, $additional) {
         \core\common\Entity::intoThePotatoes();
         $retval = "<fieldset class='option_container'>
-        <legend><strong>" . _("Location") . "</strong></legend>";
+        <legend><strong>" . _("Location")."</strong></legend>";
 
         if ($wizardMode) {
-            $retval .= "<p>" .
-                    _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.") .
+            $retval .= "<p>".
+                    _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.").
                     "</p>
                      <ul>" .
                     _("<li>Drag the marker in the map to your place, or</li>
 <li>enter your street address in the field below for lookup, or</li>
-<li>use the 'Locate Me!' button</li>") .
+<li>use the 'Locate Me!' button</li>").
                     "</ul>
                      <strong>" .
-                    _("We will use the coordinates as indicated by the marker for geolocation.") .
+                    _("We will use the coordinates as indicated by the marker for geolocation.").
                     "</strong>";
         }
         if ($additional) {
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
      */
     protected function htmlPostEdit($allowDirectInput) {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<br/>" . _("Latitude:") . " <input style='width:80px' name='geo_lat' id='geo_lat' " .($allowDirectInput ? "": "readonly"). ">" . _("Longitude:") . " <input name='geo_long' id='geo_long' style='width:80px' " .($allowDirectInput ? "": "readonly"). "></fieldset>";
+        $retval = "<br/>"._("Latitude:")." <input style='width:80px' name='geo_lat' id='geo_lat' ".($allowDirectInput ? "" : "readonly").">"._("Longitude:")." <input name='geo_long' id='geo_long' style='width:80px' ".($allowDirectInput ? "" : "readonly")."></fieldset>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

Please login to merge, or discard this patch.

		@@ -83,7 +83,7 @@ discard block
		block discarded – undo
83	83
84	84	// use HTML5 geolocation
85	85	function locateMe() {
86		- $('#address').val(\"" . _("locating") . "\");
	86	+ $('#address').val(\"" . _("locating")."\");
87	87	navigator.geolocation.getCurrentPosition(locate_succes,locate_fail,{maximumAge:3600000, timeout:5000});
88	88	}
89	89
		@@ -205,7 +205,7 @@ discard block
		block discarded – undo
205	205	view.fit(extent, {padding: [10, 0, 10, 0]});
206	206	} else {
207	207	view.setCenter([0,0]);
208		- locate_country('" . $cat->knownFederations[strtoupper($this->fedName)] . "'); // use the federation code to locate the country
	208	+ locate_country('" . $cat->knownFederations[strtoupper($this->fedName)]."'); // use the federation code to locate the country
209	209	map.setView(view);
210	210	}
211	211	view.setMaxZoom(20);
		@@ -227,14 +227,14 @@ discard block
		block discarded – undo
227	227	function getAddressLocation() {
228	228	var city = $('#address').val();
229	229	if(city == '') {
230		- alert(\"" . _("nothing entered in the address field") . "\");
	230	+ alert(\"" . _("nothing entered in the address field")."\");
231	231	return false;
232	232	}
233	233	city = city.replace(/\s,\s/g,',+');
234	234	city = city.replace(/ +/,'+');
235	235	$.get(addressService+'?format=json&addressdetails=0&q='+city, '', function(data) {
236	236	if (data[0] === undefined) {
237		- alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.") . "');
	237	+ alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.")."');
238	238	return;
239	239	}
240	240	showTmpPointer(data[0].lon, data[0].lat);
		@@ -285,7 +285,7 @@ discard block
		block discarded – undo
285	285	if ($this->readOnly) {
286	286	return "<div id='map' class='locationmap'></div><script>generateMap('map')</script>";
287	287	} else {
288		- return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . "<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>" . $this->htmlPostEdit(FALSE);
	288	+ return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml()."<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>".$this->htmlPostEdit(FALSE);
289	289	}
290	290	}
291	291
		@@ -310,7 +310,7 @@ discard block
		block discarded – undo
310	310	// we don't need this parameter in this subclass
311	311	unset($coords);
312	312	\core\common\Entity::intoThePotatoes();
313		- $retval = "<button id='location_b_" . $number . "' class='location_button'>" . _("Click to see location") . " $number</button>";
	313	+ $retval = "<button id='location_b_".$number."' class='location_button'>"._("Click to see location")." $number</button>";
314	314	\core\common\Entity::outOfThePotatoes();
315	315	return $retval;
316	316	}
		@@ -322,7 +322,7 @@ discard block
		block discarded – undo
322	322	*/
323	323	private function findLocationHtml() {
324	324	\core\common\Entity::intoThePotatoes();
325		- $retval = "<p>" . _("Address:") . " <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>" . _("Find address") . "</button> <button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
	325	+ $retval = "<p>"._("Address:")." <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>"._("Find address")."</button> <button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
326	326	\core\common\Entity::outOfThePotatoes();
327	327	return $retval;
328	328	}

		@@ -136,19 +136,19 @@ discard block
		block discarded – undo
136	136	protected function htmlPreEdit($wizardMode, $additional) {
137	137	\core\common\Entity::intoThePotatoes();
138	138	$retval = "<fieldset class='option_container'>
139		- <legend><strong>" . _("Location") . "</strong></legend>";
	139	+ <legend><strong>" . _("Location")."</strong></legend>";
140	140
141	141	if ($wizardMode) {
142		- $retval .= "<p>" .
143		- _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.") .
	142	+ $retval .= "<p>".
	143	+ _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.").
144	144	"</p>
145	145	<ul>" .
146	146	_("<li>Drag the marker in the map to your place, or</li>
147	147	<li>enter your street address in the field below for lookup, or</li>
148		-<li>use the 'Locate Me!' button</li>") .
	148	+<li>use the 'Locate Me!' button</li>").
149	149	"</ul>
150	150	<strong>" .
151		- _("We will use the coordinates as indicated by the marker for geolocation.") .
	151	+ _("We will use the coordinates as indicated by the marker for geolocation.").
152	152	"</strong>";
153	153	}
154	154	if ($additional) {
		@@ -166,7 +166,7 @@ discard block
		block discarded – undo
166	166	*/
167	167	protected function htmlPostEdit($allowDirectInput) {
168	168	\core\common\Entity::intoThePotatoes();
169		- $retval = "<br/>" . _("Latitude:") . " <input style='width:80px' name='geo_lat' id='geo_lat' " .($allowDirectInput ? "": "readonly"). ">" . _("Longitude:") . " <input name='geo_long' id='geo_long' style='width:80px' " .($allowDirectInput ? "": "readonly"). "></fieldset>";
	169	+ $retval = "<br/>"._("Latitude:")." <input style='width:80px' name='geo_lat' id='geo_lat' ".($allowDirectInput ? "" : "readonly").">"._("Longitude:")." <input name='geo_long' id='geo_long' style='width:80px' ".($allowDirectInput ? "" : "readonly")."></fieldset>";
170	170	\core\common\Entity::outOfThePotatoes();
171	171	return $retval;
172	172	}

		@@ -88,24 +88,24 @@ discard block
		block discarded – undo
88	88	$reqAuthenticator = random_bytes(16);
89	89	$packetIdentifier = random_bytes(1);
90	90	// construct Status-Server packet
91		- $prePacket = RFC5997Tests::PACKET_TYPE_STATUS_SERVER .
92		- $packetIdentifier .
93		- RFC5997Tests::PACKET_LENGTH .
94		- $reqAuthenticator .
95		- RFC5997Tests::ATTRIBUTE_NAS_IDENTIFIER .
96		- RFC5997Tests::LENGTH_NAS_IDENTIFIER .
	91	+ $prePacket = RFC5997Tests::PACKET_TYPE_STATUS_SERVER.
	92	+ $packetIdentifier.
	93	+ RFC5997Tests::PACKET_LENGTH.
	94	+ $reqAuthenticator.
	95	+ RFC5997Tests::ATTRIBUTE_NAS_IDENTIFIER.
	96	+ RFC5997Tests::LENGTH_NAS_IDENTIFIER.
97	97	RFC5997Tests::VALUE_NAS_IDENTIFIER;
98		- $sigPacket = $prePacket .
99		- RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR .
100		- RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR .
	98	+ $sigPacket = $prePacket.
	99	+ RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR.
	100	+ RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR.
101	101	"\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0";
102		- $authPacket = $prePacket .
103		- RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR .
104		- RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR .
	102	+ $authPacket = $prePacket.
	103	+ RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR.
	104	+ RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR.
105	105	hash_hmac("md5", $sigPacket, $this->secret, TRUE);
106	106	$connectErrorNumber = 0;
107	107	$connectErrorString = "";
108		- $netHandle = fsockopen("udp://" . $this->ipAddr, $this->port, $connectErrorNumber, $connectErrorString, RFC5997Tests::CONNECTION_TIMEOUT);
	108	+ $netHandle = fsockopen("udp://".$this->ipAddr, $this->port, $connectErrorNumber, $connectErrorString, RFC5997Tests::CONNECTION_TIMEOUT);
109	109	if ($netHandle === FALSE) {
110	110	throw new Exception("Unable to establish UDP socket resource. Error number was $connectErrorNumber, '$connectErrorString'");
111	111	}
		@@ -123,11 +123,11 @@ discard block
		block discarded – undo
123	123	return AbstractTest::RETVAL_INVALID;
124	124	}
125	125	// check the response authenticator to prevent spoofing.
126		- $sigResponse = RFC5997Tests::PACKET_TYPE_ACCESS_ACCEPT .
127		- $packetIdentifier .
128		- $read[2] . $read[3] .
129		- $reqAuthenticator .
130		- substr($read, 20) .
	126	+ $sigResponse = RFC5997Tests::PACKET_TYPE_ACCESS_ACCEPT.
	127	+ $packetIdentifier.
	128	+ $read[2].$read[3].
	129	+ $reqAuthenticator.
	130	+ substr($read, 20).
131	131	$this->secret;
132	132	$expected = hash("md5", $sigResponse, TRUE);
133	133	if ($expected != substr($read, 4, 16)) {

		@@ -52,10 +52,10 @@
		block discarded – undo
52	52	$ourlocale = $this->languageInstance->getLang();
53	53	header("Content-Type:text/html;charset=utf-8");
54	54	echo "<!DOCTYPE html>
55		- <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale . "'>
56		- <head lang='" . $ourlocale . "'>
	55	+ <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale."'>
	56	+ <head lang='" . $ourlocale."'>
57	57	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
58		- echo "<title>" . htmlspecialchars($pagetitle) . "</title>";
	58	+ echo "<title>".htmlspecialchars($pagetitle)."</title>";
59	59	echo '<script type="text/javascript">ie_version = 0;</script>
60	60	<!--[if IE]>
61	61	<script type="text/javascript">ie_version=1;</script>

		@@ -31,7 +31,7 @@ discard block
		block discarded – undo
31	31	* the receiving end to strip this marker and not add the title by itself.
32	32	*
33	33	*/
34		-require_once dirname(dirname(dirname((dirname(dirname(__FILE__)))))) . "/config/_config.php";
	34	+require_once dirname(dirname(dirname((dirname(dirname(__FILE__))))))."/config/_config.php";
35	35
36	36	$Gui = new \web\lib\user\Gui();
37	37
		@@ -41,46 +41,46 @@ discard block
		block discarded – undo
41	41	$subpage = $_REQUEST['subpage'];
42	42	switch ($page) {
43	43	case 'about':
44		- include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php";
	44	+ include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/about_cat.inc.php";
45	45	$out = "<div class='padding'>$out</div>";
46	46	break;
47	47	case 'tou':
48		- include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php";
	48	+ include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/tou.inc.php";
49	49	$out = "no_title<div>
50	50	<h1>
51		- " . $Tou['title'] . "
	51	+ " . $Tou['title']."
52	52	</h1>
53		-<div id='tou_1'>" . $Tou['subtitle'] .
54		- $Tou['short'] . "
	53	+<div id='tou_1'>" . $Tou['subtitle'].
	54	+ $Tou['short']."
55	55	</div>
56	56	<div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
57	57	<div id='tou_2' style='display:none; padding-top:20px'>" .
58		- $Tou['full'] . "
	58	+ $Tou['full']."
59	59	</div>
60	60	</div>
61	61	";
62	62	break;
63	63	case 'help':
64		- include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/faq.inc.php";
	64	+ include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/faq.inc.php";
65	65	switch ($subpage) {
66	66	case 'contact':
67	67	case 'idp_not_listed':
68	68	case 'device_not_listed':
69	69	case 'what_is_eduroam':
70		- $out = "no_title<div><h1>" . _("Help") . "</h1>";
	70	+ $out = "no_title<div><h1>"._("Help")."</h1>";
71	71	foreach ($Faq as $faqItem) {
72	72	if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
73		- $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
74		- $out .= "" . $faqItem['text'] . "</div>\n";
	73	+ $out .= "<div><h3>".$faqItem['title']."</h3>\n";
	74	+ $out .= "".$faqItem['text']."</div>\n";
75	75	}
76	76	}
77	77	$out .= "</div>";
78	78	break;
79	79	case 'faq':
80		- $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>";
	80	+ $out = "no_title<div><h1>"._("Frequently Asked Questions")."</h1>";
81	81	foreach ($Faq as $faqItem) {
82		- $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
83		- $out .= "" . $faqItem['text'] . "</div>\n";
	82	+ $out .= "<div><h3>".$faqItem['title']."</h3>\n";
	83	+ $out .= "".$faqItem['text']."</div>\n";
84	84	}
85	85	$out .= "</div>";
86	86	break;
		@@ -104,15 +104,15 @@ discard block
		block discarded – undo
104	104	$rn = uniqid();
105	105	$_SESSION['remindIdP'] = $rn;
106	106	$out .= "<input type='hidden' id='remindIdPs' value='$rn'>";
107		- $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>" . _("Login") . "</button>";
108		- $out .= "<br/><br/><p>" . _("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.") . "</p>";
109		- $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>" . _("Get IdP Reminder") . "</button>";
	107	+ $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>"._("Login")."</button>";
	108	+ $out .= "<br/><br/><p>"._("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.")."</p>";
	109	+ $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>"._("Get IdP Reminder")."</button>";
110	110	$out .= "<div id='remindIdPd'><span id='remindIdPh'></span><ul id='remindIdPl'></ul></div>";
111	111	$out = "<div class='padding'>$out</div>";
112	112	}
113	113	break;
114	114	case 'develop':
115		- include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/devel.inc.php";
	115	+ include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/devel.inc.php";
116	116	$out = "<div class='padding'>$out</div>";
117	117	break;
118	118	}

		@@ -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(__DIR__)) . "/config/_config.php";
	22	+require_once dirname(dirname(__DIR__))."/config/_config.php";
23	23	\core\CAT::sessionStart();
24	24	$loggerInstance = new \core\common\Logging();
25	25	$loggerInstance->debug(4, "Sociopath test\n");
		@@ -33,7 +33,7 @@ discard block
		block discarded – undo
33	33	return NULL;
34	34	}
35	35	$loggerInstance->debug(4, $_SESSION['EVIDENCE']['QUESTIONSASKED']);
36		- $loggerInstance->debug(4, "\nAnswer question " . $QNUM . "\n");
	36	+ $loggerInstance->debug(4, "\nAnswer question ".$QNUM."\n");
37	37	switch ($answer) {
38	38	case 1:
39	39	$loggerInstance->debug(4, "Revaluate with FALSE");

		@@ -19,10 +19,10 @@
		block discarded – undo
19	19	* <base_url>/copyright.php after deploying the software
20	20	*/
21	21
22		-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
	22	+require_once dirname(dirname(__DIR__))."/config/_config.php";
23	23	$realm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING);
24		-$visited = filter_input(INPUT_GET,'visited', FILTER_SANITIZE_STRING);
25		-$nro = filter_input(INPUT_GET,'nro', FILTER_SANITIZE_STRING);
	24	+$visited = filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING);
	25	+$nro = filter_input(INPUT_GET, 'nro', FILTER_SANITIZE_STRING);
26	26	\core\CAT::sessionStart();
27	27	$languageObject = new core\common\Language();
28	28	$languageObject->setTextDomain("diagonstics");

		@@ -19,7 +19,7 @@
		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	\core\CAT::sessionStart();
25	25

		@@ -121,7 +121,7 @@
		block discarded – undo
121	121	if ($trailerPosition !== FALSE) {
122	122	$base = substr($scriptself, 0, $trailerPosition);
123	123	if ($base !== FALSE) {
124		- $url = "//$servername" . $base . "/logout_check.php";
	124	+ $url = "//$servername".$base."/logout_check.php";
125	125	}
126	126	}
127	127

GEANT / CAT

Branch — release_2_1 (fc3642)

Status

Category

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

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

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

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

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

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

Spacing +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

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