Inspection of "Merge branch 'master' of github.com:GEANT/CAT" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Setup Failed

Push — master ( 1417dc...c04c22 )

by Stefan

created 2021-04-22 16:10 UTC

Status

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

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
  * @package UserGUI
  * 
  */
-require dirname(dirname(__FILE__)) . "/config/_config.php";
+require dirname(dirname(__FILE__))."/config/_config.php";
 $loggerInstance = new \core\common\Logging();
 $langObject = new \core\common\Language();
 $cat = new \core\CAT();
@@ -51,9 +51,9 @@  discard block
 block discarded – undo
     <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
         <img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="padding-right:20px; padding-top:20px; float:right" alt="logo" />
 
-        <div id="motd"><?php print ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
+        <div id="motd"><?php print (isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
 
-        <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
+        <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
         <div id="tou">
             <?php
             require "user/tou.php";
@@ -61,11 +61,11 @@  discard block
 block discarded – undo
         </div>
         <div>
             <table style='width:100%'>
-                <caption><?php echo "Legalese";?></caption>
+                <caption><?php echo "Legalese"; ?></caption>
                 <tr>
-                    <th class='wai-invisible' scope='col'><?php echo "Copyright";?></th>
-                    <th class='wai-invisible' scope='col'><?php echo "Privacy Notice";?></th>
-                    <th class='wai-invisible' scope='col'><?php echo "Attribution";?></th>
+                    <th class='wai-invisible' scope='col'><?php echo "Copyright"; ?></th>
+                    <th class='wai-invisible' scope='col'><?php echo "Privacy Notice"; ?></th>
+                    <th class='wai-invisible' scope='col'><?php echo "Attribution"; ?></th>
                 </tr>
                 <tr>
                     <td style='padding-left:20px; padding-right:20px; text-align:left; vertical-align:top;'>
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
                     </td>
                     <?php
                     if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {
-                        $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),\config\ConfAssistant::CONSORTIUM['name']) . "</a></td>";
+                        $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['name'])."</a></td>";
                     }
                     ?>
                     <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>

Please login to merge, or discard this patch.

web/admin/action_generate_zone.php 1 patch

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

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
  */
 ?>
 <?php
-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();
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
     "nl" => "_radsec._tcp.eduroam.nl.",
     ];
     foreach ($cat->getSuperglueZone() as $oneEntry) {
-        foreach (explode(',',$oneEntry['inst_realm']) as $oneRealm) {
+        foreach (explode(',', $oneEntry['inst_realm']) as $oneRealm) {
             $target = "_radsec._somewhere.eduroam.org";
             foreach ($NROs as $tld => $nroTarget) {
                 if (preg_match("/$tld$/", $oneRealm)) {

Please login to merge, or discard this patch.

core/CAT.php 1 patch

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

@@ -105,28 +105,28 @@
 block discarded – undo
         parent::__construct();
         common\Entity::intoThePotatoes();
 
-        $this->catVersionString = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>") . "</a>";
+        $this->catVersionString = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
         if (CAT::RELEASE_VERSION) {
             $major = CAT::VERSION_MAJOR;
             $minor = CAT::VERSION_MINOR;
             $patch = CAT::VERSION_PATCH;
             $extra = CAT::VERSION_EXTRA;
             $temp_version = "CAT-$major.$minor";
-            $branch = "release_$major" . "_$minor";
+            $branch = "release_$major"."_$minor";
             if (CAT::VERSION_PATCH != 0) {
                 $temp_version .= ".$patch";
             }
             if (CAT::VERSION_EXTRA != "") {
                 $temp_version .= "-$extra";
             }
-            $this->catVersionString = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
+            $this->catVersionString = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
         }
         $product = \config\Master::APPEARANCE['productname'];
         $minYear = self::COPYRIGHT_MIN_YEAR;
         $maxYear = self::COPYRIGHT_MAX_YEAR;
         $holder = self::COPYRIGHT_HOLDER;
         $consortia = self::COPYRIGHT_CONSORTIA;
-        $this->catCopyright = "$product - " . $this->catVersionString . " &copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
+        $this->catCopyright = "$product - ".$this->catVersionString." &copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
 
 
         /* Federations are created in DB with bootstrapFederation, and listed via listFederations

Please login to merge, or discard this patch.

web/admin/sanity_tests.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(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $Tests = [
     'Directories',
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
 
 $uiElements = new \web\lib\admin\UIElements();
 
-if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL" ) {
+if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
     $Tests[] = 'Makensis';
     $Tests[] = 'Makensis=>NSISmodules';
 }

Please login to merge, or discard this patch.

devices/Devices-template.php 1 patch

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

@@ -397,7 +397,7 @@  discard block
 block discarded – undo
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "geteduroam",
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],            
             
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "geteduroam",
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],  
             'android_4_7' => [
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "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='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>"),
                 ],
             ],            
             
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "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='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>"),
                 ],
             ],
             'android_pie' => [
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "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='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>"),
                 ],
             ],
             'android_oreo' => [
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "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='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>"),
                 ],
             ],
             'android_nougat' => [
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "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='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>"),
                 ],
             ],
             'android_marshmallow' => [
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "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='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>"),
                 ],
             ],
             'android_lollipop' => [
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "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='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>"),
                 ],
             ],
             'android_kitkat' => [
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "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='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>"),
                 ],
             ],
             'android_43' => [
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
                     'mime' => 'application/eap-config',
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "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='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>"),
                 ],
             ],
             'android_legacy' => [

Please login to merge, or discard this patch.

web/lib/user/TextTemplates.php 2 patches

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -89,12 +89,12 @@
 block discarded – undo
         $this->templates[WELCOME_ABOARD_TERMS] = "";
         foreach ([
                 "eduroam" => [ 
-                      "TOU"  => "https://wiki.geant.org/display/H2eduroam/Terms+and+Conditions",
-                      "PRIV" => "https://www.eduroam.org/privacy/",
+                        "TOU"  => "https://wiki.geant.org/display/H2eduroam/Terms+and+Conditions",
+                        "PRIV" => "https://www.eduroam.org/privacy/",
                     ], 
                 "OpenRoaming" => [ 
-                      "TOU"  => "https://wballiance.com/openroaming/toc-2020/",
-                      "PRIV" => "https://wballiance.com/openroaming/privacy-policy-2020/",
+                        "TOU"  => "https://wballiance.com/openroaming/toc-2020/",
+                        "PRIV" => "https://wballiance.com/openroaming/privacy-policy-2020/",
                     ]
             ] as $consortium => $terms) {
             $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>" . _("When connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply.") . "</p>", $consortium, $terms['TOU'], $terms['PRIV']);

Please login to merge, or discard this patch.

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

@@ -49,7 +49,7 @@  discard block
 block discarded – undo
 const DOWNLOAD_REDIRECT_CONTINUE = 1054;
 const SB_GO_AWAY = 1060;
 const SB_FRONTPAGE_BIGDOWNLOADBUTTON = 1061;
-const SB_FRONTPAGE_ROLLER_CUSTOMBUILT= 1062;
+const SB_FRONTPAGE_ROLLER_CUSTOMBUILT = 1062;
 
 
 /**
@@ -96,14 +96,14 @@  discard block
 block discarded – undo
                       "PRIV" => "https://wballiance.com/openroaming/privacy-policy-2020/",
                     ]
             ] as $consortium => $terms) {
-            $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>" . _("When connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply.") . "</p>", $consortium, $terms['TOU'], $terms['PRIV']);
+            $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>"._("When connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply.")."</p>", $consortium, $terms['TOU'], $terms['PRIV']);
         }
         // this would actually be a checkbox which grays out the actual download button until ACKed
         $this->templates[WELCOME_ABOARD_TERMS] .= "<p>"._("I agree to be bound by these Terms and Conditions.")."</p>";
         $this->templates[WELCOME_ABOARD_BACKTODOWNLOADS] = _("Back to downloads");
         $this->templates[EDUROAM_WELCOME_ADVERTISING] = sprintf(_("we would like to warmly welcome you among the several million users of %s! From now on, you will be able to use internet access resources on thousands of universities, research centres and other places all over the globe. All of this completely free of charge!"), \config\ConfAssistant::CONSORTIUM['display_name']);
         $this->templates[HEADING_TOPLEVEL_GREET] = sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']);
-        $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"),\config\ConfAssistant::CONSORTIUM['display_name']);
+        $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"), \config\ConfAssistant::CONSORTIUM['display_name']);
         $this->templates[FRONTPAGE_ROLLER_EASY] = sprintf(_("%s installation made easy:"), \config\ConfAssistant::CONSORTIUM['display_name']);
         $this->templates[FRONTPAGE_ROLLER_CUSTOMBUILT] = _("Custom built for your organisation");
         $this->templates[FRONTPAGE_BIGDOWNLOADBUTTON] = sprintf(_("Click here to download your %s installer"), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']);

Please login to merge, or discard this patch.

web/admin/edit_profile_result.php 1 patch

Spacing +27 added lines, -27 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(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();
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
             echo $deco->pageheader(sprintf(_("%s: Edit Profile - Result"), \config\Master::APPEARANCE['productname']), "ADMIN-IDP");
         } else {
             $profile = $my_inst->newProfile(core\AbstractProfile::PROFILETYPE_RADIUS);
-            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP " . $my_inst->identifier . " - Profile created");
+            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP ".$my_inst->identifier." - Profile created");
             echo $deco->pageheader(sprintf(_("%s: Profile wizard (step 3 completed)"), \config\Master::APPEARANCE['productname']), "ADMIN-IDP");
         }
         if (!$profile instanceof \core\ProfileRADIUS) {
@@ -109,16 +109,16 @@  discard block
 block discarded – undo
         ?>
         <h1><?php $tablecaption = _("Submitted attributes for this profile"); echo $tablecaption; ?></h1>
         <table>
-            <caption><?php echo $tablecaption;?></caption>
+            <caption><?php echo $tablecaption; ?></caption>
             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Overall Result");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Details");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Overall Result"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Details"); ?></th>
             </tr>
             <?php
             $uiElements = new web\lib\admin\UIElements();
             // set realm info, if submitted
             if ($realm !== FALSE) {
-                $profile->setRealm($anonLocal . "@" . $realm);
+                $profile->setRealm($anonLocal."@".$realm);
                 echo $uiElements->boxOkay(sprintf(_("Realm: <strong>%s</strong>"), $realm));
             } else {
                 $profile->setRealm("");
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
                     echo $uiElements->boxError(_("Realm check username cannot be configured: realm is missing!"));
                 } else {
                     $profile->setRealmcheckUser(true, $checkuser_name);
-                    echo $uiElements->boxOkay(sprintf(_("Special username for realm check is <strong>%s</strong>, the value is <strong>%s</strong>"), _("ON"), $checkuser_name . "@" . $realm));
+                    echo $uiElements->boxOkay(sprintf(_("Special username for realm check is <strong>%s</strong>, the value is <strong>%s</strong>"), _("ON"), $checkuser_name."@".$realm));
                 }
             } else {
                 $profile->setRealmCheckUser(false);
@@ -156,12 +156,12 @@  discard block
 block discarded – undo
                 $extratext = "";
                 if (!empty($realm)) {
                     if ($hint !== FALSE) {
-                        $extratext = " " . sprintf(_("The realm portion MUST be exactly '...@%s'."), $realm);
+                        $extratext = " ".sprintf(_("The realm portion MUST be exactly '...@%s'."), $realm);
                     } else {
-                        $extratext = " " . sprintf(_("The realm portion MUST end with '%s' but sub-realms of it are allowed (i.e. 'user@%s' and 'user@<...>.%s' are both acceptable)."), $realm, $realm, $realm);
+                        $extratext = " ".sprintf(_("The realm portion MUST end with '%s' but sub-realms of it are allowed (i.e. 'user@%s' and 'user@<...>.%s' are both acceptable)."), $realm, $realm, $realm);
                     }
                 }
-                echo $uiElements->boxOkay(_("Where possible, supplicants will verify that username inputs contain a syntactically correct realm.") . $extratext);
+                echo $uiElements->boxOkay(_("Where possible, supplicants will verify that username inputs contain a syntactically correct realm.").$extratext);
             } else {
                 $profile->setInputVerificationPreference(false, false);
             }
@@ -193,30 +193,30 @@  discard block
 block discarded – undo
                 echo $uiElements->boxOkay(_("Redirection is <strong>OFF</strong>"));
             }
 
-            $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $profile->identifier . " - attributes changed");
+            $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$profile->identifier." - attributes changed");
             // reload the profile to ingest new CA and server names if any; before checking EAP completeness
             $reloadedProfileNr1 = \core\ProfileFactory::instantiate($profile->identifier);
             foreach (\core\common\EAP::listKnownEAPTypes() as $a) {
                 if ($a->getIntegerRep() == \core\common\EAP::INTEGER_SILVERBULLET) { // do not allow adding silverbullet via the backdoor
                     continue;
                 }
-                if (isset($_POST[$a->getPrintableRep()]) && isset($_POST[$a->getPrintableRep() . "-priority"]) && is_numeric($_POST[$a->getPrintableRep() . "-priority"])) {
-                    $priority = (int) $_POST[$a->getPrintableRep() . "-priority"];
+                if (isset($_POST[$a->getPrintableRep()]) && isset($_POST[$a->getPrintableRep()."-priority"]) && is_numeric($_POST[$a->getPrintableRep()."-priority"])) {
+                    $priority = (int) $_POST[$a->getPrintableRep()."-priority"];
                     // add EAP type to profile as requested, but ...
                     $reloadedProfileNr1->addSupportedEapMethod($a, $priority);
-                    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $reloadedProfileNr1->identifier . " - supported EAP types changed");
+                    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$reloadedProfileNr1->identifier." - supported EAP types changed");
                     // see if we can enable the EAP type, or if info is missing
                     $eapcompleteness = $reloadedProfileNr1->isEapTypeDefinitionComplete($a);
                     if ($eapcompleteness === true) {
-                        echo $uiElements->boxOkay(_("Supported EAP Type: ") . "<strong>" . $a->getPrintableRep() . "</strong>");
+                        echo $uiElements->boxOkay(_("Supported EAP Type: ")."<strong>".$a->getPrintableRep()."</strong>");
                     } else {
                         $warntext = "";
                         if (is_array($eapcompleteness)) {
                             foreach ($eapcompleteness as $item) {
-                                $warntext .= "<strong>" . $uiElements->displayName($item) . "</strong> ";
+                                $warntext .= "<strong>".$uiElements->displayName($item)."</strong> ";
                             }
                         }
-                        echo $uiElements->boxWarning(sprintf(_("Supported EAP Type: <strong>%s</strong> is missing required information %s !"), $a->getPrintableRep(), $warntext) . "<br/>" . _("The EAP type was added to the profile, but you need to complete the missing information before we can produce installers for you."));
+                        echo $uiElements->boxWarning(sprintf(_("Supported EAP Type: <strong>%s</strong> is missing required information %s !"), $a->getPrintableRep(), $warntext)."<br/>"._("The EAP type was added to the profile, but you need to complete the missing information before we can produce installers for you."));
                     }
                 }
             }
@@ -227,23 +227,23 @@  discard block
 block discarded – undo
             if (count($significantChanges) > 0) {
                 $myInstOriginal = new \core\IdP($profile->institution);
                 // send a notification/alert mail to someone we know is in charge
-                $text = _("To whom it may concern,") . "\n\n";
+                $text = _("To whom it may concern,")."\n\n";
                 /// were made to the *Identity Provider* *LU* / integer number of IdP / (previously known as) Name
-                $text .= sprintf(_("significant changes were made to a RADIUS deployment profile of the %s %s / %s / '%s'."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name) . "\n\n";
+                $text .= sprintf(_("significant changes were made to a RADIUS deployment profile of the %s %s / %s / '%s'."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name)."\n\n";
                 if (isset($significantChanges[\core\AbstractProfile::CA_CLASH_ADDED])) {
-                    $text .= _("WARNING! A new trusted root CA was added, and it has the exact same name as a previously existing root CA. This may (but does not necessarily) mean that this is an attempt to insert an unauthorised trust root by disguising as the genuine one. The details are below:") . "\n\n";
-                    $text .= $significantChanges[\core\AbstractProfile::CA_CLASH_ADDED] . "\n\n";
+                    $text .= _("WARNING! A new trusted root CA was added, and it has the exact same name as a previously existing root CA. This may (but does not necessarily) mean that this is an attempt to insert an unauthorised trust root by disguising as the genuine one. The details are below:")."\n\n";
+                    $text .= $significantChanges[\core\AbstractProfile::CA_CLASH_ADDED]."\n\n";
                 }
                 if (isset($significantChanges[\core\AbstractProfile::CA_ADDED])) {
                     $text .= _("A new trusted root CA was added. The details are below:")."\n\n";
-                    $text .= $significantChanges[\core\AbstractProfile::CA_ADDED] . "\n\n";
+                    $text .= $significantChanges[\core\AbstractProfile::CA_ADDED]."\n\n";
                 }
                 if (isset($significantChanges[\core\AbstractProfile::SERVERNAME_ADDED])) {
-                    $text .= _("A new acceptable server name for the authentication server was added. The details are below:") . "\n\n";
-                    $text .= $significantChanges[\core\AbstractProfile::SERVERNAME_ADDED] . "\n\n";
+                    $text .= _("A new acceptable server name for the authentication server was added. The details are below:")."\n\n";
+                    $text .= $significantChanges[\core\AbstractProfile::SERVERNAME_ADDED]."\n\n";
                 }
-                $text .= _("This mail is merely a cross-check because these changes can be security-relevant. If the change was expected, you do not need to take any action.") . "\n\n";
-                $text .= _("Greetings, ") . "\n\n" . \config\Master::APPEARANCE['productname_long'];
+                $text .= _("This mail is merely a cross-check because these changes can be security-relevant. If the change was expected, you do not need to take any action.")."\n\n";
+                $text .= _("Greetings, ")."\n\n".\config\Master::APPEARANCE['productname_long'];
                 // (currently, send hard-wired to NRO - future: for linked insts, check eduroam DBv2 and send to registered admins directly)
                 $fed = new core\Federation($myInstOriginal->federation);
                 foreach ($fed->listFederationAdmins() as $id) {
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
         <?php
         if (count($reloadedProfileNr2->getEapMethodsinOrderOfPreference(1)) > 0) {
             echo "<form method='post' action='overview_installers.php?inst_id=$my_inst->identifier&profile_id=$reloadedProfileNr2->identifier' accept-charset='UTF-8'>
-        <button type='submit'>" . _("Continue to Installer Fine-Tuning and Download") . "</button>
+        <button type='submit'>"._("Continue to Installer Fine-Tuning and Download")."</button>
     </form>";
         }
         echo $deco->footer();

Please login to merge, or discard this patch.

web/skins/modern/Divs.php 1 patch

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

@@ -60,11 +60,11 @@  discard block
 block discarded – undo
         $location = $this->Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png");
         if ($location !== FALSE) {
             $retval .= "<div id='cat_logo'>
-            <a href='" . \config\ConfAssistant::CONSORTIUM['homepage'] . "'><img id='logo_img' src='$location' alt='Consortium Logo'/></a>
+            <a href='" . \config\ConfAssistant::CONSORTIUM['homepage']."'><img id='logo_img' src='$location' alt='Consortium Logo'/></a>
             <span>Configuration Assistant Tool</span>
             </div>";
         }
-        $retval .= "<div id='motd'>" . (isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp') . "</div>";
+        $retval .= "<div id='motd'>".(isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp')."</div>";
         $loc2 = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/menu.png");
         if ($loc2 !== FALSE) {
             $retval .= "<img id='hamburger' src='$loc2' alt='Menu'/>";
@@ -87,13 +87,13 @@  discard block
 block discarded – undo
     public function divUserWelcome() {
         $retval = "
 <div id='user_welcome'> <!-- this information is shown just before the download -->
-    <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING] . "</strong>
+    <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING]."</strong>
     <p>
     <span id='download_info'>
     <!-- the empty href is dynamically exchanged with the actual path by jQuery at runtime -->
-        " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD] . "
+        " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD]."
     </span>
-    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING] . "
+    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING]."
     <br/>
     <br/>";
         switch (\config\ConfAssistant::CONSORTIUM['name']) {
@@ -104,12 +104,12 @@  discard block
 block discarded – undo
         }
         $retval .= "
     </p>
-    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE] . "
-    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS] . "
-    <p>" . (false ? $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_TERMS] : "") . "
+    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE]."
+    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS]."
+    <p>" . (false ? $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_TERMS] : "")."
     </p>
     <p>
-    <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS] . "</strong></a>
+    <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS]."</strong></a>
     </p>
 </div> <!-- id='user_welcomer_page' -->
 ";
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
     public function divSilverbullet() {
         $retval = "
 <div id='silverbullet'>"
-                . $this->Gui->textTemplates->templates[user\SB_GO_AWAY] .
+                . $this->Gui->textTemplates->templates[user\SB_GO_AWAY].
                 "</div>
     ";
         return $retval;
@@ -138,14 +138,14 @@  discard block
 block discarded – undo
     public function divTopWelcome() {
         $retval = '';
         if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
-            $retval = "<br><div id='top_invite_ad'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_EDUROAM_AD] . "</div>";
+            $retval = "<br><div id='top_invite_ad'>".$this->Gui->textTemplates->templates[user\FRONTPAGE_EDUROAM_AD]."</div>";
         }
         return "
 <div id='welcome_top1'>
-    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET] . "
+    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET]."
 </div>
 <div id='top_invite'>
-    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE] . $retval . "
+    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE].$retval."
 </div>";
     }
 
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
         $retval = "
 <div id='roller'>
     <div id='slides'>
-        <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY] . "</span>
+        <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY]."</span>
         <span id='line2'></span>
         <span id='line3'></span>
         <span id='line4'>";
@@ -220,9 +220,9 @@  discard block
 block discarded – undo
     public function divProfiles() {
         return "
 <div id='profiles'> <!-- this is the profile selection filled during run time -->
-    <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION] . "
+    <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION]."
     </div>" .
-                "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>" .
+                "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>".
                 "</div>";
     }
 
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
     public function divInstitution($selectButton = TRUE) {
         $retval = "<div id='institution_name'>
     <span id='inst_name_span'></span> <div id='inst_extra_text'></div><!-- this will be filled with the IdP name -->" .
-                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">" . $this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION] . "</a>" : "") .
+                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : "").
                 "</div>";
         $retval .= $this->emptyImage('idp_logo', 'IdP Logo');
         return $retval;
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
     public function divOtherinstallers() {
         $retval = "
 <div class='sub_h'>
-    <div id='other_installers'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "
+    <div id='other_installers'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."
          <table id='device_list' style='padding:0px;'>";
 
         foreach ($this->Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) {
@@ -282,18 +282,18 @@  discard block
 block discarded – undo
             $deviceIndex = 0;
 
             $imgTag = "";
-            $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $group . ".png");
+            $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$group.".png");
             if ($imgLocation !== FALSE) {
-                $imgTag = '<img src="' . $imgLocation . '" alt="' . $group . ' Device" title="' . $group . ' Device">';
+                $imgTag = '<img src="'.$imgLocation.'" alt="'.$group.' Device" title="'.$group.' Device">';
             }
-            $retval .= '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '">' . $imgTag . '</td>';
+            $retval .= '<tbody><tr><td class="vendor" rowspan="'.$groupIndex.'">'.$imgTag.'</td>';
             foreach ($deviceGroup as $d => $D) {
                 if ($deviceIndex) {
                     $retval .= '<tr>';
                 }
-                $retval .= "<td><button id='" . $d . "'>" . $D['display'] . "</button>"
-                        . "<div class='device_info' id='info_" . $d . "'></div></td>"
-                        . "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n";
+                $retval .= "<td><button id='".$d."'>".$D['display']."</button>"
+                        . "<div class='device_info' id='info_".$d."'></div></td>"
+                        . "<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n";
                 $deviceIndex++;
             }
             $retval .= "</tbody>";
@@ -313,15 +313,15 @@  discard block
 block discarded – undo
      * @return string
      */
     public function divGuessOs($operatingSystem) {
-        $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $operatingSystem['group'] . ".png");
+        $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$operatingSystem['group'].".png");
         $vendorstyle = "";
         if ($vendorlogo !== FALSE) {
-            $vendorstyle = "style='background-image:url(\"" . $vendorlogo . "\")'";
+            $vendorstyle = "style='background-image:url(\"".$vendorlogo."\")'";
         }
         $deleteIcon = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/delete_32.png");
         $deleteImg = "";
         if ($deleteIcon !== FALSE) {
-            $deleteImg = "<img id='cross_icon_" . $operatingSystem['device'] . "' src='$deleteIcon' >";
+            $deleteImg = "<img id='cross_icon_".$operatingSystem['device']."' src='$deleteIcon' >";
         }
         return "
 <div class='sub_h' id='guess_os'>
@@ -329,23 +329,23 @@  discard block
 block discarded – undo
     <table id='browser'>
         <tr>
             <td>
-                <button class='large_button guess_os' $vendorstyle id='g_" . $operatingSystem['device'] . "'>
+                <button class='large_button guess_os' $vendorstyle id='g_".$operatingSystem['device']."'>
                     $deleteImg
-                    <div class='download_button_text_1' id='download_button_header_" . $operatingSystem['device'] . "'> " . $this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE] . "
+                    <div class='download_button_text_1' id='download_button_header_".$operatingSystem['device']."'> ".$this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE]."
                     </div>
                     <div class='download_button_text'>" .
-                $operatingSystem['display'] . "
+                $operatingSystem['display']."
                     </div>
                 </button>
-                <div class='device_info' id='info_g_" . $operatingSystem['device'] . "'></div>
+                <div class='device_info' id='info_g_" . $operatingSystem['device']."'></div>
           </td>
           <td style='vertical-align:top'>
-               <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device'] . "'>i</button>
+               <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device']."'>i</button>
           </td>
       </tr>
     </table> <!-- id='browser' -->
     <div class='sub_h'>
-       <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "</a>
+       <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."</a>
     </div>
 </div> <!-- id='guess_os' -->";
     }
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
             </td>";
 
         if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {
-            $retval .= "<td><a href='" . \config\Master::APPEARANCE['privacy_notice_url'] . "'>" . sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</a></td>";
+            $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['display_name'])."</a></td>";
         }
         $retval .= "<td>";
         if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") {

Please login to merge, or discard this patch.

core/SanityTests.php 1 patch

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

@@ -129,7 +129,7 @@  discard block
 block discarded – undo
         $this->test_result = [];
         $this->test_result['global'] = 0;
         // parse the schema file to find out the number of expected rows...
-        $schema = file(dirname(dirname(__FILE__)) . "/schema/schema.sql");
+        $schema = file(dirname(dirname(__FILE__))."/schema/schema.sql");
         $this->profileOptionCount = 0;
         $passedTheWindmill = FALSE;
         foreach ($schema as $schemaLine) {
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
     {
         $this->out[$test] = [];
         $this->name = $test;
-        $m_name = 'test' . $test;
+        $m_name = 'test'.$test;
         $this->test_result[$test] = 0;
         if (!method_exists($this, $m_name)) {
             $this->storeTestResult(\core\common\Entity::L_ERROR, "Configuration error, no test configured for <strong>$test</strong>.");
@@ -269,9 +269,9 @@  discard block
 block discarded – undo
     private function testPhp()
     {
         if (version_compare(phpversion(), $this->needversionPHP, '>=')) {
-            $this->storeTestResult(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
+            $this->storeTestResult(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running ".phpversion().".");
         } else {
-            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->needversionPHP, but you only have " . phpversion() . ".");
+            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->needversionPHP, but you only have ".phpversion().".");
         }
     }
     
@@ -284,12 +284,12 @@  discard block
 block discarded – undo
      */
     private function runConstantsTest($config)
     {
-        $templateConfig = file_get_contents(ROOT . "/config/$config-template.php");
-        $newTemplateConfig = preg_replace("/class *$config/", "class $config" . "_template", $templateConfig);
-        file_put_contents(ROOT . "/var/tmp/$config-template.php", $newTemplateConfig);
-        include(ROOT . "/var/tmp/$config-template.php");
-        unlink(ROOT . "/var/tmp/$config-template.php");
-        $rft = new \ReflectionClass("\config\\$config" . "_template");
+        $templateConfig = file_get_contents(ROOT."/config/$config-template.php");
+        $newTemplateConfig = preg_replace("/class *$config/", "class $config"."_template", $templateConfig);
+        file_put_contents(ROOT."/var/tmp/$config-template.php", $newTemplateConfig);
+        include(ROOT."/var/tmp/$config-template.php");
+        unlink(ROOT."/var/tmp/$config-template.php");
+        $rft = new \ReflectionClass("\config\\$config"."_template");
         $templateConstants = $rft->getConstants();
         $failResults = [];
         foreach ($templateConstants as $constant => $value) {
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
      * Check if all required constants are set
      */
     private function testConfigConstants() {
-        set_error_handler(function ($severity, $message, $file, $line) {
+        set_error_handler(function($severity, $message, $file, $line) {
             throw new \ErrorException($message, $severity, $severity, $file, $line);
         });
         
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
             $failCount = $failCount + count($failResults);
             if (count($failResults) > 0) {
             $this->storeTestResult(\core\common\Entity::L_ERROR, 
-                    "<strong>The following constants are not set:</strong>" . implode(', ', $failResults));
+                    "<strong>The following constants are not set:</strong>".implode(', ', $failResults));
             }
         }
         
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
             $this->storeTestResult(\core\common\Entity::L_OK, "<strong>cat_base_url</strong> set correctly");
         } else {
             $rootFromScript = $m[1] === '' ? '/' : $m[1];
-            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>" . \config\Master::PATHS['cat_base_url'] . "</strong> and should be <strong>$rootFromScript</strong>");
+            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>".\config\Master::PATHS['cat_base_url']."</strong> and should be <strong>$rootFromScript</strong>");
         }
     }
 
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
         if (count($probeReturns) == 0) {
             $this->storeTestResult(common\Entity::L_OK, "All configured RADIUS/UDP probes are reachable.");
         } else {
-            $this->storeTestResult(common\Entity::L_ERROR, "The following RADIUS probes are NOT reachable: " . implode(', ', $probeReturns));
+            $this->storeTestResult(common\Entity::L_ERROR, "The following RADIUS probes are NOT reachable: ".implode(', ', $probeReturns));
         }
     }
 
@@ -380,9 +380,9 @@  discard block
 block discarded – undo
             $SSPconfig = \SimpleSAML\Configuration::getInstance();
             $sspVersion = explode('.', $SSPconfig->getVersion());
             if ((int) $sspVersion[0] >= $this->needversionSSP['major'] && (int) $sspVersion[1] >= $this->needversionSSP['minor']) {
-                $this->storeTestResult(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running " . implode('.', $sspVersion));
+                $this->storeTestResult(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running ".implode('.', $sspVersion));
             } else {
-                $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least " . implode('.', $this->needversionSSP));
+                $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least ".implode('.', $this->needversionSSP));
             }
         }
     }
@@ -440,8 +440,8 @@  discard block
 block discarded – undo
      */
     private function testLogdir()
     {
-        if (fopen(\config\Master::PATHS['logdir'] . "/debug.log", "a") == FALSE) {
-            $this->storeTestResult(\core\common\Entity::L_WARN, "Log files in <strong>" . \config\Master::PATHS['logdir'] . "</strong> are not writable!");
+        if (fopen(\config\Master::PATHS['logdir']."/debug.log", "a") == FALSE) {
+            $this->storeTestResult(\core\common\Entity::L_WARN, "Log files in <strong>".\config\Master::PATHS['logdir']."</strong> are not writable!");
         } else {
             $this->storeTestResult(\core\common\Entity::L_OK, "Log directory is writable.");
         }
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
         }
 
         $classname = 'Imagick';
-        if (class_exists('\\' . $classname)) {
+        if (class_exists('\\'.$classname)) {
             $this->storeTestResult(\core\common\Entity::L_OK, "PHP extension <strong>Imagick</strong> is installed.");
         } else {
             $this->storeTestResult(\core\common\Entity::L_ERROR, "PHP extension <strong>Imagick</strong> not found! Get it from your distribution or <a href='http://pecl.php.net/package/imagick'>here</a>.");
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
     {
         $A = $this->getExecPath('openssl');
         if ($A['exec'] != "") {
-            $t = exec($A['exec'] . ' version');
+            $t = exec($A['exec'].' version');
             if ($A['exec_is'] == "EXPLICIT") {
                 $this->storeTestResult(\core\common\Entity::L_OK, "<strong>$t</strong> was found and is configured explicitly in your config.");
             } else {
@@ -597,14 +597,14 @@  discard block
 block discarded – undo
         }
         $A = $this->getExecPath('makensis');
         if ($A['exec'] != "") {
-            $t = exec($A['exec'] . ' -VERSION');
+            $t = exec($A['exec'].' -VERSION');
             if ($A['exec_is'] == "EXPLICIT") {
                 $this->storeTestResult(\core\common\Entity::L_OK, "<strong>makensis $t</strong> was found and is configured explicitly in your config.");
             } else {
                 $this->storeTestResult(\core\common\Entity::L_WARN, "<strong>makensis $t</strong> was found, but is not configured with an absolute path in your config.");
             }
             $outputArray = [];
-            exec($A['exec'] . ' -HELP', $outputArray);
+            exec($A['exec'].' -HELP', $outputArray);
             $t1 = count(preg_grep('/INPUTCHARSET/', $outputArray));
             if ($t1 == 1 && \config\ConfAssistant::NSIS_VERSION == 2) {
                 $this->storeTestResult(\core\common\Entity::L_ERROR, "Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
         $NSIS_Module_status = [];
         foreach ($this->NSISModules as $module) {
             unset($out);
-            exec(\config\ConfAssistant::PATHS['makensis'] . " -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
+            exec(\config\ConfAssistant::PATHS['makensis']." -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
             if ($retval > 0) {
                 $NSIS_Module_status[$module] = 0;
             } else {
@@ -701,8 +701,8 @@  discard block
 block discarded – undo
         $locales = shell_exec("locale -a");
         $allthere = "";
         foreach (\config\Master::LANGUAGES as $onelanguage) {
-            if (preg_match("/" . $onelanguage['locale'] . "/", $locales) == 0) {
-                $allthere .= $onelanguage['locale'] . " ";
+            if (preg_match("/".$onelanguage['locale']."/", $locales) == 0) {
+                $allthere .= $onelanguage['locale']." ";
             }
         }
         if ($allthere == "") {
@@ -716,47 +716,47 @@  discard block
 block discarded – undo
         ["SETTING" => \config\Master::APPEARANCE['from-mail'],
             "DEFVALUE" => "[email protected]",
             "COMPLAINTSTRING" => "APPEARANCE/from-mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['support-contact']['url'],
             "DEFVALUE" => "[email protected]?body=Only%20English%20language%20please!",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/url ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['support-contact']['display'],
             "DEFVALUE" => "[email protected]",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/display ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['support-contact']['developer-mail'],
             "DEFVALUE" => "[email protected]",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['abuse-mail'],
             "DEFVALUE" => "[email protected]",
             "COMPLAINTSTRING" => "APPEARANCE/abuse-mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['MOTD'],
             "DEFVALUE" => "Release Candidate. All bugs to be shot on sight!",
             "COMPLAINTSTRING" => "APPEARANCE/MOTD ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['webcert_CRLDP'],
             "DEFVALUE" => ['list', 'of', 'CRL', 'pointers'],
             "COMPLAINTSTRING" => "APPEARANCE/webcert_CRLDP ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => \config\Master::APPEARANCE['webcert_OCSP'],
             "DEFVALUE" => ['list', 'of', 'OCSP', 'pointers'],
             "COMPLAINTSTRING" => "APPEARANCE/webcert_OCSP ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => \config\Master::DB['INST']['host'],
             "DEFVALUE" => "db.host.example",
             "COMPLAINTSTRING" => "DB/INST ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => \config\Master::DB['INST']['host'],
             "DEFVALUE" => "db.host.example",
             "COMPLAINTSTRING" => "DB/USER ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => \config\Master::DB['EXTERNAL']['host'],
             "DEFVALUE" => "customerdb.otherhost.example",
             "COMPLAINTSTRING" => "DB/EXTERNAL ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
     ];
 
     /**
@@ -785,11 +785,11 @@  discard block
 block discarded – undo
         if (isset(\config\Diagnostics::RADIUSTESTS['TLS-clientcerts'])) {
             foreach (\config\Diagnostics::RADIUSTESTS['TLS-clientcerts'] as $cadata) {
                 foreach ($cadata['certificates'] as $cert_files) {
-                    if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['public']) === FALSE) {
-                        $defaultvalues .= "CERTIFICATE/" . $cert_files['public'] . " ";
+                    if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['public']) === FALSE) {
+                        $defaultvalues .= "CERTIFICATE/".$cert_files['public']." ";
                     }
-                    if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['private']) === FALSE) {
-                        $defaultvalues .= "CERTIFICATE/" . $cert_files['private'] . " ";
+                    if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['private']) === FALSE) {
+                        $defaultvalues .= "CERTIFICATE/".$cert_files['private']." ";
                     }
                 }
             }
@@ -882,14 +882,14 @@  discard block
 block discarded – undo
         if ($global_no_cache) {
             foreach ($Devs as $dev => $D) {
                 if (empty($D['options']['no_cache']) || $D['options']['no_cache'] != 0) {
-                    $no_cache_dev .= $dev . " ";
+                    $no_cache_dev .= $dev." ";
                     $no_cache_dev_count++;
                 }
             }
         } else {
             foreach ($Devs as $dev => $D) {
                 if (!empty($D['options']['no_cache']) && $D['options']['no_cache'] != 0) {
-                    $no_cache_dev .= $dev . " ";
+                    $no_cache_dev .= $dev." ";
                     $no_cache_dev_count++;
                 }
             }
@@ -928,13 +928,13 @@  discard block
 block discarded – undo
         $mail->isHTML(FALSE);
         $mail->CharSet = 'UTF-8';
         $mail->From = \config\Master::APPEARANCE['from-mail'];
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Invitation System";
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Invitation System";
         $mail->addAddress(\config\Master::APPEARANCE['abuse-mail']);
         $mail->Subject = "testing CAT configuration mail";
         $mail->Body = "Testing CAT mailing\n";
         $sent = $mail->send();
         if ($sent) {
-            $this->storeTestResult(\core\common\Entity::L_OK, "mailer settings appear to be working, check " . \config\Master::APPEARANCE['abuse-mail'] . " mailbox if the message was receiced.");
+            $this->storeTestResult(\core\common\Entity::L_OK, "mailer settings appear to be working, check ".\config\Master::APPEARANCE['abuse-mail']." mailbox if the message was receiced.");
         } else {
             $this->storeTestResult(\core\common\Entity::L_ERROR, "mailer settings failed, check the Config::MAILSETTINGS");
         }

Please login to merge, or discard this patch.

		@@ -105,28 +105,28 @@
		block discarded – undo
105	105	parent::__construct();
106	106	common\Entity::intoThePotatoes();
107	107
108		- $this->catVersionString = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>") . "</a>";
	108	+ $this->catVersionString = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
109	109	if (CAT::RELEASE_VERSION) {
110	110	$major = CAT::VERSION_MAJOR;
111	111	$minor = CAT::VERSION_MINOR;
112	112	$patch = CAT::VERSION_PATCH;
113	113	$extra = CAT::VERSION_EXTRA;
114	114	$temp_version = "CAT-$major.$minor";
115		- $branch = "release_$major" . "_$minor";
	115	+ $branch = "release_$major"."_$minor";
116	116	if (CAT::VERSION_PATCH != 0) {
117	117	$temp_version .= ".$patch";
118	118	}
119	119	if (CAT::VERSION_EXTRA != "") {
120	120	$temp_version .= "-$extra";
121	121	}
122		- $this->catVersionString = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
	122	+ $this->catVersionString = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
123	123	}
124	124	$product = \config\Master::APPEARANCE['productname'];
125	125	$minYear = self::COPYRIGHT_MIN_YEAR;
126	126	$maxYear = self::COPYRIGHT_MAX_YEAR;
127	127	$holder = self::COPYRIGHT_HOLDER;
128	128	$consortia = self::COPYRIGHT_CONSORTIA;
129		- $this->catCopyright = "$product - " . $this->catVersionString . " © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
	129	+ $this->catCopyright = "$product - ".$this->catVersionString." © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
130	130
131	131
132	132	/* Federations are created in DB with bootstrapFederation, and listed via listFederations

		@@ -27,7 +27,7 @@ discard block
		block discarded – undo
27	27	* @package UserGUI
28	28	*
29	29	*/
30		-require dirname(dirname(__FILE__)) . "/config/_config.php";
	30	+require dirname(dirname(__FILE__))."/config/_config.php";
31	31	$loggerInstance = new \core\common\Logging();
32	32	$langObject = new \core\common\Language();
33	33	$cat = new \core\CAT();
		@@ -51,9 +51,9 @@ discard block
		block discarded – undo
51	51	<body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
52	52	<img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="padding-right:20px; padding-top:20px; float:right" alt="logo" />
53	53
54		- <div id="motd"><?php print ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
	54	+ <div id="motd"><?php print (isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
55	55
56		- <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
	56	+ <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
57	57	<div id="tou">
58	58	<?php
59	59	require "user/tou.php";
		@@ -61,11 +61,11 @@ discard block
		block discarded – undo
61	61	</div>
62	62	<div>
63	63	<table style='width:100%'>
64		- <caption><?php echo "Legalese";?></caption>
	64	+ <caption><?php echo "Legalese"; ?></caption>
65	65	<tr>
66		- <th class='wai-invisible' scope='col'><?php echo "Copyright";?></th>
67		- <th class='wai-invisible' scope='col'><?php echo "Privacy Notice";?></th>
68		- <th class='wai-invisible' scope='col'><?php echo "Attribution";?></th>
	66	+ <th class='wai-invisible' scope='col'><?php echo "Copyright"; ?></th>
	67	+ <th class='wai-invisible' scope='col'><?php echo "Privacy Notice"; ?></th>
	68	+ <th class='wai-invisible' scope='col'><?php echo "Attribution"; ?></th>
69	69	</tr>
70	70	<tr>
71	71	<td style='padding-left:20px; padding-right:20px; text-align:left; vertical-align:top;'>
		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	</td>
74	74	<?php
75	75	if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {
76		- $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),\config\ConfAssistant::CONSORTIUM['name']) . "</a></td>";
	76	+ $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['name'])."</a></td>";
77	77	}
78	78	?>
79	79	<td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>

		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	*/
27	27	?>
28	28	<?php
29		-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
	29	+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
30	30
31	31	$auth = new \web\lib\admin\Authentication();
32	32	$deco = new \web\lib\admin\PageDecoration();
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	"nl" => "_radsec._tcp.eduroam.nl.",
76	76	];
77	77	foreach ($cat->getSuperglueZone() as $oneEntry) {
78		- foreach (explode(',',$oneEntry['inst_realm']) as $oneRealm) {
	78	+ foreach (explode(',', $oneEntry['inst_realm']) as $oneRealm) {
79	79	$target = "_radsec._somewhere.eduroam.org";
80	80	foreach ($NROs as $tld => $nroTarget) {
81	81	if (preg_match("/$tld$/", $oneRealm)) {

		@@ -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(dirname(__FILE__))) . "/config/_config.php";
	22	+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
23	23
24	24	$Tests = [
25	25	'Directories',
		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43
44	44	$uiElements = new \web\lib\admin\UIElements();
45	45
46		-if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" \|\| \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL" ) {
	46	+if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" \|\| \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
47	47	$Tests[] = 'Makensis';
48	48	$Tests[] = 'Makensis=>NSISmodules';
49	49	}

		@@ -397,7 +397,7 @@ discard block
		block discarded – undo
397	397	'mime' => 'application/eap-config',
398	398	'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
399	399	"geteduroam",
400		- "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>" . _("as local download") . "</a>"),
	400	+ "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>"._("as local download")."</a>"),
401	401	],
402	402	],
403	403
		@@ -411,7 +411,7 @@ discard block
		block discarded – undo
411	411	'mime' => 'application/eap-config',
412	412	'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
413	413	"geteduroam",
414		- "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>" . _("as local download") . "</a>"),
	414	+ "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>"._("as local download")."</a>"),
415	415	],
416	416	],
417	417	'android_4_7' => [
		@@ -424,7 +424,7 @@ discard block
		block discarded – undo
424	424	'mime' => 'application/eap-config',
425	425	'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
426	426	"eduroamCAT",
427		- "<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>"),
	427	+ "<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>"),
428	428	],
429	429	],
430	430
		@@ -439,7 +439,7 @@ discard block
		block discarded – undo
439	439	'mime' => 'application/eap-config',
440	440	'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
441	441	"eduroamCAT",
442		- "<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>"),
	442	+ "<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>"),
443	443	],
444	444	],
445	445	'android_pie' => [
		@@ -453,7 +453,7 @@ discard block
		block discarded – undo
453	453	'mime' => 'application/eap-config',
454	454	'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
455	455	"eduroamCAT",
456		- "<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>"),
	456	+ "<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>"),
457	457	],
458	458	],
459	459	'android_oreo' => [
		@@ -467,7 +467,7 @@ discard block
		block discarded – undo
467	467	'mime' => 'application/eap-config',
468	468	'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
469	469	"eduroamCAT",
470		- "<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>"),
	470	+ "<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>"),
471	471	],
472	472	],
473	473	'android_nougat' => [
		@@ -481,7 +481,7 @@ discard block
		block discarded – undo
481	481	'mime' => 'application/eap-config',
482	482	'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
483	483	"eduroamCAT",
484		- "<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>"),
	484	+ "<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>"),
485	485	],
486	486	],
487	487	'android_marshmallow' => [
		@@ -495,7 +495,7 @@ discard block
		block discarded – undo
495	495	'mime' => 'application/eap-config',
496	496	'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
497	497	"eduroamCAT",
498		- "<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>"),
	498	+ "<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>"),
499	499	],
500	500	],
501	501	'android_lollipop' => [
		@@ -509,7 +509,7 @@ discard block
		block discarded – undo
509	509	'mime' => 'application/eap-config',
510	510	'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
511	511	"eduroamCAT",
512		- "<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>"),
	512	+ "<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>"),
513	513	],
514	514	],
515	515	'android_kitkat' => [
		@@ -523,7 +523,7 @@ discard block
		block discarded – undo
523	523	'mime' => 'application/eap-config',
524	524	'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
525	525	"eduroamCAT",
526		- "<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>"),
	526	+ "<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>"),
527	527	],
528	528	],
529	529	'android_43' => [
		@@ -537,7 +537,7 @@ discard block
		block discarded – undo
537	537	'mime' => 'application/eap-config',
538	538	'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
539	539	"eduroamCAT",
540		- "<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>"),
	540	+ "<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>"),
541	541	],
542	542	],
543	543	'android_legacy' => [

		@@ -89,12 +89,12 @@
		block discarded – undo
89	89	$this->templates[WELCOME_ABOARD_TERMS] = "";
90	90	foreach ([
91	91	"eduroam" => [
92		- "TOU" => "https://wiki.geant.org/display/H2eduroam/Terms+and+Conditions",
93		- "PRIV" => "https://www.eduroam.org/privacy/",
	92	+ "TOU" => "https://wiki.geant.org/display/H2eduroam/Terms+and+Conditions",
	93	+ "PRIV" => "https://www.eduroam.org/privacy/",
94	94	],
95	95	"OpenRoaming" => [
96		- "TOU" => "https://wballiance.com/openroaming/toc-2020/",
97		- "PRIV" => "https://wballiance.com/openroaming/privacy-policy-2020/",
	96	+ "TOU" => "https://wballiance.com/openroaming/toc-2020/",
	97	+ "PRIV" => "https://wballiance.com/openroaming/privacy-policy-2020/",
98	98	]
99	99	] as $consortium => $terms) {
100	100	$this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>" . _("When connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply.") . "</p>", $consortium, $terms['TOU'], $terms['PRIV']);

		@@ -49,7 +49,7 @@ discard block
		block discarded – undo
49	49	const DOWNLOAD_REDIRECT_CONTINUE = 1054;
50	50	const SB_GO_AWAY = 1060;
51	51	const SB_FRONTPAGE_BIGDOWNLOADBUTTON = 1061;
52		-const SB_FRONTPAGE_ROLLER_CUSTOMBUILT= 1062;
	52	+const SB_FRONTPAGE_ROLLER_CUSTOMBUILT = 1062;
53	53
54	54
55	55	/**
		@@ -96,14 +96,14 @@ discard block
		block discarded – undo
96	96	"PRIV" => "https://wballiance.com/openroaming/privacy-policy-2020/",
97	97	]
98	98	] as $consortium => $terms) {
99		- $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>" . _("When connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply.") . "</p>", $consortium, $terms['TOU'], $terms['PRIV']);
	99	+ $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>"._("When connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply.")."</p>", $consortium, $terms['TOU'], $terms['PRIV']);
100	100	}
101	101	// this would actually be a checkbox which grays out the actual download button until ACKed
102	102	$this->templates[WELCOME_ABOARD_TERMS] .= "<p>"._("I agree to be bound by these Terms and Conditions.")."</p>";
103	103	$this->templates[WELCOME_ABOARD_BACKTODOWNLOADS] = _("Back to downloads");
104	104	$this->templates[EDUROAM_WELCOME_ADVERTISING] = sprintf(_("we would like to warmly welcome you among the several million users of %s! From now on, you will be able to use internet access resources on thousands of universities, research centres and other places all over the globe. All of this completely free of charge!"), \config\ConfAssistant::CONSORTIUM['display_name']);
105	105	$this->templates[HEADING_TOPLEVEL_GREET] = sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']);
106		- $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"),\config\ConfAssistant::CONSORTIUM['display_name']);
	106	+ $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"), \config\ConfAssistant::CONSORTIUM['display_name']);
107	107	$this->templates[FRONTPAGE_ROLLER_EASY] = sprintf(_("%s installation made easy:"), \config\ConfAssistant::CONSORTIUM['display_name']);
108	108	$this->templates[FRONTPAGE_ROLLER_CUSTOMBUILT] = _("Custom built for your organisation");
109	109	$this->templates[FRONTPAGE_BIGDOWNLOADBUTTON] = sprintf(_("Click here to download your %s installer"), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']);

		@@ -60,11 +60,11 @@ discard block
		block discarded – undo
60	60	$location = $this->Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png");
61	61	if ($location !== FALSE) {
62	62	$retval .= "<div id='cat_logo'>
63		- <a href='" . \config\ConfAssistant::CONSORTIUM['homepage'] . "'><img id='logo_img' src='$location' alt='Consortium Logo'/></a>
	63	+ <a href='" . \config\ConfAssistant::CONSORTIUM['homepage']."'><img id='logo_img' src='$location' alt='Consortium Logo'/></a>
64	64	<span>Configuration Assistant Tool</span>
65	65	</div>";
66	66	}
67		- $retval .= "<div id='motd'>" . (isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp') . "</div>";
	67	+ $retval .= "<div id='motd'>".(isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp')."</div>";
68	68	$loc2 = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/menu.png");
69	69	if ($loc2 !== FALSE) {
70	70	$retval .= "<img id='hamburger' src='$loc2' alt='Menu'/>";
		@@ -87,13 +87,13 @@ discard block
		block discarded – undo
87	87	public function divUserWelcome() {
88	88	$retval = "
89	89	<div id='user_welcome'> <!-- this information is shown just before the download -->
90		- <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING] . "</strong>
	90	+ <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING]."</strong>
91	91	<p>
92	92	<span id='download_info'>
93	93	<!-- the empty href is dynamically exchanged with the actual path by jQuery at runtime -->
94		- " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD] . "
	94	+ " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD]."
95	95	</span>
96		- <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING] . "
	96	+ <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING]."
97	97	<br/>
98	98	<br/>";
99	99	switch (\config\ConfAssistant::CONSORTIUM['name']) {
		@@ -104,12 +104,12 @@ discard block
		block discarded – undo
104	104	}
105	105	$retval .= "
106	106	</p>
107		- <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE] . "
108		- <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS] . "
109		- <p>" . (false ? $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_TERMS] : "") . "
	107	+ <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE]."
	108	+ <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS]."
	109	+ <p>" . (false ? $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_TERMS] : "")."
110	110	</p>
111	111	<p>
112		- <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS] . "</strong></a>
	112	+ <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS]."</strong></a>
113	113	</p>
114	114	</div> <!-- id='user_welcomer_page' -->
115	115	";
		@@ -124,7 +124,7 @@ discard block
		block discarded – undo
124	124	public function divSilverbullet() {
125	125	$retval = "
126	126	<div id='silverbullet'>"
127		- . $this->Gui->textTemplates->templates[user\SB_GO_AWAY] .
	127	+ . $this->Gui->textTemplates->templates[user\SB_GO_AWAY].
128	128	"</div>
129	129	";
130	130	return $retval;
		@@ -138,14 +138,14 @@ discard block
		block discarded – undo
138	138	public function divTopWelcome() {
139	139	$retval = '';
140	140	if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
141		- $retval = "<br><div id='top_invite_ad'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_EDUROAM_AD] . "</div>";
	141	+ $retval = "<br><div id='top_invite_ad'>".$this->Gui->textTemplates->templates[user\FRONTPAGE_EDUROAM_AD]."</div>";
142	142	}
143	143	return "
144	144	<div id='welcome_top1'>
145		- " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET] . "
	145	+ " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET]."
146	146	</div>
147	147	<div id='top_invite'>
148		- " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE] . $retval . "
	148	+ " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE].$retval."
149	149	</div>";
150	150	}
151	151
		@@ -158,7 +158,7 @@ discard block
		block discarded – undo
158	158	$retval = "
159	159	<div id='roller'>
160	160	<div id='slides'>
161		- <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY] . "</span>
	161	+ <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY]."</span>
162	162	<span id='line2'></span>
163	163	<span id='line3'></span>
164	164	<span id='line4'>";
		@@ -220,9 +220,9 @@ discard block
		block discarded – undo
220	220	public function divProfiles() {
221	221	return "
222	222	<div id='profiles'> <!-- this is the profile selection filled during run time -->
223		- <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION] . "
	223	+ <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION]."
224	224	</div>" .
225		- "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>" .
	225	+ "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>".
226	226	"</div>";
227	227	}
228	228
		@@ -250,7 +250,7 @@ discard block
		block discarded – undo
250	250	public function divInstitution($selectButton = TRUE) {
251	251	$retval = "<div id='institution_name'>
252	252	<span id='inst_name_span'></span> <div id='inst_extra_text'></div><!-- this will be filled with the IdP name -->" .
253		- ($selectButton ? "<a id='select_another' class='signin' href=\"\">" . $this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION] . "</a>" : "") .
	253	+ ($selectButton ? "<a id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : "").
254	254	"</div>";
255	255	$retval .= $this->emptyImage('idp_logo', 'IdP Logo');
256	256	return $retval;
		@@ -274,7 +274,7 @@ discard block
		block discarded – undo
274	274	public function divOtherinstallers() {
275	275	$retval = "
276	276	<div class='sub_h'>
277		- <div id='other_installers'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "
	277	+ <div id='other_installers'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."
278	278	<table id='device_list' style='padding:0px;'>";
279	279
280	280	foreach ($this->Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) {
		@@ -282,18 +282,18 @@ discard block
		block discarded – undo
282	282	$deviceIndex = 0;
283	283
284	284	$imgTag = "";
285		- $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $group . ".png");
	285	+ $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$group.".png");
286	286	if ($imgLocation !== FALSE) {
287		- $imgTag = '<img src="' . $imgLocation . '" alt="' . $group . ' Device" title="' . $group . ' Device">';
	287	+ $imgTag = '<img src="'.$imgLocation.'" alt="'.$group.' Device" title="'.$group.' Device">';
288	288	}
289		- $retval .= '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '">' . $imgTag . '</td>';
	289	+ $retval .= '<tbody><tr><td class="vendor" rowspan="'.$groupIndex.'">'.$imgTag.'</td>';
290	290	foreach ($deviceGroup as $d => $D) {
291	291	if ($deviceIndex) {
292	292	$retval .= '<tr>';
293	293	}
294		- $retval .= "<td><button id='" . $d . "'>" . $D['display'] . "</button>"
295		- . "<div class='device_info' id='info_" . $d . "'></div></td>"
296		- . "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n";
	294	+ $retval .= "<td><button id='".$d."'>".$D['display']."</button>"
	295	+ . "<div class='device_info' id='info_".$d."'></div></td>"
	296	+ . "<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n";
297	297	$deviceIndex++;
298	298	}
299	299	$retval .= "</tbody>";
		@@ -313,15 +313,15 @@ discard block
		block discarded – undo
313	313	* @return string
314	314	*/
315	315	public function divGuessOs($operatingSystem) {
316		- $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $operatingSystem['group'] . ".png");
	316	+ $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$operatingSystem['group'].".png");
317	317	$vendorstyle = "";
318	318	if ($vendorlogo !== FALSE) {
319		- $vendorstyle = "style='background-image:url(\"" . $vendorlogo . "\")'";
	319	+ $vendorstyle = "style='background-image:url(\"".$vendorlogo."\")'";
320	320	}
321	321	$deleteIcon = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/delete_32.png");
322	322	$deleteImg = "";
323	323	if ($deleteIcon !== FALSE) {
324		- $deleteImg = "<img id='cross_icon_" . $operatingSystem['device'] . "' src='$deleteIcon' >";
	324	+ $deleteImg = "<img id='cross_icon_".$operatingSystem['device']."' src='$deleteIcon' >";
325	325	}
326	326	return "
327	327	<div class='sub_h' id='guess_os'>
		@@ -329,23 +329,23 @@ discard block
		block discarded – undo
329	329	<table id='browser'>
330	330	<tr>
331	331	<td>
332		- <button class='large_button guess_os' $vendorstyle id='g_" . $operatingSystem['device'] . "'>
	332	+ <button class='large_button guess_os' $vendorstyle id='g_".$operatingSystem['device']."'>
333	333	$deleteImg
334		- <div class='download_button_text_1' id='download_button_header_" . $operatingSystem['device'] . "'> " . $this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE] . "
	334	+ <div class='download_button_text_1' id='download_button_header_".$operatingSystem['device']."'> ".$this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE]."
335	335	</div>
336	336	<div class='download_button_text'>" .
337		- $operatingSystem['display'] . "
	337	+ $operatingSystem['display']."
338	338	</div>
339	339	</button>
340		- <div class='device_info' id='info_g_" . $operatingSystem['device'] . "'></div>
	340	+ <div class='device_info' id='info_g_" . $operatingSystem['device']."'></div>
341	341	</td>
342	342	<td style='vertical-align:top'>
343		- <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device'] . "'>i</button>
	343	+ <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device']."'>i</button>
344	344	</td>
345	345	</tr>
346	346	</table> <!-- id='browser' -->
347	347	<div class='sub_h'>
348		- <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "</a>
	348	+ <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."</a>
349	349	</div>
350	350	</div> <!-- id='guess_os' -->";
351	351	}
		@@ -366,7 +366,7 @@ discard block
		block discarded – undo
366	366	</td>";
367	367
368	368	if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {
369		- $retval .= "<td><a href='" . \config\Master::APPEARANCE['privacy_notice_url'] . "'>" . sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</a></td>";
	369	+ $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['display_name'])."</a></td>";
370	370	}
371	371	$retval .= "<td>";
372	372	if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") {

		@@ -129,7 +129,7 @@ discard block
		block discarded – undo
129	129	$this->test_result = [];
130	130	$this->test_result['global'] = 0;
131	131	// parse the schema file to find out the number of expected rows...
132		- $schema = file(dirname(dirname(__FILE__)) . "/schema/schema.sql");
	132	+ $schema = file(dirname(dirname(__FILE__))."/schema/schema.sql");
133	133	$this->profileOptionCount = 0;
134	134	$passedTheWindmill = FALSE;
135	135	foreach ($schema as $schemaLine) {
		@@ -156,7 +156,7 @@ discard block
		block discarded – undo
156	156	{
157	157	$this->out[$test] = [];
158	158	$this->name = $test;
159		- $m_name = 'test' . $test;
	159	+ $m_name = 'test'.$test;
160	160	$this->test_result[$test] = 0;
161	161	if (!method_exists($this, $m_name)) {
162	162	$this->storeTestResult(\core\common\Entity::L_ERROR, "Configuration error, no test configured for <strong>$test</strong>.");
		@@ -269,9 +269,9 @@ discard block
		block discarded – undo
269	269	private function testPhp()
270	270	{
271	271	if (version_compare(phpversion(), $this->needversionPHP, '>=')) {
272		- $this->storeTestResult(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
	272	+ $this->storeTestResult(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running ".phpversion().".");
273	273	} else {
274		- $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->needversionPHP, but you only have " . phpversion() . ".");
	274	+ $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->needversionPHP, but you only have ".phpversion().".");
275	275	}
276	276	}
277	277
		@@ -284,12 +284,12 @@ discard block
		block discarded – undo
284	284	*/
285	285	private function runConstantsTest($config)
286	286	{
287		- $templateConfig = file_get_contents(ROOT . "/config/$config-template.php");
288		- $newTemplateConfig = preg_replace("/class *$config/", "class $config" . "_template", $templateConfig);
289		- file_put_contents(ROOT . "/var/tmp/$config-template.php", $newTemplateConfig);
290		- include(ROOT . "/var/tmp/$config-template.php");
291		- unlink(ROOT . "/var/tmp/$config-template.php");
292		- $rft = new \ReflectionClass("\config\\$config" . "_template");
	287	+ $templateConfig = file_get_contents(ROOT."/config/$config-template.php");
	288	+ $newTemplateConfig = preg_replace("/class *$config/", "class $config"."_template", $templateConfig);
	289	+ file_put_contents(ROOT."/var/tmp/$config-template.php", $newTemplateConfig);
	290	+ include(ROOT."/var/tmp/$config-template.php");
	291	+ unlink(ROOT."/var/tmp/$config-template.php");
	292	+ $rft = new \ReflectionClass("\config\\$config"."_template");
293	293	$templateConstants = $rft->getConstants();
294	294	$failResults = [];
295	295	foreach ($templateConstants as $constant => $value) {
		@@ -306,7 +306,7 @@ discard block
		block discarded – undo
306	306	* Check if all required constants are set
307	307	*/
308	308	private function testConfigConstants() {
309		- set_error_handler(function ($severity, $message, $file, $line) {
	309	+ set_error_handler(function($severity, $message, $file, $line) {
310	310	throw new \ErrorException($message, $severity, $severity, $file, $line);
311	311	});
312	312
		@@ -317,7 +317,7 @@ discard block
		block discarded – undo
317	317	$failCount = $failCount + count($failResults);
318	318	if (count($failResults) > 0) {
319	319	$this->storeTestResult(\core\common\Entity::L_ERROR,
320		- "<strong>The following constants are not set:</strong>" . implode(', ', $failResults));
	320	+ "<strong>The following constants are not set:</strong>".implode(', ', $failResults));
321	321	}
322	322	}
323	323
		@@ -341,7 +341,7 @@ discard block
		block discarded – undo
341	341	$this->storeTestResult(\core\common\Entity::L_OK, "<strong>cat_base_url</strong> set correctly");
342	342	} else {
343	343	$rootFromScript = $m[1] === '' ? '/' : $m[1];
344		- $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>" . \config\Master::PATHS['cat_base_url'] . "</strong> and should be <strong>$rootFromScript</strong>");
	344	+ $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>".\config\Master::PATHS['cat_base_url']."</strong> and should be <strong>$rootFromScript</strong>");
345	345	}
346	346	}
347	347
		@@ -362,7 +362,7 @@ discard block
		block discarded – undo
362	362	if (count($probeReturns) == 0) {
363	363	$this->storeTestResult(common\Entity::L_OK, "All configured RADIUS/UDP probes are reachable.");
364	364	} else {
365		- $this->storeTestResult(common\Entity::L_ERROR, "The following RADIUS probes are NOT reachable: " . implode(', ', $probeReturns));
	365	+ $this->storeTestResult(common\Entity::L_ERROR, "The following RADIUS probes are NOT reachable: ".implode(', ', $probeReturns));
366	366	}
367	367	}
368	368
		@@ -380,9 +380,9 @@ discard block
		block discarded – undo
380	380	$SSPconfig = \SimpleSAML\Configuration::getInstance();
381	381	$sspVersion = explode('.', $SSPconfig->getVersion());
382	382	if ((int) $sspVersion[0] >= $this->needversionSSP['major'] && (int) $sspVersion[1] >= $this->needversionSSP['minor']) {
383		- $this->storeTestResult(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running " . implode('.', $sspVersion));
	383	+ $this->storeTestResult(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running ".implode('.', $sspVersion));
384	384	} else {
385		- $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least " . implode('.', $this->needversionSSP));
	385	+ $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least ".implode('.', $this->needversionSSP));
386	386	}
387	387	}
388	388	}
		@@ -440,8 +440,8 @@ discard block
		block discarded – undo
440	440	*/
441	441	private function testLogdir()
442	442	{
443		- if (fopen(\config\Master::PATHS['logdir'] . "/debug.log", "a") == FALSE) {
444		- $this->storeTestResult(\core\common\Entity::L_WARN, "Log files in <strong>" . \config\Master::PATHS['logdir'] . "</strong> are not writable!");
	443	+ if (fopen(\config\Master::PATHS['logdir']."/debug.log", "a") == FALSE) {
	444	+ $this->storeTestResult(\core\common\Entity::L_WARN, "Log files in <strong>".\config\Master::PATHS['logdir']."</strong> are not writable!");
445	445	} else {
446	446	$this->storeTestResult(\core\common\Entity::L_OK, "Log directory is writable.");
447	447	}
		@@ -473,7 +473,7 @@ discard block
		block discarded – undo
473	473	}
474	474
475	475	$classname = 'Imagick';
476		- if (class_exists('\\' . $classname)) {
	476	+ if (class_exists('\\'.$classname)) {
477	477	$this->storeTestResult(\core\common\Entity::L_OK, "PHP extension <strong>Imagick</strong> is installed.");
478	478	} else {
479	479	$this->storeTestResult(\core\common\Entity::L_ERROR, "PHP extension <strong>Imagick</strong> not found! Get it from your distribution or <a href='http://pecl.php.net/package/imagick'>here</a>.");
		@@ -569,7 +569,7 @@ discard block
		block discarded – undo
569	569	{
570	570	$A = $this->getExecPath('openssl');
571	571	if ($A['exec'] != "") {
572		- $t = exec($A['exec'] . ' version');
	572	+ $t = exec($A['exec'].' version');
573	573	if ($A['exec_is'] == "EXPLICIT") {
574	574	$this->storeTestResult(\core\common\Entity::L_OK, "<strong>$t</strong> was found and is configured explicitly in your config.");
575	575	} else {
		@@ -597,14 +597,14 @@ discard block
		block discarded – undo
597	597	}
598	598	$A = $this->getExecPath('makensis');
599	599	if ($A['exec'] != "") {
600		- $t = exec($A['exec'] . ' -VERSION');
	600	+ $t = exec($A['exec'].' -VERSION');
601	601	if ($A['exec_is'] == "EXPLICIT") {
602	602	$this->storeTestResult(\core\common\Entity::L_OK, "<strong>makensis $t</strong> was found and is configured explicitly in your config.");
603	603	} else {
604	604	$this->storeTestResult(\core\common\Entity::L_WARN, "<strong>makensis $t</strong> was found, but is not configured with an absolute path in your config.");
605	605	}
606	606	$outputArray = [];
607		- exec($A['exec'] . ' -HELP', $outputArray);
	607	+ exec($A['exec'].' -HELP', $outputArray);
608	608	$t1 = count(preg_grep('/INPUTCHARSET/', $outputArray));
609	609	if ($t1 == 1 && \config\ConfAssistant::NSIS_VERSION == 2) {
610	610	$this->storeTestResult(\core\common\Entity::L_ERROR, "Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
		@@ -634,7 +634,7 @@ discard block
		block discarded – undo
634	634	$NSIS_Module_status = [];
635	635	foreach ($this->NSISModules as $module) {
636	636	unset($out);
637		- exec(\config\ConfAssistant::PATHS['makensis'] . " -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
	637	+ exec(\config\ConfAssistant::PATHS['makensis']." -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
638	638	if ($retval > 0) {
639	639	$NSIS_Module_status[$module] = 0;
640	640	} else {
		@@ -701,8 +701,8 @@ discard block
		block discarded – undo
701	701	$locales = shell_exec("locale -a");
702	702	$allthere = "";
703	703	foreach (\config\Master::LANGUAGES as $onelanguage) {
704		- if (preg_match("/" . $onelanguage['locale'] . "/", $locales) == 0) {
705		- $allthere .= $onelanguage['locale'] . " ";
	704	+ if (preg_match("/".$onelanguage['locale']."/", $locales) == 0) {
	705	+ $allthere .= $onelanguage['locale']." ";
706	706	}
707	707	}
708	708	if ($allthere == "") {
		@@ -716,47 +716,47 @@ discard block
		block discarded – undo
716	716	["SETTING" => \config\Master::APPEARANCE['from-mail'],
717	717	"DEFVALUE" => "[email protected]",
718	718	"COMPLAINTSTRING" => "APPEARANCE/from-mail ",
719		- "REQUIRED" => FALSE,],
	719	+ "REQUIRED" => FALSE, ],
720	720	["SETTING" => \config\Master::APPEARANCE['support-contact']['url'],
721	721	"DEFVALUE" => "[email protected]?body=Only%20English%20language%20please!",
722	722	"COMPLAINTSTRING" => "APPEARANCE/support-contact/url ",
723		- "REQUIRED" => FALSE,],
	723	+ "REQUIRED" => FALSE, ],
724	724	["SETTING" => \config\Master::APPEARANCE['support-contact']['display'],
725	725	"DEFVALUE" => "[email protected]",
726	726	"COMPLAINTSTRING" => "APPEARANCE/support-contact/display ",
727		- "REQUIRED" => FALSE,],
	727	+ "REQUIRED" => FALSE, ],
728	728	["SETTING" => \config\Master::APPEARANCE['support-contact']['developer-mail'],
729	729	"DEFVALUE" => "[email protected]",
730	730	"COMPLAINTSTRING" => "APPEARANCE/support-contact/mail ",
731		- "REQUIRED" => FALSE,],
	731	+ "REQUIRED" => FALSE, ],
732	732	["SETTING" => \config\Master::APPEARANCE['abuse-mail'],
733	733	"DEFVALUE" => "[email protected]",
734	734	"COMPLAINTSTRING" => "APPEARANCE/abuse-mail ",
735		- "REQUIRED" => FALSE,],
	735	+ "REQUIRED" => FALSE, ],
736	736	["SETTING" => \config\Master::APPEARANCE['MOTD'],
737	737	"DEFVALUE" => "Release Candidate. All bugs to be shot on sight!",
738	738	"COMPLAINTSTRING" => "APPEARANCE/MOTD ",
739		- "REQUIRED" => FALSE,],
	739	+ "REQUIRED" => FALSE, ],
740	740	["SETTING" => \config\Master::APPEARANCE['webcert_CRLDP'],
741	741	"DEFVALUE" => ['list', 'of', 'CRL', 'pointers'],
742	742	"COMPLAINTSTRING" => "APPEARANCE/webcert_CRLDP ",
743		- "REQUIRED" => TRUE,],
	743	+ "REQUIRED" => TRUE, ],
744	744	["SETTING" => \config\Master::APPEARANCE['webcert_OCSP'],
745	745	"DEFVALUE" => ['list', 'of', 'OCSP', 'pointers'],
746	746	"COMPLAINTSTRING" => "APPEARANCE/webcert_OCSP ",
747		- "REQUIRED" => TRUE,],
	747	+ "REQUIRED" => TRUE, ],
748	748	["SETTING" => \config\Master::DB['INST']['host'],
749	749	"DEFVALUE" => "db.host.example",
750	750	"COMPLAINTSTRING" => "DB/INST ",
751		- "REQUIRED" => TRUE,],
	751	+ "REQUIRED" => TRUE, ],
752	752	["SETTING" => \config\Master::DB['INST']['host'],
753	753	"DEFVALUE" => "db.host.example",
754	754	"COMPLAINTSTRING" => "DB/USER ",
755		- "REQUIRED" => TRUE,],
	755	+ "REQUIRED" => TRUE, ],
756	756	["SETTING" => \config\Master::DB['EXTERNAL']['host'],
757	757	"DEFVALUE" => "customerdb.otherhost.example",
758	758	"COMPLAINTSTRING" => "DB/EXTERNAL ",
759		- "REQUIRED" => FALSE,],
	759	+ "REQUIRED" => FALSE, ],
760	760	];
761	761
762	762	/**
		@@ -785,11 +785,11 @@ discard block
		block discarded – undo
785	785	if (isset(\config\Diagnostics::RADIUSTESTS['TLS-clientcerts'])) {
786	786	foreach (\config\Diagnostics::RADIUSTESTS['TLS-clientcerts'] as $cadata) {
787	787	foreach ($cadata['certificates'] as $cert_files) {
788		- if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['public']) === FALSE) {
789		- $defaultvalues .= "CERTIFICATE/" . $cert_files['public'] . " ";
	788	+ if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['public']) === FALSE) {
	789	+ $defaultvalues .= "CERTIFICATE/".$cert_files['public']." ";
790	790	}
791		- if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['private']) === FALSE) {
792		- $defaultvalues .= "CERTIFICATE/" . $cert_files['private'] . " ";
	791	+ if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['private']) === FALSE) {
	792	+ $defaultvalues .= "CERTIFICATE/".$cert_files['private']." ";
793	793	}
794	794	}
795	795	}
		@@ -882,14 +882,14 @@ discard block
		block discarded – undo
882	882	if ($global_no_cache) {
883	883	foreach ($Devs as $dev => $D) {
884	884	if (empty($D['options']['no_cache']) \|\| $D['options']['no_cache'] != 0) {
885		- $no_cache_dev .= $dev . " ";
	885	+ $no_cache_dev .= $dev." ";
886	886	$no_cache_dev_count++;
887	887	}
888	888	}
889	889	} else {
890	890	foreach ($Devs as $dev => $D) {
891	891	if (!empty($D['options']['no_cache']) && $D['options']['no_cache'] != 0) {
892		- $no_cache_dev .= $dev . " ";
	892	+ $no_cache_dev .= $dev." ";
893	893	$no_cache_dev_count++;
894	894	}
895	895	}
		@@ -928,13 +928,13 @@ discard block
		block discarded – undo
928	928	$mail->isHTML(FALSE);
929	929	$mail->CharSet = 'UTF-8';
930	930	$mail->From = \config\Master::APPEARANCE['from-mail'];
931		- $mail->FromName = \config\Master::APPEARANCE['productname'] . " Invitation System";
	931	+ $mail->FromName = \config\Master::APPEARANCE['productname']." Invitation System";
932	932	$mail->addAddress(\config\Master::APPEARANCE['abuse-mail']);
933	933	$mail->Subject = "testing CAT configuration mail";
934	934	$mail->Body = "Testing CAT mailing\n";
935	935	$sent = $mail->send();
936	936	if ($sent) {
937		- $this->storeTestResult(\core\common\Entity::L_OK, "mailer settings appear to be working, check " . \config\Master::APPEARANCE['abuse-mail'] . " mailbox if the message was receiced.");
	937	+ $this->storeTestResult(\core\common\Entity::L_OK, "mailer settings appear to be working, check ".\config\Master::APPEARANCE['abuse-mail']." mailbox if the message was receiced.");
938	938	} else {
939	939	$this->storeTestResult(\core\common\Entity::L_ERROR, "mailer settings failed, check the Config::MAILSETTINGS");
940	940	}

GEANT / CAT

Push — master ( 1417dc...c04c22 )

Status

Category

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

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

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

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

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

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

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

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

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

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