Inspection of "Merge pull request #269 from DimitriPapadopoulos/G..." - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — release_2_1 ( 0530b6...7784c3 )

by Stefan

created 2023-05-31 11:41 UTC

Status

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

@@ -61,10 +61,10 @@
 block discarded – undo
         header("Content-Type:text/html;charset=utf-8");
         ?>
         <!DOCTYPE html>
-          <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale;?>' <?php echo ($direction ? "dir='rtl'" : "");?>>
-          <head lang='<?php echo $ourlocale;?>'>
+          <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale; ?>' <?php echo ($direction ? "dir='rtl'" : ""); ?>>
+          <head lang='<?php echo $ourlocale; ?>'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-          <title><?php echo htmlspecialchars($pagetitle);?></title>
+          <title><?php echo htmlspecialchars($pagetitle); ?></title>
           <script type="text/javascript">ie_version = 0;</script>
 <!--[if IE]>
 <script type="text/javascript">ie_version=1;</script>

Please login to merge, or discard this patch.

web/lib/admin/OptionParser.php 1 patch

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

@@ -101,7 +101,7 @@  discard block
 block discarded – undo
                 $optionClass = \core\Options::instance();
                 $optionProps = $optionClass->optionType($optiontype);
                 $allowedValues = explode(',', substr($optionProps["flags"], 7));
-                if (in_array($incomingBinary,$allowedValues))  {
+                if (in_array($incomingBinary, $allowedValues)) {
                     return TRUE;
                 }
                 return FALSE;
@@ -347,14 +347,14 @@  discard block
 block discarded – undo
                 case \core\Options::TYPECODE_TEXT:
                 case \core\Options::TYPECODE_COORDINATES:
                 case \core\Options::TYPECODE_INTEGER:
-                    $varName = $listOfEntries["$objId-" . self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['field']];
+                    $varName = $listOfEntries["$objId-".self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['field']];
                     if (!empty($varName)) {
                         $content = call_user_func_array([$this->validator, self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['function']], array_merge([$varName], self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['extraarg']));
                         break;
                     }
                     continue 2;
                 case \core\Options::TYPECODE_BOOLEAN:
-                    $varName = $listOfEntries["$objId-" . \core\Options::TYPECODE_BOOLEAN];
+                    $varName = $listOfEntries["$objId-".\core\Options::TYPECODE_BOOLEAN];
                     if (!empty($varName)) {
                         $contentValid = $this->validator->boolean($varName);
                         if ($contentValid) {
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
                     }
                     continue 2;
                 case \core\Options::TYPECODE_STRING:
-                    $previsionalContent = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING];
+                    $previsionalContent = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING];
                     if (!empty(trim($previsionalContent))) {
                         $content = $this->furtherStringChecks($objValue, $previsionalContent, $bad);
                         if ($content === FALSE) {
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
                     continue 2;
                     
                 case \core\Options::TYPECODE_ENUM_OPENROAMING:
-                    $previsionalContent = $listOfEntries["$objId-" . \core\Options::TYPECODE_ENUM_OPENROAMING];
+                    $previsionalContent = $listOfEntries["$objId-".\core\Options::TYPECODE_ENUM_OPENROAMING];
                     if (!empty($previsionalContent)) {
                         $content = $this->furtherStringChecks($objValue, $previsionalContent, $bad);
                         if ($content === FALSE) {
@@ -389,15 +389,15 @@  discard block
 block discarded – undo
                     continue 2;    
                 case \core\Options::TYPECODE_FILE:
                     // this is either actually an uploaded file, or a reference to a DB entry of a previously uploaded file
-                    $reference = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING];
+                    $reference = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING];
                     if (!empty($reference)) { // was already in, by ROWID reference, extract
                         // ROWID means it's a multi-line string (simple strings are inline in the form; so allow whitespace)
                         $content = $this->validator->string(urldecode($reference), TRUE);
                         break;
                     }
-                    $fileName = $listOfEntries["$objId-" . \core\Options::TYPECODE_FILE] ?? "";
+                    $fileName = $listOfEntries["$objId-".\core\Options::TYPECODE_FILE] ?? "";
                     if ($fileName != "") { // let's do the download
-                        $rawContent = \core\common\OutsideComm::downloadFile("file:///" . $fileName);
+                        $rawContent = \core\common\OutsideComm::downloadFile("file:///".$fileName);
 
                         if ($rawContent === FALSE || !$this->checkUploadSanity($objValue, $rawContent)) {
                             $bad[] = $objValue;
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
                     }
                     continue 2;
                 default:
-                    throw new Exception("Internal Error: Unknown option type " . $objValue . "!");
+                    throw new Exception("Internal Error: Unknown option type ".$objValue."!");
             }
             // lang can be NULL here, if it's not a multilang attribute, or a ROWID reference. Never mind that.
             $retval[] = ["$objValue" => ["lang" => $languageFlag, "content" => $content]];

Please login to merge, or discard this patch.

web/resources/css/cat.css.php 1 patch

Spacing +43 added lines, -43 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,7 +34,7 @@  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;
@@ -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 {
@@ -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,14 +189,14 @@  discard block
 block discarded – undo
     display: block;
     position: absolute;
     top:0;
-    <?php echo $end;?>:0;
+    <?php echo $end; ?>:0;
     padding-end:20px;
     padding-top:7px;
 }
 
 div.sidebar {
     display: inline;
-    float: <?php echo $end;?>;
+    float: <?php echo $end; ?>;
     padding-end: 20px;
 }
 div.sidebar a {
@@ -241,8 +241,8 @@  discard block
 block discarded – undo
 
 div.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;
@@ -288,8 +288,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;
@@ -315,7 +315,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;
 }
@@ -324,15 +324,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 {
@@ -346,12 +346,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;
 }
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     padding-start:30px;
 }
 
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
 }
 
 #close_button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     height: 23px;
     border-start-style: inset; 
@@ -606,14 +606,14 @@  discard block
 block discarded – undo
     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;
@@ -627,7 +627,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;
@@ -661,7 +661,7 @@  discard block
 block discarded – undo
     width: 30em; 
     padding-start: 10px; 
     padding-end: 0px; 
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: white; 
     box-shadow: 10px 10px 5px #888888;
 }
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
     padding-top: 4px; 
     padding-bottom: 12px; 
     padding-start: 30px; 
-    background: <?php echo $colour1;?>; 
+    background: <?php echo $colour1; ?>; 
     text-align: start; 
     text-shadow: 10px 10px 5px #888888;
 }
@@ -718,9 +718,9 @@  discard block
 block discarded – undo
     border-bottom-style:solid;
     border-top-width:5px;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     padding-start:30px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 #heading h1 { 
@@ -739,7 +739,7 @@  discard block
 block discarded – undo
     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;
 }
@@ -748,7 +748,7 @@  discard block
 block discarded – undo
 #main_menu_info { 
                     position: relative;
                     top: 15px;
-                    <?php echo $start;?>: 0px;
+                    <?php echo $start; ?>: 0px;
                     padding:10px; padding-start:20px; padding-end:20px;
                     background: #f0f0f0;
                     border: 1px solid #dddddd;
@@ -786,7 +786,7 @@  discard block
 block discarded – undo
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -804,7 +804,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;
@@ -827,18 +827,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;
 }
 
@@ -850,7 +850,7 @@  discard block
 block discarded – undo
 
 #line3 {
     top:245px;
-    <?php echo $start;?>: 200px;
+    <?php echo $start; ?>: 200px;
     color: maroon;
     font-size:25px;
 }
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
 
 #front_page_leftmenu {
     border-end:solid; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     border-width:5px; 
     min-height:400px; 
     padding-start: 10px; 
@@ -910,11 +910,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 {
@@ -922,7 +922,7 @@  discard block
 block discarded – undo
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {
@@ -972,7 +972,7 @@  discard block
 block discarded – undo
 .download_button_text {
     width: 380px;
     position:absolute;
-    <?php echo $end;?>: 5px;
+    <?php echo $end; ?>: 5px;
     padding-top:0px;
 }
 

Please login to merge, or discard this patch.

web/skins/modern/resources/css/cat-user.css.php 1 patch

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

@@ -18,7 +18,7 @@
 block discarded – undo
  * License: see the web/copyright.inc.php file in the file structure or
  *          <base_url>/copyright.php after deploying the software
  */
-require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . "/config/_config.php";
+require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__))))))."/config/_config.php";
 $langInstance = new core\common\Language();
 $start = $langInstance->rtl ? "right" : "left";
 $end = $langInstance->rtl ? "left" : "right";

Please login to merge, or discard this patch.

web/skins/modern/accountstatus/resources/css/accountstatus.css.php 1 patch

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

@@ -20,7 +20,7 @@
 block discarded – undo
 $start = $langInstance->rtl ? "right" : "left";
 ?>
 #sb_info {
-    padding-<?php echo $start;?>: 30px; 
+    padding-<?php echo $start; ?>: 30px; 
     font-size: 12px;  
     font-weight: normal; 
 }

Please login to merge, or discard this patch.

web/admin/css/eapSorter.css.php 1 patch

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

@@ -29,15 +29,15 @@  discard block
 block discarded – undo
 ol.eapmethods { list-style-position: inside; margin: 0; padding: 0px; padding-top: 20px; padding-bottom: 0px; width: 20em; }
 ol.eapmethods li{
     background: #CCF;
-    border-<?php echo $start;?>-style: inset;
-    border-<?php echo $start;?>-width: 1px;
-    border-<?php echo $start;?>-color: #8BBACB;
+    border-<?php echo $start; ?>-style: inset;
+    border-<?php echo $start; ?>-width: 1px;
+    border-<?php echo $start; ?>-color: #8BBACB;
     border-top-style: inset;
     border-top-width: 1px;
     border-top-color: #8BBACB;
-    border-<?php echo $end;?>-style: outset;
-    border-<?php echo $end;?>-width: 2px;
-    border-<?php echo $end;?>-color: #043D52;
+    border-<?php echo $end; ?>-style: outset;
+    border-<?php echo $end; ?>-width: 2px;
+    border-<?php echo $end; ?>-color: #043D52;
     border-bottom-style: outset;
     border-bottom-width: 2px;
     border-bottom-color: #043D52;
@@ -48,8 +48,8 @@  discard block
 block discarded – undo
     background-position:95% 50%;
     margin: 2px 0px 2px 0px;
     padding: 3px;
-    padding-<?php echo $start;?>: 1em;
-    padding-<?php echo $end;?>: 0px;
+    padding-<?php echo $start; ?>: 1em;
+    padding-<?php echo $end; ?>: 0px;
 }
 
 table.eaptable td {

Please login to merge, or discard this patch.

web/admin/css/silverbullet.css.php 1 patch

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

@@ -80,16 +80,16 @@
 block discarded – undo
     margin-bottom:3px;
 }
 .sb-date-picker{
-    padding-<?php echo $end;?>:25px;
+    padding-<?php echo $end; ?>:25px;
     width: 140px;
 }
 .sb-date-button{
-    margin-<?php echo $start;?>:-30px;
+    margin-<?php echo $start; ?>:-30px;
     min-height: 22px;
-    border-<?php echo $start;?>-style: solid;
+    border-<?php echo $start; ?>-style: solid;
     border-top-style: solid;
-    border-<?php echo $end;?>-style: solid;
-    border-<?php echo $end;?>-width: 1px;
+    border-<?php echo $end; ?>-style: solid;
+    border-<?php echo $end; ?>-width: 1px;
     border-bottom-width: 1px;
     border-radius: 1px;
     box-shadow: 0px 0px 0px #666666;

Please login to merge, or discard this patch.

web/admin/inc/overview_js.php 1 patch

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

@@ -69,7 +69,7 @@
 block discarded – undo
     $langInstance = new core\common\Language();
     $end = $langInstance->rtl ? "left" : "right";
     ?>
-    pressedButton.next().append('<span style="padding-<?php echo $end;?>:1em">'+msg+'<\/span>');
+    pressedButton.next().append('<span style="padding-<?php echo $end; ?>:1em">'+msg+'<\/span>');
     }
     );
     }

Please login to merge, or discard this patch.

core/common/Language.php 1 patch

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

@@ -81,9 +81,9 @@  discard block
 block discarded – undo
         $loggerInstance = new \core\common\Logging();
         $olddomain = textdomain(NULL);
         $loggerInstance->debug(4, "set_locale($domain)\n");
-        $loggerInstance->debug(4, ROOT . "\n");
+        $loggerInstance->debug(4, ROOT."\n");
         textdomain($domain);
-        bindtextdomain($domain, ROOT . "/translation/");
+        bindtextdomain($domain, ROOT."/translation/");
         bind_textdomain_codeset($domain, "UTF-8");
         return $olddomain;
     }
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
 
             // check if this language is supported by the CAT config
             foreach (\config\Master::LANGUAGES as $language => $value) {
-                if (preg_match("/^" . $language . ".*/", $tryLang)) {
+                if (preg_match("/^".$language.".*/", $tryLang)) {
                     $localeTmp = $value['locale'];
                     $langIndex = $language; // ???
                     break;
@@ -152,11 +152,11 @@  discard block
 block discarded – undo
             }
         }
         $isRtl = \config\Master::LANGUAGES[$langIndex]['rtl'];
-        putenv("LC_ALL=" . $theLocale);
+        putenv("LC_ALL=".$theLocale);
         $_SESSION['language'] = $langIndex;
         $loggerInstance->debug(4, "selected lang:$langIndex:$theLocale\n");
         $loggerInstance->debug(4, print_r($langConverted, true));
-        return([$langIndex, $theLocale,$isRtl]);
+        return([$langIndex, $theLocale, $isRtl]);
     }
 
     /**

Please login to merge, or discard this patch.

		@@ -101,7 +101,7 @@ discard block
		block discarded – undo
101	101	$optionClass = \core\Options::instance();
102	102	$optionProps = $optionClass->optionType($optiontype);
103	103	$allowedValues = explode(',', substr($optionProps["flags"], 7));
104		- if (in_array($incomingBinary,$allowedValues)) {
	104	+ if (in_array($incomingBinary, $allowedValues)) {
105	105	return TRUE;
106	106	}
107	107	return FALSE;
		@@ -347,14 +347,14 @@ discard block
		block discarded – undo
347	347	case \core\Options::TYPECODE_TEXT:
348	348	case \core\Options::TYPECODE_COORDINATES:
349	349	case \core\Options::TYPECODE_INTEGER:
350		- $varName = $listOfEntries["$objId-" . self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['field']];
	350	+ $varName = $listOfEntries["$objId-".self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['field']];
351	351	if (!empty($varName)) {
352	352	$content = call_user_func_array([$this->validator, self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['function']], array_merge([$varName], self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['extraarg']));
353	353	break;
354	354	}
355	355	continue 2;
356	356	case \core\Options::TYPECODE_BOOLEAN:
357		- $varName = $listOfEntries["$objId-" . \core\Options::TYPECODE_BOOLEAN];
	357	+ $varName = $listOfEntries["$objId-".\core\Options::TYPECODE_BOOLEAN];
358	358	if (!empty($varName)) {
359	359	$contentValid = $this->validator->boolean($varName);
360	360	if ($contentValid) {
		@@ -367,7 +367,7 @@ discard block
		block discarded – undo
367	367	}
368	368	continue 2;
369	369	case \core\Options::TYPECODE_STRING:
370		- $previsionalContent = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING];
	370	+ $previsionalContent = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING];
371	371	if (!empty(trim($previsionalContent))) {
372	372	$content = $this->furtherStringChecks($objValue, $previsionalContent, $bad);
373	373	if ($content === FALSE) {
		@@ -378,7 +378,7 @@ discard block
		block discarded – undo
378	378	continue 2;
379	379
380	380	case \core\Options::TYPECODE_ENUM_OPENROAMING:
381		- $previsionalContent = $listOfEntries["$objId-" . \core\Options::TYPECODE_ENUM_OPENROAMING];
	381	+ $previsionalContent = $listOfEntries["$objId-".\core\Options::TYPECODE_ENUM_OPENROAMING];
382	382	if (!empty($previsionalContent)) {
383	383	$content = $this->furtherStringChecks($objValue, $previsionalContent, $bad);
384	384	if ($content === FALSE) {
		@@ -389,15 +389,15 @@ discard block
		block discarded – undo
389	389	continue 2;
390	390	case \core\Options::TYPECODE_FILE:
391	391	// this is either actually an uploaded file, or a reference to a DB entry of a previously uploaded file
392		- $reference = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING];
	392	+ $reference = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING];
393	393	if (!empty($reference)) { // was already in, by ROWID reference, extract
394	394	// ROWID means it's a multi-line string (simple strings are inline in the form; so allow whitespace)
395	395	$content = $this->validator->string(urldecode($reference), TRUE);
396	396	break;
397	397	}
398		- $fileName = $listOfEntries["$objId-" . \core\Options::TYPECODE_FILE] ?? "";
	398	+ $fileName = $listOfEntries["$objId-".\core\Options::TYPECODE_FILE] ?? "";
399	399	if ($fileName != "") { // let's do the download
400		- $rawContent = \core\common\OutsideComm::downloadFile("file:///" . $fileName);
	400	+ $rawContent = \core\common\OutsideComm::downloadFile("file:///".$fileName);
401	401
402	402	if ($rawContent === FALSE \|\| !$this->checkUploadSanity($objValue, $rawContent)) {
403	403	$bad[] = $objValue;
		@@ -408,7 +408,7 @@ discard block
		block discarded – undo
408	408	}
409	409	continue 2;
410	410	default:
411		- throw new Exception("Internal Error: Unknown option type " . $objValue . "!");
	411	+ throw new Exception("Internal Error: Unknown option type ".$objValue."!");
412	412	}
413	413	// lang can be NULL here, if it's not a multilang attribute, or a ROWID reference. Never mind that.
414	414	$retval[] = ["$objValue" => ["lang" => $languageFlag, "content" => $content]];

		@@ -61,10 +61,10 @@
		block discarded – undo
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>

		@@ -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,7 +34,7 @@ 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;
		@@ -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 {
		@@ -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,14 +189,14 @@ discard block
		block discarded – undo
189	189	display: block;
190	190	position: absolute;
191	191	top:0;
192		- <?php echo $end;?>:0;
	192	+ <?php echo $end; ?>:0;
193	193	padding-end:20px;
194	194	padding-top:7px;
195	195	}
196	196
197	197	div.sidebar {
198	198	display: inline;
199		- float: <?php echo $end;?>;
	199	+ float: <?php echo $end; ?>;
200	200	padding-end: 20px;
201	201	}
202	202	div.sidebar a {
		@@ -241,8 +241,8 @@ discard block
		block discarded – undo
241	241
242	242	div.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;
		@@ -288,8 +288,8 @@ discard block
		block discarded – undo
288	288	position: fixed;
289	289	top: 0;
290	290	bottom: 0;
291		- <?php echo $start;?>: 0;
292		- <?php echo $end;?>: 0;
	291	+ <?php echo $start; ?>: 0;
	292	+ <?php echo $end; ?>: 0;
293	293	background-color: #000000;
294	294	opacity: 0.5;
295	295	z-index: 90;
		@@ -315,7 +315,7 @@ discard block
		block discarded – undo
315	315	padding: 15px;
316	316	text-align: start;
317	317	width: 850px;
318		- <?php echo $start;?>: 100px;
	318	+ <?php echo $start; ?>: 100px;
319	319	top: 50px;
320	320	z-index: 100;
321	321	}
		@@ -324,15 +324,15 @@ discard block
		block discarded – undo
324	324	position: absolute;
325	325	top: 0;
326	326	bottom: 0;
327		- <?php echo $start;?>: 0;
328		- <?php echo $end;?>: 0;
	327	+ <?php echo $start; ?>: 0;
	328	+ <?php echo $end; ?>: 0;
329	329	z-index: 100;
330	330	}
331	331
332	332	div#msgbox div {
333	333	position: fixed;
334		- <?php echo $start;?>: 0;
335		- <?php echo $end;?>: 0;
	334	+ <?php echo $start; ?>: 0;
	335	+ <?php echo $end; ?>: 0;
336	336	}
337	337
338	338	div#msgbox div div.graybox {
		@@ -346,12 +346,12 @@ discard block
		block discarded – undo
346	346	div.graybox img {
347	347	display: block;
348	348	cursor: pointer;
349		- float: <?php echo $end;?>;
	349	+ float: <?php echo $end; ?>;
350	350	margin: 0px 0px 10px 10px;
351	351	}
352	352
353	353	img.icon {
354		- float: <?php echo $start;?>;
	354	+ float: <?php echo $start; ?>;
355	355	margin-end: 5px;
356	356	margin-top: 3px;
357	357	}
		@@ -408,7 +408,7 @@ discard block
		block discarded – undo
408	408
409	409	span.edu_cat {
410	410	font-weight: bold;
411		- color: <?php echo $colour2;?>;
	411	+ color: <?php echo $colour2; ?>;
412	412	}
413	413
414	414	span.tooltip {
		@@ -516,7 +516,7 @@ discard block
		block discarded – undo
516	516	border-bottom-style:solid;
517	517	border-top-width:5px;
518	518	border-bottom-width:5px;
519		- border-color: <?php echo $colour1;?>;
	519	+ border-color: <?php echo $colour1; ?>;
520	520	padding-start:30px;
521	521	}
522	522
		@@ -586,7 +586,7 @@ discard block
		block discarded – undo
586	586	}
587	587
588	588	#close_button {
589		- background: <?php echo $colour2;?>;
	589	+ background: <?php echo $colour2; ?>;
590	590	color: #FFFFFF;
591	591	height: 23px;
592	592	border-start-style: inset;
		@@ -606,14 +606,14 @@ discard block
		block discarded – undo
606	606	padding-top: 1px;
607	607	padding-bottom: 1px;
608	608	position: relative;
609		- <?php echo $start;?>: 640px;
	609	+ <?php echo $start; ?>: 640px;
610	610	cursor:pointer;
611	611	}
612	612
613	613	#loading_ico {
614	614	display: none;
615	615	position: absolute;
616		- <?php echo $start;?>: 200px;
	616	+ <?php echo $start; ?>: 200px;
617	617	top: 220px;
618	618	z-index: 200;
619	619	text-align: center;
		@@ -627,7 +627,7 @@ discard block
		block discarded – undo
627	627	z-index: 100;
628	628	position: absolute;
629	629	width: 700px;
630		- <?php echo $start;?>: 200px;
	630	+ <?php echo $start; ?>: 200px;
631	631	text-align: justify;
632	632	top: 200px;
633	633	box-shadow: 5px 5px 5px #666666;
		@@ -661,7 +661,7 @@ discard block
		block discarded – undo
661	661	width: 30em;
662	662	padding-start: 10px;
663	663	padding-end: 0px;
664		- background: <?php echo $colour2;?>;
	664	+ background: <?php echo $colour2; ?>;
665	665	color: white;
666	666	box-shadow: 10px 10px 5px #888888;
667	667	}
		@@ -708,7 +708,7 @@ discard block
		block discarded – undo
708	708	padding-top: 4px;
709	709	padding-bottom: 12px;
710	710	padding-start: 30px;
711		- background: <?php echo $colour1;?>;
	711	+ background: <?php echo $colour1; ?>;
712	712	text-align: start;
713	713	text-shadow: 10px 10px 5px #888888;
714	714	}
		@@ -718,9 +718,9 @@ discard block
		block discarded – undo
718	718	border-bottom-style:solid;
719	719	border-top-width:5px;
720	720	border-bottom-width:5px;
721		- border-color: <?php echo $colour1;?>;
	721	+ border-color: <?php echo $colour1; ?>;
722	722	padding-start:30px;
723		- color: <?php echo $colour2;?>;
	723	+ color: <?php echo $colour2; ?>;
724	724	}
725	725
726	726	#heading h1 {
		@@ -739,7 +739,7 @@ discard block
		block discarded – undo
739	739	text-align: justify;
740	740	border-bottom-style:solid;
741	741	border-bottom-width:5px;
742		- border-color: <?php echo $colour1;?>;
	742	+ border-color: <?php echo $colour1; ?>;
743	743	font-size: 11px;
744	744	font-weight: normal;
745	745	}
		@@ -748,7 +748,7 @@ discard block
		block discarded – undo
748	748	#main_menu_info {
749	749	position: relative;
750	750	top: 15px;
751		- <?php echo $start;?>: 0px;
	751	+ <?php echo $start; ?>: 0px;
752	752	padding:10px; padding-start:20px; padding-end:20px;
753	753	background: #f0f0f0;
754	754	border: 1px solid #dddddd;
		@@ -786,7 +786,7 @@ discard block
		block discarded – undo
786	786
787	787	#faq {
788	788	padding: 20px;
789		- color: <?php echo $colour2;?>;
	789	+ color: <?php echo $colour2; ?>;
790	790	background: #ffffff;
791	791	}
792	792
		@@ -804,7 +804,7 @@ discard block
		block discarded – undo
804	804	#idp_logo {
805	805	display:none;
806	806	position:absolute;
807		- <?php echo $end;?>:30px;
	807	+ <?php echo $end; ?>:30px;
808	808	max-height:150px;
809	809	max-width:150px;
810	810	padding-top:10px;
		@@ -827,18 +827,18 @@ discard block
		block discarded – undo
827	827	#slides img {
828	828	position: absolute;
829	829	top: 145px;
830		- <?php echo $end;?>: 60px;
	830	+ <?php echo $end; ?>: 60px;
831	831	}
832	832
833	833	#slides span {
834	834	position: absolute;
835		- <?php echo $start;?>: 180px;
	835	+ <?php echo $start; ?>: 180px;
836	836	z-index: 20;
837	837	}
838	838
839	839	#line1 {
840	840	top:145px;
841		- color: <?php echo $colour2;?>;
	841	+ color: <?php echo $colour2; ?>;
842	842	font-size:20px;
843	843	}
844	844
		@@ -850,7 +850,7 @@ discard block
		block discarded – undo
850	850
851	851	#line3 {
852	852	top:245px;
853		- <?php echo $start;?>: 200px;
	853	+ <?php echo $start; ?>: 200px;
854	854	color: maroon;
855	855	font-size:25px;
856	856	}
		@@ -885,7 +885,7 @@ discard block
		block discarded – undo
885	885
886	886	#front_page_leftmenu {
887	887	border-end:solid;
888		- border-color: <?php echo $colour1;?>;
	888	+ border-color: <?php echo $colour1; ?>;
889	889	border-width:5px;
890	890	min-height:400px;
891	891	padding-start: 10px;
		@@ -910,11 +910,11 @@ discard block
		block discarded – undo
910	910	}
911	911
912	912	a:link {
913		- color:<?php echo $colour2;?>;
	913	+ color:<?php echo $colour2; ?>;
914	914	}
915	915
916	916	a:visited {
917		- color:<?php echo $colour2;?>;
	917	+ color:<?php echo $colour2; ?>;
918	918	}
919	919
920	920	a:hover {
		@@ -922,7 +922,7 @@ discard block
		block discarded – undo
922	922	}
923	923
924	924	a:active {
925		- color:<?php echo $colour2;?>;
	925	+ color:<?php echo $colour2; ?>;
926	926	}
927	927
928	928	.comment {
		@@ -972,7 +972,7 @@ discard block
		block discarded – undo
972	972	.download_button_text {
973	973	width: 380px;
974	974	position:absolute;
975		- <?php echo $end;?>: 5px;
	975	+ <?php echo $end; ?>: 5px;
976	976	padding-top:0px;
977	977	}
978	978

		@@ -18,7 +18,7 @@
		block discarded – undo
18	18	* License: see the web/copyright.inc.php file in the file structure or
19	19	* <base_url>/copyright.php after deploying the software
20	20	*/
21		-require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . "/config/_config.php";
	21	+require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__))))))."/config/_config.php";
22	22	$langInstance = new core\common\Language();
23	23	$start = $langInstance->rtl ? "right" : "left";
24	24	$end = $langInstance->rtl ? "left" : "right";

		@@ -20,7 +20,7 @@
		block discarded – undo
20	20	$start = $langInstance->rtl ? "right" : "left";
21	21	?>
22	22	#sb_info {
23		- padding-<?php echo $start;?>: 30px;
	23	+ padding-<?php echo $start; ?>: 30px;
24	24	font-size: 12px;
25	25	font-weight: normal;
26	26	}

		@@ -29,15 +29,15 @@ discard block
		block discarded – undo
29	29	ol.eapmethods { list-style-position: inside; margin: 0; padding: 0px; padding-top: 20px; padding-bottom: 0px; width: 20em; }
30	30	ol.eapmethods li{
31	31	background: #CCF;
32		- border-<?php echo $start;?>-style: inset;
33		- border-<?php echo $start;?>-width: 1px;
34		- border-<?php echo $start;?>-color: #8BBACB;
	32	+ border-<?php echo $start; ?>-style: inset;
	33	+ border-<?php echo $start; ?>-width: 1px;
	34	+ border-<?php echo $start; ?>-color: #8BBACB;
35	35	border-top-style: inset;
36	36	border-top-width: 1px;
37	37	border-top-color: #8BBACB;
38		- border-<?php echo $end;?>-style: outset;
39		- border-<?php echo $end;?>-width: 2px;
40		- border-<?php echo $end;?>-color: #043D52;
	38	+ border-<?php echo $end; ?>-style: outset;
	39	+ border-<?php echo $end; ?>-width: 2px;
	40	+ border-<?php echo $end; ?>-color: #043D52;
41	41	border-bottom-style: outset;
42	42	border-bottom-width: 2px;
43	43	border-bottom-color: #043D52;
		@@ -48,8 +48,8 @@ discard block
		block discarded – undo
48	48	background-position:95% 50%;
49	49	margin: 2px 0px 2px 0px;
50	50	padding: 3px;
51		- padding-<?php echo $start;?>: 1em;
52		- padding-<?php echo $end;?>: 0px;
	51	+ padding-<?php echo $start; ?>: 1em;
	52	+ padding-<?php echo $end; ?>: 0px;
53	53	}
54	54
55	55	table.eaptable td {

		@@ -80,16 +80,16 @@
		block discarded – undo
80	80	margin-bottom:3px;
81	81	}
82	82	.sb-date-picker{
83		- padding-<?php echo $end;?>:25px;
	83	+ padding-<?php echo $end; ?>:25px;
84	84	width: 140px;
85	85	}
86	86	.sb-date-button{
87		- margin-<?php echo $start;?>:-30px;
	87	+ margin-<?php echo $start; ?>:-30px;
88	88	min-height: 22px;
89		- border-<?php echo $start;?>-style: solid;
	89	+ border-<?php echo $start; ?>-style: solid;
90	90	border-top-style: solid;
91		- border-<?php echo $end;?>-style: solid;
92		- border-<?php echo $end;?>-width: 1px;
	91	+ border-<?php echo $end; ?>-style: solid;
	92	+ border-<?php echo $end; ?>-width: 1px;
93	93	border-bottom-width: 1px;
94	94	border-radius: 1px;
95	95	box-shadow: 0px 0px 0px #666666;

		@@ -69,7 +69,7 @@
		block discarded – undo
69	69	$langInstance = new core\common\Language();
70	70	$end = $langInstance->rtl ? "left" : "right";
71	71	?>
72		- pressedButton.next().append('<span style="padding-<?php echo $end;?>:1em">'+msg+'<\/span>');
	72	+ pressedButton.next().append('<span style="padding-<?php echo $end; ?>:1em">'+msg+'<\/span>');
73	73	}
74	74	);
75	75	}

		@@ -81,9 +81,9 @@ discard block
		block discarded – undo
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
		block discarded – undo
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;
		@@ -152,11 +152,11 @@ discard block
		block discarded – undo
152	152	}
153	153	}
154	154	$isRtl = \config\Master::LANGUAGES[$langIndex]['rtl'];
155		- putenv("LC_ALL=" . $theLocale);
	155	+ putenv("LC_ALL=".$theLocale);
156	156	$_SESSION['language'] = $langIndex;
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	/**

GEANT / CAT

Push — release_2_1 ( 0530b6...7784c3 )

Status

Category

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

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

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

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

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

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

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

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

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