Inspection of "Merge branch 'master' into release_2_1" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Push — release_2_1 ( 1471d5...cd1bdf )

by Tomasz

created 2024-11-27 10:43 UTC

Status

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

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

Please login to merge, or discard this patch.

web/404.php 1 patch

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

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
  * @package UserGUI
  */
 error_reporting(E_ALL | E_STRICT);
-require dirname(dirname(__FILE__)) . "/config/_config.php";
+require dirname(dirname(__FILE__))."/config/_config.php";
 $langObject = new \core\common\Language();
 $langObject->setTextDomain("web_user");
 
@@ -38,25 +38,25 @@  discard block
 block discarded – undo
 <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
     <div id="heading">
         <?php
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
-        print '<div id="motd">' . ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp' ) . '</div>';
-        print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']) . '</h1>
-<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'] . '</h2>';
+        print '<img src="'.dirname($_SERVER['SCRIPT_NAME']).'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
+        print '<div id="motd">'.(isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp').'</div>';
+        print '<h1 style="padding-bottom:0px; height:1em;">'.sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']).'</h1>
+<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'].'</h2>';
         echo '<table id="lang_select"><tr><td>';
         echo _("View this page in");
         ?>
         <?php
         foreach (\config\Master::LANGUAGES as $lang => $value) {
-            echo "<a href='javascript:changeLang(\"$lang\")'>" . $value['display'] . "</a> ";
+            echo "<a href='javascript:changeLang(\"$lang\")'>".$value['display']."</a> ";
         }
-        echo '</td><td style="text-align:right;padding-right:20px"><a href="' . dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang() . '">' . _("Start page") . '</a></td></tr></table>';
+        echo '</td><td style="text-align:right;padding-right:20px"><a href="'.dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang().'">'._("Start page").'</a></td></tr></table>';
         ?>
     </div> <!-- id="heading" -->
     <div id="main_body" style='padding:20px;'>
-        <h1><?php echo _("This is not the CAT you are looking for.");?></h1>
-        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number");?></p>
+        <h1><?php echo _("This is not the CAT you are looking for."); ?></h1>
+        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number"); ?></p>
         <h2>404</h2>
-        <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang());?></p>
+        <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang()); ?></p>
     </div> <!-- id="main_body" -->
 
         <?php echo $deco->footer();

Please login to merge, or discard this patch.

web/4013.php 1 patch

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

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
  * @package UserGUI
  */
 error_reporting(E_ALL | E_STRICT);
-require dirname(dirname(__FILE__)) . "/config/_config.php";
+require dirname(dirname(__FILE__))."/config/_config.php";
 
 $langObject = new \core\common\Language();
 $langObject->setTextDomain("web_user");
@@ -39,24 +39,24 @@  discard block
 block discarded – undo
 <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
     <div id="heading">
         <?php
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
-        print '<div id="motd">' . ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp' ) . '</div>';
-        print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']) . '</h1>
-<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'] . '</h2>';
+        print '<img src="'.dirname($_SERVER['SCRIPT_NAME']).'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
+        print '<div id="motd">'.(isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp').'</div>';
+        print '<h1 style="padding-bottom:0px; height:1em;">'.sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']).'</h1>
+<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'].'</h2>';
         echo '<table id="lang_select"><tr><td>';
         echo _("View this page in");
         ?>
         <?php
         foreach (\config\Master::LANGUAGES as $lang => $value) {
-            echo "<a href='javascript:changeLang(\"$lang\")'>" . $value['display'] . "</a> ";
+            echo "<a href='javascript:changeLang(\"$lang\")'>".$value['display']."</a> ";
         }
-        echo '</td><td style="text-align:right;padding-right:20px"><a href="' . dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang() . '">' . _("Start page") . '</a></td></tr></table>';
+        echo '</td><td style="text-align:right;padding-right:20px"><a href="'.dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang().'">'._("Start page").'</a></td></tr></table>';
         ?>
     </div> <!-- id="heading" -->
     <div id="main_body" style='padding:20px;'>
-        <h1><?php echo _("Maybe this is the CAT you are looking for...");?></h1>
-        <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as");?></p>
+        <h1><?php echo _("Maybe this is the CAT you are looking for..."); ?></h1>
+        <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as"); ?></p>
         <h2>401/403</h2>
-        <p><?php echo sprintf(_("Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang())?></p>
+        <p><?php echo sprintf(_("Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang())?></p>
     </div>
         <?php echo $deco->footer();

Please login to merge, or discard this patch.

web/skins/modern/Menu.php 1 patch

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

@@ -40,9 +40,9 @@  discard block
 block discarded – undo
         $langsArray = [];
         foreach (\config\Master::LANGUAGES as $lang => $value) {
             if ($lang == $selectedLang) {
-                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")', 'class'=>'selected-lang'];
+                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")', 'class'=>'selected-lang'];
             } else {
-                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")'];
+                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")'];
             }
         }
         $this->menu = [['id' => 'start',
@@ -101,13 +101,13 @@  discard block
 block discarded – undo
                 $iD = $menuItem['id'] ?? $id;
                 $catInfo = NULL;
                 if (!empty($menuItem['catInfo'])) {
-                    $catInfo = 'javascript:infoCAT("' . $iD . '", "' . $menuItem['catInfo'][0] . '","' . $menuItem['catInfo'][1] . '")';
+                    $catInfo = 'javascript:infoCAT("'.$iD.'", "'.$menuItem['catInfo'][0].'","'.$menuItem['catInfo'][1].'")';
                 }
                 if (!empty($menuItem['link']) && substr($menuItem['link'], 0, 1) === '/') {
-                    $menuItem['link'] = \core\CAT::getRootUrlPath() . $menuItem['link'];
+                    $menuItem['link'] = \core\CAT::getRootUrlPath().$menuItem['link'];
                 }
                 $link = $catInfo ?? $menuItem['link'] ?? '';
-                $class = empty($menuItem['class']) ? '' : ' class="' . $menuItem['class'] . '"';
+                $class = empty($menuItem['class']) ? '' : ' class="'.$menuItem['class'].'"';
                 $submenu = $menuItem['submenu'] ?? [];
                 $out .= $this->printMenuItem($menuItem['text'], $link, $class);
                 $out .= $this->printMenu($submenu, $iD);
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
         if ($itemLink === '') {
             return("<li><span>$itemText</span>");
         }
-        return "<li><a href='" . $itemLink . "'" . $itemClass . '>' . $itemText . "</a>";
+        return "<li><a href='".$itemLink."'".$itemClass.'>'.$itemText."</a>";
     }
     
     /**

Please login to merge, or discard this patch.

core/User.php 1 patch

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

@@ -154,8 +154,8 @@  discard block
 block discarded – undo
         common\Entity::intoThePotatoes();
         $mail = \core\common\OutsideComm::mailHandle();
 // who to whom?
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System";
-        $mail->addReplyTo(\config\Master::APPEARANCE['support-contact']['developer-mail'], \config\Master::APPEARANCE['productname'] . " " . _("Feedback"));
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System";
+        $mail->addReplyTo(\config\Master::APPEARANCE['support-contact']['developer-mail'], \config\Master::APPEARANCE['productname']." "._("Feedback"));
         $mail->addAddress($mailaddr[0]["value"]);
 // what do we want to say?
         $mail->Subject = $subject;
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
                 }
                 $lookFor .= "$name";
             }
-            $finding = preg_match("/^(" . $lookFor . "):(.*)/", $oneRow->user_id, $matches);
+            $finding = preg_match("/^(".$lookFor."):(.*)/", $oneRow->user_id, $matches);
             if ($finding === 0 || $finding === FALSE) {
                 return FALSE;
             }
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
                         $matchedProviders[] = $idp;
                         $name = $idp;
                         if ($skipCurl == 0) {
-                            $url = \config\Diagnostics::EDUGAINRESOLVER['url'] . "?action=get_entity_name&type=idp&e_id=$idp&lang=$lang";
+                            $url = \config\Diagnostics::EDUGAINRESOLVER['url']."?action=get_entity_name&type=idp&e_id=$idp&lang=$lang";
                             $ch = curl_init($url);
                             if ($ch === FALSE) {
                                 $loggerInstance->debug(2, "Unable ask eduGAIN about IdP - CURL init failed!");
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
                             }
                             curl_close($ch);
                         }
-                        $listOfProviders[] = User::PROVIDER_STRINGS[$providerStrings[0]] . " - IdP: " . $name;
+                        $listOfProviders[] = User::PROVIDER_STRINGS[$providerStrings[0]]." - IdP: ".$name;
                     }
                     break;
                 case $providerStrings[1]:

Please login to merge, or discard this patch.

web/user/faq.php 1 patch

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

@@ -50,19 +50,19 @@  discard block
 block discarded – undo
 
 array_push($FAQ, [
     'title' => sprintf(_("Is it safe to use %s installers?"), \config\Master::APPEARANCE['productname']),
-    'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']) . ' ' . ( isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
+    'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']).' '.(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
 ]);
 
 array_push($FAQ, [
     'title' => _("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
-    'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.") . " " . (isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name']) . " " : "") . sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
+    'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name'])." " : "").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
 ]);
 
 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == NULL) {
     $text = sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your organisation and report the problem, the administrators should be able to trace your connections."), \config\ConfAssistant::CONSORTIUM['display_name']);
 } else {
     if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') {
-        $diagUrl = \config\Master::PATHS['cat_base_url'] . "diag/";
+        $diagUrl = \config\Master::PATHS['cat_base_url']."diag/";
     } else {
         $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'];
     }
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
     $tocText = "";
     $fullText = "";
     foreach ($FAQ as $faq) {
-        $tocText .= '<a href="#toc' . $counter . '">' . $faq['title'] . "</a><br>\n";
-        $fullText .= "<dt><a name=toc$counter>" . $faq['title'] . "</a></dt>\n<dd>" . $faq['text'] . "</dd>\n";
+        $tocText .= '<a href="#toc'.$counter.'">'.$faq['title']."</a><br>\n";
+        $fullText .= "<dt><a name=toc$counter>".$faq['title']."</a></dt>\n<dd>".$faq['text']."</dd>\n";
         $counter++;
     }
     ?>

Please login to merge, or discard this patch.

core/Options.php 1 patch

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

@@ -142,17 +142,17 @@  discard block
 block discarded – undo
         foreach (array_keys($this->typeDb) as $name) {
             if ($className === 0) {
                 $tempArray[] = $name;
-            } elseif (preg_match('/^' . $className . ':/', $name) > 0) {
+            } elseif (preg_match('/^'.$className.':/', $name) > 0) {
                 $tempArray[] = $name;
             }
         }
         $returnArray = $tempArray;
         // remove silverbullet-specific options if this deployment is not SB
         foreach ($tempArray as $key => $val) {
-            if (( \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] != 'LOCAL') && (preg_match('/^fed:silverbullet/', $val) > 0)) {
+            if ((\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] != 'LOCAL') && (preg_match('/^fed:silverbullet/', $val) > 0)) {
                 unset($returnArray[$key]);
             }
-            if (( \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] != 'LOCAL') && (preg_match('/^fed:minted_ca_file/', $val) > 0)) {
+            if ((\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] != 'LOCAL') && (preg_match('/^fed:minted_ca_file/', $val) > 0)) {
                 unset($returnArray[$key]);
             }
         }
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
         if (isset($this->typeDb[$optionname])) {
             return $this->typeDb[$optionname];
         }
-        throw new Exception("Metadata about an option was requested, but the option name does not exist in the system: " . htmlentities($optionname));
+        throw new Exception("Metadata about an option was requested, but the option name does not exist in the system: ".htmlentities($optionname));
     }
 
     /**

Please login to merge, or discard this patch.

config/_config.php 1 patch

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

@@ -21,14 +21,14 @@  discard block
 block discarded – undo
  */
 
 require_once "autoloader.php";
-require_once __DIR__ . "/../packageRoot.php";
+require_once __DIR__."/../packageRoot.php";
 
 // enable Composer autoloader, if exists
-if (file_exists(__DIR__ . "/../vendor/autoload.php") !== FALSE) {
-    include_once __DIR__ . "/../vendor/autoload.php";
+if (file_exists(__DIR__."/../vendor/autoload.php") !== FALSE) {
+    include_once __DIR__."/../vendor/autoload.php";
 }
 
-if (!file_exists(ROOT . "/config/Master.php")) {
+if (!file_exists(ROOT."/config/Master.php")) {
     echo "Master configuration file not found. You need to configure the product! At least config/Master.php is required!";
     throw new Exception("Master config file not found!");
 }
@@ -36,14 +36,14 @@  discard block
 block discarded – undo
 /* load sub-configs if we are dealing with those in this installation */
 
 if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == 'LOCAL' || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == 'LOCAL') {
-    if (!file_exists(ROOT . "/config/ConfAssistant.php")) {
+    if (!file_exists(ROOT."/config/ConfAssistant.php")) {
         echo "ConfAssistant configuration file not found. You need to configure the product!";
         throw new Exception("ConfAssistant config file not found!");
     }
 }
 
 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') {
-    if (!file_exists(ROOT . "/config/Diagnostics.php")) {
+    if (!file_exists(ROOT."/config/Diagnostics.php")) {
         echo "Diagnostics configuration file not found. You need to configure the product!";
         throw new Exception("Diagnostics config file not found!");
     }

Please login to merge, or discard this patch.

web/admin/edit_federation_result.php 1 patch

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

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
  * @author Stefan Winter <[email protected]>
  */
 
-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();
@@ -46,18 +46,18 @@  discard block
 block discarded – undo
 
 if ($submitGiven == web\lib\common\FormElements::BUTTON_SAVE) { // here we go
     $fed_name = $my_fed->name;
-    echo "<h1>" . sprintf(_("Submitted attributes for %s '%s'"), $uiElements->nomenclatureFed, $fed_name) . "</h1>";
+    echo "<h1>".sprintf(_("Submitted attributes for %s '%s'"), $uiElements->nomenclatureFed, $fed_name)."</h1>";
     echo "<table>";
     echo $optionParser->processSubmittedFields($my_fed, $_POST, $_FILES);
     echo "</table>";
 
     $loggerInstance = new \core\common\Logging();
-    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "FED " . $my_fed->name . " - attributes changed");
+    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "FED ".$my_fed->name." - attributes changed");
 
     // re-instantiate ourselves... profiles need fresh data
 
     $my_fed = $validator->existingFederation($_GET['fed_id'], $_SESSION['user']);
 
-    echo "<br/><form method='post' action='overview_federation.php' accept-charset='UTF-8'><button type='submit'>" . _("Continue to dashboard") . "</button></form>";
+    echo "<br/><form method='post' action='overview_federation.php' accept-charset='UTF-8'><button type='submit'>"._("Continue to dashboard")."</button></form>";
 }
 echo $deco->footer();

Please login to merge, or discard this patch.

		@@ -154,8 +154,8 @@ discard block
		block discarded – undo
154	154	common\Entity::intoThePotatoes();
155	155	$mail = \core\common\OutsideComm::mailHandle();
156	156	// who to whom?
157		- $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System";
158		- $mail->addReplyTo(\config\Master::APPEARANCE['support-contact']['developer-mail'], \config\Master::APPEARANCE['productname'] . " " . _("Feedback"));
	157	+ $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System";
	158	+ $mail->addReplyTo(\config\Master::APPEARANCE['support-contact']['developer-mail'], \config\Master::APPEARANCE['productname']." "._("Feedback"));
159	159	$mail->addAddress($mailaddr[0]["value"]);
160	160	// what do we want to say?
161	161	$mail->Subject = $subject;
		@@ -218,7 +218,7 @@ discard block
		block discarded – undo
218	218	}
219	219	$lookFor .= "$name";
220	220	}
221		- $finding = preg_match("/^(" . $lookFor . "):(.*)/", $oneRow->user_id, $matches);
	221	+ $finding = preg_match("/^(".$lookFor."):(.*)/", $oneRow->user_id, $matches);
222	222	if ($finding === 0 \|\| $finding === FALSE) {
223	223	return FALSE;
224	224	}
		@@ -236,7 +236,7 @@ discard block
		block discarded – undo
236	236	$matchedProviders[] = $idp;
237	237	$name = $idp;
238	238	if ($skipCurl == 0) {
239		- $url = \config\Diagnostics::EDUGAINRESOLVER['url'] . "?action=get_entity_name&type=idp&e_id=$idp&lang=$lang";
	239	+ $url = \config\Diagnostics::EDUGAINRESOLVER['url']."?action=get_entity_name&type=idp&e_id=$idp&lang=$lang";
240	240	$ch = curl_init($url);
241	241	if ($ch === FALSE) {
242	242	$loggerInstance->debug(2, "Unable ask eduGAIN about IdP - CURL init failed!");
		@@ -252,7 +252,7 @@ discard block
		block discarded – undo
252	252	}
253	253	curl_close($ch);
254	254	}
255		- $listOfProviders[] = User::PROVIDER_STRINGS[$providerStrings[0]] . " - IdP: " . $name;
	255	+ $listOfProviders[] = User::PROVIDER_STRINGS[$providerStrings[0]]." - IdP: ".$name;
256	256	}
257	257	break;
258	258	case $providerStrings[1]:

		@@ -50,19 +50,19 @@ discard block
		block discarded – undo
50	50
51	51	array_push($FAQ, [
52	52	'title' => sprintf(_("Is it safe to use %s installers?"), \config\Master::APPEARANCE['productname']),
53		- 'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']) . ' ' . ( isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
	53	+ 'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']).' '.(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
54	54	]);
55	55
56	56	array_push($FAQ, [
57	57	'title' => _("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
58		- 'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.") . " " . (isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name']) . " " : "") . sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
	58	+ 'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name'])." " : "").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
59	59	]);
60	60
61	61	if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == NULL) {
62	62	$text = sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your organisation and report the problem, the administrators should be able to trace your connections."), \config\ConfAssistant::CONSORTIUM['display_name']);
63	63	} else {
64	64	if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') {
65		- $diagUrl = \config\Master::PATHS['cat_base_url'] . "diag/";
	65	+ $diagUrl = \config\Master::PATHS['cat_base_url']."diag/";
66	66	} else {
67	67	$diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'];
68	68	}
		@@ -99,8 +99,8 @@ discard block
		block discarded – undo
99	99	$tocText = "";
100	100	$fullText = "";
101	101	foreach ($FAQ as $faq) {
102		- $tocText .= '<a href="#toc' . $counter . '">' . $faq['title'] . "</a><br>\n";
103		- $fullText .= "<dt><a name=toc$counter>" . $faq['title'] . "</a></dt>\n<dd>" . $faq['text'] . "</dd>\n";
	102	+ $tocText .= '<a href="#toc'.$counter.'">'.$faq['title']."</a><br>\n";
	103	+ $fullText .= "<dt><a name=toc$counter>".$faq['title']."</a></dt>\n<dd>".$faq['text']."</dd>\n";
104	104	$counter++;
105	105	}
106	106	?>

		@@ -142,17 +142,17 @@ discard block
		block discarded – undo
142	142	foreach (array_keys($this->typeDb) as $name) {
143	143	if ($className === 0) {
144	144	$tempArray[] = $name;
145		- } elseif (preg_match('/^' . $className . ':/', $name) > 0) {
	145	+ } elseif (preg_match('/^'.$className.':/', $name) > 0) {
146	146	$tempArray[] = $name;
147	147	}
148	148	}
149	149	$returnArray = $tempArray;
150	150	// remove silverbullet-specific options if this deployment is not SB
151	151	foreach ($tempArray as $key => $val) {
152		- if (( \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] != 'LOCAL') && (preg_match('/^fed:silverbullet/', $val) > 0)) {
	152	+ if ((\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] != 'LOCAL') && (preg_match('/^fed:silverbullet/', $val) > 0)) {
153	153	unset($returnArray[$key]);
154	154	}
155		- if (( \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] != 'LOCAL') && (preg_match('/^fed:minted_ca_file/', $val) > 0)) {
	155	+ if ((\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] != 'LOCAL') && (preg_match('/^fed:minted_ca_file/', $val) > 0)) {
156	156	unset($returnArray[$key]);
157	157	}
158	158	}
		@@ -172,7 +172,7 @@ discard block
		block discarded – undo
172	172	if (isset($this->typeDb[$optionname])) {
173	173	return $this->typeDb[$optionname];
174	174	}
175		- throw new Exception("Metadata about an option was requested, but the option name does not exist in the system: " . htmlentities($optionname));
	175	+ throw new Exception("Metadata about an option was requested, but the option name does not exist in the system: ".htmlentities($optionname));
176	176	}
177	177
178	178	/**

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

		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	* @package UserGUI
27	27	*/
28	28	error_reporting(E_ALL \| E_STRICT);
29		-require dirname(dirname(__FILE__)) . "/config/_config.php";
	29	+require dirname(dirname(__FILE__))."/config/_config.php";
30	30	$langObject = new \core\common\Language();
31	31	$langObject->setTextDomain("web_user");
32	32
		@@ -38,25 +38,25 @@ discard block
		block discarded – undo
38	38	<body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
39	39	<div id="heading">
40	40	<?php
41		- print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
42		- print '<div id="motd">' . ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp' ) . '</div>';
43		- print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']) . '</h1>
44		-<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'] . '</h2>';
	41	+ print '<img src="'.dirname($_SERVER['SCRIPT_NAME']).'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
	42	+ print '<div id="motd">'.(isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp').'</div>';
	43	+ print '<h1 style="padding-bottom:0px; height:1em;">'.sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']).'</h1>
	44	+<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'].'</h2>';
45	45	echo '<table id="lang_select"><tr><td>';
46	46	echo _("View this page in");
47	47	?>
48	48	<?php
49	49	foreach (\config\Master::LANGUAGES as $lang => $value) {
50		- echo "<a href='javascript:changeLang(\"$lang\")'>" . $value['display'] . "</a> ";
	50	+ echo "<a href='javascript:changeLang(\"$lang\")'>".$value['display']."</a> ";
51	51	}
52		- echo '</td><td style="text-align:right;padding-right:20px"><a href="' . dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang() . '">' . _("Start page") . '</a></td></tr></table>';
	52	+ echo '</td><td style="text-align:right;padding-right:20px"><a href="'.dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang().'">'._("Start page").'</a></td></tr></table>';
53	53	?>
54	54	</div> <!-- id="heading" -->
55	55	<div id="main_body" style='padding:20px;'>
56		- <h1><?php echo _("This is not the CAT you are looking for.");?></h1>
57		- <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number");?></p>
	56	+ <h1><?php echo _("This is not the CAT you are looking for."); ?></h1>
	57	+ <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number"); ?></p>
58	58	<h2>404</h2>
59		- <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang());?></p>
	59	+ <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang()); ?></p>
60	60	</div> <!-- id="main_body" -->
61	61
62	62	<?php echo $deco->footer();

		@@ -40,9 +40,9 @@ discard block
		block discarded – undo
40	40	$langsArray = [];
41	41	foreach (\config\Master::LANGUAGES as $lang => $value) {
42	42	if ($lang == $selectedLang) {
43		- $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")', 'class'=>'selected-lang'];
	43	+ $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")', 'class'=>'selected-lang'];
44	44	} else {
45		- $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")'];
	45	+ $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")'];
46	46	}
47	47	}
48	48	$this->menu = [['id' => 'start',
		@@ -101,13 +101,13 @@ discard block
		block discarded – undo
101	101	$iD = $menuItem['id'] ?? $id;
102	102	$catInfo = NULL;
103	103	if (!empty($menuItem['catInfo'])) {
104		- $catInfo = 'javascript:infoCAT("' . $iD . '", "' . $menuItem['catInfo'][0] . '","' . $menuItem['catInfo'][1] . '")';
	104	+ $catInfo = 'javascript:infoCAT("'.$iD.'", "'.$menuItem['catInfo'][0].'","'.$menuItem['catInfo'][1].'")';
105	105	}
106	106	if (!empty($menuItem['link']) && substr($menuItem['link'], 0, 1) === '/') {
107		- $menuItem['link'] = \core\CAT::getRootUrlPath() . $menuItem['link'];
	107	+ $menuItem['link'] = \core\CAT::getRootUrlPath().$menuItem['link'];
108	108	}
109	109	$link = $catInfo ?? $menuItem['link'] ?? '';
110		- $class = empty($menuItem['class']) ? '' : ' class="' . $menuItem['class'] . '"';
	110	+ $class = empty($menuItem['class']) ? '' : ' class="'.$menuItem['class'].'"';
111	111	$submenu = $menuItem['submenu'] ?? [];
112	112	$out .= $this->printMenuItem($menuItem['text'], $link, $class);
113	113	$out .= $this->printMenu($submenu, $iD);
		@@ -131,7 +131,7 @@ discard block
		block discarded – undo
131	131	if ($itemLink === '') {
132	132	return("<li><span>$itemText</span>");
133	133	}
134		- return "<li><a href='" . $itemLink . "'" . $itemClass . '>' . $itemText . "</a>";
	134	+ return "<li><a href='".$itemLink."'".$itemClass.'>'.$itemText."</a>";
135	135	}
136	136
137	137	/**

		@@ -21,14 +21,14 @@ discard block
		block discarded – undo
21	21	*/
22	22
23	23	require_once "autoloader.php";
24		-require_once __DIR__ . "/../packageRoot.php";
	24	+require_once __DIR__."/../packageRoot.php";
25	25
26	26	// enable Composer autoloader, if exists
27		-if (file_exists(__DIR__ . "/../vendor/autoload.php") !== FALSE) {
28		- include_once __DIR__ . "/../vendor/autoload.php";
	27	+if (file_exists(__DIR__."/../vendor/autoload.php") !== FALSE) {
	28	+ include_once __DIR__."/../vendor/autoload.php";
29	29	}
30	30
31		-if (!file_exists(ROOT . "/config/Master.php")) {
	31	+if (!file_exists(ROOT."/config/Master.php")) {
32	32	echo "Master configuration file not found. You need to configure the product! At least config/Master.php is required!";
33	33	throw new Exception("Master config file not found!");
34	34	}
		@@ -36,14 +36,14 @@ discard block
		block discarded – undo
36	36	/* load sub-configs if we are dealing with those in this installation */
37	37
38	38	if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == 'LOCAL' \|\| \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == 'LOCAL') {
39		- if (!file_exists(ROOT . "/config/ConfAssistant.php")) {
	39	+ if (!file_exists(ROOT."/config/ConfAssistant.php")) {
40	40	echo "ConfAssistant configuration file not found. You need to configure the product!";
41	41	throw new Exception("ConfAssistant config file not found!");
42	42	}
43	43	}
44	44
45	45	if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') {
46		- if (!file_exists(ROOT . "/config/Diagnostics.php")) {
	46	+ if (!file_exists(ROOT."/config/Diagnostics.php")) {
47	47	echo "Diagnostics configuration file not found. You need to configure the product!";
48	48	throw new Exception("Diagnostics config file not found!");
49	49	}

		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	* @author Stefan Winter <[email protected]>
26	26	*/
27	27
28		-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
	28	+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
29	29
30	30	$auth = new \web\lib\admin\Authentication();
31	31	$deco = new \web\lib\admin\PageDecoration();
		@@ -46,18 +46,18 @@ discard block
		block discarded – undo
46	46
47	47	if ($submitGiven == web\lib\common\FormElements::BUTTON_SAVE) { // here we go
48	48	$fed_name = $my_fed->name;
49		- echo "<h1>" . sprintf(_("Submitted attributes for %s '%s'"), $uiElements->nomenclatureFed, $fed_name) . "</h1>";
	49	+ echo "<h1>".sprintf(_("Submitted attributes for %s '%s'"), $uiElements->nomenclatureFed, $fed_name)."</h1>";
50	50	echo "<table>";
51	51	echo $optionParser->processSubmittedFields($my_fed, $_POST, $_FILES);
52	52	echo "</table>";
53	53
54	54	$loggerInstance = new \core\common\Logging();
55		- $loggerInstance->writeAudit($_SESSION['user'], "MOD", "FED " . $my_fed->name . " - attributes changed");
	55	+ $loggerInstance->writeAudit($_SESSION['user'], "MOD", "FED ".$my_fed->name." - attributes changed");
56	56
57	57	// re-instantiate ourselves... profiles need fresh data
58	58
59	59	$my_fed = $validator->existingFederation($_GET['fed_id'], $_SESSION['user']);
60	60
61		- echo "<br/><form method='post' action='overview_federation.php' accept-charset='UTF-8'><button type='submit'>" . _("Continue to dashboard") . "</button></form>";
	61	+ echo "<br/><form method='post' action='overview_federation.php' accept-charset='UTF-8'><button type='submit'>"._("Continue to dashboard")."</button></form>";
62	62	}
63	63	echo $deco->footer();

GEANT / CAT

Push — release_2_1 ( 1471d5...cd1bdf )

Status

Category

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

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

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

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

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

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

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

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

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