Inspection of "better do this in the constructor" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Setup Failed

Push — master ( 4c9a9e...25777d )

by Stefan

created 2021-07-08 14:13 UTC

Status

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

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
 <head>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
 <link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
-<title><?php echo config\Master::APPEARANCE['productname'];?> Copyright and Licensing</title>
+<title><?php echo config\Master::APPEARANCE['productname']; ?> Copyright and Licensing</title>
 </head>
 <body>
 <div id="wrap">
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
             <div id="user_page" style="display:block">
                 <?php echo $divs->divPagetitle(config\Master::APPEARANCE['productname']." Copyright and Licensing", ""); ?>
                 <div style="padding:20px">
-            <?php require dirname(dirname(__DIR__)) . "/copyright.inc.php"; ?>
+            <?php require dirname(dirname(__DIR__))."/copyright.inc.php"; ?>
                 </div>
             </div>
         </div>

Please login to merge, or discard this patch.

web/skins/example/accountstatus.php 1 patch

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

@@ -16,12 +16,12 @@
 block discarded – undo
  * License: see the web/copyright.inc.php file in the file structure or
  *          <base_url>/copyright.php after deploying the software
  */?>
-<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>)</h1>
-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
+<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>)</h1>
+<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
 <p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
 <p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
-<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
-<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>
+<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
 <pre>
-    <?php print_r($statusInfo);?>
+    <?php print_r($statusInfo); ?>
 </pre>

Please login to merge, or discard this patch.

web/skins/example/index.php 1 patch

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

@@ -20,7 +20,7 @@
 block discarded – undo
  */
 ?>
 <h1>Example Skin (main user frontpage)</h1>
-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
+<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
 <p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
 <p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
-<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>

Please login to merge, or discard this patch.

web/tou.php 1 patch

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.

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.

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

		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	<head>
25	25	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
26	26	<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
27		-<title><?php echo config\Master::APPEARANCE['productname'];?> Copyright and Licensing</title>
	27	+<title><?php echo config\Master::APPEARANCE['productname']; ?> Copyright and Licensing</title>
28	28	</head>
29	29	<body>
30	30	<div id="wrap">
		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	<div id="user_page" style="display:block">
36	36	<?php echo $divs->divPagetitle(config\Master::APPEARANCE['productname']." Copyright and Licensing", ""); ?>
37	37	<div style="padding:20px">
38		- <?php require dirname(dirname(__DIR__)) . "/copyright.inc.php"; ?>
	38	+ <?php require dirname(dirname(__DIR__))."/copyright.inc.php"; ?>
39	39	</div>
40	40	</div>
41	41	</div>

		@@ -16,12 +16,12 @@
		block discarded – undo
16	16	* License: see the web/copyright.inc.php file in the file structure or
17	17	* <base_url>/copyright.php after deploying the software
18	18	*/?>
19		-<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>)</h1>
20		-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
	19	+<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>)</h1>
	20	+<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
21	21	<p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
22	22	<p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
23		-<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
24		-<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
	23	+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>
	24	+<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
25	25	<pre>
26		- <?php print_r($statusInfo);?>
	26	+ <?php print_r($statusInfo); ?>
27	27	</pre>

		@@ -20,7 +20,7 @@
		block discarded – undo
20	20	*/
21	21	?>
22	22	<h1>Example Skin (main user frontpage)</h1>
23		-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
	23	+<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
24	24	<p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
25	25	<p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
26		-<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
	26	+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>

		@@ -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	}

		@@ -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']);

		@@ -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 ( 4c9a9e...25777d )

Status

Category

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

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

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

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

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 +44 added lines, -44 removed lines patch added patch discarded remove patch