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

display phperror below fixed header in sparkle theme; fix wrong parameter-list and ignorance of in makePathfield

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-16 11:32:25 +01:00
parent 37a242a679
commit 6ed02e593c
2 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,17 +23,15 @@
* @param string path The path to start searching in
* @param integer uid The uid which must match the found directories
* @param integer gid The gid which must match the found direcotries
* @param string fieldType Either "Manual" or "Dropdown"
* @param string value the value for the input-field
*
*
* @return string The html tag for the choosen $fieldType
*
* @author Martin Burchert <martin.burchert@syscp.de>
* @author Manuel Bernhardt <manuel.bernhardt@syscp.de>
*/
function makePathfield($path, $uid, $gid, $value = '', $dom = false) {
function makePathfield($path, $uid, $gid, $fieldType, $value = '', $dom = false)
{
global $lng;
$value = str_replace($path, '', $value);
@@ -47,41 +45,34 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '', $dom = false)
$value = '/'.$value;
}
if($fieldType == 'Manual')
{
$fieldType = Settings::Get('panel.pathedit');
if ($fieldType == 'Manual') {
$field = array(
'type' => 'text',
'value' => htmlspecialchars($value)
);
}
elseif($fieldType == 'Dropdown')
{
} elseif($fieldType == 'Dropdown') {
$dirList = findDirs($path, $uid, $gid);
natcasesort($dirList);
if(sizeof($dirList) > 0)
{
if(sizeof($dirList) <= 100)
{
if (sizeof($dirList) > 0) {
if (sizeof($dirList) <= 100) {
$_field = '';
foreach($dirList as $key => $dir)
{
if(strpos($dir, $path) === 0)
{
foreach ($dirList as $key => $dir) {
if (strpos($dir, $path) === 0) {
$dir = makeCorrectDir(substr($dir, strlen($path)));
}
$_field.= makeoption($dir, $dir, $value);
}
$field = array(
'type' => 'select',
'value' => $_field
);
}
else
{
} else {
// remove starting slash we added
// for the Dropdown, #225
$value = substr($value, 1);
@@ -92,9 +83,7 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '', $dom = false)
'note' => $lng['panel']['toomanydirs']
);
}
}
else
{
} else {
//$field = $lng['panel']['dirsmissing'];
//$field = '<input type="hidden" name="path" value="/" />';
$field = array(

2
templates/Sparkle/misc/phperrornice.tpl vendored
View File

@@ -1,4 +1,4 @@
<div class="messagewrapperfull">
<div class="messagewrapperfull" style="margin-top:50px;margin-bottom:-55px">
<div class="warningcontainer bradius">
<div class="warningtitle">PHP warning/error</div>
<div class="warning">