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

- updated outdated domains_add & domains_edit templates in Classic-theme

Browse Source 
- fixed formfield when path-mode is 'Manual'
fixes #620

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2011-03-01 10:31:38 +01:00
parent fb430e55d2
commit 13bde22344
5 changed files with 20 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/formfields/customer/domains/formfield.domains_add.php
View File

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

3
lib/formfields/customer/domains/formfield.domains_edit.php
View File

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

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

@@ -38,6 +38,12 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '')
$value = str_replace($path, '', $value);
$field = array();
// path is given without starting slash
// 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($fieldType == 'Manual')
{
$field = array(
@@ -48,12 +54,6 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '')
}
elseif($fieldType == 'Dropdown')
{
// path is given without starting slash
// but dirList holds the paths with starting slash
// so we just add one here to get the correct
// default path selected, #225
$value = '/'.$value;
$dirList = findDirs($path, $uid, $gid);
natcasesort($dirList);
@@ -93,7 +93,7 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '')
else
{
//$field = $lng['panel']['dirsmissing'];
$field = '<input type="hidden" name="path" value="/" />';
//$field = '<input type="hidden" name="path" value="/" />';
$field = array(
'type' => 'hidden',
'value' => '/',