Inspection of "use fqdn fact instead of nodename (possibly has no..." - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Setup Failed

Push — master ( 8cabca...76c89b )

by Stefan

created 2021-02-03 14:34 UTC

Status

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.

core/IdPlist.php 1 patch

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

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
         foreach ($idps as $idp) {
             $idpTitle[$idp['entityID']] = $idp['title'];
             $d = self::getIdpDistance($idp, $here);
-            $resultSet[$idp['entityID']] = $d . " " . $idp['title'];
+            $resultSet[$idp['entityID']] = $d." ".$idp['title'];
         }
         asort($resultSet);
         $outarray = [];
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
         $allIDPs = ($country != "" ? $handle->exec($query, "s", $country) : $handle->exec($query));
         $returnarray = [];
         // SELECTs never return a booleans, always an object
-        $i=0;
+        $i = 0;
         while ($queryResult = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allIDPs)) {
             $i++;
             $institutionOptions = explode('---', $queryResult->options);

Please login to merge, or discard this patch.

core/SanityTests.php 1 patch

Spacing +45 added lines, -45 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>.");
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
                 $matchArray = [];
                 preg_match('/([^ ]+) ?/', $config[$pathToCheck], $matchArray);
                 $exe = $matchArray[1];
-                $the_path = exec("which " . $config[$pathToCheck]);
+                $the_path = exec("which ".$config[$pathToCheck]);
                 if ($the_path == $exe) {
                     $exec_is = "EXPLICIT";
                 } else {
@@ -272,9 +272,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().".");
         }
     }
     
@@ -287,12 +287,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) {
@@ -309,7 +309,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);
         });
         
@@ -320,7 +320,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));
             }
         }
         
@@ -344,7 +344,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>");
         }
     }
 
@@ -365,7 +365,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));
         }
     }
 
@@ -383,9 +383,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));
             }
         }
     }
@@ -443,8 +443,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.");
         }
@@ -483,7 +483,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>.");
@@ -579,7 +579,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 {
@@ -607,14 +607,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']!");
@@ -644,7 +644,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 {
@@ -711,8 +711,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 == "") {
@@ -726,47 +726,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, ],
     ];
 
     /**
@@ -795,11 +795,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']." ";
                     }
                 }
             }
@@ -892,14 +892,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++;
                 }
             }
@@ -938,13 +938,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.

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.

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

		@@ -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)) {

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	foreach ($idps as $idp) {
38	38	$idpTitle[$idp['entityID']] = $idp['title'];
39	39	$d = self::getIdpDistance($idp, $here);
40		- $resultSet[$idp['entityID']] = $d . " " . $idp['title'];
	40	+ $resultSet[$idp['entityID']] = $d." ".$idp['title'];
41	41	}
42	42	asort($resultSet);
43	43	$outarray = [];
		@@ -79,7 +79,7 @@ discard block
		block discarded – undo
79	79	$allIDPs = ($country != "" ? $handle->exec($query, "s", $country) : $handle->exec($query));
80	80	$returnarray = [];
81	81	// SELECTs never return a booleans, always an object
82		- $i=0;
	82	+ $i = 0;
83	83	while ($queryResult = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allIDPs)) {
84	84	$i++;
85	85	$institutionOptions = explode('---', $queryResult->options);

		@@ -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>.");
		@@ -252,7 +252,7 @@ discard block
		block discarded – undo
252	252	$matchArray = [];
253	253	preg_match('/([^ ]+) ?/', $config[$pathToCheck], $matchArray);
254	254	$exe = $matchArray[1];
255		- $the_path = exec("which " . $config[$pathToCheck]);
	255	+ $the_path = exec("which ".$config[$pathToCheck]);
256	256	if ($the_path == $exe) {
257	257	$exec_is = "EXPLICIT";
258	258	} else {
		@@ -272,9 +272,9 @@ discard block
		block discarded – undo
272	272	private function testPhp()
273	273	{
274	274	if (version_compare(phpversion(), $this->needversionPHP, '>=')) {
275		- $this->storeTestResult(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
	275	+ $this->storeTestResult(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running ".phpversion().".");
276	276	} else {
277		- $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->needversionPHP, but you only have " . phpversion() . ".");
	277	+ $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->needversionPHP, but you only have ".phpversion().".");
278	278	}
279	279	}
280	280
		@@ -287,12 +287,12 @@ discard block
		block discarded – undo
287	287	*/
288	288	private function runConstantsTest($config)
289	289	{
290		- $templateConfig = file_get_contents(ROOT . "/config/$config-template.php");
291		- $newTemplateConfig = preg_replace("/class *$config/", "class $config" . "_template", $templateConfig);
292		- file_put_contents(ROOT . "/var/tmp/$config-template.php", $newTemplateConfig);
293		- include(ROOT . "/var/tmp/$config-template.php");
294		- unlink(ROOT . "/var/tmp/$config-template.php");
295		- $rft = new \ReflectionClass("\config\\$config" . "_template");
	290	+ $templateConfig = file_get_contents(ROOT."/config/$config-template.php");
	291	+ $newTemplateConfig = preg_replace("/class *$config/", "class $config"."_template", $templateConfig);
	292	+ file_put_contents(ROOT."/var/tmp/$config-template.php", $newTemplateConfig);
	293	+ include(ROOT."/var/tmp/$config-template.php");
	294	+ unlink(ROOT."/var/tmp/$config-template.php");
	295	+ $rft = new \ReflectionClass("\config\\$config"."_template");
296	296	$templateConstants = $rft->getConstants();
297	297	$failResults = [];
298	298	foreach ($templateConstants as $constant => $value) {
		@@ -309,7 +309,7 @@ discard block
		block discarded – undo
309	309	* Check if all required constants are set
310	310	*/
311	311	private function testConfigConstants() {
312		- set_error_handler(function ($severity, $message, $file, $line) {
	312	+ set_error_handler(function($severity, $message, $file, $line) {
313	313	throw new \ErrorException($message, $severity, $severity, $file, $line);
314	314	});
315	315
		@@ -320,7 +320,7 @@ discard block
		block discarded – undo
320	320	$failCount = $failCount + count($failResults);
321	321	if (count($failResults) > 0) {
322	322	$this->storeTestResult(\core\common\Entity::L_ERROR,
323		- "<strong>The following constants are not set:</strong>" . implode(', ', $failResults));
	323	+ "<strong>The following constants are not set:</strong>".implode(', ', $failResults));
324	324	}
325	325	}
326	326
		@@ -344,7 +344,7 @@ discard block
		block discarded – undo
344	344	$this->storeTestResult(\core\common\Entity::L_OK, "<strong>cat_base_url</strong> set correctly");
345	345	} else {
346	346	$rootFromScript = $m[1] === '' ? '/' : $m[1];
347		- $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>");
	347	+ $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>");
348	348	}
349	349	}
350	350
		@@ -365,7 +365,7 @@ discard block
		block discarded – undo
365	365	if (count($probeReturns) == 0) {
366	366	$this->storeTestResult(common\Entity::L_OK, "All configured RADIUS/UDP probes are reachable.");
367	367	} else {
368		- $this->storeTestResult(common\Entity::L_ERROR, "The following RADIUS probes are NOT reachable: " . implode(', ', $probeReturns));
	368	+ $this->storeTestResult(common\Entity::L_ERROR, "The following RADIUS probes are NOT reachable: ".implode(', ', $probeReturns));
369	369	}
370	370	}
371	371
		@@ -383,9 +383,9 @@ discard block
		block discarded – undo
383	383	$SSPconfig = \SimpleSAML\Configuration::getInstance();
384	384	$sspVersion = explode('.', $SSPconfig->getVersion());
385	385	if ((int) $sspVersion[0] >= $this->needversionSSP['major'] && (int) $sspVersion[1] >= $this->needversionSSP['minor']) {
386		- $this->storeTestResult(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running " . implode('.', $sspVersion));
	386	+ $this->storeTestResult(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running ".implode('.', $sspVersion));
387	387	} else {
388		- $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least " . implode('.', $this->needversionSSP));
	388	+ $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least ".implode('.', $this->needversionSSP));
389	389	}
390	390	}
391	391	}
		@@ -443,8 +443,8 @@ discard block
		block discarded – undo
443	443	*/
444	444	private function testLogdir()
445	445	{
446		- if (fopen(\config\Master::PATHS['logdir'] . "/debug.log", "a") == FALSE) {
447		- $this->storeTestResult(\core\common\Entity::L_WARN, "Log files in <strong>" . \config\Master::PATHS['logdir'] . "</strong> are not writable!");
	446	+ if (fopen(\config\Master::PATHS['logdir']."/debug.log", "a") == FALSE) {
	447	+ $this->storeTestResult(\core\common\Entity::L_WARN, "Log files in <strong>".\config\Master::PATHS['logdir']."</strong> are not writable!");
448	448	} else {
449	449	$this->storeTestResult(\core\common\Entity::L_OK, "Log directory is writable.");
450	450	}
		@@ -483,7 +483,7 @@ discard block
		block discarded – undo
483	483	$classname = 'Imagick';
484	484	}
485	485
486		- if (class_exists('\\' . $classname)) {
	486	+ if (class_exists('\\'.$classname)) {
487	487	$this->storeTestResult(\core\common\Entity::L_OK, "PHP extension <strong>Imagick</strong> is installed.");
488	488	} else {
489	489	$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>.");
		@@ -579,7 +579,7 @@ discard block
		block discarded – undo
579	579	{
580	580	$A = $this->getExecPath('openssl');
581	581	if ($A['exec'] != "") {
582		- $t = exec($A['exec'] . ' version');
	582	+ $t = exec($A['exec'].' version');
583	583	if ($A['exec_is'] == "EXPLICIT") {
584	584	$this->storeTestResult(\core\common\Entity::L_OK, "<strong>$t</strong> was found and is configured explicitly in your config.");
585	585	} else {
		@@ -607,14 +607,14 @@ discard block
		block discarded – undo
607	607	}
608	608	$A = $this->getExecPath('makensis');
609	609	if ($A['exec'] != "") {
610		- $t = exec($A['exec'] . ' -VERSION');
	610	+ $t = exec($A['exec'].' -VERSION');
611	611	if ($A['exec_is'] == "EXPLICIT") {
612	612	$this->storeTestResult(\core\common\Entity::L_OK, "<strong>makensis $t</strong> was found and is configured explicitly in your config.");
613	613	} else {
614	614	$this->storeTestResult(\core\common\Entity::L_WARN, "<strong>makensis $t</strong> was found, but is not configured with an absolute path in your config.");
615	615	}
616	616	$outputArray = [];
617		- exec($A['exec'] . ' -HELP', $outputArray);
	617	+ exec($A['exec'].' -HELP', $outputArray);
618	618	$t1 = count(preg_grep('/INPUTCHARSET/', $outputArray));
619	619	if ($t1 == 1 && \config\ConfAssistant::NSIS_VERSION == 2) {
620	620	$this->storeTestResult(\core\common\Entity::L_ERROR, "Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
		@@ -644,7 +644,7 @@ discard block
		block discarded – undo
644	644	$NSIS_Module_status = [];
645	645	foreach ($this->NSISModules as $module) {
646	646	unset($out);
647		- exec(\config\ConfAssistant::PATHS['makensis'] . " -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
	647	+ exec(\config\ConfAssistant::PATHS['makensis']." -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
648	648	if ($retval > 0) {
649	649	$NSIS_Module_status[$module] = 0;
650	650	} else {
		@@ -711,8 +711,8 @@ discard block
		block discarded – undo
711	711	$locales = shell_exec("locale -a");
712	712	$allthere = "";
713	713	foreach (\config\Master::LANGUAGES as $onelanguage) {
714		- if (preg_match("/" . $onelanguage['locale'] . "/", $locales) == 0) {
715		- $allthere .= $onelanguage['locale'] . " ";
	714	+ if (preg_match("/".$onelanguage['locale']."/", $locales) == 0) {
	715	+ $allthere .= $onelanguage['locale']." ";
716	716	}
717	717	}
718	718	if ($allthere == "") {
		@@ -726,47 +726,47 @@ discard block
		block discarded – undo
726	726	["SETTING" => \config\Master::APPEARANCE['from-mail'],
727	727	"DEFVALUE" => "[email protected]",
728	728	"COMPLAINTSTRING" => "APPEARANCE/from-mail ",
729		- "REQUIRED" => FALSE,],
	729	+ "REQUIRED" => FALSE, ],
730	730	["SETTING" => \config\Master::APPEARANCE['support-contact']['url'],
731	731	"DEFVALUE" => "[email protected]?body=Only%20English%20language%20please!",
732	732	"COMPLAINTSTRING" => "APPEARANCE/support-contact/url ",
733		- "REQUIRED" => FALSE,],
	733	+ "REQUIRED" => FALSE, ],
734	734	["SETTING" => \config\Master::APPEARANCE['support-contact']['display'],
735	735	"DEFVALUE" => "[email protected]",
736	736	"COMPLAINTSTRING" => "APPEARANCE/support-contact/display ",
737		- "REQUIRED" => FALSE,],
	737	+ "REQUIRED" => FALSE, ],
738	738	["SETTING" => \config\Master::APPEARANCE['support-contact']['developer-mail'],
739	739	"DEFVALUE" => "[email protected]",
740	740	"COMPLAINTSTRING" => "APPEARANCE/support-contact/mail ",
741		- "REQUIRED" => FALSE,],
	741	+ "REQUIRED" => FALSE, ],
742	742	["SETTING" => \config\Master::APPEARANCE['abuse-mail'],
743	743	"DEFVALUE" => "[email protected]",
744	744	"COMPLAINTSTRING" => "APPEARANCE/abuse-mail ",
745		- "REQUIRED" => FALSE,],
	745	+ "REQUIRED" => FALSE, ],
746	746	["SETTING" => \config\Master::APPEARANCE['MOTD'],
747	747	"DEFVALUE" => "Release Candidate. All bugs to be shot on sight!",
748	748	"COMPLAINTSTRING" => "APPEARANCE/MOTD ",
749		- "REQUIRED" => FALSE,],
	749	+ "REQUIRED" => FALSE, ],
750	750	["SETTING" => \config\Master::APPEARANCE['webcert_CRLDP'],
751	751	"DEFVALUE" => ['list', 'of', 'CRL', 'pointers'],
752	752	"COMPLAINTSTRING" => "APPEARANCE/webcert_CRLDP ",
753		- "REQUIRED" => TRUE,],
	753	+ "REQUIRED" => TRUE, ],
754	754	["SETTING" => \config\Master::APPEARANCE['webcert_OCSP'],
755	755	"DEFVALUE" => ['list', 'of', 'OCSP', 'pointers'],
756	756	"COMPLAINTSTRING" => "APPEARANCE/webcert_OCSP ",
757		- "REQUIRED" => TRUE,],
	757	+ "REQUIRED" => TRUE, ],
758	758	["SETTING" => \config\Master::DB['INST']['host'],
759	759	"DEFVALUE" => "db.host.example",
760	760	"COMPLAINTSTRING" => "DB/INST ",
761		- "REQUIRED" => TRUE,],
	761	+ "REQUIRED" => TRUE, ],
762	762	["SETTING" => \config\Master::DB['INST']['host'],
763	763	"DEFVALUE" => "db.host.example",
764	764	"COMPLAINTSTRING" => "DB/USER ",
765		- "REQUIRED" => TRUE,],
	765	+ "REQUIRED" => TRUE, ],
766	766	["SETTING" => \config\Master::DB['EXTERNAL']['host'],
767	767	"DEFVALUE" => "customerdb.otherhost.example",
768	768	"COMPLAINTSTRING" => "DB/EXTERNAL ",
769		- "REQUIRED" => FALSE,],
	769	+ "REQUIRED" => FALSE, ],
770	770	];
771	771
772	772	/**
		@@ -795,11 +795,11 @@ discard block
		block discarded – undo
795	795	if (isset(\config\Diagnostics::RADIUSTESTS['TLS-clientcerts'])) {
796	796	foreach (\config\Diagnostics::RADIUSTESTS['TLS-clientcerts'] as $cadata) {
797	797	foreach ($cadata['certificates'] as $cert_files) {
798		- if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['public']) === FALSE) {
799		- $defaultvalues .= "CERTIFICATE/" . $cert_files['public'] . " ";
	798	+ if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['public']) === FALSE) {
	799	+ $defaultvalues .= "CERTIFICATE/".$cert_files['public']." ";
800	800	}
801		- if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['private']) === FALSE) {
802		- $defaultvalues .= "CERTIFICATE/" . $cert_files['private'] . " ";
	801	+ if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['private']) === FALSE) {
	802	+ $defaultvalues .= "CERTIFICATE/".$cert_files['private']." ";
803	803	}
804	804	}
805	805	}
		@@ -892,14 +892,14 @@ discard block
		block discarded – undo
892	892	if ($global_no_cache) {
893	893	foreach ($Devs as $dev => $D) {
894	894	if (empty($D['options']['no_cache']) \|\| $D['options']['no_cache'] != 0) {
895		- $no_cache_dev .= $dev . " ";
	895	+ $no_cache_dev .= $dev." ";
896	896	$no_cache_dev_count++;
897	897	}
898	898	}
899	899	} else {
900	900	foreach ($Devs as $dev => $D) {
901	901	if (!empty($D['options']['no_cache']) && $D['options']['no_cache'] != 0) {
902		- $no_cache_dev .= $dev . " ";
	902	+ $no_cache_dev .= $dev." ";
903	903	$no_cache_dev_count++;
904	904	}
905	905	}
		@@ -938,13 +938,13 @@ discard block
		block discarded – undo
938	938	$mail->isHTML(FALSE);
939	939	$mail->CharSet = 'UTF-8';
940	940	$mail->From = \config\Master::APPEARANCE['from-mail'];
941		- $mail->FromName = \config\Master::APPEARANCE['productname'] . " Invitation System";
	941	+ $mail->FromName = \config\Master::APPEARANCE['productname']." Invitation System";
942	942	$mail->addAddress(\config\Master::APPEARANCE['abuse-mail']);
943	943	$mail->Subject = "testing CAT configuration mail";
944	944	$mail->Body = "Testing CAT mailing\n";
945	945	$sent = $mail->send();
946	946	if ($sent) {
947		- $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.");
	947	+ $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.");
948	948	} else {
949	949	$this->storeTestResult(\core\common\Entity::L_ERROR, "mailer settings failed, check the Config::MAILSETTINGS");
950	950	}

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

GEANT / CAT

Push — master ( 8cabca...76c89b )

Status

Category

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

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

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