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

more and more checkstyle fixes

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-24 12:59:40 +01:00
parent 585d42f1b8
commit 35c631946d
48 changed files with 298 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Froxlor/UI/Data.php
View File

@@ -60,4 +60,4 @@ class Data
return $newfieldvalue;
}
}
}

2
lib/Froxlor/UI/Fields.php
View File

@@ -105,4 +105,4 @@ class Fields
eval("\$returnvalue = \"" . \Froxlor\UI\Template::getTemplate("formfields/bool", true) . "\";");
return $returnvalue;
}
}
}

6
lib/Froxlor/UI/Form.php
View File

@@ -45,8 +45,8 @@ class Form
if (isset($groupdetails['title']) && $groupdetails['title'] != '') {
$fields .= self::getFormOverviewGroupOutput($groupname, $groupdetails);
}
} // only show one section
elseif ($part != '' && ($groupname == $part || $part == 'all')) {
} elseif ($part != '' && ($groupname == $part || $part == 'all')) {
// only show one section
/**
* this part checks for the 'websrv_avail' entry in the settings-array
* if found, we check if the current webserver is in the array.
@@ -188,7 +188,7 @@ class Form
}
}
public static function processFormEx(&$form, &$input, $url_params = array(), $part, $settings_all, $settings_part, $only_enabledisable)
public static function processFormEx(&$form, &$input, $url_params = array(), $part = null, $settings_all = array(), $settings_part = null, $only_enabledisable = false)
{
if (\Froxlor\Validate\Form::validateFormDefinition($form)) {
$submitted_fields = array();

4
lib/Froxlor/UI/HTML.php
View File

@@ -126,9 +126,9 @@ class HTML
*/
public static function makecheckbox($name, $title, $value, $break = false, $selvalue = null, $title_trusted = false, $value_trusted = false)
{
if ($selvalue !== NULL && $value == $selvalue) {
if ($selvalue !== null && $value == $selvalue) {
$checked = 'checked="checked"';
} else if (isset($_SESSION['requestData'][$name])) {
} elseif (isset($_SESSION['requestData'][$name])) {
$checked = 'checked="checked"';
} else {
$checked = '';

4
lib/Froxlor/UI/HtmlForm.php
View File

@@ -122,7 +122,7 @@ class HtmlForm
return self::textArea($fieldname, $data);
break;
case 'checkbox':
return self::_checkbox($fieldname, $data);
return self::checkbox($fieldname, $data);
break;
case 'file':
return self::file($fieldname, $data);
@@ -250,7 +250,7 @@ class HtmlForm
* @param array $data
* contains the data array
*/
public static function _checkbox($fieldname = '', $data = array())
private static function checkbox($fieldname = '', $data = array())
{
// $data['value'] contains checked items
$checked = array();

2
lib/Froxlor/UI/Template.php
View File

@@ -122,4 +122,4 @@ class Template
}
return false;
}
}
}