GEANT / CAT

web/admin/edit_user_result.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $loggerInstance = new \core\common\Logging();
 $deco = new \web\lib\admin\PageDecoration();
@@ -29,7 +29,7 @@ 
 
 $user = new \core\User($_SESSION['user']);
 if (!isset($_POST['submitbutton']) || $_POST['submitbutton'] != web\lib\common\FormElements::BUTTON_SAVE) { // what are we supposed to do?
-    echo "<p>" . _("The page was called with insufficient data. Please report this as an error.") . "</p>";
+    echo "<p>"._("The page was called with insufficient data. Please report this as an error.")."</p>";
     echo $deco->footer();
     exit(0);
 }
@@ -46,7 +46,7 @@ 
 if (isset($_POST['option'])) {
     foreach ($_POST['option'] as $opt_id => $optname) {
         if ($optname == "user:fedadmin") {
-            echo "Security violation: user tried to make himself " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation'] . " administrator!";
+            echo "Security violation: user tried to make himself ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']." administrator!";
             exit(1);
         }
     }

web/diag/testTelepath.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 
 $therealm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING);
 $thevisited = filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING);
@@ -35,7 +35,7 @@ 
     $validator = new \web\lib\common\InputValidation();
     
     echo "<pre>";
-    echo "Testing " . $validatedRealm . " in " . $validator->string($thevisited);
+    echo "Testing ".$validatedRealm." in ".$validator->string($thevisited);
     print_r($telepath->magic());
     echo "</pre>";
 }
\ No newline at end of file

web/diag/processSociopath.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 CAT_session_start();
 $loggerInstance = new \core\common\Logging();
 $loggerInstance->debug(4, "Sociopath test\n");
@@ -33,7 +33,7 @@ 
         return NULL;
     }
     $loggerInstance->debug(4, $_SESSION['EVIDENCE']['QUESTIONSASKED']);
-    $loggerInstance->debug(4, "\nAnswer question " . $QNUM . "\n");
+    $loggerInstance->debug(4, "\nAnswer question ".$QNUM."\n");
     switch ($answer) {
         case 1:
             $loggerInstance->debug(4, "Revaluate with FALSE");

web/diag/testSociopath.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 
 $sociopath = new \core\diag\Sociopath();
 

web/diag/adminQuery.php

Spacing +31 added lines, -31 removed lines

@@ -19,7 +19,7 @@ 
  * License: see the web/copyright.inc.php file in the file structure or
  *          <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";
 $languageInstance = new \core\common\Language();
 $languageInstance->setTextDomain("diagnostics");
 
@@ -56,119 +56,119 @@ 
     $select = "<div id='sp_abuse_problem'>
 <select style='margin-left: 0px;' id='select_sp_problem'>";
     foreach ($sp_problem as $pname => $pdesc) {
-        $select = $select . "<option value='$pname'>$pdesc</option>\n";
+        $select = $select."<option value='$pname'>$pdesc</option>\n";
     }
-    $select = $select . "</select></div>";
+    $select = $select."</select></div>";
     $res = "
 <table id='sp_questions'>
     <tr>
-        <td>" . _("Select your problem") . "</td>
+        <td>" . _("Select your problem")."</td>
         <td>$select</td>
     </tr>
     <tr>
-        <td>" . _("What is the realm of the IdP in question?") . "</td>
+        <td>"._("What is the realm of the IdP in question?")."</td>
         <td>
                 <input type='text' name='admin_realm' id='admin_realm' value=''>
                 <button id='realm_in_db_admin' accesskey='R' type='button'>" .
-            _("Check if this value is registered") .
+            _("Check if this value is registered").
             "</button>
         </td>
     </tr>
     <tr class='hidden_row'>
-        <td>" . _("What is the authentication timestamp of the user session in question?") . "</td>
+        <td>" . _("What is the authentication timestamp of the user session in question?")."</td>
         <td><input type='text' id='timestamp' name='timestamp'>
             <div id='datepicker'></div>
         </td>
     </tr>
     <tr class='hidden_row'>
-        <td>" . _("What is the MAC address of the user session in question?") . "</td>
+        <td>" . _("What is the MAC address of the user session in question?")."</td>
         <td><input type='text' id='mac' name='mac'></td>
     </tr>
     <tr class='hidden_row'>
-        <td>" . _("Additional comments") . "</td>
+        <td>" . _("Additional comments")."</td>
         <td><textarea id='freetext' name='freetext' cols='60' rows='5'></textarea></td>
     </tr>
     <tr class='hidden_row'>
-        <td>" . _("Please specify an email address on which the IdP can contact you") . "</td>
+        <td>" . _("Please specify an email address on which the IdP can contact you")."</td>
         <td><input type='text' id='email' name='email'></td>
     </tr>
     <tr class='hidden_row' id='send_query_to_idp'>
-        <td>" . _("Now you can send your query") . "</td>
-        <td><button type='submit' id='submit_idp_query' name='go'>" . _("Send") . "</button></td>
+        <td>" . _("Now you can send your query")."</td>
+        <td><button type='submit' id='submit_idp_query' name='go'>" . _("Send")."</button></td>
     </tr>
  </table>";
-    $res = $res . $javascript;
+    $res = $res.$javascript;
 }
 if ($queryType == 'idp') {
     $select = "<div id='idp_reported_problem' style='display:;'>
 <select style='margin-left:0px;' id='select_idp_problem'>";
     foreach ($idp_problem as $pname => $pdesc) {
-        $select = $select . "<option value='$pname'>$pdesc</option>\n";
+        $select = $select."<option value='$pname'>$pdesc</option>\n";
     }
-    $select = $select . "</select></div>";
+    $select = $select."</select></div>";
     $res = "
 <table id='idp_questions'>
     <tr>
-        <td>" . _("Select your problem") . "</td>
+        <td>" . _("Select your problem")."</td>
         <td>$select</td>
     </tr>
     <tr>
-        <td>" . _("Identify the SP by one of following means") . "</td>
+        <td>"._("Identify the SP by one of following means")."</td>
         <td></td>
     </tr>
     <tr id='by_opname'>
-        <td>" . _("SP Operator-Name attribute") . "</td>
+        <td>" . _("SP Operator-Name attribute")."</td>
         <td><input type='text' id='opname' name='opname' value=''></td>
     </tr>
     <tr id='spmanually'>
-        <td>" . _("Select the SP manually:") . "</td>
+        <td>" . _("Select the SP manually:")."</td>
         <td>
             <div id='select_asp_country'><a href='' id='asp_countries_list'>
-            <span id='opnameselect'>" . _("click to select country and organisation") . "</a></span>
+            <span id='opnameselect'>" . _("click to select country and organisation")."</a></span>
             </div>
             <div id='select_asp_area'></div>
         </td>
     </tr>
     <tr id='asp_desc' style='display: none;'>
-        <td>" . _("or") . ' ' . _("at least describe the SP location") . "</td>
+        <td>" . _("or").' '._("at least describe the SP location")."</td>
         <td><input type='text' id='asp_location' name='asp_location' value=''></td>
     </tr>
     <tr>
-        <td>" . _("What is the outer ID of the user session in question?") . "</td>
+        <td>" . _("What is the outer ID of the user session in question?")."</td>
         <td><input type='text' id='outer_id' name='outer_id' value=''></td>
     </tr>
     <tr>
-        <td>" . _("What is the authentication timestamp of the user session in question?") . "</td>
+        <td>" . _("What is the authentication timestamp of the user session in question?")."</td>
         <td>
             <input type='text' id='timestamp' name='timestamp'>
             <div id='datepicker'></div>
         </td>
     </tr>
     <tr>
-        <td>" . _("What is the MAC address of the user session in question?") . "</td>
+        <td>" . _("What is the MAC address of the user session in question?")."</td>
         <td><input type='text' id='mac' name='mac'></td>
     </tr>
     <tr>
-        <td>" . _("Additional comments about the problem") . "</td>
+        <td>" . _("Additional comments about the problem")."</td>
         <td><textarea id='freetext' name='freetext' cols='60' rows='5'></textarea></td>
     </tr>
     <tr>
-        <td>" . _("Do you have any contact details by which the user wishes to be contacted by the SP?") . "</td>
+        <td>" . _("Do you have any contact details by which the user wishes to be contacted by the SP?")."</td>
         <td><textarea id='c_details' name='c_details' cols='60' rows='5'></textarea></td>
     </tr>
     <tr>
-        <td>" . _("Please specify an email address on which the SP can contact you") . "</td>
+        <td>" . _("Please specify an email address on which the SP can contact you")."</td>
         <td><input type='text' id='email' name='email'></td>
     </tr>
     <tr class='hidden_row' id='send_query_to_sp'>
-        <td>" . _("Now you can send your query") . "</td>
-        <td><button type='submit' id='submit_sp_query' name='go'>" . _("Send") . "</button></td>
+        <td>" . _("Now you can send your query")."</td>
+        <td><button type='submit' id='submit_sp_query' name='go'>" . _("Send")."</button></td>
     </tr>
 </table>";
-    $res = $res . $javascript;
+    $res = $res.$javascript;
 }
 if ($queryType == 'idp_send' || $queryType == 'sp_send') {
-    include_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+    include_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
     $cat = new \core\CAT();
     $returnArray = array();
     if (count((array) $o) > 0) {

web/404.php

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
  * @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 @@ 
 <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['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
-        print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1>
-<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['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['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp').'</div>';
+        print '<h1 style="padding-bottom:0px; height:1em;">'.sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']).'</h1>
+<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'].'</h2>';
         echo '<table id="lang_select"><tr><td>';
         echo _("View this page in");
         ?>
         <?php
         foreach (CONFIG['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();

web/resources/css/cat.css.php

Spacing +17 added lines, -17 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 $colour1 = CONFIG['APPEARANCE']['colour1'];
 $colour2 = CONFIG['APPEARANCE']['colour2'];
 header('Content-type: text/css; charset=utf-8');
@@ -29,7 +29,7 @@ 
 }
 
 body {
-    background: <?php echo $colour1;?>;
+    background: <?php echo $colour1; ?>;
     color: #000000;
     font-family:Verdana, Arial, Helvetica, sans-serif;
     font-size:11px;
@@ -44,7 +44,7 @@ 
 }
 
 button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     min-height: 23px;
     border-left-style: outset; 
@@ -395,7 +395,7 @@ 
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -491,7 +491,7 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     padding-left:30px;
 }
 
@@ -561,7 +561,7 @@ 
 }
 
 #close_button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     height: 23px;
     border-left-style: inset; 
@@ -636,7 +636,7 @@ 
     width: 30em; 
     padding-left: 10px; 
     padding-right: 0px; 
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: white; 
     box-shadow: 10px 10px 5px #888888;
 }
@@ -683,7 +683,7 @@ 
     padding-top: 4px; 
     padding-bottom: 12px; 
     padding-left: 30px; 
-    background: <?php echo $colour1;?>; 
+    background: <?php echo $colour1; ?>; 
     text-align: left; 
     text-shadow: 10px 10px 5px #888888;
 }
@@ -693,9 +693,9 @@ 
     border-bottom-style:solid;
     border-top-width:5px;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     padding-left:30px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 #heading h1 { 
@@ -714,7 +714,7 @@ 
     text-align: justify;
     border-bottom-style:solid;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     font-size: 11px;
     font-weight: normal;
 }
@@ -761,7 +761,7 @@ 
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -813,7 +813,7 @@ 
 
 #line1 {
     top:145px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     font-size:20px;
 }
 
@@ -860,7 +860,7 @@ 
 
 #front_page_leftmenu {
     border-right:solid; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     border-width:5px; 
     min-height:400px; 
     padding-left: 10px; 
@@ -885,11 +885,11 @@ 
 }
 
 a:link {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:visited {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:hover {
@@ -897,7 +897,7 @@ 
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {

web/lib/user/Skinjob.php

Spacing +6 added lines, -6 removed lines

@@ -95,17 +95,17 @@
         }
 
         // does the file exist in the current skin's directory? Has precedence
-        if ($submodule !== '' && file_exists(__DIR__ . "/../../skins/" . $this->skin . "/" . $submodule . $path . $filename)) {
-            $extrapath = "/skins/" . $this->skin . "/" . $submodule;
+        if ($submodule !== '' && file_exists(__DIR__."/../../skins/".$this->skin."/".$submodule.$path.$filename)) {
+            $extrapath = "/skins/".$this->skin."/".$submodule;
         }
-        elseif (file_exists(__DIR__ . "/../../skins/" . $this->skin . $path . $filename)) {
-            $extrapath = "/skins/" . $this->skin;
-        } elseif (file_exists(__DIR__ . "/../../" . $path . $filename)) {
+        elseif (file_exists(__DIR__."/../../skins/".$this->skin.$path.$filename)) {
+            $extrapath = "/skins/".$this->skin;
+        } elseif (file_exists(__DIR__."/../../".$path.$filename)) {
             $extrapath = "";
         } else {
             return FALSE;
         }       
-        return htmlspecialchars(\core\CAT::getRootUrlPath() . $extrapath . $path . $filename, ENT_QUOTES);
+        return htmlspecialchars(\core\CAT::getRootUrlPath().$extrapath.$path.$filename, ENT_QUOTES);
     }
 
 }

Braces +1 added lines, -2 removed lines

@@ -97,8 +97,7 @@
         // does the file exist in the current skin's directory? Has precedence
         if ($submodule !== '' && file_exists(__DIR__ . "/../../skins/" . $this->skin . "/" . $submodule . $path . $filename)) {
             $extrapath = "/skins/" . $this->skin . "/" . $submodule;
-        }
-        elseif (file_exists(__DIR__ . "/../../skins/" . $this->skin . $path . $filename)) {
+        } elseif (file_exists(__DIR__ . "/../../skins/" . $this->skin . $path . $filename)) {
             $extrapath = "/skins/" . $this->skin;
         } elseif (file_exists(__DIR__ . "/../../" . $path . $filename)) {
             $extrapath = "";

web/lib/user/Gui.php

Spacing +3 added lines, -3 removed lines

@@ -53,10 +53,10 @@
         $ourlocale = $this->langObject->getLang();
         header("Content-Type:text/html;charset=utf-8");
         echo "<!DOCTYPE html>
-          <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale . "'>
-          <head lang='" . $ourlocale . "'>
+          <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale."'>
+          <head lang='" . $ourlocale."'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
-        echo "<title>" . htmlspecialchars($pagetitle) . "</title>";
+        echo "<title>".htmlspecialchars($pagetitle)."</title>";
         echo '<script type="text/javascript">ie_version = 0;</script>
 <!--[if IE]>
 <script type="text/javascript">ie_version=1;</script>