GEANT /
CAT
@@ -66,13 +66,13 @@ discard block |
||
| 66 | 66 | $retval = "<div class='sidebar'><p>"; |
| 67 | 67 | |
| 68 | 68 | if ($advancedControls) { |
| 69 | - $retval .= "<strong>" . _("You are:") . "</strong> ".$_SESSION['name'] |
|
| 69 | + $retval .= "<strong>"._("You are:")."</strong> ".$_SESSION['name'] |
|
| 70 | 70 | ."<br/> |
| 71 | 71 | <br/> |
| 72 | - <a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_user.php'>" . _("Go to your Profile page") . "</a> |
|
| 73 | - <a href='" . \core\CAT::getRootUrlPath() . "/admin/inc/logout.php'>" . _("Logout") . "</a> "; |
|
| 72 | + <a href='" . \core\CAT::getRootUrlPath()."/admin/overview_user.php'>"._("Go to your Profile page")."</a> |
|
| 73 | + <a href='" . \core\CAT::getRootUrlPath()."/admin/inc/logout.php'>"._("Logout")."</a> "; |
|
| 74 | 74 | } |
| 75 | - $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/'>" . _("Start page") . "</a> |
|
| 75 | + $retval .= "<a href='".\core\CAT::getRootUrlPath()."/'>"._("Start page")."</a> |
|
| 76 | 76 | </p> |
| 77 | 77 | </div> <!-- sidebar -->"; |
| 78 | 78 | \core\common\Entity::outOfThePotatoes(); |
@@ -96,23 +96,23 @@ discard block |
||
| 96 | 96 | <h1>$cap1</h1> |
| 97 | 97 | </div><!--header_captions--> |
| 98 | 98 | <div id='langselection' style='padding-top:20px; padding-left:10px;'> |
| 99 | - <form action='$place' method='GET' accept-charset='UTF-8'>" . _("View this page in") . " |
|
| 99 | + <form action='$place' method='GET' accept-charset='UTF-8'>"._("View this page in")." |
|
| 100 | 100 | <select id='lang' name='lang' onchange='this.form.submit()'>"; |
| 101 | 101 | |
| 102 | 102 | foreach (\config\Master::LANGUAGES as $lang => $getValue) { |
| 103 | - $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $getValue['display'] . "</option> "; |
|
| 103 | + $retval .= "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "")." >".$getValue['display']."</option> "; |
|
| 104 | 104 | } |
| 105 | 105 | $retval .= "</select>"; |
| 106 | 106 | |
| 107 | 107 | foreach ($_GET as $getVar => $getValue) { |
| 108 | 108 | $filterValue = filter_input(INPUT_GET, $getVar, FILTER_SANITIZE_STRING); |
| 109 | 109 | if ($getVar != "lang" && $getValue != "") { |
| 110 | - $retval .= "<input type='hidden' name='" . htmlspecialchars($getVar) . "' value='" . htmlspecialchars($filterValue) . "'>"; |
|
| 110 | + $retval .= "<input type='hidden' name='".htmlspecialchars($getVar)."' value='".htmlspecialchars($filterValue)."'>"; |
|
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | $retval .= "</form> |
| 114 | 114 | </div><!--langselection-->"; |
| 115 | - $logoUrl = \core\CAT::getRootUrlPath() . "/resources/images/consortium_logo.png"; |
|
| 115 | + $logoUrl = \core\CAT::getRootUrlPath()."/resources/images/consortium_logo.png"; |
|
| 116 | 116 | $retval .= "<div class='consortium_logo'> |
| 117 | 117 | <img id='test_locate' src='$logoUrl' alt='Consortium Logo'> |
| 118 | 118 | </div> <!-- consortium_logo --> |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | |
| 206 | 206 | if (isset(\config\Master::APPEARANCE['MOTD']) && \config\Master::APPEARANCE['MOTD'] != "") { |
| 207 | 207 | $retval .= "<div id='header_MOTD' style='display:inline-block; padding-left:20px;vertical-align:top;'> |
| 208 | - <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD'] . "</p> |
|
| 208 | + <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD']."</p> |
|
| 209 | 209 | </div><!--header_MOTD-->"; |
| 210 | 210 | } |
| 211 | 211 | $retval .= $this->sidebar($advancedControls); |
@@ -231,9 +231,9 @@ discard block |
||
| 231 | 231 | <html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'".($this->langObject->rtl ? "dir='rtl'" : "")."> |
| 232 | 232 | <head lang='$ourlocale'> |
| 233 | 233 | <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>"; |
| 234 | - $cssUrl = \core\CAT::getRootUrlPath() . "/resources/css/cat.css.php"; |
|
| 234 | + $cssUrl = \core\CAT::getRootUrlPath()."/resources/css/cat.css.php"; |
|
| 235 | 235 | $retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />"; |
| 236 | - $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>"; |
|
| 236 | + $retval .= "<title>".htmlspecialchars($pagetitle)."</title>"; |
|
| 237 | 237 | return $retval; |
| 238 | 238 | } |
| 239 | 239 | |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | // we may need to jump up one dir if we are either in admin/ or accountstatus/ |
| 248 | 248 | // (accountstatus courtesy of my good mood. It's userspace not admin space so |
| 249 | 249 | // it shouldn't be using this function any more.) |
| 250 | - $logoBase = \core\CAT::getRootUrlPath() . "/resources/images"; |
|
| 250 | + $logoBase = \core\CAT::getRootUrlPath()."/resources/images"; |
|
| 251 | 251 | return "<span id='logos' style='position:fixed; left:50%;'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/> |
| 252 | 252 | <img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span> |
| 253 | 253 | <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>"; |
@@ -269,9 +269,9 @@ discard block |
||
| 269 | 269 | <table style='width:100%'> |
| 270 | 270 | <tr> |
| 271 | 271 | <td style='padding-left:20px; padding-right:20px; text-align:left; vertical-align:top;'> |
| 272 | - " . $cat->catCopyright . "</td>"; |
|
| 272 | + " . $cat->catCopyright."</td>"; |
|
| 273 | 273 | if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) { |
| 274 | - $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),\config\ConfAssistant::CONSORTIUM['display_name']) . "</a></td>"; |
|
| 274 | + $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['display_name'])."</a></td>"; |
|
| 275 | 275 | } |
| 276 | 276 | $retval .= " <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>"; |
| 277 | 277 | |
@@ -61,10 +61,10 @@ |
||
| 61 | 61 | header("Content-Type:text/html;charset=utf-8"); |
| 62 | 62 | ?> |
| 63 | 63 | <!DOCTYPE html> |
| 64 | - <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale;?>' <?php echo ($direction ? "dir='rtl'" : "");?>> |
|
| 65 | - <head lang='<?php echo $ourlocale;?>'> |
|
| 64 | + <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale; ?>' <?php echo ($direction ? "dir='rtl'" : ""); ?>> |
|
| 65 | + <head lang='<?php echo $ourlocale; ?>'> |
|
| 66 | 66 | <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'> |
| 67 | - <title><?php echo htmlspecialchars($pagetitle);?></title> |
|
| 67 | + <title><?php echo htmlspecialchars($pagetitle); ?></title> |
|
| 68 | 68 | <script type="text/javascript">ie_version = 0;</script> |
| 69 | 69 | <!--[if IE]> |
| 70 | 70 | <script type="text/javascript">ie_version=1;</script> |
@@ -81,9 +81,9 @@ discard block |
||
| 81 | 81 | $loggerInstance = new \core\common\Logging(); |
| 82 | 82 | $olddomain = textdomain(NULL); |
| 83 | 83 | $loggerInstance->debug(4, "set_locale($domain)\n"); |
| 84 | - $loggerInstance->debug(4, ROOT . "\n"); |
|
| 84 | + $loggerInstance->debug(4, ROOT."\n"); |
|
| 85 | 85 | textdomain($domain); |
| 86 | - bindtextdomain($domain, ROOT . "/translation/"); |
|
| 86 | + bindtextdomain($domain, ROOT."/translation/"); |
|
| 87 | 87 | bind_textdomain_codeset($domain, "UTF-8"); |
| 88 | 88 | return $olddomain; |
| 89 | 89 | } |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | |
| 137 | 137 | // check if this language is supported by the CAT config |
| 138 | 138 | foreach (\config\Master::LANGUAGES as $language => $value) { |
| 139 | - if (preg_match("/^" . $language . ".*/", $tryLang)) { |
|
| 139 | + if (preg_match("/^".$language.".*/", $tryLang)) { |
|
| 140 | 140 | $localeTmp = $value['locale']; |
| 141 | 141 | $langIndex = $language; // ??? |
| 142 | 142 | break; |
@@ -151,12 +151,12 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | } |
| 154 | - putenv("LC_ALL=" . $theLocale); |
|
| 154 | + putenv("LC_ALL=".$theLocale); |
|
| 155 | 155 | $_SESSION['language'] = $langIndex; |
| 156 | 156 | $loggerInstance = new \core\common\Logging(); |
| 157 | 157 | $loggerInstance->debug(4, "selected lang:$langIndex:$theLocale\n"); |
| 158 | 158 | $loggerInstance->debug(4, print_r($langConverted, true)); |
| 159 | - return([$langIndex, $theLocale,$isRtl]); |
|
| 159 | + return([$langIndex, $theLocale, $isRtl]); |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
