From be90262e383405bd4c3839d7b969ce21257ed75f Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 03 May 2016 09:08:44 -0400
Subject: [PATCH] - remoting (json) should produce array - Changed default value for expire of ftp user, should have fixed: #3862
---
interface/web/sites/form/ftp_user.tform.php | 3 ++-
interface/lib/classes/json_handler.inc.php | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/json_handler.inc.php b/interface/lib/classes/json_handler.inc.php
index 1df5898..d6d58c3 100644
--- a/interface/lib/classes/json_handler.inc.php
+++ b/interface/lib/classes/json_handler.inc.php
@@ -91,7 +91,7 @@
if(is_array($_POST)) {
foreach($_POST as $key => $val) {
- $tmp = json_decode($val);
+ $tmp = json_decode($val, true);
if(!$tmp) $params[] = $val;
else $params[] = (array)$tmp;
}
diff --git a/interface/web/sites/form/ftp_user.tform.php b/interface/web/sites/form/ftp_user.tform.php
index 239bfdb..324fb61 100644
--- a/interface/web/sites/form/ftp_user.tform.php
+++ b/interface/web/sites/form/ftp_user.tform.php
@@ -296,7 +296,8 @@
$form['tabs']['advanced']['fields']['expires'] = array(
'datatype' => 'DATETIME',
- 'formtype' => 'DATETIME'
+ 'formtype' => 'DATETIME',
+ 'default' => null
);
--
Gitblit v1.9.1