GEANT / CAT

web/lib/admin/OptionParser.php

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 ?>
 <?php
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 /**
  * This class parses HTML field input from POST and FILES and extracts valid and authorized options to be set.
@@ -345,14 +345,14 @@ 
                     case \core\Options::TYPECODE_TEXT:
                     case \core\Options::TYPECODE_COORDINATES:
                     case \core\Options::TYPECODE_INTEGER:
-                        $varName = $listOfEntries["$objId-" . $validators[$optioninfo['type']]['field']];
+                        $varName = $listOfEntries["$objId-".$validators[$optioninfo['type']]['field']];
                         if (!empty($varName)) {
                             $content = call_user_func_array([$this->validator, $validators[$optioninfo['type']]['function']], array_merge([$varName], $validators[$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) {
@@ -365,7 +365,7 @@ 
                         }
                         continue 2;
                     case \core\Options::TYPECODE_STRING:
-                        $previsionalContent = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING];
+                        $previsionalContent = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING];
                         if (!empty($previsionalContent)) {
                             $content = $this->furtherStringChecks($objValue, $previsionalContent, $bad);
                             if ($content === FALSE) {
@@ -376,15 +376,15 @@ 
                         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;
@@ -395,7 +395,7 @@ 
                         }
                         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" => $lang, "content" => $content]];