From 2cb36b272f063d4d8ab67dc593fad14370a1055f Mon Sep 17 00:00:00 2001
From: Christian Klinger
Date: Tue, 19 Jul 2016 15:42:39 +0200
Subject: refactored makeInput().

---
 modules-available/baseconfig/page.inc.php | 39 +++++++++++++++++--------------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'modules-available/baseconfig')

diff --git a/modules-available/baseconfig/page.inc.php b/modules-available/baseconfig/page.inc.php
index 2f2aa7ab..41a7523f 100644
--- a/modules-available/baseconfig/page.inc.php
+++ b/modules-available/baseconfig/page.inc.php
@@ -248,42 +248,45 @@ class Page_BaseConfig extends Page
 	private function makeInput($validator, $setting, $current, $shadows)
 	{
 
-		$shadowjs = "";
-		if(!empty($shadows)) {
-			$shadowjs = " data-shadows=\"$shadows\"";
-		}
-
-		error_log(print_r($shadows, true));
+		/* for the html snippet we need: */
+		$tag = 'input';
+		$type = 'text';
+		$shadowjs = empty($shadows) ? "" :  " data-shadows=\"$shadows\"";
+		$classes = "form-control";
+		$extras= "";
+		$inner = "";
+		/* -- */
 
 		$parts = explode(':', $validator, 2);
 		if ($parts[0] === 'list' || $parts[0] == 'multilist') {
 			$items = explode('|', $parts[1]);
 			$multiple = $parts[0] == 'multilist';
-			$extras = $multiple ? ' multiple class="multilist"' : 'class="form-control"';
-			$ret = '<select id="' .$setting . '" name="setting[' . $setting . ']" ' . $extras .  $shadowjs . '>';
+			if ($multiple) {
+				$extras = 'multiple ';
+				$classes .= " multilist";
+			}
+			$tag = 'select';
+
 			foreach ($items as $item) {
 				if ($item === $current) {
-					$ret .= '<option selected="selected">' . $item . '</option>';
+					$inner .= '<option selected="selected">' . $item . '</option>';
 				} else {
-					$ret .= '<option>' . $item . '</option>';
+					$inner .= '<option>' . $item . '</option>';
 				}
 			}
-			return $ret . '</select>';
 		}
 		/* multiinput: enter multiple free-form strings*/
 		if (strtolower($validator) == 'multiinput') {
-			return '<input id="' . $setting . '"name="setting[' . $setting . ']" ' . $shadowjs . ' class="multiinput" value="' . $current . '"></input>';
+			$classes .= " multiinput";
 		}
 
-
-		// Password field guessing
+		/* Password field guessing */
 		if (stripos($validator, 'password') !== false) {
 			$type = Property::getPasswordFieldType();
-		} else {
-			$type = 'text';
 		}
-		// Fallback: single line input
-		return '<input type="' . $type . '" id="' .$setting . '" name="setting[' . $setting . ']"' . $shadowjs . ' class="form-control" size="30" value="' . $current . '">';
+
+		return "<$tag type=\"$type\" id=\"$setting\" name=\"setting['$setting']\" $shadowjs $extras class=\"$classes\" value=\"$current\""
+			. ($inner == "" ? "/>" : ">$inner </$tag>");
 	}
 
 }
-- 
cgit v1.2.3-55-g7522