GEANT / CAT

web/lib/admin/OptionParser.php

Spacing +17 added lines, -17 removed lines

@@ -26,7 +26,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.
@@ -344,14 +344,14 @@ 
                     case \core\Options::TYPECODE_TEXT:
                     case \core\Options::TYPECODE_COORDINATES:
                     case \core\Options::TYPECODE_INTEGER:
-                        $varName = "$objId-" . $validators[$optioninfo['type']]['field'];
+                        $varName = "$objId-".$validators[$optioninfo['type']]['field'];
                         if (!empty($listOfEntries[$varName])) {
                             $content = call_user_func_array([$this->validator, $validators[$optioninfo['type']]['function']], array_merge([$listOfEntries[$varName]], $validators[$optioninfo['type']]['extraarg']));
                             break;
                         }
                         continue 2;
                     case \core\Options::TYPECODE_BOOLEAN:
-                        $varName = "$objId-" . \core\Options::TYPECODE_BOOLEAN;
+                        $varName = "$objId-".\core\Options::TYPECODE_BOOLEAN;
                         if (!empty($listOfEntries[$varName])) {
                             $contentValid = $this->validator->boolean($listOfEntries[$varName]);
                             if ($contentValid) {
@@ -364,24 +364,24 @@ 
                         }
                         continue 2;
                     case \core\Options::TYPECODE_STRING:
-                        if (!empty($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING])) {
+                        if (!empty($listOfEntries["$objId-".\core\Options::TYPECODE_STRING])) {
                             switch ($objValue) {
                                 case "media:consortium_OI":
-                                    $content = $this->validator->consortiumOI($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
+                                    $content = $this->validator->consortiumOI($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
                                     if ($content === FALSE) {
                                         $bad[] = $objValue;
                                         continue 3;
                                     }
                                     break;
                                 case "media:remove_SSID":
-                                    $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
+                                    $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
                                     if ($content == "eduroam") {
                                         $bad[] = $objValue;
                                         continue 3;
                                     }
                                     break;
                                 case "media:force_proxy":
-                                    $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
+                                    $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
                                     $serverAndPort = explode(':', strrev($content), 2);
                                     if (count($serverAndPort) != 2) {
                                         $bad[] = $objValue;
@@ -394,40 +394,40 @@ 
                                     }
                                     break;
                                 case "support:url":
-                                    $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
-                                    if (preg_match("/^http/",$content) != 1) {
+                                    $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
+                                    if (preg_match("/^http/", $content) != 1) {
                                         $bad[] = $objValue;
                                         continue 3;
                                     }
                                     break;
                                 case "support:email":
-                                    $content = $this->validator->email($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
+                                    $content = $this->validator->email($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
                                     if ($content === FALSE) {
                                         $bad[] = $objValue;
                                         continue 3;
                                     }
                                     break;
                                 case "managedsp:operatorname":
-                                    $content = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING];
+                                    $content = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING];
                                     if (!preg_match("/^1.*\..*/", $content)) {
                                         $bad[] = $objValue;
                                         continue 3;
                                     }
                                     break;
                                 default:
-                                    $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
+                                    $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
                                     break;
                             }
                             break;
                         }
                         continue 2;
                     case \core\Options::TYPECODE_FILE:
-                        if (!empty($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING])) { // was already in, by ROWID reference, extract
+                        if (!empty($listOfEntries["$objId-".\core\Options::TYPECODE_STRING])) { // 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($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]), TRUE);
+                            $content = $this->validator->string(urldecode($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]), TRUE);
                             break;
-                        } else if (isset($listOfEntries["$objId-" . \core\Options::TYPECODE_FILE]) && ($listOfEntries["$objId-" . \core\Options::TYPECODE_FILE] != "")) { // let's do the download
-                            $rawContent = \core\common\OutsideComm::downloadFile("file:///" . $listOfEntries["$objId-" . \core\Options::TYPECODE_FILE]);
+                        } else if (isset($listOfEntries["$objId-".\core\Options::TYPECODE_FILE]) && ($listOfEntries["$objId-".\core\Options::TYPECODE_FILE] != "")) { // let's do the download
+                            $rawContent = \core\common\OutsideComm::downloadFile("file:///".$listOfEntries["$objId-".\core\Options::TYPECODE_FILE]);
 
                             if ($rawContent === FALSE || !$this->checkUploadSanity($objValue, $rawContent)) {
                                 $bad[] = $objValue;
@@ -438,7 +438,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]];