diff --git a/lib/formfields/customer/extras/formfield.htaccess_add.php b/lib/formfields/customer/extras/formfield.htaccess_add.php index 9890554b..d0bc1f39 100644 --- a/lib/formfields/customer/extras/formfield.htaccess_add.php +++ b/lib/formfields/customer/extras/formfield.htaccess_add.php @@ -28,7 +28,8 @@ return array( 'label' => $lng['panel']['path'], 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '
'.$pathSelect['value'] : ''), 'type' => $pathSelect['type'], - 'select_var' => $pathSelect['value'] + 'select_var' => $pathSelect['value'], + 'value' => $pathSelect['value'] ), 'options_indexes' => array( 'label' => $lng['extras']['directory_browsing'], diff --git a/lib/formfields/customer/extras/formfield.htpasswd_add.php b/lib/formfields/customer/extras/formfield.htpasswd_add.php index fe936c37..a0487e6b 100644 --- a/lib/formfields/customer/extras/formfield.htpasswd_add.php +++ b/lib/formfields/customer/extras/formfield.htpasswd_add.php @@ -28,7 +28,8 @@ return array( 'label' => $lng['panel']['path'], 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '
'.$pathSelect['value'] : ''), 'type' => $pathSelect['type'], - 'select_var' => $pathSelect['value'] + 'select_var' => $pathSelect['value'], + 'value' => $pathSelect['value'] ), 'username' => array( 'label' => $lng['login']['username'], diff --git a/lib/formfields/customer/ftp/formfield.ftp_add.php b/lib/formfields/customer/ftp/formfield.ftp_add.php index bc7529c2..23039a30 100644 --- a/lib/formfields/customer/ftp/formfield.ftp_add.php +++ b/lib/formfields/customer/ftp/formfield.ftp_add.php @@ -21,13 +21,13 @@ return array( 'sections' => array( 'section_a' => array( 'title' => $lng['ftp']['account_add'], - 'image' => 'icons/user_add.png', + 'image' => 'icons/user_add.png', 'fields' => array( 'ftp_username' => array( 'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false), - 'label' => $lng['login']['username'], - 'type' => 'text' - ), + 'label' => $lng['login']['username'], + 'type' => 'text' + ), 'ftp_domain' => array( 'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false), 'label' => $lng['domains']['domainname'], @@ -38,7 +38,8 @@ return array( 'label' => $lng['panel']['path'], 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '
'.$pathSelect['value'] : ''), 'type' => $pathSelect['type'], - 'select_var' => $pathSelect['value'] + 'select_var' => $pathSelect['value'], + 'value' => $pathSelect['value'] ), 'ftp_password' => array( 'label' => $lng['login']['password'], diff --git a/lib/formfields/customer/ftp/formfield.ftp_edit.php b/lib/formfields/customer/ftp/formfield.ftp_edit.php index ca154635..4047f042 100644 --- a/lib/formfields/customer/ftp/formfield.ftp_edit.php +++ b/lib/formfields/customer/ftp/formfield.ftp_edit.php @@ -21,7 +21,7 @@ return array( 'sections' => array( 'section_a' => array( 'title' => $lng['ftp']['account_edit'], - 'image' => 'icons/user_edit.png', + 'image' => 'icons/user_edit.png', 'fields' => array( 'username' => array( 'label' => $lng['login']['username'], @@ -32,13 +32,14 @@ return array( 'label' => $lng['panel']['path'], 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '
'.$pathSelect['value'] : ''), 'type' => $pathSelect['type'], - 'select_var' => $pathSelect['value'] + 'select_var' => $pathSelect['value'], + 'value' => $pathSelect['value'] ), 'ftp_password' => array( 'label' => $lng['login']['password'], 'desc' => $lng['ftp']['editpassdescription'], 'type' => 'password', - ), + ) ) ) ) diff --git a/lib/functions/filedir/function.makePathfield.php b/lib/functions/filedir/function.makePathfield.php index 912a47b4..df3615ae 100644 --- a/lib/functions/filedir/function.makePathfield.php +++ b/lib/functions/filedir/function.makePathfield.php @@ -42,7 +42,9 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '') // but dirList holds the paths with starting slash // so we just add one here to get the correct // default path selected, #225 - $value = '/'.$value; + if ($value != '/') { + $value = '/'.$value; + } if($fieldType == 'Manual') {