GEANT / CAT

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

web/user/devel.inc.php

Spacing +7 added lines, -7 removed lines

@@ -19,13 +19,13 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-$out = "<h3>" . _("Access the sources") . "</h3>" .
-        sprintf(_("%s is an opensource project. If you are interested in the details of the implementation, please visit <a href='%s'>GitHub</a>."), CONFIG['APPEARANCE']['productname'], "https://github.com/GEANT/CAT" ) .
-        "<h3>" . _("Join the developers mailing list.") . "</h3>" .
-        sprintf(_("The list is available at: %s"), CONFIG['APPEARANCE']['support-contact']['display']) .
-        "<h3>" . _("Add a translation") . "</h3>" .
-        _("If you would like to add a new language to CAT then please contact us ...") .
-        "<h3><a href='" . \core\CAT::getRootUrlPath() . "/apidoc' target='_blank'>". _("Documentation") . "</a></h3>" ;
+$out = "<h3>"._("Access the sources")."</h3>".
+        sprintf(_("%s is an opensource project. If you are interested in the details of the implementation, please visit <a href='%s'>GitHub</a>."), CONFIG['APPEARANCE']['productname'], "https://github.com/GEANT/CAT").
+        "<h3>"._("Join the developers mailing list.")."</h3>".
+        sprintf(_("The list is available at: %s"), CONFIG['APPEARANCE']['support-contact']['display']).
+        "<h3>"._("Add a translation")."</h3>".
+        _("If you would like to add a new language to CAT then please contact us ...").
+        "<h3><a href='".\core\CAT::getRootUrlPath()."/apidoc' target='_blank'>"._("Documentation")."</a></h3>";
 
         
 

web/user/API.php

Indentation +5 added lines, -5 removed lines

@@ -98,7 +98,7 @@ 
         break;
     case 'listIdentityProviders':
         if ($federation === FALSE) {
-           $federation = $id ? $validator->Federation($id)->tld : FALSE;
+            $federation = $id ? $validator->Federation($id)->tld : FALSE;
         }
         if ($federation === FALSE) { // federation is a mandatory parameter!
             exit;
@@ -110,7 +110,7 @@ 
         break;
     case 'listProfiles': // needs $idp set - abort if not
         if ($idp === FALSE) {
-           $idp = $id ? $validator->IdP($id)->identifier : FALSE;
+            $idp = $id ? $validator->IdP($id)->identifier : FALSE;
         }
         if ($idp === FALSE) {
             exit;
@@ -119,7 +119,7 @@ 
         break;
     case 'listDevices':
         if ($profile === FALSE) {
-           $profile = $id ? $validator->Profile($id)->identifier : FALSE;
+            $profile = $id ? $validator->Profile($id)->identifier : FALSE;
         }
         if ($profile === FALSE) {
             exit;
@@ -146,7 +146,7 @@ 
         break;
     case 'profileAttributes': // needs $profile set
         if ($profile === FALSE) {
-           $profile = $id ? $validator->Profile($id)->identifier : FALSE;
+            $profile = $id ? $validator->Profile($id)->identifier : FALSE;
         }
         if ($profile === FALSE) {
             exit;
@@ -155,7 +155,7 @@ 
         break;
     case 'sendLogo': // needs $idp and $disco set
         if ($idp === FALSE) {
-           $idp = $id ? $validator->IdP($id)->identifier : FALSE;
+            $idp = $id ? $validator->IdP($id)->identifier : FALSE;
         }
         if ($idp === FALSE) {
             exit;

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
  *
  * @package UserAPI
  */
-include(dirname(dirname(dirname(__FILE__))) . "/config/_config.php");
+include(dirname(dirname(dirname(__FILE__)))."/config/_config.php");
 $API = new \core\UserNetAPI();
 $validator = new web\lib\common\InputValidation();
 $loggerInstance = new \core\common\Logging();

web/user/tou.inc.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-        $Tou =  [
+        $Tou = [
     'title' => _("Terms of Use"),
     'subtitle' => _("(for legal reasons, the Terms of Use are in English only)"),
     'short' => "<p>The purpose of this service is to make eduroam configuration easier for end users and eduroam