GEANT / CAT

core/SilverbulletCertificate.php

Spacing +5 added lines, -5 removed lines

@@ -195,7 +195,7 @@ 
         $invitationObject = new SilverbulletInvitation($token);
         $profile = new ProfileSilverbullet($invitationObject->profile);
         $inst = new IdP($profile->institution);
-        $loggerInstance->debug(5, "tokenStatus: done, got " . $invitationObject->invitationTokenStatus . ", " . $invitationObject->profile . ", " . $invitationObject->userId . ", " . $invitationObject->expiry . ", " . $invitationObject->invitationTokenString . "\n");
+        $loggerInstance->debug(5, "tokenStatus: done, got ".$invitationObject->invitationTokenStatus.", ".$invitationObject->profile.", ".$invitationObject->userId.", ".$invitationObject->expiry.", ".$invitationObject->invitationTokenString."\n");
         if ($invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_VALID && $invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_PARTIALLY_REDEEMED) {
             throw new Exception("Attempt to generate a SilverBullet installer with an invalid/redeemed/expired token. The user should never have gotten that far!");
         }
@@ -208,12 +208,12 @@ 
             throw new Exception("Despite a valid token, the corresponding user was not found in database or database query error!");
         }
         $expiryObject = mysqli_fetch_object(/** @scrutinizer ignore-type */ $userrow);
-        $loggerInstance->debug(5, "EXP: " . $expiryObject->expiry . "\n");
+        $loggerInstance->debug(5, "EXP: ".$expiryObject->expiry."\n");
         $expiryDateObject = date_create_from_format("Y-m-d H:i:s", $expiryObject->expiry);
         if ($expiryDateObject === FALSE) {
             throw new Exception("The expiry date we got from the DB is bogus!");
         }
-        $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s") . "\n");
+        $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s")."\n");
         // date_create with no parameters can't fail, i.e. is never FALSE
         $validity = date_diff(/** @scrutinizer ignore-type */ date_create(), $expiryDateObject);
         $expiryDays = $validity->days + 1;
@@ -251,7 +251,7 @@ 
         $certString = "";
         openssl_x509_export($cert, $certString);
         $parsedCert = $x509->processCertificate($certString);
-        $loggerInstance->debug(5, "CERTINFO: " . print_r($parsedCert['full_details'], true));
+        $loggerInstance->debug(5, "CERTINFO: ".print_r($parsedCert['full_details'], true));
         $realExpiryDate = date_create_from_format("U", $parsedCert['full_details']['validTo_time_t'])->format("Y-m-d H:i:s");
 
         // store new cert info in DB
@@ -298,7 +298,7 @@ 
         $username = "";
         while ($usernameIsUnique === FALSE) {
             $usernameLocalPart = common\Entity::randomString(64 - 1 - strlen($realm), "0123456789abcdefghijklmnopqrstuvwxyz");
-            $username = $usernameLocalPart . "@" . $realm;
+            $username = $usernameLocalPart."@".$realm;
             $uniquenessQuery = $databaseHandle->exec("SELECT cn from silverbullet_certificate WHERE cn = ? AND ca_type = ?", "ss", $username, $certtype);
             // SELECT -> resource, not boolean
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $uniquenessQuery) == 0) {

devices/Devices-template.php

Spacing +8 added lines, -8 removed lines

@@ -377,7 +377,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_pie' => [
@@ -392,7 +392,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_oreo' => [
@@ -407,7 +407,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_nougat' => [
@@ -422,7 +422,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_marshmallow' => [
@@ -437,7 +437,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_lollipop' => [
@@ -452,7 +452,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_kitkat' => [
@@ -467,7 +467,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_43' => [
@@ -482,7 +482,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_legacy' => [

web/lib/user/Gui.php

Spacing +3 added lines, -3 removed lines

@@ -52,10 +52,10 @@
         $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>

web/skins/modern/user/cat_info.php

Spacing +18 added lines, -18 removed lines

@@ -31,7 +31,7 @@ 
  * 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 @@ 
 $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 @@ 
                     $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;
         }

web/diag/processSociopath.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
  *          <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 @@ 
         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");

web/diag/magicTelepath.php

Spacing +3 added lines, -3 removed lines

@@ -19,10 +19,10 @@
  *          <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");

web/admin/inc/option_xhr.inc.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 \core\CAT::sessionStart();
 

web/user/remindIdP.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  *          <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();
 

web/lib/admin/MapOpenLayers.php

Spacing +7 added lines, -7 removed lines

@@ -83,7 +83,7 @@ 
         
 // 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 @@ 
                 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 @@ 
         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 @@ 
         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 @@ 
         // 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 @@ 
      */
     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;
     }