auto-format all files; add table-definitions to test-bootstrap file

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

lib/functions/formfields/bool/function.getFormFieldDataBool.php

@@ -16,15 +16,11 @@
  * @package    Functions
  *
  */
-
 function getFormFieldDataBool($fieldname, $fielddata, &$input)
 {
-	if(isset($input[$fieldname]) && ($input[$fieldname] === '1' || $input[$fieldname] === 1 || $input[$fieldname] === true || strtolower($input[$fieldname]) === 'yes' || strtolower($input[$fieldname]) === 'ja'))
-	{
+	if (isset($input[$fieldname]) && ($input[$fieldname] === '1' || $input[$fieldname] === 1 || $input[$fieldname] === true || strtolower($input[$fieldname]) === 'yes' || strtolower($input[$fieldname]) === 'ja')) {
 		$newfieldvalue = '1';
-	}
-	else
-	{
+	} else {
 		$newfieldvalue = '0';
 	}
 

lib/functions/formfields/bool/function.getFormFieldOutputBool.php

@@ -16,7 +16,6 @@
  * @package    Functions
  *
  */
-
 function getFormFieldOutputBool($fieldname, $fielddata, $do_show = true)
 {
 	$label = $fielddata['label'];

lib/functions/formfields/bool/function.validateFormFieldBool.php

@@ -16,15 +16,11 @@
  * @package    Functions
  *
  */
-
 function validateFormFieldBool($fieldname, $fielddata, $newfieldvalue)
 {
-	if($newfieldvalue === '1' || $newfieldvalue === 1 || $newfieldvalue === true || strtolower($newfieldvalue) === 'yes' || strtolower($newfieldvalue) === 'ja' || $newfieldvalue === '0' || $newfieldvalue === 0 || $newfieldvalue === false || strtolower($newfieldvalue) === 'no' || strtolower($newfieldvalue) === 'nein' || strtolower($newfieldvalue) === '')
-	{
+	if ($newfieldvalue === '1' || $newfieldvalue === 1 || $newfieldvalue === true || strtolower($newfieldvalue) === 'yes' || strtolower($newfieldvalue) === 'ja' || $newfieldvalue === '0' || $newfieldvalue === 0 || $newfieldvalue === false || strtolower($newfieldvalue) === 'no' || strtolower($newfieldvalue) === 'nein' || strtolower($newfieldvalue) === '') {
 		return true;
-	}
-	else
-	{
+	} else {
 		return 'noboolean';
 	}
 }

lib/functions/formfields/constant.formfields.php

@@ -16,10 +16,9 @@
  * @package    Functions
  *
  */
-
-if(!defined('FORMFIELDS_PLAUSIBILITY_CHECK_OK'))
+if (! defined('FORMFIELDS_PLAUSIBILITY_CHECK_OK'))
 	define('FORMFIELDS_PLAUSIBILITY_CHECK_OK', 0);
-if(!defined('FORMFIELDS_PLAUSIBILITY_CHECK_ERROR'))
+if (! defined('FORMFIELDS_PLAUSIBILITY_CHECK_ERROR'))
 	define('FORMFIELDS_PLAUSIBILITY_CHECK_ERROR', 1);
-if(!defined('FORMFIELDS_PLAUSIBILITY_CHECK_QUESTION'))
+if (! defined('FORMFIELDS_PLAUSIBILITY_CHECK_QUESTION'))
 	define('FORMFIELDS_PLAUSIBILITY_CHECK_QUESTION', 2);

lib/functions/formfields/date/function.getFormFieldOutputDate.php

@@ -16,11 +16,9 @@
  * @package    Functions
  *
  */
-
 function getFormFieldOutputDate($fieldname, $fielddata, $do_show = true)
 {
-	if(isset($fielddata['date_timestamp']) && $fielddata['date_timestamp'] === true)
-	{
+	if (isset($fielddata['date_timestamp']) && $fielddata['date_timestamp'] === true) {
 		$fielddata['value'] = date('Y-m-d', $fielddata['value']);
 	}
 

lib/functions/formfields/date/function.manipulateFormFieldDataDate.php

@@ -16,11 +16,9 @@
  * @package    Functions
  *
  */
-
 function manipulateFormFieldDataDate($fieldname, $fielddata, $newfieldvalue)
 {
-	if(isset($fielddata['date_timestamp']) && $fielddata['date_timestamp'] === true)
-	{
+	if (isset($fielddata['date_timestamp']) && $fielddata['date_timestamp'] === true) {
 		$newfieldvalue = strtotime($newfieldvalue);
 	}
 

lib/functions/formfields/date/function.validateFormFieldDate.php

@@ -16,17 +16,13 @@
  * @package    Functions
  *
  */
-
 function validateFormFieldDate($fieldname, $fielddata, $newfieldvalue)
 {
-	if($newfieldvalue == '0000-00-00' || preg_match('/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', $newfieldvalue))
-	{
+	if ($newfieldvalue == '0000-00-00' || preg_match('/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', $newfieldvalue)) {
 		$returnvalue = true;
-	}
-	else
-	{
+	} else {
 		$returnvalue = false;
 	}
-	
+
 	return $returnvalue;
 }

lib/functions/formfields/file/function.getFormFieldOutputFile.php

@@ -14,7 +14,6 @@
  * @package    Functions
  *
  */
-
 function getFormFieldOutputFile($fieldname, $fielddata, $do_show = true)
 {
 	$label = $fielddata['label'];

lib/functions/formfields/file/function.validateFormFieldFile.php

@@ -14,7 +14,6 @@
  * @package    Functions
  *
  */
-
 function validateFormFieldFile($fieldname, $fielddata, $newfieldvalue)
 {
 	return true;

lib/functions/formfields/function.buildForm.php

@@ -16,32 +16,25 @@
  * @package    Functions
  *
  */
-
 function buildForm($form)
 {
 	$fields = '';
 
-	if(validateFormDefinition($form))
-	{
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			if(isset($groupdetails['title']) && $groupdetails['title'] != '')
-			{
+	if (validateFormDefinition($form)) {
+		foreach ($form['groups'] as $groupname => $groupdetails) {
+			if (isset($groupdetails['title']) && $groupdetails['title'] != '') {
 				$fields .= getFormGroupOutput($groupname, $groupdetails);
 			}
-			
-			if(validateFieldDefinition($groupdetails))
-			{
+
+			if (validateFieldDefinition($groupdetails)) {
 				// Prefetch form fields
-				foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-				{
+				foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
 					$groupdetails['fields'][$fieldname] = array_merge_prefix($fielddetails, $fielddetails['type'], prefetchFormFieldData($fieldname, $fielddetails));
 					$form['groups'][$groupname]['fields'][$fieldname] = $groupdetails['fields'][$fieldname];
 				}
 
 				// Collect form field output
-				foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-				{
+				foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
 					$fields .= getFormFieldOutput($fieldname, $fielddetails);
 				}
 			}

lib/functions/formfields/function.buildFormEx.php

@@ -14,9 +14,8 @@
  * @package    Settings
  *
  */
-
-function buildFormEx($form, $part = '') {
-
+function buildFormEx($form, $part = '')
+{
 	$fields = '';
 
 	if (validateFormDefinition($form)) {
@@ -26,18 +25,18 @@ function buildFormEx($form, $part = '') {
 				if (isset($groupdetails['title']) && $groupdetails['title'] != '') {
 					$fields .= getFormOverviewGroupOutput($groupname, $groupdetails);
 				}
-			}
-			// only show one section
+			} // only show one section
 			elseif ($part != '' && ($groupname == $part || $part == 'all')) {
 				/**
 				 * this part checks for the 'websrv_avail' entry in the settings-array
-				 * if found, we check if the current webserver is in the array. If this
+				 * if found, we check if the current webserver is in the array.
+				 * If this
 				 * is not the case, we change the setting type to "hidden", #502
 				 */
 				$do_show = true;
 				if (isset($groupdetails['websrv_avail']) && is_array($groupdetails['websrv_avail'])) {
 					$websrv = Settings::Get('system.webserver');
-					if (!in_array($websrv, $groupdetails['websrv_avail'])) {
+					if (! in_array($websrv, $groupdetails['websrv_avail'])) {
 						$do_show = false;
 					}
 				}
@@ -49,24 +48,24 @@ function buildFormEx($form, $part = '') {
 					$do_show = $groupdetails['visible'];
 				}
 
-				//if ($do_show) {
-					if (isset($groupdetails['title']) && $groupdetails['title'] != '') {
-						$fields .= getFormGroupOutput($groupname, $groupdetails);
+				// if ($do_show) {
+				if (isset($groupdetails['title']) && $groupdetails['title'] != '') {
+					$fields .= getFormGroupOutput($groupname, $groupdetails);
+				}
+
+				if (validateFieldDefinition($groupdetails)) {
+					// Prefetch form fields
+					foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
+						$groupdetails['fields'][$fieldname] = array_merge_prefix($fielddetails, $fielddetails['type'], prefetchFormFieldData($fieldname, $fielddetails));
+						$form['groups'][$groupname]['fields'][$fieldname] = $groupdetails['fields'][$fieldname];
 					}
 
-					if (validateFieldDefinition($groupdetails)) {
-						// Prefetch form fields
-						foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
-							$groupdetails['fields'][$fieldname] = array_merge_prefix($fielddetails, $fielddetails['type'], prefetchFormFieldData($fieldname, $fielddetails));
-							$form['groups'][$groupname]['fields'][$fieldname] = $groupdetails['fields'][$fieldname];
-						}
-
-						// Collect form field output
-						foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
-							$fields .= getFormFieldOutput($fieldname, $fielddetails);
-						}
+					// Collect form field output
+					foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
+						$fields .= getFormFieldOutput($fieldname, $fielddetails);
 					}
-				//}
+				}
+				// }
 			}
 		}
 	}

lib/functions/formfields/function.checkPlausibilityFormField.php

@@ -16,16 +16,12 @@
  * @package    Functions
  *
  */
-
 function checkPlausibilityFormField($fieldname, $fielddata, $newfieldvalue, $allnewfieldvalues)
 {
 	$returnvalue = '';
-	if(is_array($fielddata) && isset($fielddata['plausibility_check_method']) && $fielddata['plausibility_check_method'] != '' && function_exists($fielddata['plausibility_check_method']))
-	{
+	if (is_array($fielddata) && isset($fielddata['plausibility_check_method']) && $fielddata['plausibility_check_method'] != '' && function_exists($fielddata['plausibility_check_method'])) {
 		$returnvalue = call_user_func($fielddata['plausibility_check_method'], $fieldname, $fielddata, $newfieldvalue, $allnewfieldvalues);
-	}
-	else
-	{
+	} else {
 		$returnvalue = false;
 	}
 	return $returnvalue;

lib/functions/formfields/function.getFormFieldData.php

@@ -16,26 +16,17 @@
  * @package    Functions
  *
  */
-
 function getFormFieldData($fieldname, $fielddata, &$input)
 {
-	if(is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('getFormFieldData' . ucfirst($fielddata['type'])))
-	{
+	if (is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('getFormFieldData' . ucfirst($fielddata['type']))) {
 		$gfdFunc = 'getFormFieldData' . ucfirst($fielddata['type']);
 		$newfieldvalue = $gfdFunc($fieldname, $fielddata, $input);
-	}
-	else
-	{
-		if(isset($input[$fieldname]))
-		{
+	} else {
+		if (isset($input[$fieldname])) {
 			$newfieldvalue = $input[$fieldname];
-		}
-		elseif(isset($fielddata['default']))
-		{
+		} elseif (isset($fielddata['default'])) {
 			$newfieldvalue = $fielddata['default'];
-		}
-		else
-		{
+		} else {
 			$newfieldvalue = false;
 		}
 	}

lib/functions/formfields/function.getFormFieldOutput.php

@@ -16,17 +16,12 @@
  * @package    Functions
  *
  */
-
-function getFormFieldOutput($fieldname, $fielddata) {
-
+function getFormFieldOutput($fieldname, $fielddata)
+{
 	global $lng;
 
 	$returnvalue = '';
-	if (is_array($fielddata)
-		&& isset($fielddata['type'])
-		&& $fielddata['type'] != ''
-		&& function_exists('getFormFieldOutput' . ucfirst($fielddata['type']))
-	) {
+	if (is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('getFormFieldOutput' . ucfirst($fielddata['type']))) {
 		if (isset($fielddata['label']) && is_array($fielddata['label'])) {
 			if (isset($fielddata['label']['title']) && isset($fielddata['label']['description'])) {
 				$fielddata['label'] = '<b>' . $fielddata['label']['title'] . '</b><br />' . $fielddata['label']['description'];
@@ -35,7 +30,7 @@ function getFormFieldOutput($fieldname, $fielddata) {
 			}
 		}
 
-		if (!isset($fielddata['value'])) {
+		if (! isset($fielddata['value'])) {
 			if (isset($fielddata['default'])) {
 				$fielddata['value'] = $fielddata['default'];
 			} else {
@@ -45,15 +40,16 @@ function getFormFieldOutput($fieldname, $fielddata) {
 
 		/**
 		 * this part checks for the 'websrv_avail' entry in the settings-array
-		 * if found, we check if the current webserver is in the array. If this
+		 * if found, we check if the current webserver is in the array.
+		 * If this
 		 * is not the case, we change the setting type to "hidden", #502
 		 */
 		$do_show = true;
 		if (isset($fielddata['websrv_avail']) && is_array($fielddata['websrv_avail'])) {
 			$websrv = Settings::Get('system.webserver');
-			if (!in_array($websrv, $fielddata['websrv_avail'])) {
+			if (! in_array($websrv, $fielddata['websrv_avail'])) {
 				$do_show = false;
-				$fielddata['label'].= sprintf($lng['serversettings']['option_unavailable_websrv'], implode(", ", $fielddata['websrv_avail']));
+				$fielddata['label'] .= sprintf($lng['serversettings']['option_unavailable_websrv'], implode(", ", $fielddata['websrv_avail']));
 			}
 		}
 
@@ -62,14 +58,14 @@ function getFormFieldOutput($fieldname, $fielddata) {
 		// be false due to websrv_avail
 		if (isset($fielddata['visible']) && $do_show) {
 			$do_show = $fielddata['visible'];
-			if (!$do_show) {
-				$fielddata['label'].= $lng['serversettings']['option_unavailable'];
+			if (! $do_show) {
+				$fielddata['label'] .= $lng['serversettings']['option_unavailable'];
 			}
 		}
 
-		//if ($do_show) {
-			$returnvalue = call_user_func('getFormFieldOutput' . ucfirst($fielddata['type']), $fieldname, $fielddata, $do_show);
-		//}
+		// if ($do_show) {
+		$returnvalue = call_user_func('getFormFieldOutput' . ucfirst($fielddata['type']), $fieldname, $fielddata, $do_show);
+		// }
 	}
 	return $returnvalue;
 }

lib/functions/formfields/function.getFormGroupOutput.php

@@ -16,16 +16,15 @@
  * @package    Functions
  *
  */
-
-function getFormGroupOutput($groupname, $groupdetails) {
-
+function getFormGroupOutput($groupname, $groupdetails)
+{
 	global $lng, $theme;
 	eval("\$group = \"" . \Froxlor\UI\Template::getTemplate("settings/settings_group") . "\";");
 	return $group;
 }
 
-function getFormOverviewGroupOutput($groupname, $groupdetails) {
-
+function getFormOverviewGroupOutput($groupname, $groupdetails)
+{
 	global $lng, $filename, $s, $theme;
 
 	$group = '';
@@ -34,38 +33,28 @@ function getFormOverviewGroupOutput($groupname, $groupdetails) {
 
 	$activated = true;
 	$option = '';
-	if(isset($groupdetails['fields']))
-	{
-		foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-		{
-			if(isset($fielddetails['overview_option'])
-				&& $fielddetails['overview_option'] == true
-			) {
-				if($fielddetails['type'] != 'option'
-					&& $fielddetails['type'] != 'bool')
-				{
+	if (isset($groupdetails['fields'])) {
+		foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
+			if (isset($fielddetails['overview_option']) && $fielddetails['overview_option'] == true) {
+				if ($fielddetails['type'] != 'option' && $fielddetails['type'] != 'bool') {
 					\Froxlor\UI\Response::standard_error('overviewsettingoptionisnotavalidfield');
 				}
 
-				if($fielddetails['type'] == 'option')
-				{
+				if ($fielddetails['type'] == 'option') {
 					$options_array = $fielddetails['option_options'];
 					$options = '';
-					foreach($options_array as $value => $vtitle)
-					{
-						$options .= makeoption($vtitle, $value, Settings::Get($fielddetails['settinggroup'].'.'.$fielddetails['varname']));
+					foreach ($options_array as $value => $vtitle) {
+						$options .= makeoption($vtitle, $value, Settings::Get($fielddetails['settinggroup'] . '.' . $fielddetails['varname']));
 					}
-					$option.= $fielddetails['label'].': ';
-					$option.= '<select class="dropdown_noborder" name="'.$fieldname.'">';
-					$option.= $options;
-					$option.= '</select>';
+					$option .= $fielddetails['label'] . ':&nbsp;';
+					$option .= '<select class="dropdown_noborder" name="' . $fieldname . '">';
+					$option .= $options;
+					$option .= '</select>';
 					$activated = true;
-				}
-				else
-				{
-					$option.= $lng['admin']['activated'].':&nbsp;';
-					$option.= makeyesno($fieldname, '1', '0', Settings::Get($fielddetails['settinggroup'].'.'.$fielddetails['varname']));
-					$activated = (int)Settings::Get($fielddetails['settinggroup'].'.'.$fielddetails['varname']);
+				} else {
+					$option .= $lng['admin']['activated'] . ':&nbsp;';
+					$option .= makeyesno($fieldname, '1', '0', Settings::Get($fielddetails['settinggroup'] . '.' . $fielddetails['varname']));
+					$activated = (int) Settings::Get($fielddetails['settinggroup'] . '.' . $fielddetails['varname']);
 				}
 			}
 		}
@@ -73,13 +62,14 @@ function getFormOverviewGroupOutput($groupname, $groupdetails) {
 
 	/**
 	 * this part checks for the 'websrv_avail' entry in the settings
-	 * if found, we check if the current webserver is in the array. If this
+	 * if found, we check if the current webserver is in the array.
+	 * If this
 	 * is not the case, we change the setting type to "hidden", #502
 	 */
 	$do_show = true;
 	if (isset($groupdetails['websrv_avail']) && is_array($groupdetails['websrv_avail'])) {
 		$websrv = Settings::Get('system.webserver');
-		if (!in_array($websrv, $groupdetails['websrv_avail'])) {
+		if (! in_array($websrv, $groupdetails['websrv_avail'])) {
 			$do_show = false;
 			$title .= sprintf($lng['serversettings']['option_unavailable_websrv'], implode(", ", $groupdetails['websrv_avail']));
 			// hack disabled flag into select-box

lib/functions/formfields/function.manipulateFormFieldData.php

@@ -16,11 +16,9 @@
  * @package    Functions
  *
  */
-
 function manipulateFormFieldData($fieldname, $fielddata, $newfieldvalue)
 {
-	if(is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('manipulateFormFieldData' . ucfirst($fielddata['type'])))
-	{
+	if (is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('manipulateFormFieldData' . ucfirst($fielddata['type']))) {
 		$newfieldvalue = call_user_func('manipulateFormFieldData' . ucfirst($fielddata['type']), $fieldname, $fielddata, $newfieldvalue);
 	}
 

lib/functions/formfields/function.prefetchFormFieldData.php

@@ -16,12 +16,10 @@
  * @package    Functions
  *
  */
-
 function prefetchFormFieldData($fieldname, $fielddata)
 {
 	$returnvalue = array();
-	if(is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('prefetchFormFieldData' . ucfirst($fielddata['type'])))
-	{
+	if (is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('prefetchFormFieldData' . ucfirst($fielddata['type']))) {
 		$returnvalue = call_user_func('prefetchFormFieldData' . ucfirst($fielddata['type']), $fieldname, $fielddata);
 	}
 	return $returnvalue;

lib/functions/formfields/function.processForm.php

@@ -16,45 +16,33 @@
  * @package    Functions
  *
  */
-
 function processForm(&$form, &$input, $url_params = array())
 {
-	if(validateFormDefinition($form))
-	{
+	if (validateFormDefinition($form)) {
 		$submitted_fields = array();
 		$changed_fields = array();
 		$saved_fields = array();
 
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			if(validateFieldDefinition($groupdetails))
-			{
+		foreach ($form['groups'] as $groupname => $groupdetails) {
+			if (validateFieldDefinition($groupdetails)) {
 				// Prefetch form fields
-				foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-				{
+				foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
 					$groupdetails['fields'][$fieldname] = array_merge_prefix($fielddetails, $fielddetails['type'], prefetchFormFieldData($fieldname, $fielddetails));
 					$form['groups'][$groupname]['fields'][$fieldname] = $groupdetails['fields'][$fieldname];
 				}
 			}
 		}
 
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			if(validateFieldDefinition($groupdetails))
-			{
+		foreach ($form['groups'] as $groupname => $groupdetails) {
+			if (validateFieldDefinition($groupdetails)) {
 				// Validate fields
-				foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-				{
+				foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
 					$newfieldvalue = getFormFieldData($fieldname, $fielddetails, $input);
 
-					if($newfieldvalue != $fielddetails['value'])
-					{
-						if(($error = validateFormField($fieldname, $fielddetails, $newfieldvalue)) !== true)
-						{
+					if ($newfieldvalue != $fielddetails['value']) {
+						if (($error = validateFormField($fieldname, $fielddetails, $newfieldvalue)) !== true) {
 							\Froxlor\UI\Response::standard_error($error, $fieldname);
-						}
-						else
-						{
+						} else {
 							$changed_fields[$fieldname] = $newfieldvalue;
 						}
 					}
@@ -64,51 +52,37 @@ function processForm(&$form, &$input, $url_params = array())
 			}
 		}
 
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			if(validateFieldDefinition($groupdetails))
-			{
+		foreach ($form['groups'] as $groupname => $groupdetails) {
+			if (validateFieldDefinition($groupdetails)) {
 				// Check fields for plausibility
-				foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-				{
-					if(($plausibility_check = checkPlausibilityFormField($fieldname, $fielddetails, $submitted_fields[$fieldname], $submitted_fields)) !== false)
-					{
-						if(is_array($plausibility_check) && isset($plausibility_check[0]))
-						{
-							if($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_OK)
-							{
+				foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
+					if (($plausibility_check = checkPlausibilityFormField($fieldname, $fielddetails, $submitted_fields[$fieldname], $submitted_fields)) !== false) {
+						if (is_array($plausibility_check) && isset($plausibility_check[0])) {
+							if ($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_OK) {
 								// Nothing to do here, everything's okay
-							}
-							elseif($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_ERROR)
-							{
+							} elseif ($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_ERROR) {
 								unset($plausibility_check[0]);
 								$error = $plausibility_check[1];
 								unset($plausibility_check[1]);
 								$targetname = implode(' ', $plausibility_check);
 								\Froxlor\UI\Response::standard_error($error, $targetname);
-							}
-							elseif($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_QUESTION)
-							{
+							} elseif ($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_QUESTION) {
 								unset($plausibility_check[0]);
 								$question = $plausibility_check[1];
 								unset($plausibility_check[1]);
 								$targetname = implode(' ', $plausibility_check);
-								if(!isset($input[$question]))
-								{
-									if(is_array($url_params) && isset($url_params['filename']))
-									{
+								if (! isset($input[$question])) {
+									if (is_array($url_params) && isset($url_params['filename'])) {
 										$filename = $url_params['filename'];
 										unset($url_params['filename']);
-									}
-									else
-									{
+									} else {
 										$filename = '';
 									}
-									ask_yesno($question, $filename, array_merge($url_params, $submitted_fields, array($question => $question)), $targetname);
+									ask_yesno($question, $filename, array_merge($url_params, $submitted_fields, array(
+										$question => $question
+									)), $targetname);
 								}
-							}
-							else
-							{
+							} else {
 								\Froxlor\UI\Response::standard_error('plausibilitychecknotunderstood');
 							}
 						}
@@ -117,21 +91,14 @@ function processForm(&$form, &$input, $url_params = array())
 			}
 		}
 
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			if(validateFieldDefinition($groupdetails))
-			{
+		foreach ($form['groups'] as $groupname => $groupdetails) {
+			if (validateFieldDefinition($groupdetails)) {
 				// Save fields
-				foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-				{
-					if(isset($changed_fields[$fieldname]))
-					{
-						if(($saved_field = saveFormField($fieldname, $fielddetails, manipulateFormFieldData($fieldname, $fielddetails, $changed_fields[$fieldname]))) !== false)
-						{
+				foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
+					if (isset($changed_fields[$fieldname])) {
+						if (($saved_field = saveFormField($fieldname, $fielddetails, manipulateFormFieldData($fieldname, $fielddetails, $changed_fields[$fieldname]))) !== false) {
 							$saved_fields = array_merge($saved_fields, $saved_field);
-						}
-						else
-						{
+						} else {
 							\Froxlor\UI\Response::standard_error('errorwhensaving', $fieldname);
 						}
 					}
@@ -146,26 +113,17 @@ function processForm(&$form, &$input, $url_params = array())
 
 function processFormEx(&$form, &$input, $url_params = array(), $part, $settings_all, $settings_part, $only_enabledisable)
 {
-	if(validateFormDefinition($form))
-	{
+	if (validateFormDefinition($form)) {
 		$submitted_fields = array();
 		$changed_fields = array();
 		$saved_fields = array();
 
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			if(($settings_part && $part == $groupname)
-				|| $settings_all
-				|| $only_enabledisable
-			){
-				if(validateFieldDefinition($groupdetails))
-				{
+		foreach ($form['groups'] as $groupname => $groupdetails) {
+			if (($settings_part && $part == $groupname) || $settings_all || $only_enabledisable) {
+				if (validateFieldDefinition($groupdetails)) {
 					// Prefetch form fields
-					foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-					{
-						if(!$only_enabledisable
-							|| ($only_enabledisable && isset($fielddetails['overview_option']))
-						) {
+					foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
+						if (! $only_enabledisable || ($only_enabledisable && isset($fielddetails['overview_option']))) {
 							$groupdetails['fields'][$fieldname] = array_merge_prefix($fielddetails, $fielddetails['type'], prefetchFormFieldData($fieldname, $fielddetails));
 							$form['groups'][$groupname]['fields'][$fieldname] = $groupdetails['fields'][$fieldname];
 						}
@@ -174,29 +132,17 @@ function processFormEx(&$form, &$input, $url_params = array(), $part, $settings_
 			}
 		}
 
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			if(($settings_part && $part == $groupname)
-				|| $settings_all
-				|| $only_enabledisable
-			){
-				if(validateFieldDefinition($groupdetails))
-				{
+		foreach ($form['groups'] as $groupname => $groupdetails) {
+			if (($settings_part && $part == $groupname) || $settings_all || $only_enabledisable) {
+				if (validateFieldDefinition($groupdetails)) {
 					// Validate fields
-					foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-					{
-						if(!$only_enabledisable
-							|| ($only_enabledisable && isset($fielddetails['overview_option']))
-						) {
+					foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
+						if (! $only_enabledisable || ($only_enabledisable && isset($fielddetails['overview_option']))) {
 							$newfieldvalue = getFormFieldData($fieldname, $fielddetails, $input);
-							if($newfieldvalue != $fielddetails['value'])
-							{
-								if(($error = validateFormField($fieldname, $fielddetails, $newfieldvalue)) !== true)
-								{
+							if ($newfieldvalue != $fielddetails['value']) {
+								if (($error = validateFormField($fieldname, $fielddetails, $newfieldvalue)) !== true) {
 									\Froxlor\UI\Response::standard_error($error, $fieldname);
-								}
-								else
-								{
+								} else {
 									$changed_fields[$fieldname] = $newfieldvalue;
 								}
 							}
@@ -208,58 +154,39 @@ function processFormEx(&$form, &$input, $url_params = array(), $part, $settings_
 			}
 		}
 
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			if(($settings_part && $part == $groupname)
-				|| $settings_all
-				|| $only_enabledisable
-			){
-				if(validateFieldDefinition($groupdetails))
-				{
+		foreach ($form['groups'] as $groupname => $groupdetails) {
+			if (($settings_part && $part == $groupname) || $settings_all || $only_enabledisable) {
+				if (validateFieldDefinition($groupdetails)) {
 					// Check fields for plausibility
-					foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-					{
-						if(!$only_enabledisable
-							|| ($only_enabledisable && isset($fielddetails['overview_option']))
-						) {
-							if(($plausibility_check = checkPlausibilityFormField($fieldname, $fielddetails, $submitted_fields[$fieldname], $submitted_fields)) !== false)
-							{
-								if(is_array($plausibility_check) && isset($plausibility_check[0]))
-								{
-									if($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_OK)
-									{
+					foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
+						if (! $only_enabledisable || ($only_enabledisable && isset($fielddetails['overview_option']))) {
+							if (($plausibility_check = checkPlausibilityFormField($fieldname, $fielddetails, $submitted_fields[$fieldname], $submitted_fields)) !== false) {
+								if (is_array($plausibility_check) && isset($plausibility_check[0])) {
+									if ($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_OK) {
 										// Nothing to do here, everything's okay
-									}
-									elseif($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_ERROR)
-									{
+									} elseif ($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_ERROR) {
 										unset($plausibility_check[0]);
 										$error = $plausibility_check[1];
 										unset($plausibility_check[1]);
 										$targetname = implode(' ', $plausibility_check);
 										\Froxlor\UI\Response::standard_error($error, $targetname);
-									}
-									elseif($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_QUESTION)
-									{
+									} elseif ($plausibility_check[0] == FORMFIELDS_PLAUSIBILITY_CHECK_QUESTION) {
 										unset($plausibility_check[0]);
 										$question = $plausibility_check[1];
 										unset($plausibility_check[1]);
 										$targetname = implode(' ', $plausibility_check);
-										if(!isset($input[$question]))
-										{
-											if(is_array($url_params) && isset($url_params['filename']))
-											{
+										if (! isset($input[$question])) {
+											if (is_array($url_params) && isset($url_params['filename'])) {
 												$filename = $url_params['filename'];
 												unset($url_params['filename']);
-											}
-											else
-											{
+											} else {
 												$filename = '';
 											}
-											ask_yesno($question, $filename, array_merge($url_params, $submitted_fields, array($question => $question)), $targetname);
+											ask_yesno($question, $filename, array_merge($url_params, $submitted_fields, array(
+												$question => $question
+											)), $targetname);
 										}
-									}
-									else
-									{
+									} else {
 										\Froxlor\UI\Response::standard_error('plausibilitychecknotunderstood');
 									}
 								}
@@ -270,28 +197,16 @@ function processFormEx(&$form, &$input, $url_params = array(), $part, $settings_
 			}
 		}
 
-		foreach($form['groups'] as $groupname => $groupdetails)
-		{
-			if(($settings_part && $part == $groupname)
-				|| $settings_all
-				|| $only_enabledisable
-			){
-				if(validateFieldDefinition($groupdetails))
-				{
+		foreach ($form['groups'] as $groupname => $groupdetails) {
+			if (($settings_part && $part == $groupname) || $settings_all || $only_enabledisable) {
+				if (validateFieldDefinition($groupdetails)) {
 					// Save fields
-					foreach($groupdetails['fields'] as $fieldname => $fielddetails)
-					{
-						if(!$only_enabledisable
-							|| ($only_enabledisable && isset($fielddetails['overview_option']))
-						) {
-							if(isset($changed_fields[$fieldname]))
-							{
-								if(($saved_field = saveFormField($fieldname, $fielddetails, manipulateFormFieldData($fieldname, $fielddetails, $changed_fields[$fieldname]))) !== false)
-								{
+					foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
+						if (! $only_enabledisable || ($only_enabledisable && isset($fielddetails['overview_option']))) {
+							if (isset($changed_fields[$fieldname])) {
+								if (($saved_field = saveFormField($fieldname, $fielddetails, manipulateFormFieldData($fieldname, $fielddetails, $changed_fields[$fieldname]))) !== false) {
 									$saved_fields = array_merge($saved_fields, $saved_field);
-								}
-								else
-								{
+								} else {
 									\Froxlor\UI\Response::standard_error('errorwhensaving', $fieldname);
 								}
 							}

lib/functions/formfields/function.returnField.php

@@ -16,8 +16,9 @@
  * @package    Functions
  *
  */
-
 function returnField($fieldname, $fielddata, $newfieldvalue)
 {
-	return array($fieldname => $newfieldvalue);
+	return array(
+		$fieldname => $newfieldvalue
+	);
 }

lib/functions/formfields/function.saveForm.php

@@ -16,20 +16,17 @@
  * @package    Functions
  *
  */
-
 function saveForm($fielddata, $newfieldvalue)
 {
 	$returnvalue = '';
-	if(is_array($fielddata) && isset($fielddata['save_method']) && $fielddata['save_method'] != '')
-	{
-		$returnvalue = call_user_func(array('\\Froxlor\\Settings\\Store', $fielddata['save_method']), $fielddata, $newfieldvalue);
-	}
-	elseif(is_array($fielddata) && !isset($fielddata['save_method']))
-	{
+	if (is_array($fielddata) && isset($fielddata['save_method']) && $fielddata['save_method'] != '') {
+		$returnvalue = call_user_func(array(
+			'\\Froxlor\\Settings\\Store',
+			$fielddata['save_method']
+		), $fielddata, $newfieldvalue);
+	} elseif (is_array($fielddata) && ! isset($fielddata['save_method'])) {
 		$returnvalue = true;
-	}
-	else
-	{
+	} else {
 		$returnvalue = false;
 	}
 	return $returnvalue;

lib/functions/formfields/function.validateFormDefinition.php

@@ -16,15 +16,13 @@
  * @package    Functions
  *
  */
-
 function validateFormDefinition($form)
 {
 	$returnvalue = false;
-	
-	if(is_array($form) && !empty($form) && isset($form['groups']) && is_array($form['groups']) && !empty($form['groups']))
-	{
+
+	if (is_array($form) && ! empty($form) && isset($form['groups']) && is_array($form['groups']) && ! empty($form['groups'])) {
 		$returnvalue = true;
 	}
-	
+
 	return $returnvalue;
 }

lib/functions/formfields/function.validateFormField.php

@@ -16,16 +16,12 @@
  * @package    Functions
  *
  */
-
 function validateFormField($fieldname, $fielddata, $newfieldvalue)
 {
 	$returnvalue = '';
-	if(is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('validateFormField' . ucfirst($fielddata['type'])))
-	{
+	if (is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('validateFormField' . ucfirst($fielddata['type']))) {
 		$returnvalue = call_user_func('validateFormField' . ucfirst($fielddata['type']), $fieldname, $fielddata, $newfieldvalue);
-	}
-	else
-	{
+	} else {
 		$returnvalue = 'validation method not found';
 	}
 	return $returnvalue;

lib/functions/formfields/hidden/function.getFormFieldOutputHidden.php

@@ -16,13 +16,11 @@
  * @package    Functions
  *
  */
-
 function getFormFieldOutputHidden($fieldname, $fielddata)
 {
 	$returnvalue = '<input type="hidden" name="' . $fieldname . '" value="' . htmlentities($fielddata['value']) . '" />';
 
-	if(isset($fielddata['label']) && $fielddata['label'] != '')
-	{
+	if (isset($fielddata['label']) && $fielddata['label'] != '') {
 		$label = $fielddata['label'];
 		$value = htmlentities($fielddata['value']);
 		eval("\$returnvalue .= \"" . \Froxlor\UI\Template::getTemplate("formfields/hidden", true) . "\";");

lib/functions/formfields/hidden/function.validateFormFieldHidden.php

@@ -16,7 +16,6 @@
  * @package    Functions
  *
  */
-
 function validateFormFieldHidden($fieldname, $fielddata, $newfieldvalue)
 {
 	/**
@@ -24,15 +23,9 @@ function validateFormFieldHidden($fieldname, $fielddata, $newfieldvalue)
 	 * because it might be possible that the cronjob ran
 	 * while settings have been edited (bug #52)
 	 */
-	if($newfieldvalue === $fielddata['value']
-		|| $fieldname == 'system_last_tasks_run'
-		|| $fieldname == 'system_last_traffic_run'
-		|| $fieldname == 'system_lastcronrun'
-	) {
+	if ($newfieldvalue === $fielddata['value'] || $fieldname == 'system_last_tasks_run' || $fieldname == 'system_last_traffic_run' || $fieldname == 'system_lastcronrun') {
 		return true;
-	}
-	else
-	{
+	} else {
 		return 'hiddenfieldvaluechanged';
 	}
 }

lib/functions/formfields/hiddenstring/function.getFormFieldOutputString.php

@@ -16,7 +16,6 @@
  * @package    Functions
  *
  */
-
 function getFormFieldOutputHiddenString($fieldname, $fielddata, $do_show = true)
 {
 	$label = $fielddata['label'];

lib/functions/formfields/hiddenstring/function.validateFormFieldString.php

@@ -16,100 +16,71 @@
  * @package    Functions
  *
  */
-
 function validateFormFieldHiddenString($fieldname, $fielddata, $newfieldvalue)
 {
-	if(isset($fielddata['string_delimiter']) && $fielddata['string_delimiter'] != '')
-	{
+	if (isset($fielddata['string_delimiter']) && $fielddata['string_delimiter'] != '') {
 		$newfieldvalues = explode($fielddata['string_delimiter'], $newfieldvalue);
 		unset($fielddata['string_delimiter']);
 
 		$returnvalue = true;
-		foreach($newfieldvalues as $single_newfieldvalue)
-		{
+		foreach ($newfieldvalues as $single_newfieldvalue) {
 			/**
-	 		 * don't use tabs in value-fields, #81
-	 		 */
+			 * don't use tabs in value-fields, #81
+			 */
 			$single_newfieldvalue = str_replace("\t", " ", $single_newfieldvalue);
 			$single_returnvalue = validateFormFieldString($fieldname, $fielddata, $single_newfieldvalue);
-			if($single_returnvalue !== true)
-			{
+			if ($single_returnvalue !== true) {
 				$returnvalue = $single_returnvalue;
 				break;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$returnvalue = false;
 
 		/**
- 		 * don't use tabs in value-fields, #81
- 		 */
+		 * don't use tabs in value-fields, #81
+		 */
 		$newfieldvalue = str_replace("\t", " ", $newfieldvalue);
 
-		if(isset($fielddata['string_type']) && $fielddata['string_type'] == 'mail')
-		{
+		if (isset($fielddata['string_type']) && $fielddata['string_type'] == 'mail') {
 			$returnvalue = (filter_var($newfieldvalue, FILTER_VALIDATE_EMAIL) == $newfieldvalue);
-		}
-		elseif(isset($fielddata['string_type']) && $fielddata['string_type'] == 'url')
-		{
+		} elseif (isset($fielddata['string_type']) && $fielddata['string_type'] == 'url') {
 			$returnvalue = validateUrl($newfieldvalue);
-		}
-		elseif(isset($fielddata['string_type']) && $fielddata['string_type'] == 'dir')
-		{
+		} elseif (isset($fielddata['string_type']) && $fielddata['string_type'] == 'dir') {
 			// add trailing slash to validate path if needed
 			// refs #331
-			if(substr($newfieldvalue, -1) != '/') {
-				$newfieldvalue.= '/';
+			if (substr($newfieldvalue, - 1) != '/') {
+				$newfieldvalue .= '/';
 			}
 			$returnvalue = ($newfieldvalue == \Froxlor\FileDir::makeCorrectDir($newfieldvalue));
-		}
-		elseif(isset($fielddata['string_type']) && $fielddata['string_type'] == 'file')
-		{
+		} elseif (isset($fielddata['string_type']) && $fielddata['string_type'] == 'file') {
 			$returnvalue = ($newfieldvalue == \Froxlor\FileDir::makeCorrectFile($newfieldvalue));
-		}
-		elseif(isset($fielddata['string_type']) && $fielddata['string_type'] == 'filedir')
-		{
+		} elseif (isset($fielddata['string_type']) && $fielddata['string_type'] == 'filedir') {
 			$returnvalue = (($newfieldvalue == \Froxlor\FileDir::makeCorrectDir($newfieldvalue)) || ($newfieldvalue == \Froxlor\FileDir::makeCorrectFile($newfieldvalue)));
-		}
-		elseif(preg_match('/^[^\r\n\t\f\0]*$/D', $newfieldvalue))
-		{
+		} elseif (preg_match('/^[^\r\n\t\f\0]*$/D', $newfieldvalue)) {
 			$returnvalue = true;
 		}
 
-		if(isset($fielddata['string_regexp']) && $fielddata['string_regexp'] != '')
-		{
-			if(preg_match($fielddata['string_regexp'], $newfieldvalue))
-			{
+		if (isset($fielddata['string_regexp']) && $fielddata['string_regexp'] != '') {
+			if (preg_match($fielddata['string_regexp'], $newfieldvalue)) {
 				$returnvalue = true;
-			}
-			else
-			{
+			} else {
 				$returnvalue = false;
 			}
 		}
 
-		if(isset($fielddata['string_emptyallowed']) && $fielddata['string_emptyallowed'] === true && $newfieldvalue === '')
-		{
+		if (isset($fielddata['string_emptyallowed']) && $fielddata['string_emptyallowed'] === true && $newfieldvalue === '') {
 			$returnvalue = true;
-		}
-		elseif(isset($fielddata['string_emptyallowed']) && $fielddata['string_emptyallowed'] === false && $newfieldvalue === '')
-		{
+		} elseif (isset($fielddata['string_emptyallowed']) && $fielddata['string_emptyallowed'] === false && $newfieldvalue === '') {
 			$returnvalue = 'stringmustntbeempty';
 		}
 	}
-	
-	if($returnvalue === true)
-	{
+
+	if ($returnvalue === true) {
 		return true;
-	}
-	elseif($returnvalue === false)
-	{
+	} elseif ($returnvalue === false) {
 		return 'stringformaterror';
-	}
-	else
-	{
+	} else {
 		return $returnvalue;
 	}
 }

lib/functions/formfields/int/function.getFormFieldDataInt.php

@@ -16,16 +16,12 @@
  * @package    Functions
  *
  */
-
 function getFormFieldDataInt($fieldname, $fielddata, &$input)
 {
-	if(isset($input[$fieldname]))
-	{
-		$newfieldvalue = (int)$input[$fieldname];
-	}
-	else
-	{
-		$newfieldvalue = (int)$fielddata['default'];
+	if (isset($input[$fieldname])) {
+		$newfieldvalue = (int) $input[$fieldname];
+	} else {
+		$newfieldvalue = (int) $fielddata['default'];
 	}
 
 	return $newfieldvalue;

lib/functions/formfields/int/function.getFormFieldOutputInt.php

@@ -16,7 +16,6 @@
  * @package    Functions
  *
  */
-
 function getFormFieldOutputInt($fieldname, $fielddata, $do_show = true)
 {
 	return getFormFieldOutputString($fieldname, $fielddata, $do_show);

lib/functions/formfields/int/function.validateFormFieldInt.php

@@ -16,17 +16,14 @@
  * @package    Functions
  *
  */
-
 function validateFormFieldInt($fieldname, $fielddata, $newfieldvalue)
 {
-	if(isset($fielddata['int_min']) && (int)$newfieldvalue < (int)$fielddata['int_min'])
-	{
-		return('intvaluetoolow');
+	if (isset($fielddata['int_min']) && (int) $newfieldvalue < (int) $fielddata['int_min']) {
+		return ('intvaluetoolow');
 	}
 
-	if(isset($fielddata['int_max']) && (int)$newfieldvalue > (int)$fielddata['int_max'])
-	{
-		return('intvaluetoohigh');
+	if (isset($fielddata['int_max']) && (int) $newfieldvalue > (int) $fielddata['int_max']) {
+		return ('intvaluetoohigh');
 	}
 
 	return true;

lib/functions/formfields/label/function.getFormFieldOutputLabel.php

@@ -16,7 +16,6 @@
  * @package    Functions
  *
  */
-
 function getFormFieldOutputLabel($fieldname, $fielddata)
 {
 	$label = $fielddata['label'];

lib/functions/formfields/label/function.validateFormFieldLabel.php

@@ -16,11 +16,9 @@
  * @package    Functions
  *
  */
-
 function validateFormFieldLabel($fieldname, $fielddata, $newfieldvalue)
 {
 	// Return false, in case we happen to have that field in our $input array, so someone doesn't get the chance to save crap to our database
 	// TODO: Throw some error that actually makes sense - false would just throw unknown error
-
 	return false;
 }

lib/functions/formfields/option/function.getFormFieldDataOption.php

@@ -16,20 +16,15 @@
  * @package    Functions
  *
  */
-
 function getFormFieldDataOption($fieldname, $fielddata, &$input)
 {
-	if(isset($input[$fieldname]))
-	{
+	if (isset($input[$fieldname])) {
 		$newfieldvalue = $input[$fieldname];
-	}
-	else
-	{
+	} else {
 		$newfieldvalue = $fielddata['default'];
 	}
-	
-	if(is_array($newfieldvalue))
-	{
+
+	if (is_array($newfieldvalue)) {
 		$newfieldvalue = implode(',', $newfieldvalue);
 	}
 

lib/functions/formfields/option/function.getFormFieldOutputOption.php

@@ -16,28 +16,22 @@
  * @package    Functions
  *
  */
-
 function getFormFieldOutputOption($fieldname, $fielddata, $do_show = true)
 {
 	$returnvalue = '';
 
-	if(isset($fielddata['option_options']) && is_array($fielddata['option_options']) && !empty($fielddata['option_options']))
-	{
-		if(isset($fielddata['option_mode']) && $fielddata['option_mode'] == 'multiple')
-		{
+	if (isset($fielddata['option_options']) && is_array($fielddata['option_options']) && ! empty($fielddata['option_options'])) {
+		if (isset($fielddata['option_mode']) && $fielddata['option_mode'] == 'multiple') {
 			$multiple = true;
 			$fielddata['value'] = explode(',', $fielddata['value']);
-		}
-		else
-		{
+		} else {
 			$multiple = false;
 		}
 
 		$label = $fielddata['label'];
 		$options_array = $fielddata['option_options'];
 		$options = '';
-		foreach($options_array as $value => $title)
-		{
+		foreach ($options_array as $value => $title) {
 			$options .= makeoption($title, $value, $fielddata['value']);
 		}
 		eval("\$returnvalue = \"" . \Froxlor\UI\Template::getTemplate("formfields/option", true) . "\";");

lib/functions/formfields/option/function.prefetchFormFieldDataOption.php

@@ -16,15 +16,13 @@
  * @package    Functions
  *
  */
-
 function prefetchFormFieldDataOption($fieldname, $fielddata)
 {
 	$returnvalue = array();
-	
-	if((!isset($fielddata['option_options']) || !is_array($fielddata['option_options']) || empty($fielddata['option_options'])) && (isset($fielddata['option_options_method']) && function_exists($fielddata['option_options_method'])))
-	{
+
+	if ((! isset($fielddata['option_options']) || ! is_array($fielddata['option_options']) || empty($fielddata['option_options'])) && (isset($fielddata['option_options_method']) && function_exists($fielddata['option_options_method']))) {
 		$returnvalue['options'] = call_user_func($fielddata['option_options_method']);
 	}
-	
+
 	return $returnvalue;
 }

lib/functions/formfields/option/function.validateFormFieldOption.php

@@ -16,30 +16,22 @@
  * @package    Functions
  *
  */
-
 function validateFormFieldOption($fieldname, $fielddata, $newfieldvalue)
 {
 	$returnvalue = true;
 
-	if(isset($fielddata['option_mode']) && $fielddata['option_mode'] == 'multiple')
-	{
+	if (isset($fielddata['option_mode']) && $fielddata['option_mode'] == 'multiple') {
 		$options = explode(',', $newfieldvalue);
-		foreach($options as $option)
-		{
+		foreach ($options as $option) {
 			$returnvalue = ($returnvalue && isset($fielddata['option_options'][$option]));
 		}
-	}
-	else
-	{
+	} else {
 		$returnvalue = isset($fielddata['option_options'][$newfieldvalue]);
 	}
 
-	if($returnvalue === true || $fielddata['visible'] == false)
-	{
+	if ($returnvalue === true || $fielddata['visible'] == false) {
 		return true;
-	}
-	else
-	{
+	} else {
 		if (isset($fielddata['option_emptyallowed']) && $fielddata['option_emptyallowed']) {
 			return true;
 		}

lib/functions/formfields/string/function.getFormFieldOutputString.php

@@ -16,7 +16,6 @@
  * @package    Functions
  *
  */
-
 function getFormFieldOutputString($fieldname, $fielddata, $do_show = true)
 {
 	$label = $fielddata['label'];

lib/functions/formfields/text/function.getFormFieldDataText.php

@@ -14,9 +14,9 @@
  * @package    Functions
  *
  */
-
-function getFormFieldDataText($fieldname, $fielddata, &$input) {
-	if(isset($input[$fieldname])) {
+function getFormFieldDataText($fieldname, $fielddata, &$input)
+{
+	if (isset($input[$fieldname])) {
 		$newfieldvalue = str_replace("\r\n", "\n", $input[$fieldname]);
 	} else {
 		$newfieldvalue = $fielddata['default'];

lib/functions/formfields/text/function.getFormFieldOutputText.php

@@ -16,7 +16,6 @@
  * @package    Functions
  *
  */
-
 function getFormFieldOutputText($fieldname, $fielddata, $do_show = true)
 {
 	$label = $fielddata['label'];

lib/functions/formfields/text/function.validateFormFieldText.php

@@ -16,15 +16,13 @@
  * @package    Functions
  *
  */
-
 function validateFormFieldText($fieldname, $fielddata, $newfieldvalue)
 {
 	$returnvalue = 'stringformaterror';
-	
-	if(preg_match('/^[^\0]*$/', $newfieldvalue))
-	{
+
+	if (preg_match('/^[^\0]*$/', $newfieldvalue)) {
 		$returnvalue = true;
 	}
-	
+
 	return $returnvalue;
 }