GEANT / CAT

schema/1_1-2_0-script.php

Spacing +11 added lines, -11 removed lines

@@ -46,12 +46,12 @@ 
         // SELECT -> returns resource, not a boolean
         while ($oneAffectedPayload = mysqli_fetch_object(/** @scrutinizer ignore-type */ $affectedPayloads)) {
             if ($oneAffectedPayload->option_lang !== NULL) {
-                echo "[SKIP] The option in row " . $oneAffectedPayload->row . " of table $tableName appears to be converted already. Not touching it.\n";
+                echo "[SKIP] The option in row ".$oneAffectedPayload->row." of table $tableName appears to be converted already. Not touching it.\n";
                 continue;
             }
             $decoded = unserialize($oneAffectedPayload->option_value);
             if ($decoded === FALSE || !isset($decoded["lang"]) || !isset($decoded['content'])) {
-                echo "[WARN] Please check row " . $oneAffectedPayload->row . " of table $tableName - this entry did not successfully unserialize() even though it is a multi-lang attribute!\n";
+                echo "[WARN] Please check row ".$oneAffectedPayload->row." of table $tableName - this entry did not successfully unserialize() even though it is a multi-lang attribute!\n";
                 continue;
             }
             // pry apart lang and content into their own columns
@@ -60,7 +60,7 @@ 
             $row = $oneAffectedPayload->row;
             $rewrittenPayload = $dbInstance->exec("UPDATE $tableName SET option_lang = ?, option_value = ? WHERE row = ?", "ssi", $theLang, $theContent, $row);
             if ($rewrittenPayload !== FALSE) {
-                echo "[ OK ] " . $oneAffectedPayload->option_value . " ---> $theLang # $theContent\n";
+                echo "[ OK ] ".$oneAffectedPayload->option_value." ---> $theLang # $theContent\n";
                 continue;
             }
             echo "[FAIL] Unknown error executing the payload update for row $row of table $tableName. Did you run the 'ALTER TABLE' statements?\n";
@@ -83,7 +83,7 @@ 
     
     $rewrittenPayload = $dbInstance->exec("UPDATE institution_option SET option_value = ? WHERE row = ?", "si", $newstyle, $row);
     if ($rewrittenPayload !== FALSE) {
-        echo "[ OK ] " . $oneAffectedPayload->option_value . " ---> $newstyle\n";
+        echo "[ OK ] ".$oneAffectedPayload->option_value." ---> $newstyle\n";
         continue;
     }
     echo "[FAIL] Unknown error executing the payload update for row $row of table institution_option.\n";
@@ -96,7 +96,7 @@ 
 $conditionString = "WHERE ";
 $typeString = "";
 foreach ($eap_options as $index => $name) {
-    $conditionString .= ($index == 0 ? "" : "OR ") . "option_name = ? ";
+    $conditionString .= ($index == 0 ? "" : "OR ")."option_name = ? ";
     $typeString .= "s";
 }
 $idpWideOptionsQuery = $dbInstance->exec("SELECT institution_id, option_name, option_lang, option_value FROM institution_option $conditionString", $typeString, $eap_options[0], $eap_options[1]);
@@ -105,11 +105,11 @@ 
 
 while ($oneAttrib = mysqli_fetch_object(/** @scrutinizer ignore-type */ $idpWideOptionsQuery)) {
     if (!isset($profiles[$oneAttrib->institution_id])) {
-        $idp = new \core\IdP((int)$oneAttrib->institution_id);
+        $idp = new \core\IdP((int) $oneAttrib->institution_id);
         $profiles[$oneAttrib->institution_id] = ['IdP' => $idp, 'Profiles' => $idp->listProfiles()];
-        echo "Debug: IdP " . $idp->identifier . " has profiles ";
+        echo "Debug: IdP ".$idp->identifier." has profiles ";
         foreach ($profiles[$oneAttrib->institution_id]['Profiles'] as $oneProfileObject) {
-            echo $oneProfileObject->identifier . " ";
+            echo $oneProfileObject->identifier." ";
         }
         echo "\n";
     }
@@ -121,12 +121,12 @@ 
             foreach ($relevantAttributes as $relevantAttribute) {
                 if ($relevantAttribute['level'] == 'Profile') {
                     $hasOnProfileLevel = TRUE;
-                    echo "[SKIP] EAP option " . $oneAttrib->option_name . " for IdP " . $profiles[$oneAttrib->institution_id]['IdP']->name . " (ID " . $profiles[$oneAttrib->institution_id]['IdP']->identifier . "), profile " . $oneProfileObject->name . " (ID " . $oneProfileObject->identifier . ") because Profile has EAP override.\n";
+                    echo "[SKIP] EAP option ".$oneAttrib->option_name." for IdP ".$profiles[$oneAttrib->institution_id]['IdP']->name." (ID ".$profiles[$oneAttrib->institution_id]['IdP']->identifier."), profile ".$oneProfileObject->name." (ID ".$oneProfileObject->identifier.") because Profile has EAP override.\n";
                 }
             }
             if ($hasOnProfileLevel === FALSE) { // only add if profile didn't previously override IdP wide anyway!
                 $oneProfileObject->addAttribute($oneAttrib->option_name, $oneAttrib->option_lang, $oneAttrib->option_value);
-                echo "[OK  ] Added profile EAP option " . $oneAttrib->option_name . " for IdP " . $profiles[$oneAttrib->institution_id]['IdP']->name . " (ID " . $profiles[$oneAttrib->institution_id]['IdP']->identifier . "), profile " . $oneProfileObject->name . " (ID " . $oneProfileObject->identifier . ").\n";
+                echo "[OK  ] Added profile EAP option ".$oneAttrib->option_name." for IdP ".$profiles[$oneAttrib->institution_id]['IdP']->name." (ID ".$profiles[$oneAttrib->institution_id]['IdP']->identifier."), profile ".$oneProfileObject->name." (ID ".$oneProfileObject->identifier.").\n";
             }
         }
     }
@@ -136,5 +136,5 @@ 
     $optLang = $oneAttrib->option_lang;
     $optValue = $oneAttrib->option_value;
     $deletionQuery = $dbInstance->exec("DELETE FROM institution_option WHERE institution_id = ? AND option_name = ? and option_lang = ? and option_value = ?", "isss", $instId, $optName, $optLang, $optValue);
-    echo "[OK  ] Deleted IdP-wide EAP option $optName for IdP " . $profiles[$instId]['IdP']->name . " (ID " . $profiles[$instId]['IdP']->identifier . ").\n";
+    echo "[OK  ] Deleted IdP-wide EAP option $optName for IdP ".$profiles[$instId]['IdP']->name." (ID ".$profiles[$instId]['IdP']->identifier.").\n";
 }

utils/ocspweb/index.php

Spacing +7 added lines, -7 removed lines

@@ -109,7 +109,7 @@ 
 exec("openssl ocsp -reqin $derFilePath -req_text", $output, $retval);
 
 if ($retval !== 0) {
-    instantDeath("openssl ocsp returned a non-zero return code. The DER data is probably bogus. B64 representation of DER data is: " . base64_encode($ocspRequestDer));
+    instantDeath("openssl ocsp returned a non-zero return code. The DER data is probably bogus. B64 representation of DER data is: ".base64_encode($ocspRequestDer));
 }
 if ($output === NULL) { // this can't really happen, but makes Scrutinizer happier
     $output = [];
@@ -139,14 +139,14 @@ 
  * back (if we have it).
  */
 if (strcasecmp($nameHash, OUR_NAME_HASH) != 0 || strcasecmp($keyHash, OUR_KEY_HASH) != 0) {
-    instantDeath("The request is about a different Issuer name / public key. Expected vs. actual name hash: " . OUR_NAME_HASH . " / $nameHash, " . OUR_KEY_HASH . " / $keyHash");
+    instantDeath("The request is about a different Issuer name / public key. Expected vs. actual name hash: ".OUR_NAME_HASH." / $nameHash, ".OUR_KEY_HASH." / $keyHash");
 }
-error_log("base64-encoded request: " . base64_encode($ocspRequestDer));
+error_log("base64-encoded request: ".base64_encode($ocspRequestDer));
 
-$response = fopen(__DIR__ . "/statements/" . $serialHex . ".der", "r");
+$response = fopen(__DIR__."/statements/".$serialHex.".der", "r");
 if ($response === FALSE) { // not found
     // first lets load the unauthorised response, which is the default reply
-    $unauthResponse = fopen(__DIR__ . "/statements/UNAUTHORIZED.der", "r");
+    $unauthResponse = fopen(__DIR__."/statements/UNAUTHORIZED.der", "r");
     if ($unauthResponse === FALSE) {
         instantDeath("Unable to open our canned UNAUTHORIZED response!");
     }
@@ -188,7 +188,7 @@ 
 
 $responseContent = fread($response, 1000000);
 fclose($response);
-error_log("base64-encoded response: " . base64_encode($responseContent));
+error_log("base64-encoded response: ".base64_encode($responseContent));
 header('Content-Type: application/ocsp-response');
-header('Content-Length: ' . strlen($responseContent));
+header('Content-Length: '.strlen($responseContent));
 echo $responseContent;

utils/cleanup.php

Spacing +1 added lines, -1 removed lines

@@ -24,6 +24,6 @@
 /**
  * This script deletes obsolete directories from installer cache and siverbullet directory
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 web\lib\admin\Maintenance::deleteObsoleteTempDirs();

utils/ocsp_update.php

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     $certObject->triggerNewOCSPStatement();
 }
 
- /* 
+    /* 
   * and then writes all recently updated statements to a temporary directory. The 
   * calling script ocsp_update.sh should then scp all the files to their 
   * destination.

Spacing +5 added lines, -5 removed lines

@@ -28,11 +28,11 @@ 
  * It works on two CAs, the RSA and ECDSA variant. There is a separate temp
  * subdir for both ( temp_ocsp_RSA and temp_ocsp_ECDSA ).
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
-if (file_exists(__DIR__ . "/semaphore")) {
+require_once dirname(dirname(__FILE__))."/config/_config.php";
+if (file_exists(__DIR__."/semaphore")) {
     exit(1); // another instance is still busy doing stuff. Don't interfere.
 }
-file_put_contents(__DIR__ . "/semaphore", "BUSY");
+file_put_contents(__DIR__."/semaphore", "BUSY");
 $dbLink = \core\DBConnection::handle("INST");
 $allSerials = $dbLink->exec("SELECT serial_number, ca_type FROM silverbullet_certificate WHERE serial_number IS NOT NULL AND expiry > NOW() AND OCSP_timestamp < DATE_SUB(NOW(), INTERVAL 1 WEEK)");
 // SELECT query -> always returns a mysql_result, not boolean
@@ -58,8 +58,8 @@ 
 #    echo "Writing OCSP statement for serial number $statementRow->serial_number\n";
     $filename = strtoupper(dechex($statementRow->serial_number)).".der";
     if (strlen($filename) % 2 == 1) {
-        $filename = "0" . $filename;
+        $filename = "0".$filename;
     }
     file_put_contents($tempdirBase."_".$statementRow->ca_type."/".$filename, $statementRow->OCSP);
 }
-unlink(__DIR__ . "/semaphore");
\ No newline at end of file
+unlink(__DIR__."/semaphore");
\ No newline at end of file

utils/notify_invitation_expiry.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 
 // please run this as a cron job every hour
 
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 // iterate through all federations and see if there are recently expired 
 // invitations for any of them
@@ -55,7 +55,7 @@ 
     $admins = $this_fed->listFederationAdmins();
     $mailtext = "Hello,
 
-invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] ." have recently expired:
+invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." have recently expired:
 
 ";
     foreach ($listofinstnames as $instname) {
@@ -65,7 +65,7 @@ 
     if ($numberofexistingidps > 0) {
         $mailtext .= "
 
-Additionally, $numberofexistingidps invitations for an existing ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." have expired.
+Additionally, $numberofexistingidps invitations for an existing ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." have expired.
         ";
     }
     $mailtext .= "
@@ -73,7 +73,7 @@ 
 
 Greetings,
 
-A humble " . CONFIG['APPEARANCE']['productname'] . " cron job
+A humble " . CONFIG['APPEARANCE']['productname']." cron job
 ";
 
     foreach ($admins as $admin) {

web/basic.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
  * @package Core
  */
 
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 $validator = new \web\lib\common\InputValidation();
 

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['APPEARANCE']['productname']),
-    'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), CONFIG['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['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['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['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['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['FUNCTIONALITY_LOCATIONS']['DIAGNOSTICS'] == 'LOCAL') {
-        $diagUrl = CONFIG['PATHS']['cat_base_url'] . "diag/";
+        $diagUrl = CONFIG['PATHS']['cat_base_url']."diag/";
     } else {
         $diagUrl = CONFIG['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++;
     }
     ?>

web/user/about_cat.inc.php

Indentation +3 added lines, -3 removed lines

@@ -34,9 +34,9 @@
 $skinObject = new \web\lib\user\Skinjob("classic");
 /// eduroam CAT, twice the consortium name eduroam, twice eduroam CAT
 $out = sprintf(_("<span class='edu_cat'>%s</span> is built as a cooperation platform."))."<p>".
-       sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ".
-                 "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ".
-                 "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), 
+        sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ".
+                    "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ".
+                    "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), 
         CONFIG['APPEARANCE']['productname'], 
         CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], 
         CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], 

Spacing +5 added lines, -5 removed lines

@@ -42,10 +42,10 @@ 
         CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], 
         CONFIG['APPEARANCE']['productname'], 
         CONFIG['APPEARANCE']['productname']);
-$out .= "<p>" . sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), CONFIG['APPEARANCE']['productname']) . "</p>";
-$out .= "<table><tr><th>" . _("Device Group") . "</th><th>" . _("Device") . "</th>";
+$out .= "<p>".sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), CONFIG['APPEARANCE']['productname'])."</p>";
+$out .= "<table><tr><th>"._("Device Group")."</th><th>"._("Device")."</th>";
 foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
-    $out .= "<th style='min-width: 80px;'>" . $oneeap->getPrintableRep() . "</th>";
+    $out .= "<th style='min-width: 80px;'>".$oneeap->getPrintableRep()."</th>";
 }
 $out .= "</tr>";
 foreach (\devices\Devices::listDevices() as $index => $onedevice) {
@@ -54,12 +54,12 @@ 
             continue;
         }
     }
-    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/" . $onedevice['group'] . ".png");
+    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/".$onedevice['group'].".png");
     $vendorImg = "";
     if ($vendor !== FALSE) {
         $vendorImg = "<img src='$vendor' alt='logo'>";
     }
-    $out .= "<tr><td class='vendor'>$vendorImg</td><td>" . $onedevice['display'] . "</td>";
+    $out .= "<tr><td class='vendor'>$vendorImg</td><td>".$onedevice['display']."</td>";
     $device_instance = new \core\DeviceFactory($index);
     foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
         $out .= "<td>";

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";
 
 CAT_session_start();