Inspection of "fotter corrections to support RTL better" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — release_2_1 ( c45181...103168 )

by Tomasz

created 2023-06-26 20:02 UTC

Status

Spacing +85 added lines, -85 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 dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 $colour1 = \config\Master::APPEARANCE['colour1'];
 $colour2 = \config\Master::APPEARANCE['colour2'];
 // we need to know if we are serving a RTL language so we can flip some heading
@@ -34,14 +34,14 @@  discard block
 block discarded – undo
 }
 
 body {
-    background: <?php echo $colour1;?>;
+    background: <?php echo $colour1; ?>;
     color: #000000;
     font-family:Verdana, Arial, Helvetica, sans-serif;
     font-size:11px;
     height: 100%;
     margin: 0px;
     padding: 0px;
-    padding-<?php echo $start;?>: 0px;
+    padding-<?php echo $start; ?>: 0px;
     min-width: 700px;
     font-size: 11px;
     font-weight: normal;
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
 }
 
 button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     min-height: 23px;
     border-start-style: outset; 
@@ -78,14 +78,14 @@  discard block
 block discarded – undo
     background:#095e80;
     border-style:inset;
     position: relative;
-    <?php echo $start;?>: 3px;
+    <?php echo $start; ?>: 3px;
 }
 
 button.pressedDisabled {
     background:#999;
     border-style:inset;
     position: relative;
-    <?php echo $start;?>: 3px;
+    <?php echo $start; ?>: 3px;
 }
 
 button.delete {
@@ -93,14 +93,14 @@  discard block
 block discarded – undo
 }
 
 .problemdescription {
-    padding-<?php echo $start;?>:40px;
+    padding-<?php echo $start; ?>:40px;
     padding-top: 10px;
     padding-bottom: 10px;
     background-color: lightyellow;
 }
 
 .problemsolution {
-    padding-<?php echo $start;?>:40px;
+    padding-<?php echo $start; ?>:40px;
     padding-top: 10px;
     padding-bottom: 10px;
     background-color: lightgreen;
@@ -167,8 +167,8 @@  discard block
 block discarded – undo
 div.profilemodulebuttons {
     position: inherit;
     bottom: 5px;
-    <?php echo $end;?>: 5px;
-    text-align: <?php echo $end;?>;
+    <?php echo $end; ?>: 5px;
+    text-align: <?php echo $end; ?>;
 }
 
 div.profilebox {
@@ -189,15 +189,15 @@  discard block
 block discarded – undo
     display: block;
     position: absolute;
     top:0;
-    <?php echo $end;?>:0;
-    padding-<?php echo $end;?>:20px;
+    <?php echo $end; ?>:0;
+    padding-<?php echo $end; ?>:20px;
     padding-top:7px;
 }
 
 div.sidebar {
     display: inline;
-    float: <?php echo $end;?>;
-    padding-<?php echo $end;?>: 20px;
+    float: <?php echo $end; ?>;
+    padding-<?php echo $end; ?>: 20px;
 }
 div.sidebar a {
     color: white;
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
 div.header {
     height: 54px;
     background: #FFFFFF;
-    padding-<?php echo $start;?>:30px;
+    padding-<?php echo $start; ?>:30px;
     padding-bottom: 10px;
     color: <?php echo $colour2?>;
 }
@@ -216,8 +216,8 @@  discard block
 block discarded – undo
     top: 54px;
     bottom: 50px;
     padding-top: 10px;
-    padding-<?php echo $start;?>: 0px;
-    padding-<?php echo $end;?>: 0px;
+    padding-<?php echo $start; ?>: 0px;
+    padding-<?php echo $end; ?>: 0px;
     width:100%;
 }
 
@@ -231,18 +231,18 @@  discard block
 block discarded – undo
     color: #FFFFFF;
     min-height:100px;
     overflow: auto;
-    padding-<?php echo $start;?>:20px'
+    padding-<?php echo $start; ?>:20px'
 }
 
 #thirdrow {
-    padding-<?php echo $start;?>: 10px;
-    padding-<?php echo $end;?>: 10px;
+    padding-<?php echo $start; ?>: 10px;
+    padding-<?php echo $end; ?>: 10px;
 }
 
 #footer {
     width: 100%;
-    <?php echo $start;?>: 0;
-    <?php echo $end;?>: 0;
+    <?php echo $start; ?>: 0;
+    <?php echo $end; ?>: 0;
     bottom: 0;
     position: absolute;
     background: white;
@@ -289,8 +289,8 @@  discard block
 block discarded – undo
     position: fixed;
     top: 0;
     bottom: 0;
-    <?php echo $start;?>: 0;
-    <?php echo $end;?>: 0;
+    <?php echo $start; ?>: 0;
+    <?php echo $end; ?>: 0;
     background-color: #000000;
     opacity: 0.5;
     z-index: 90;
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
     padding: 15px;
     text-align: start;
     width: 850px;
-    <?php echo $start;?>: 100px;
+    <?php echo $start; ?>: 100px;
     top: 50px;
     z-index: 100;
 }
@@ -325,15 +325,15 @@  discard block
 block discarded – undo
     position: absolute;
     top: 0;
     bottom: 0;
-    <?php echo $start;?>: 0;
-    <?php echo $end;?>: 0;
+    <?php echo $start; ?>: 0;
+    <?php echo $end; ?>: 0;
     z-index: 100;
 }
 
 div#msgbox div {
     position: fixed;
-    <?php echo $start;?>: 0;
-    <?php echo $end;?>: 0;
+    <?php echo $start; ?>: 0;
+    <?php echo $end; ?>: 0;
 }
 
 div#msgbox div div.graybox {
@@ -347,12 +347,12 @@  discard block
 block discarded – undo
 div.graybox img {
     display: block;
     cursor: pointer;
-    float: <?php echo $end;?>;
+    float: <?php echo $end; ?>;
     margin: 0px 0px 10px 10px;
 }
 
 img.icon {
-    float: <?php echo $start;?>;
+    float: <?php echo $start; ?>;
     margin-end: 5px;
     margin-top: 3px;
 }
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
 }
 
 table.authrecord td {
-    padding-<?php echo $end;?>: 10px;
+    padding-<?php echo $end; ?>: 10px;
 }
 
 p.MOTD {
@@ -517,8 +517,8 @@  discard block
 block discarded – undo
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>; 
-    padding-<?php echo $start;?>:30px;
+    border-color: <?php echo $colour1; ?>; 
+    padding-<?php echo $start; ?>:30px;
 }
 
 .no_borders button.disabledDevice {
@@ -573,8 +573,8 @@  discard block
 block discarded – undo
 
 .signin_large {
     vertical-align: top;
-    padding-<?php echo $start;?>:20px;
-    padding-<?php echo $end;?>:20px;
+    padding-<?php echo $start; ?>:20px;
+    padding-<?php echo $end; ?>:20px;
     color: #bfd5dc;
     font-size: 20px;
 }
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
 }
 
 #close_button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     height: 23px;
     border-start-style: inset; 
@@ -602,19 +602,19 @@  discard block
 block discarded – undo
     border-bottom-style: outset; 
     border-bottom-width: 2px; 
     border-bottom-color: #043d52;
-    padding-<?php echo $start;?>: 5px;
-    padding-<?php echo $end;?>: 5px;
+    padding-<?php echo $start; ?>: 5px;
+    padding-<?php echo $end; ?>: 5px;
     padding-top: 1px;
     padding-bottom: 1px;
     position: relative;
-    <?php echo $start;?>: 640px;
+    <?php echo $start; ?>: 640px;
     cursor:pointer;
 }
 
 #loading_ico {
     display: none;
     position: absolute;
-    <?php echo $start;?>: 200px;
+    <?php echo $start; ?>: 200px;
     top: 220px;
     z-index: 200;
     text-align: center;
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
     z-index: 100;
     position: absolute;
     width: 700px;
-    <?php echo $start;?>: 200px;
+    <?php echo $start; ?>: 200px;
     text-align: justify;
     top: 200px;
     box-shadow: 5px 5px 5px #666666;
@@ -636,23 +636,23 @@  discard block
 block discarded – undo
 }
 
 #user_info {
-    padding-<?php echo $start;?>: 30px; 
+    padding-<?php echo $start; ?>: 30px; 
     font-size: 11px;  
     font-weight: normal; 
 }
 
 #user_welcome {
     background: #ffffff;
-    padding-<?php echo $start;?>: 30px; 
+    padding-<?php echo $start; ?>: 30px; 
     padding-top: 20px; 
-    padding-<?php echo $end;?>: 180px;
+    padding-<?php echo $end; ?>: 180px;
     font-size: 12px;  
     font-weight: normal; 
 }
 
 #devices {
     z-index:90;
-    padding-<?php echo $start;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
     font-size: 11px;  
     font-weight: normal;
     position: relative;
@@ -660,15 +660,15 @@  discard block
 block discarded – undo
 
 #profile_list {
     width: 30em; 
-    padding-<?php echo $start;?>: 10px; 
-    padding-<?php echo $end;?>: 0px; 
-    background: <?php echo $colour2;?>; 
+    padding-<?php echo $start; ?>: 10px; 
+    padding-<?php echo $end; ?>: 0px; 
+    background: <?php echo $colour2; ?>; 
     color: white; 
     box-shadow: 10px 10px 5px #888888;
 }
 
 #profile_redirect {
-    padding-<?php echo $start;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
     padding-top: 20px;
     font-size: 11px;
     font-weight: normal;
@@ -678,13 +678,13 @@  discard block
 block discarded – undo
 }
 
 #profiles {
-    padding-<?php echo $start;?>: 30px; 
+    padding-<?php echo $start; ?>: 30px; 
     font-size: 11px; 
     padding-bottom: 10px 
 }
 
 #signin {
-    padding-<?php echo $start;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
     padding-top: 10px;
 }
 
@@ -708,8 +708,8 @@  discard block
 block discarded – undo
     font-size: 14px; 
     padding-top: 4px; 
     padding-bottom: 12px; 
-    padding-<?php echo $start;?>: 30px; 
-    background: <?php echo $colour1;?>; 
+    padding-<?php echo $start; ?>: 30px; 
+    background: <?php echo $colour1; ?>; 
     text-align: start; 
     text-shadow: 10px 10px 5px #888888;
 }
@@ -719,9 +719,9 @@  discard block
 block discarded – undo
     border-bottom-style:solid;
     border-top-width:5px;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
-    padding-<?php echo $start;?>:30px;
-    color: <?php echo $colour2;?>;
+    border-color: <?php echo $colour1; ?>;
+    padding-<?php echo $start; ?>:30px;
+    color: <?php echo $colour2; ?>;
 }
 
 #heading h1 { 
@@ -736,11 +736,11 @@  discard block
 block discarded – undo
 
 #welcome {
     padding: 20px;
-    padding-<?php echo $start;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
     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;
 }
@@ -749,14 +749,14 @@  discard block
 block discarded – undo
 #main_menu_info { 
                     position: relative;
                     top: 15px;
-                    <?php echo $start;?>: 0px;
-                    padding:10px; padding-<?php echo $start;?>:20px; padding-<?php echo $end;?>:20px;
+                    <?php echo $start; ?>: 0px;
+                    padding:10px; padding-<?php echo $start; ?>:20px; padding-<?php echo $end; ?>:20px;
                     background: #f0f0f0;
                     border: 1px solid #dddddd;
                     margin-start: 25px;
-                    padding-<?php echo $start;?>: 25px;
+                    padding-<?php echo $start; ?>: 25px;
                     margin-end: 25px;
-                    padding-<?php echo $end;?>: 25px;
+                    padding-<?php echo $end; ?>: 25px;
                     padding-bottom: 10px;
                     vertical-align: top;
                     box-shadow: 5px 5px 5px #666666;
@@ -787,7 +787,7 @@  discard block
 block discarded – undo
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -805,7 +805,7 @@  discard block
 block discarded – undo
 #idp_logo {
    display:none;
    position:absolute;
-   <?php echo $end;?>:30px;
+   <?php echo $end; ?>:30px;
    max-height:150px;
    max-width:150px;
    padding-top:10px;
@@ -828,18 +828,18 @@  discard block
 block discarded – undo
 #slides img {
     position: absolute;
     top: 145px;
-    <?php echo $end;?>: 60px;
+    <?php echo $end; ?>: 60px;
 }
 
 #slides span {
     position: absolute;
-    <?php echo $start;?>: 180px;
+    <?php echo $start; ?>: 180px;
     z-index: 20;
 }
 
 #line1 {
     top:145px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     font-size:20px;
 }
 
@@ -851,7 +851,7 @@  discard block
 block discarded – undo
 
 #line3 {
     top:245px;
-    <?php echo $start;?>: 200px;
+    <?php echo $start; ?>: 200px;
     color: maroon;
     font-size:25px;
 }
@@ -880,16 +880,16 @@  discard block
 block discarded – undo
     height:100%;
     border-spacing:0; 
     border-collapse:collapse;
-    padding-<?php echo $start;?>:200px;
+    padding-<?php echo $start; ?>:200px;
     padding-top:10px;
 }
 
 #front_page_leftmenu {
     border-end:solid; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     border-width:5px; 
     min-height:400px; 
-    padding-<?php echo $start;?>: 10px; 
+    padding-<?php echo $start; ?>: 10px; 
     vertical-align:top; 
     width:110px; 
     padding-top:30px;
@@ -899,8 +899,8 @@  discard block
 block discarded – undo
     vertical-align: top;
     height:280px;
     background: #fff;
-    padding-<?php echo $start;?>: 20px;
-    padding-<?php echo $end;?>: 20px;
+    padding-<?php echo $start; ?>: 20px;
+    padding-<?php echo $end; ?>: 20px;
 }
 
 #user_button_td {
@@ -911,11 +911,11 @@  discard block
 block discarded – undo
 }
 
 a:link {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:visited {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:hover {
@@ -923,7 +923,7 @@  discard block
 block discarded – undo
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {
@@ -954,13 +954,13 @@  discard block
 block discarded – undo
 table.user_overview th {
     text-align: start;  
     background: #f0f0f0;
-    padding-<?php echo $start;?>: 4px;
-    padding-<?php echo $end;?>: 4px;
+    padding-<?php echo $start; ?>: 4px;
+    padding-<?php echo $end; ?>: 4px;
 }
 table.user_overview td {
     border-top-style: none;
-    padding-<?php echo $start;?>: 4px;
-    padding-<?php echo $end;?>: 4px;
+    padding-<?php echo $start; ?>: 4px;
+    padding-<?php echo $end; ?>: 4px;
     padding-top: 0px;
     height: 25px;
 }
@@ -973,14 +973,14 @@  discard block
 block discarded – undo
 .download_button_text {
     width: 380px;
     position:absolute;
-    <?php echo $end;?>: 5px;
+    <?php echo $end; ?>: 5px;
     padding-top:0px;
 }
 
 #download_info {
    background: #f0f0f0;
-   padding-<?php echo $start;?>: 20px;
-   padding-<?php echo $end;?>: 20px;
+   padding-<?php echo $start; ?>: 20px;
+   padding-<?php echo $end; ?>: 20px;
    padding-top:3px;
    padding-bottom:3px;
 }

Please login to merge, or discard this patch.

web/lib/admin/PageDecoration.php 1 patch

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

@@ -73,13 +73,13 @@  discard block
 block discarded – undo
         $retval = "<div class='sidebar'><p>";
 
         if ($advancedControls) {
-            $retval .= "<strong>" . _("You are:") . "</strong> ".$_SESSION['name']
+            $retval .= "<strong>"._("You are:")."</strong> ".$_SESSION['name']
             ."<br/>
               <br/>
-              <a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_user.php'>" . _("Go to your Profile page") . "</a> 
-              <a href='" . \core\CAT::getRootUrlPath() . "/admin/inc/logout.php'>" . _("Logout") . "</a> ";
+              <a href='" . \core\CAT::getRootUrlPath()."/admin/overview_user.php'>"._("Go to your Profile page")."</a> 
+              <a href='" . \core\CAT::getRootUrlPath()."/admin/inc/logout.php'>"._("Logout")."</a> ";
         }
-        $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/'>" . _("Start page") . "</a>
+        $retval .= "<a href='".\core\CAT::getRootUrlPath()."/'>"._("Start page")."</a>
             </p>
         </div> <!-- sidebar -->";
         \core\common\Entity::outOfThePotatoes();
@@ -103,23 +103,23 @@  discard block
 block discarded – undo
                     <h1>$cap1</h1>
                 </div><!--header_captions-->
                 <div id='langselection' style='padding-top:20px; padding-".$this->start.":10px;'>
-                    <form action='$place' method='GET' accept-charset='UTF-8'>" . _("View this page in") . "&nbsp;
+                    <form action='$place' method='GET' accept-charset='UTF-8'>"._("View this page in")."&nbsp;
                         <select id='lang' name='lang' onchange='this.form.submit()'>";
 
         foreach (\config\Master::LANGUAGES as $lang => $getValue) {
-            $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $getValue['display'] . "</option> ";
+            $retval .= "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "")." >".$getValue['display']."</option> ";
         }
         $retval .= "</select>";
 
         foreach ($_GET as $getVar => $getValue) {
             $filterValue = filter_input(INPUT_GET, $getVar, FILTER_SANITIZE_STRING);
             if ($getVar != "lang" && $getValue != "") {
-                $retval .= "<input type='hidden' name='" . htmlspecialchars($getVar) . "' value='" . htmlspecialchars($filterValue) . "'>";
+                $retval .= "<input type='hidden' name='".htmlspecialchars($getVar)."' value='".htmlspecialchars($filterValue)."'>";
             }
         }
         $retval .= "</form>
                 </div><!--langselection-->";
-        $logoUrl = \core\CAT::getRootUrlPath() . "/resources/images/consortium_logo.png";
+        $logoUrl = \core\CAT::getRootUrlPath()."/resources/images/consortium_logo.png";
         $retval .= "<div class='consortium_logo'>
                     <img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
                 </div> <!-- consortium_logo -->
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
 
         if (isset(\config\Master::APPEARANCE['MOTD']) && \config\Master::APPEARANCE['MOTD'] != "") {
             $retval .= "<div id='header_MOTD' style='display:inline-block; padding-".$this->start.":20px;vertical-align:top;'>
-              <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD'] . "</p>
+              <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD']."</p>
               </div><!--header_MOTD-->";
         }
         $retval .= $this->sidebar($advancedControls);
@@ -238,9 +238,9 @@  discard block
 block discarded – undo
           <html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'".($this->langObject->rtl ? "dir='rtl'" : "").">
           <head lang='$ourlocale'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
-        $cssUrl = \core\CAT::getRootUrlPath() . "/resources/css/cat.css.php";
+        $cssUrl = \core\CAT::getRootUrlPath()."/resources/css/cat.css.php";
         $retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
-        $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
+        $retval .= "<title>".htmlspecialchars($pagetitle)."</title>";
         return $retval;
     }
 
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
             // we may need to jump up one dir if we are either in admin/ or accountstatus/
             // (accountstatus courtesy of my good mood. It's userspace not admin space so
             // it shouldn't be using this function any more.)
-            $logoBase = \core\CAT::getRootUrlPath() . "/resources/images";
+            $logoBase = \core\CAT::getRootUrlPath()."/resources/images";
             return "<span id='logos'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
               <img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>
               <span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";

Please login to merge, or discard this patch.

core/CAT.php 1 patch

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

@@ -109,7 +109,7 @@  discard block
 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;
@@ -117,14 +117,14 @@  discard block
 block discarded – undo
             $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'];
@@ -132,9 +132,9 @@  discard block
 block discarded – undo
         $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>";
         $this->catCopyrifhtAndLicense = "&copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
-        $this->catVersion = "$product<br>" . $this->catVersionString;
+        $this->catVersion = "$product<br>".$this->catVersionString;
 
         /* Federations are created in DB with bootstrapFederation, and listed via listFederations
          */

Please login to merge, or discard this patch.

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

		@@ -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 dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
	22	+require dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
23	23	$colour1 = \config\Master::APPEARANCE['colour1'];
24	24	$colour2 = \config\Master::APPEARANCE['colour2'];
25	25	// we need to know if we are serving a RTL language so we can flip some heading
		@@ -34,14 +34,14 @@ discard block
		block discarded – undo
34	34	}
35	35
36	36	body {
37		- background: <?php echo $colour1;?>;
	37	+ background: <?php echo $colour1; ?>;
38	38	color: #000000;
39	39	font-family:Verdana, Arial, Helvetica, sans-serif;
40	40	font-size:11px;
41	41	height: 100%;
42	42	margin: 0px;
43	43	padding: 0px;
44		- padding-<?php echo $start;?>: 0px;
	44	+ padding-<?php echo $start; ?>: 0px;
45	45	min-width: 700px;
46	46	font-size: 11px;
47	47	font-weight: normal;
		@@ -57,7 +57,7 @@ discard block
		block discarded – undo
57	57	}
58	58
59	59	button {
60		- background: <?php echo $colour2;?>;
	60	+ background: <?php echo $colour2; ?>;
61	61	color: #FFFFFF;
62	62	min-height: 23px;
63	63	border-start-style: outset;
		@@ -78,14 +78,14 @@ discard block
		block discarded – undo
78	78	background:#095e80;
79	79	border-style:inset;
80	80	position: relative;
81		- <?php echo $start;?>: 3px;
	81	+ <?php echo $start; ?>: 3px;
82	82	}
83	83
84	84	button.pressedDisabled {
85	85	background:#999;
86	86	border-style:inset;
87	87	position: relative;
88		- <?php echo $start;?>: 3px;
	88	+ <?php echo $start; ?>: 3px;
89	89	}
90	90
91	91	button.delete {
		@@ -93,14 +93,14 @@ discard block
		block discarded – undo
93	93	}
94	94
95	95	.problemdescription {
96		- padding-<?php echo $start;?>:40px;
	96	+ padding-<?php echo $start; ?>:40px;
97	97	padding-top: 10px;
98	98	padding-bottom: 10px;
99	99	background-color: lightyellow;
100	100	}
101	101
102	102	.problemsolution {
103		- padding-<?php echo $start;?>:40px;
	103	+ padding-<?php echo $start; ?>:40px;
104	104	padding-top: 10px;
105	105	padding-bottom: 10px;
106	106	background-color: lightgreen;
		@@ -167,8 +167,8 @@ discard block
		block discarded – undo
167	167	div.profilemodulebuttons {
168	168	position: inherit;
169	169	bottom: 5px;
170		- <?php echo $end;?>: 5px;
171		- text-align: <?php echo $end;?>;
	170	+ <?php echo $end; ?>: 5px;
	171	+ text-align: <?php echo $end; ?>;
172	172	}
173	173
174	174	div.profilebox {
		@@ -189,15 +189,15 @@ discard block
		block discarded – undo
189	189	display: block;
190	190	position: absolute;
191	191	top:0;
192		- <?php echo $end;?>:0;
193		- padding-<?php echo $end;?>:20px;
	192	+ <?php echo $end; ?>:0;
	193	+ padding-<?php echo $end; ?>:20px;
194	194	padding-top:7px;
195	195	}
196	196
197	197	div.sidebar {
198	198	display: inline;
199		- float: <?php echo $end;?>;
200		- padding-<?php echo $end;?>: 20px;
	199	+ float: <?php echo $end; ?>;
	200	+ padding-<?php echo $end; ?>: 20px;
201	201	}
202	202	div.sidebar a {
203	203	color: white;
		@@ -206,7 +206,7 @@ discard block
		block discarded – undo
206	206	div.header {
207	207	height: 54px;
208	208	background: #FFFFFF;
209		- padding-<?php echo $start;?>:30px;
	209	+ padding-<?php echo $start; ?>:30px;
210	210	padding-bottom: 10px;
211	211	color: <?php echo $colour2?>;
212	212	}
		@@ -216,8 +216,8 @@ discard block
		block discarded – undo
216	216	top: 54px;
217	217	bottom: 50px;
218	218	padding-top: 10px;
219		- padding-<?php echo $start;?>: 0px;
220		- padding-<?php echo $end;?>: 0px;
	219	+ padding-<?php echo $start; ?>: 0px;
	220	+ padding-<?php echo $end; ?>: 0px;
221	221	width:100%;
222	222	}
223	223
		@@ -231,18 +231,18 @@ discard block
		block discarded – undo
231	231	color: #FFFFFF;
232	232	min-height:100px;
233	233	overflow: auto;
234		- padding-<?php echo $start;?>:20px'
	234	+ padding-<?php echo $start; ?>:20px'
235	235	}
236	236
237	237	#thirdrow {
238		- padding-<?php echo $start;?>: 10px;
239		- padding-<?php echo $end;?>: 10px;
	238	+ padding-<?php echo $start; ?>: 10px;
	239	+ padding-<?php echo $end; ?>: 10px;
240	240	}
241	241
242	242	#footer {
243	243	width: 100%;
244		- <?php echo $start;?>: 0;
245		- <?php echo $end;?>: 0;
	244	+ <?php echo $start; ?>: 0;
	245	+ <?php echo $end; ?>: 0;
246	246	bottom: 0;
247	247	position: absolute;
248	248	background: white;
		@@ -289,8 +289,8 @@ discard block
		block discarded – undo
289	289	position: fixed;
290	290	top: 0;
291	291	bottom: 0;
292		- <?php echo $start;?>: 0;
293		- <?php echo $end;?>: 0;
	292	+ <?php echo $start; ?>: 0;
	293	+ <?php echo $end; ?>: 0;
294	294	background-color: #000000;
295	295	opacity: 0.5;
296	296	z-index: 90;
		@@ -316,7 +316,7 @@ discard block
		block discarded – undo
316	316	padding: 15px;
317	317	text-align: start;
318	318	width: 850px;
319		- <?php echo $start;?>: 100px;
	319	+ <?php echo $start; ?>: 100px;
320	320	top: 50px;
321	321	z-index: 100;
322	322	}
		@@ -325,15 +325,15 @@ discard block
		block discarded – undo
325	325	position: absolute;
326	326	top: 0;
327	327	bottom: 0;
328		- <?php echo $start;?>: 0;
329		- <?php echo $end;?>: 0;
	328	+ <?php echo $start; ?>: 0;
	329	+ <?php echo $end; ?>: 0;
330	330	z-index: 100;
331	331	}
332	332
333	333	div#msgbox div {
334	334	position: fixed;
335		- <?php echo $start;?>: 0;
336		- <?php echo $end;?>: 0;
	335	+ <?php echo $start; ?>: 0;
	336	+ <?php echo $end; ?>: 0;
337	337	}
338	338
339	339	div#msgbox div div.graybox {
		@@ -347,12 +347,12 @@ discard block
		block discarded – undo
347	347	div.graybox img {
348	348	display: block;
349	349	cursor: pointer;
350		- float: <?php echo $end;?>;
	350	+ float: <?php echo $end; ?>;
351	351	margin: 0px 0px 10px 10px;
352	352	}
353	353
354	354	img.icon {
355		- float: <?php echo $start;?>;
	355	+ float: <?php echo $start; ?>;
356	356	margin-end: 5px;
357	357	margin-top: 3px;
358	358	}
		@@ -409,7 +409,7 @@ discard block
		block discarded – undo
409	409
410	410	span.edu_cat {
411	411	font-weight: bold;
412		- color: <?php echo $colour2;?>;
	412	+ color: <?php echo $colour2; ?>;
413	413	}
414	414
415	415	span.tooltip {
		@@ -468,7 +468,7 @@ discard block
		block discarded – undo
468	468	}
469	469
470	470	table.authrecord td {
471		- padding-<?php echo $end;?>: 10px;
	471	+ padding-<?php echo $end; ?>: 10px;
472	472	}
473	473
474	474	p.MOTD {
		@@ -517,8 +517,8 @@ discard block
		block discarded – undo
517	517	border-bottom-style:solid;
518	518	border-top-width:5px;
519	519	border-bottom-width:5px;
520		- border-color: <?php echo $colour1;?>;
521		- padding-<?php echo $start;?>:30px;
	520	+ border-color: <?php echo $colour1; ?>;
	521	+ padding-<?php echo $start; ?>:30px;
522	522	}
523	523
524	524	.no_borders button.disabledDevice {
		@@ -573,8 +573,8 @@ discard block
		block discarded – undo
573	573
574	574	.signin_large {
575	575	vertical-align: top;
576		- padding-<?php echo $start;?>:20px;
577		- padding-<?php echo $end;?>:20px;
	576	+ padding-<?php echo $start; ?>:20px;
	577	+ padding-<?php echo $end; ?>:20px;
578	578	color: #bfd5dc;
579	579	font-size: 20px;
580	580	}
		@@ -587,7 +587,7 @@ discard block
		block discarded – undo
587	587	}
588	588
589	589	#close_button {
590		- background: <?php echo $colour2;?>;
	590	+ background: <?php echo $colour2; ?>;
591	591	color: #FFFFFF;
592	592	height: 23px;
593	593	border-start-style: inset;
		@@ -602,19 +602,19 @@ discard block
		block discarded – undo
602	602	border-bottom-style: outset;
603	603	border-bottom-width: 2px;
604	604	border-bottom-color: #043d52;
605		- padding-<?php echo $start;?>: 5px;
606		- padding-<?php echo $end;?>: 5px;
	605	+ padding-<?php echo $start; ?>: 5px;
	606	+ padding-<?php echo $end; ?>: 5px;
607	607	padding-top: 1px;
608	608	padding-bottom: 1px;
609	609	position: relative;
610		- <?php echo $start;?>: 640px;
	610	+ <?php echo $start; ?>: 640px;
611	611	cursor:pointer;
612	612	}
613	613
614	614	#loading_ico {
615	615	display: none;
616	616	position: absolute;
617		- <?php echo $start;?>: 200px;
	617	+ <?php echo $start; ?>: 200px;
618	618	top: 220px;
619	619	z-index: 200;
620	620	text-align: center;
		@@ -628,7 +628,7 @@ discard block
		block discarded – undo
628	628	z-index: 100;
629	629	position: absolute;
630	630	width: 700px;
631		- <?php echo $start;?>: 200px;
	631	+ <?php echo $start; ?>: 200px;
632	632	text-align: justify;
633	633	top: 200px;
634	634	box-shadow: 5px 5px 5px #666666;
		@@ -636,23 +636,23 @@ discard block
		block discarded – undo
636	636	}
637	637
638	638	#user_info {
639		- padding-<?php echo $start;?>: 30px;
	639	+ padding-<?php echo $start; ?>: 30px;
640	640	font-size: 11px;
641	641	font-weight: normal;
642	642	}
643	643
644	644	#user_welcome {
645	645	background: #ffffff;
646		- padding-<?php echo $start;?>: 30px;
	646	+ padding-<?php echo $start; ?>: 30px;
647	647	padding-top: 20px;
648		- padding-<?php echo $end;?>: 180px;
	648	+ padding-<?php echo $end; ?>: 180px;
649	649	font-size: 12px;
650	650	font-weight: normal;
651	651	}
652	652
653	653	#devices {
654	654	z-index:90;
655		- padding-<?php echo $start;?>: 30px;
	655	+ padding-<?php echo $start; ?>: 30px;
656	656	font-size: 11px;
657	657	font-weight: normal;
658	658	position: relative;
		@@ -660,15 +660,15 @@ discard block
		block discarded – undo
660	660
661	661	#profile_list {
662	662	width: 30em;
663		- padding-<?php echo $start;?>: 10px;
664		- padding-<?php echo $end;?>: 0px;
665		- background: <?php echo $colour2;?>;
	663	+ padding-<?php echo $start; ?>: 10px;
	664	+ padding-<?php echo $end; ?>: 0px;
	665	+ background: <?php echo $colour2; ?>;
666	666	color: white;
667	667	box-shadow: 10px 10px 5px #888888;
668	668	}
669	669
670	670	#profile_redirect {
671		- padding-<?php echo $start;?>: 30px;
	671	+ padding-<?php echo $start; ?>: 30px;
672	672	padding-top: 20px;
673	673	font-size: 11px;
674	674	font-weight: normal;
		@@ -678,13 +678,13 @@ discard block
		block discarded – undo
678	678	}
679	679
680	680	#profiles {
681		- padding-<?php echo $start;?>: 30px;
	681	+ padding-<?php echo $start; ?>: 30px;
682	682	font-size: 11px;
683	683	padding-bottom: 10px
684	684	}
685	685
686	686	#signin {
687		- padding-<?php echo $start;?>: 30px;
	687	+ padding-<?php echo $start; ?>: 30px;
688	688	padding-top: 10px;
689	689	}
690	690
		@@ -708,8 +708,8 @@ discard block
		block discarded – undo
708	708	font-size: 14px;
709	709	padding-top: 4px;
710	710	padding-bottom: 12px;
711		- padding-<?php echo $start;?>: 30px;
712		- background: <?php echo $colour1;?>;
	711	+ padding-<?php echo $start; ?>: 30px;
	712	+ background: <?php echo $colour1; ?>;
713	713	text-align: start;
714	714	text-shadow: 10px 10px 5px #888888;
715	715	}
		@@ -719,9 +719,9 @@ discard block
		block discarded – undo
719	719	border-bottom-style:solid;
720	720	border-top-width:5px;
721	721	border-bottom-width:5px;
722		- border-color: <?php echo $colour1;?>;
723		- padding-<?php echo $start;?>:30px;
724		- color: <?php echo $colour2;?>;
	722	+ border-color: <?php echo $colour1; ?>;
	723	+ padding-<?php echo $start; ?>:30px;
	724	+ color: <?php echo $colour2; ?>;
725	725	}
726	726
727	727	#heading h1 {
		@@ -736,11 +736,11 @@ discard block
		block discarded – undo
736	736
737	737	#welcome {
738	738	padding: 20px;
739		- padding-<?php echo $start;?>: 30px;
	739	+ padding-<?php echo $start; ?>: 30px;
740	740	text-align: justify;
741	741	border-bottom-style:solid;
742	742	border-bottom-width:5px;
743		- border-color: <?php echo $colour1;?>;
	743	+ border-color: <?php echo $colour1; ?>;
744	744	font-size: 11px;
745	745	font-weight: normal;
746	746	}
		@@ -749,14 +749,14 @@ discard block
		block discarded – undo
749	749	#main_menu_info {
750	750	position: relative;
751	751	top: 15px;
752		- <?php echo $start;?>: 0px;
753		- padding:10px; padding-<?php echo $start;?>:20px; padding-<?php echo $end;?>:20px;
	752	+ <?php echo $start; ?>: 0px;
	753	+ padding:10px; padding-<?php echo $start; ?>:20px; padding-<?php echo $end; ?>:20px;
754	754	background: #f0f0f0;
755	755	border: 1px solid #dddddd;
756	756	margin-start: 25px;
757		- padding-<?php echo $start;?>: 25px;
	757	+ padding-<?php echo $start; ?>: 25px;
758	758	margin-end: 25px;
759		- padding-<?php echo $end;?>: 25px;
	759	+ padding-<?php echo $end; ?>: 25px;
760	760	padding-bottom: 10px;
761	761	vertical-align: top;
762	762	box-shadow: 5px 5px 5px #666666;
		@@ -787,7 +787,7 @@ discard block
		block discarded – undo
787	787
788	788	#faq {
789	789	padding: 20px;
790		- color: <?php echo $colour2;?>;
	790	+ color: <?php echo $colour2; ?>;
791	791	background: #ffffff;
792	792	}
793	793
		@@ -805,7 +805,7 @@ discard block
		block discarded – undo
805	805	#idp_logo {
806	806	display:none;
807	807	position:absolute;
808		- <?php echo $end;?>:30px;
	808	+ <?php echo $end; ?>:30px;
809	809	max-height:150px;
810	810	max-width:150px;
811	811	padding-top:10px;
		@@ -828,18 +828,18 @@ discard block
		block discarded – undo
828	828	#slides img {
829	829	position: absolute;
830	830	top: 145px;
831		- <?php echo $end;?>: 60px;
	831	+ <?php echo $end; ?>: 60px;
832	832	}
833	833
834	834	#slides span {
835	835	position: absolute;
836		- <?php echo $start;?>: 180px;
	836	+ <?php echo $start; ?>: 180px;
837	837	z-index: 20;
838	838	}
839	839
840	840	#line1 {
841	841	top:145px;
842		- color: <?php echo $colour2;?>;
	842	+ color: <?php echo $colour2; ?>;
843	843	font-size:20px;
844	844	}
845	845
		@@ -851,7 +851,7 @@ discard block
		block discarded – undo
851	851
852	852	#line3 {
853	853	top:245px;
854		- <?php echo $start;?>: 200px;
	854	+ <?php echo $start; ?>: 200px;
855	855	color: maroon;
856	856	font-size:25px;
857	857	}
		@@ -880,16 +880,16 @@ discard block
		block discarded – undo
880	880	height:100%;
881	881	border-spacing:0;
882	882	border-collapse:collapse;
883		- padding-<?php echo $start;?>:200px;
	883	+ padding-<?php echo $start; ?>:200px;
884	884	padding-top:10px;
885	885	}
886	886
887	887	#front_page_leftmenu {
888	888	border-end:solid;
889		- border-color: <?php echo $colour1;?>;
	889	+ border-color: <?php echo $colour1; ?>;
890	890	border-width:5px;
891	891	min-height:400px;
892		- padding-<?php echo $start;?>: 10px;
	892	+ padding-<?php echo $start; ?>: 10px;
893	893	vertical-align:top;
894	894	width:110px;
895	895	padding-top:30px;
		@@ -899,8 +899,8 @@ discard block
		block discarded – undo
899	899	vertical-align: top;
900	900	height:280px;
901	901	background: #fff;
902		- padding-<?php echo $start;?>: 20px;
903		- padding-<?php echo $end;?>: 20px;
	902	+ padding-<?php echo $start; ?>: 20px;
	903	+ padding-<?php echo $end; ?>: 20px;
904	904	}
905	905
906	906	#user_button_td {
		@@ -911,11 +911,11 @@ discard block
		block discarded – undo
911	911	}
912	912
913	913	a:link {
914		- color:<?php echo $colour2;?>;
	914	+ color:<?php echo $colour2; ?>;
915	915	}
916	916
917	917	a:visited {
918		- color:<?php echo $colour2;?>;
	918	+ color:<?php echo $colour2; ?>;
919	919	}
920	920
921	921	a:hover {
		@@ -923,7 +923,7 @@ discard block
		block discarded – undo
923	923	}
924	924
925	925	a:active {
926		- color:<?php echo $colour2;?>;
	926	+ color:<?php echo $colour2; ?>;
927	927	}
928	928
929	929	.comment {
		@@ -954,13 +954,13 @@ discard block
		block discarded – undo
954	954	table.user_overview th {
955	955	text-align: start;
956	956	background: #f0f0f0;
957		- padding-<?php echo $start;?>: 4px;
958		- padding-<?php echo $end;?>: 4px;
	957	+ padding-<?php echo $start; ?>: 4px;
	958	+ padding-<?php echo $end; ?>: 4px;
959	959	}
960	960	table.user_overview td {
961	961	border-top-style: none;
962		- padding-<?php echo $start;?>: 4px;
963		- padding-<?php echo $end;?>: 4px;
	962	+ padding-<?php echo $start; ?>: 4px;
	963	+ padding-<?php echo $end; ?>: 4px;
964	964	padding-top: 0px;
965	965	height: 25px;
966	966	}
		@@ -973,14 +973,14 @@ discard block
		block discarded – undo
973	973	.download_button_text {
974	974	width: 380px;
975	975	position:absolute;
976		- <?php echo $end;?>: 5px;
	976	+ <?php echo $end; ?>: 5px;
977	977	padding-top:0px;
978	978	}
979	979
980	980	#download_info {
981	981	background: #f0f0f0;
982		- padding-<?php echo $start;?>: 20px;
983		- padding-<?php echo $end;?>: 20px;
	982	+ padding-<?php echo $start; ?>: 20px;
	983	+ padding-<?php echo $end; ?>: 20px;
984	984	padding-top:3px;
985	985	padding-bottom:3px;
986	986	}

		@@ -73,13 +73,13 @@ discard block
		block discarded – undo
73	73	$retval = "<div class='sidebar'><p>";
74	74
75	75	if ($advancedControls) {
76		- $retval .= "<strong>" . _("You are:") . "</strong> ".$_SESSION['name']
	76	+ $retval .= "<strong>"._("You are:")."</strong> ".$_SESSION['name']
77	77	."<br/>
78	78	<br/>
79		- <a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_user.php'>" . _("Go to your Profile page") . "</a>
80		- <a href='" . \core\CAT::getRootUrlPath() . "/admin/inc/logout.php'>" . _("Logout") . "</a> ";
	79	+ <a href='" . \core\CAT::getRootUrlPath()."/admin/overview_user.php'>"._("Go to your Profile page")."</a>
	80	+ <a href='" . \core\CAT::getRootUrlPath()."/admin/inc/logout.php'>"._("Logout")."</a> ";
81	81	}
82		- $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/'>" . _("Start page") . "</a>
	82	+ $retval .= "<a href='".\core\CAT::getRootUrlPath()."/'>"._("Start page")."</a>
83	83	</p>
84	84	</div> <!-- sidebar -->";
85	85	\core\common\Entity::outOfThePotatoes();
		@@ -103,23 +103,23 @@ discard block
		block discarded – undo
103	103	<h1>$cap1</h1>
104	104	</div><!--header_captions-->
105	105	<div id='langselection' style='padding-top:20px; padding-".$this->start.":10px;'>
106		- <form action='$place' method='GET' accept-charset='UTF-8'>" . _("View this page in") . "
	106	+ <form action='$place' method='GET' accept-charset='UTF-8'>"._("View this page in")."
107	107	<select id='lang' name='lang' onchange='this.form.submit()'>";
108	108
109	109	foreach (\config\Master::LANGUAGES as $lang => $getValue) {
110		- $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $getValue['display'] . "</option> ";
	110	+ $retval .= "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "")." >".$getValue['display']."</option> ";
111	111	}
112	112	$retval .= "</select>";
113	113
114	114	foreach ($_GET as $getVar => $getValue) {
115	115	$filterValue = filter_input(INPUT_GET, $getVar, FILTER_SANITIZE_STRING);
116	116	if ($getVar != "lang" && $getValue != "") {
117		- $retval .= "<input type='hidden' name='" . htmlspecialchars($getVar) . "' value='" . htmlspecialchars($filterValue) . "'>";
	117	+ $retval .= "<input type='hidden' name='".htmlspecialchars($getVar)."' value='".htmlspecialchars($filterValue)."'>";
118	118	}
119	119	}
120	120	$retval .= "</form>
121	121	</div><!--langselection-->";
122		- $logoUrl = \core\CAT::getRootUrlPath() . "/resources/images/consortium_logo.png";
	122	+ $logoUrl = \core\CAT::getRootUrlPath()."/resources/images/consortium_logo.png";
123	123	$retval .= "<div class='consortium_logo'>
124	124	<img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
125	125	</div> <!-- consortium_logo -->
		@@ -212,7 +212,7 @@ discard block
		block discarded – undo
212	212
213	213	if (isset(\config\Master::APPEARANCE['MOTD']) && \config\Master::APPEARANCE['MOTD'] != "") {
214	214	$retval .= "<div id='header_MOTD' style='display:inline-block; padding-".$this->start.":20px;vertical-align:top;'>
215		- <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD'] . "</p>
	215	+ <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD']."</p>
216	216	</div><!--header_MOTD-->";
217	217	}
218	218	$retval .= $this->sidebar($advancedControls);
		@@ -238,9 +238,9 @@ discard block
		block discarded – undo
238	238	<html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'".($this->langObject->rtl ? "dir='rtl'" : "").">
239	239	<head lang='$ourlocale'>
240	240	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
241		- $cssUrl = \core\CAT::getRootUrlPath() . "/resources/css/cat.css.php";
	241	+ $cssUrl = \core\CAT::getRootUrlPath()."/resources/css/cat.css.php";
242	242	$retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
243		- $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
	243	+ $retval .= "<title>".htmlspecialchars($pagetitle)."</title>";
244	244	return $retval;
245	245	}
246	246
		@@ -254,7 +254,7 @@ discard block
		block discarded – undo
254	254	// we may need to jump up one dir if we are either in admin/ or accountstatus/
255	255	// (accountstatus courtesy of my good mood. It's userspace not admin space so
256	256	// it shouldn't be using this function any more.)
257		- $logoBase = \core\CAT::getRootUrlPath() . "/resources/images";
	257	+ $logoBase = \core\CAT::getRootUrlPath()."/resources/images";
258	258	return "<span id='logos'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
259	259	<img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>
260	260	<span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";

GEANT / CAT

Push — release_2_1 ( c45181...103168 )

Status

Category

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

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

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