get rid of most of the checkstyle warnings

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-24 13:50:45 +01:00
parent 30f5902b88
commit 7416a41a42
41 changed files with 129 additions and 119 deletions

View File

@@ -154,7 +154,7 @@ if ($action == '') {
's' => $s
));
} else {
\Froxlor\UI\HTML::ask_yesno('admin_template_reallydelete', $filename, array(
\Froxlor\UI\HTML::askYesNo('admin_template_reallydelete', $filename, array(
'subjectid' => $subjectid,
'mailbodyid' => $mailbodyid,
'page' => $page,
@@ -190,7 +190,7 @@ if ($action == '') {
's' => $s
));
} else {
\Froxlor\UI\HTML::ask_yesno('admin_template_reallydelete', $filename, array(
\Froxlor\UI\HTML::askYesNo('admin_template_reallydelete', $filename, array(
'id' => $id,
'page' => $page,
'action' => $action
@@ -426,7 +426,7 @@ if ($action == '') {
));
} else {
$result = \Froxlor\PhpHelper::htmlentities_array($result);
$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
$template = $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])];
$subject = $result['value'];
$result_stmt = Database::prepare("
@@ -442,7 +442,7 @@ if ($action == '') {
// don't escape the already escaped language-string so save up before htmlentities()
$language = $result['language'];
$result = \Froxlor\PhpHelper::htmlentities_array($result);
$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
$mailbody = $result['value'];
$template_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.template_edit.php';
@@ -487,7 +487,7 @@ if ($action == '') {
's' => $s
));
} else {
$row = \Froxlor\PhpHelper::htmlentities_array($row);
$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
$filetemplate_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.filetemplate_edit.php';
$filetemplate_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($filetemplate_edit_data);