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

fix output of default path-value if path-select-mode is 'Manual', fixes #642

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2011-03-08 11:48:05 +01:00
parent 00f8707703
commit b5124b8274
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/formfields/customer/extras/formfield.htaccess_add.php
View File

@@ -28,7 +28,8 @@ return array(
'label' => $lng['panel']['path'], 'label' => $lng['panel']['path'],
'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''), 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'type' => $pathSelect['type'], 'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'] 'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']
), ),
'options_indexes' => array( 'options_indexes' => array(
'label' => $lng['extras']['directory_browsing'], 'label' => $lng['extras']['directory_browsing'],

3
lib/formfields/customer/extras/formfield.htpasswd_add.php
View File

@@ -28,7 +28,8 @@ return array(
'label' => $lng['panel']['path'], 'label' => $lng['panel']['path'],
'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''), 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'type' => $pathSelect['type'], 'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'] 'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']
), ),
'username' => array( 'username' => array(
'label' => $lng['login']['username'], 'label' => $lng['login']['username'],

11
lib/formfields/customer/ftp/formfield.ftp_add.php
View File

@@ -21,13 +21,13 @@ return array(
'sections' => array( 'sections' => array(
'section_a' => array( 'section_a' => array(
'title' => $lng['ftp']['account_add'], 'title' => $lng['ftp']['account_add'],
'image' => 'icons/user_add.png', 'image' => 'icons/user_add.png',
'fields' => array( 'fields' => array(
'ftp_username' => array( 'ftp_username' => array(
'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false), 'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false),
'label' => $lng['login']['username'], 'label' => $lng['login']['username'],
'type' => 'text' 'type' => 'text'
), ),
'ftp_domain' => array( 'ftp_domain' => array(
'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false), 'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false),
'label' => $lng['domains']['domainname'], 'label' => $lng['domains']['domainname'],
@@ -38,7 +38,8 @@ return array(
'label' => $lng['panel']['path'], 'label' => $lng['panel']['path'],
'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''), 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'type' => $pathSelect['type'], 'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'] 'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']
), ),
'ftp_password' => array( 'ftp_password' => array(
'label' => $lng['login']['password'], 'label' => $lng['login']['password'],

7
lib/formfields/customer/ftp/formfield.ftp_edit.php
View File

@@ -21,7 +21,7 @@ return array(
'sections' => array( 'sections' => array(
'section_a' => array( 'section_a' => array(
'title' => $lng['ftp']['account_edit'], 'title' => $lng['ftp']['account_edit'],
'image' => 'icons/user_edit.png', 'image' => 'icons/user_edit.png',
'fields' => array( 'fields' => array(
'username' => array( 'username' => array(
'label' => $lng['login']['username'], 'label' => $lng['login']['username'],
@@ -32,13 +32,14 @@ return array(
'label' => $lng['panel']['path'], 'label' => $lng['panel']['path'],
'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''), 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'type' => $pathSelect['type'], 'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'] 'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']
), ),
'ftp_password' => array( 'ftp_password' => array(
'label' => $lng['login']['password'], 'label' => $lng['login']['password'],
'desc' => $lng['ftp']['editpassdescription'], 'desc' => $lng['ftp']['editpassdescription'],
'type' => 'password', 'type' => 'password',
), )
) )
) )
) )

4
lib/functions/filedir/function.makePathfield.php
View File

@@ -42,7 +42,9 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '')
// but dirList holds the paths with starting slash // but dirList holds the paths with starting slash
// so we just add one here to get the correct // so we just add one here to get the correct
// default path selected, #225 // default path selected, #225
$value = '/'.$value; if ($value != '/') {
$value = '/'.$value;
}
if($fieldType == 'Manual') if($fieldType == 'Manual')
{ {