maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

get rid of storeSetting*-functions

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-19 19:58:14 +01:00
parent 26510f0745
commit d654b18517
15 changed files with 481 additions and 685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/functions/formfields/function.saveForm.php
View File

@@ -20,9 +20,9 @@
function saveForm($fielddata, $newfieldvalue)
{
$returnvalue = '';
if(is_array($fielddata) && isset($fielddata['save_method']) && $fielddata['save_method'] != '' && function_exists($fielddata['save_method']))
if(is_array($fielddata) && isset($fielddata['save_method']) && $fielddata['save_method'] != '')
{
$returnvalue = call_user_func($fielddata['save_method'], $fielddata, $newfieldvalue);
$returnvalue = call_user_func(array('\\Froxlor\\Settings\\Store', $fielddata['save_method']), $fielddata, $newfieldvalue);
}
elseif(is_array($fielddata) && !isset($fielddata['save_method']))
{

17
lib/functions/formfields/function.saveFormField.php
View File

@@ -16,20 +16,17 @@
* @package Functions
*
*/
function saveFormField($fieldname, $fielddata, $newfieldvalue)
{
$returnvalue = '';
if(is_array($fielddata) && isset($fielddata['save_method']) && $fielddata['save_method'] != '' && function_exists($fielddata['save_method']))
{
$returnvalue = call_user_func($fielddata['save_method'], $fieldname, $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']
), $fieldname, $fielddata, $newfieldvalue);
} elseif (is_array($fielddata) && ! isset($fielddata['save_method'])) {
$returnvalue = array();
}
else
{
} else {
$returnvalue = false;
}
return $returnvalue;

8
lib/functions/formfields/function.validateFieldDefinition.php
View File

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