GEANT / CAT

web/user/faq.php

Spacing +5 added lines, -5 removed lines

@@ -50,19 +50,19 @@ 
 
 array_push($FAQ, [
     'title' => sprintf(_("Is it safe to use %s installers?"), \config\Master::APPEARANCE['productname']),
-    'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']) . ' ' . ( isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
+    'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']).' '.(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
 ]);
 
 array_push($FAQ, [
     'title' => _("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
-    'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.") . " " . (isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name']) . " " : "") . sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
+    'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name'])." " : "").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
 ]);
 
 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == NULL) {
     $text = sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your organisation and report the problem, the administrators should be able to trace your connections."), \config\ConfAssistant::CONSORTIUM['display_name']);
 } else {
     if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') {
-        $diagUrl = \config\Master::PATHS['cat_base_url'] . "diag/";
+        $diagUrl = \config\Master::PATHS['cat_base_url']."diag/";
     } else {
         $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'];
     }
@@ -99,8 +99,8 @@ 
     $tocText = "";
     $fullText = "";
     foreach ($FAQ as $faq) {
-        $tocText .= '<a href="#toc' . $counter . '">' . $faq['title'] . "</a><br>\n";
-        $fullText .= "<dt><a name=toc$counter>" . $faq['title'] . "</a></dt>\n<dd>" . $faq['text'] . "</dd>\n";
+        $tocText .= '<a href="#toc'.$counter.'">'.$faq['title']."</a><br>\n";
+        $fullText .= "<dt><a name=toc$counter>".$faq['title']."</a></dt>\n<dd>".$faq['text']."</dd>\n";
         $counter++;
     }
     ?>

core/Options.php

Spacing +4 added lines, -4 removed lines

@@ -142,17 +142,17 @@ 
         foreach (array_keys($this->typeDb) as $name) {
             if ($className === 0) {
                 $tempArray[] = $name;
-            } elseif (preg_match('/^' . $className . ':/', $name) > 0) {
+            } elseif (preg_match('/^'.$className.':/', $name) > 0) {
                 $tempArray[] = $name;
             }
         }
         $returnArray = $tempArray;
         // remove silverbullet-specific options if this deployment is not SB
         foreach ($tempArray as $key => $val) {
-            if (( \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] != 'LOCAL') && (preg_match('/^fed:silverbullet/', $val) > 0)) {
+            if ((\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] != 'LOCAL') && (preg_match('/^fed:silverbullet/', $val) > 0)) {
                 unset($returnArray[$key]);
             }
-            if (( \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] != 'LOCAL') && (preg_match('/^fed:minted_ca_file/', $val) > 0)) {
+            if ((\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] != 'LOCAL') && (preg_match('/^fed:minted_ca_file/', $val) > 0)) {
                 unset($returnArray[$key]);
             }
         }
@@ -172,7 +172,7 @@ 
         if (isset($this->typeDb[$optionname])) {
             return $this->typeDb[$optionname];
         }
-        throw new Exception("Metadata about an option was requested, but the option name does not exist in the system: " . htmlentities($optionname));
+        throw new Exception("Metadata about an option was requested, but the option name does not exist in the system: ".htmlentities($optionname));
     }
 
     /**

config/_config.php

Spacing +6 added lines, -6 removed lines

@@ -21,14 +21,14 @@ 
  */
 
 require_once "autoloader.php";
-require_once __DIR__ . "/../packageRoot.php";
+require_once __DIR__."/../packageRoot.php";
 
 // enable Composer autoloader, if exists
-if (file_exists(__DIR__ . "/../vendor/autoload.php") !== FALSE) {
-    include_once __DIR__ . "/../vendor/autoload.php";
+if (file_exists(__DIR__."/../vendor/autoload.php") !== FALSE) {
+    include_once __DIR__."/../vendor/autoload.php";
 }
 
-if (!file_exists(ROOT . "/config/Master.php")) {
+if (!file_exists(ROOT."/config/Master.php")) {
     echo "Master configuration file not found. You need to configure the product! At least config/Master.php is required!";
     throw new Exception("Master config file not found!");
 }
@@ -36,14 +36,14 @@ 
 /* load sub-configs if we are dealing with those in this installation */
 
 if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == 'LOCAL' || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == 'LOCAL') {
-    if (!file_exists(ROOT . "/config/ConfAssistant.php")) {
+    if (!file_exists(ROOT."/config/ConfAssistant.php")) {
         echo "ConfAssistant configuration file not found. You need to configure the product!";
         throw new Exception("ConfAssistant config file not found!");
     }
 }
 
 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') {
-    if (!file_exists(ROOT . "/config/Diagnostics.php")) {
+    if (!file_exists(ROOT."/config/Diagnostics.php")) {
         echo "Diagnostics configuration file not found. You need to configure the product!";
         throw new Exception("Diagnostics config file not found!");
     }

web/admin/edit_federation_result.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
  * @author Stefan Winter <stefan.winter@restena.lu>
  */
 
-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();
@@ -46,18 +46,18 @@ 
 
 if ($submitGiven == web\lib\common\FormElements::BUTTON_SAVE) { // here we go
     $fed_name = $my_fed->name;
-    echo "<h1>" . sprintf(_("Submitted attributes for %s '%s'"), $uiElements->nomenclatureFed, $fed_name) . "</h1>";
+    echo "<h1>".sprintf(_("Submitted attributes for %s '%s'"), $uiElements->nomenclatureFed, $fed_name)."</h1>";
     echo "<table>";
     echo $optionParser->processSubmittedFields($my_fed, $_POST, $_FILES);
     echo "</table>";
 
     $loggerInstance = new \core\common\Logging();
-    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "FED " . $my_fed->name . " - attributes changed");
+    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "FED ".$my_fed->name." - attributes changed");
 
     // re-instantiate ourselves... profiles need fresh data
 
     $my_fed = $validator->existingFederation($_GET['fed_id'], $_SESSION['user']);
 
-    echo "<br/><form method='post' action='overview_federation.php' accept-charset='UTF-8'><button type='submit'>" . _("Continue to dashboard") . "</button></form>";
+    echo "<br/><form method='post' action='overview_federation.php' accept-charset='UTF-8'><button type='submit'>"._("Continue to dashboard")."</button></form>";
 }
 echo $deco->footer();

web/skins/modern/test.php

Spacing +11 added lines, -11 removed lines

@@ -28,9 +28,9 @@ 
 ?>
 
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
 <!-- JQuery -->
 
 <script type="text/javascript">
@@ -44,10 +44,10 @@ 
 $operatingSystem = $Gui->detectOS();
 $Gui->loggerInstance->debug(4, $operatingSystem);
 if ($operatingSystem) {
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
 }
 
-print 'downloadMessage = "' . $Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
 //TODO modify this based on OS detection
 if (preg_match('/Android/', $_SERVER['HTTP_USER_AGENT'])) {
     $profile_list_size = 1;
@@ -58,7 +58,7 @@ 
 require "user/js/cat_js.php";
 ?>
     var loading_ico = new Image();
-    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>";
+    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>";
 </script>
 <?php $Gui->languageInstance->setTextDomain("web_user"); ?>
 <!-- DiscoJuice -->
@@ -67,9 +67,9 @@ 
     front_page = 0;
     var lang = "<?php echo($Gui->languageInstance->getLang()) ?>";
 </script>
-<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" />
 <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");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 </head>
 <body>
 <div id="wrap">
@@ -77,14 +77,14 @@ 
     <?php echo $divs->divHeading($visibility); ?>
     <div id="main_page">
         <div id="loading_ico">
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>" alt="Authenticating ..."/>
+          <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>" alt="Authenticating ..."/>
         </div>
         <div id="info_overlay"> <!-- device info -->
             <div id="info_window"></div>
-            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
         </div>
         <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
-          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
           <div id="main_menu_content"></div>
         </div>
         <div id="main_body">

utils/installTranslations.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  * License: see the web/copyright.php file in the file structure
  * ******************************************************************************
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 const AREAS = ["web_admin", "web_user", "devices", "core", "diagnostics"];
 foreach (\config\Master::LANGUAGES as $lang => $details) {

web/admin/112365365321.php

Spacing +3 added lines, -3 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';
 
 $uiElements = new web\lib\admin\UIElements();
 
@@ -75,7 +75,7 @@ 
                         // filesystem cleanup
                     case web\lib\common\FormElements::BUTTON_DELETE:
                         $i = web\lib\admin\Maintenance::deleteObsoleteTempDirs();
-                        echo "<div class='ca-summary'><table>" . $uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted") . "</table></div>";
+                        echo "<div class='ca-summary'><table>".$uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted")."</table></div>";
                         break;
                     default:
                         break;
@@ -141,7 +141,7 @@ 
                     $admin_query = $dbHandle->exec("SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user, SUM(downloads_silverbullet) as silverbullet FROM downloads WHERE device_id = '$index'");
                     // SELECT -> mysqli_result, not boolean
                     while ($a = mysqli_fetch_object(/** @scrutinizer ignore-type */ $admin_query)) {
-                        echo "<td>" . $device_array['display'] . "</td><td>" . $a->admin . "</td><td>" . $a->user . "</td><td>" . $a->silverbullet . "</td><td>" . sprintf("%s", $a->user + $a->silverbullet) . "</td>";
+                        echo "<td>".$device_array['display']."</td><td>".$a->admin."</td><td>".$a->user."</td><td>".$a->silverbullet."</td><td>".sprintf("%s", $a->user + $a->silverbullet)."</td>";
                         $gross_admin = $gross_admin + $a->admin;
                         $gross_user = $gross_user + $a->user;
                         $gross_silverbullet = $gross_silverbullet + $a->silverbullet;

devices/PP_OSU_XML/DevicePPOSUXML.php

Spacing +9 added lines, -9 removed lines

@@ -92,10 +92,10 @@ 
         <NodeName>AAAServerTrustRoot</NodeName>';
         foreach ($this->attributes['internal:CAs'][0] as $oneCert) {
             $retval .= '<Node>
-                         <NodeName>' . $oneCert['uuid'] . '</NodeName>
+                         <NodeName>' . $oneCert['uuid'].'</NodeName>
                              <Node>
                                <NodeName>CertSHA256Fingerprint</NodeName>
-                               <Value>' . $oneCert['sha256'] . '</Value>
+                               <Value>' . $oneCert['sha256'].'</Value>
                              </Node>
                        </Node>
                   ';
@@ -114,7 +114,7 @@ 
         $now = new \DateTime();
         return '<Node>
           <NodeName>CreationDate</NodeName>
-          <Value>' . $now->format("Y-m-d") . "T" . $now->format("H:i:s") . "Z" . '</Value>
+          <Value>' . $now->format("Y-m-d")."T".$now->format("H:i:s")."Z".'</Value>
         </Node>';
     }
 
@@ -128,11 +128,11 @@ 
         <NodeName>HomeSP</NodeName>
         <Node>
           <NodeName>FriendlyName</NodeName>
-          <Value>' . sprintf(_("%s via Passpoint"), \config\ConfAssistant::CONSORTIUM['display_name']) . '</Value>
+          <Value>' . sprintf(_("%s via Passpoint"), \config\ConfAssistant::CONSORTIUM['display_name']).'</Value>
         </Node>
         <Node>
           <NodeName>FQDN</NodeName>
-          <Value>' . $this->attributes['eap:server_name'][0] /* what, only one FQDN allowed? */ . '</Value>
+          <Value>' . $this->attributes['eap:server_name'][0] /* what, only one FQDN allowed? */.'</Value>
         </Node>
         <Node>
           <NodeName>RoamingConsortiumOI</NodeName>
@@ -148,7 +148,7 @@ 
                 $oiList .= ",";
             }
         }
-        $retval .= $oiList . '</Value>
+        $retval .= $oiList.'</Value>
         </Node>
       </Node>
 ';
@@ -165,7 +165,7 @@ 
         <NodeName>Credential</NodeName>
         <Node>
               <NodeName>Realm</NodeName>
-              <Value>' . $this->attributes['internal:realm'][0] . '</Value>
+              <Value>' . $this->attributes['internal:realm'][0].'</Value>
             </Node>';
         /* the example file I got did not include CreationDate, so omit it
          * 
@@ -180,7 +180,7 @@ 
             </Node>
             <Node>
               <NodeName>CertSHA256Fingerprint</NodeName>
-              <Value>' . strtoupper($this->clientCert["sha256"]) /* the actual cert has to go... where? */ . '</Value>
+              <Value>' . strtoupper($this->clientCert["sha256"]) /* the actual cert has to go... where? */.'</Value>
             </Node>
           </Node>
       </Node>
@@ -298,7 +298,7 @@ 
         // foresee signing.
         // but if they ever change their mind, we are prepared
 
-        $outputFromSigning = system($this->sign . " installer_profile '$fileName' > /dev/null");
+        $outputFromSigning = system($this->sign." installer_profile '$fileName' > /dev/null");
         if ($outputFromSigning === FALSE) {
             $this->loggerInstance->debug(2, "Signing the ONC installer $fileName FAILED!\n");
         }

core/ProfileSilverbullet.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 
 // realm is automatically calculated, then stored in DB
 
-        $this->realm = "opaquehash@$myInst->identifier-$this->identifier." . strtolower($myInst->federation) . \config\ConfAssistant::SILVERBULLET['realm_suffix'];
+        $this->realm = "opaquehash@$myInst->identifier-$this->identifier.".strtolower($myInst->federation).\config\ConfAssistant::SILVERBULLET['realm_suffix'];
         $localValueIfAny = "";
 
 // but there's some common internal attributes populated directly
@@ -113,11 +113,11 @@ 
 
         // and we need to populate eap:server_name and eap:ca_file with the NRO-specific EAP information
         $silverbulletAttributes = [
-            "eap:server_name" => "auth." . strtolower($myFed->tld) . \config\ConfAssistant::SILVERBULLET['server_suffix'],
+            "eap:server_name" => "auth.".strtolower($myFed->tld).\config\ConfAssistant::SILVERBULLET['server_suffix'],
         ];
         $temp = array_merge($this->addInternalAttributes($internalAttributes), $this->addInternalAttributes($silverbulletAttributes));
         $x509 = new \core\common\X509();
-        $caHandle = fopen(dirname(__FILE__) . "/../config/SilverbulletServerCerts/" . strtoupper($myFed->tld) . "/root.pem", "r");
+        $caHandle = fopen(dirname(__FILE__)."/../config/SilverbulletServerCerts/".strtoupper($myFed->tld)."/root.pem", "r");
         if ($caHandle !== FALSE) {
             $cAFile = fread($caHandle, 16000000);
             foreach ($x509->splitCertificate($cAFile) as $oneCa) {
@@ -273,7 +273,7 @@ 
         if (empty($certNames)) {
             return [];
         }
-        $namesCondensed = "'" . implode("' OR username = '", $certNames) . "'";
+        $namesCondensed = "'".implode("' OR username = '", $certNames)."'";
         $serverHandles = DBConnection::handle("RADIUS");
         $returnarray = [];
         foreach ($serverHandles as $oneDbServer) {