mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-23 23:29:31 +01:00
2 slashes are one to much ;-)
This commit is contained in:
parent
b3ecd8456d
commit
adaa4fb4a9
@ -46,19 +46,12 @@
|
|||||||
|
|
||||||
switch ($phpgw_flags['currentapp'])
|
switch ($phpgw_flags['currentapp'])
|
||||||
{
|
{
|
||||||
case 'jinn' :
|
|
||||||
$BASE_DIR = $sessdata[UploadImageBaseDir];
|
|
||||||
$BASE_URL = $sessdata[UploadImageBaseURL];
|
|
||||||
$MAX_HEIGHT = $sessdata[UploadImageMaxHeight];
|
|
||||||
$MAX_WIDTH = $sessdata[UploadImageMaxWidth];
|
|
||||||
// _debug_array($sessdata);
|
|
||||||
//die();
|
|
||||||
break;
|
|
||||||
case 'sitemgr' :
|
case 'sitemgr' :
|
||||||
if(is_writeable($sessdata['upload_dir']))
|
if(is_writeable($sessdata['upload_dir']))
|
||||||
{
|
{
|
||||||
$BASE_DIR = $sessdata['upload_dir'];
|
$BASE_DIR = $sessdata['upload_dir'];
|
||||||
$BASE_URL = str_replace($GLOBALS['_SERVER']['DOCUMENT_ROOT'],'',$sessdata['upload_dir']);
|
$BASE_URL = str_replace($GLOBALS['_SERVER']['DOCUMENT_ROOT'],'',$sessdata['upload_dir']);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -71,7 +64,14 @@
|
|||||||
'Notify your Administrator to correct this Situation';
|
'Notify your Administrator to correct this Situation';
|
||||||
die();
|
die();
|
||||||
}
|
}
|
||||||
|
case 'jinn' :
|
||||||
default :
|
default :
|
||||||
|
$BASE_DIR = $sessdata[UploadImageBaseDir];
|
||||||
|
$BASE_URL = $sessdata[UploadImageBaseURL];
|
||||||
|
$MAX_HEIGHT = $sessdata[UploadImageMaxHeight];
|
||||||
|
$MAX_WIDTH = $sessdata[UploadImageMaxWidth];
|
||||||
|
// _debug_array($sessdata);
|
||||||
|
//die();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -90,11 +90,15 @@
|
|||||||
$BASE_ROOT = '';
|
$BASE_ROOT = '';
|
||||||
$IMG_ROOT = $BASE_ROOT;
|
$IMG_ROOT = $BASE_ROOT;
|
||||||
|
|
||||||
if(strrpos($BASE_DIR, '/')!= strlen($BASE_DIR)-1)
|
// this seems to make no sense... maybe jinn needs it for some reason
|
||||||
$BASE_DIR .= '/';
|
if ($phpgw_flags['app'] == 'jinn')
|
||||||
|
{
|
||||||
|
if(strrpos($BASE_DIR, '/')!= strlen($BASE_DIR)-1)
|
||||||
|
$BASE_DIR .= '/';
|
||||||
|
|
||||||
if(strrpos($BASE_URL, '/')!= strlen($BASE_URL)-1)
|
if(strrpos($BASE_URL, '/')!= strlen($BASE_URL)-1)
|
||||||
$BASE_URL .= '/';
|
$BASE_URL .= '/';
|
||||||
|
}
|
||||||
|
|
||||||
//Built in function of dirname is faulty
|
//Built in function of dirname is faulty
|
||||||
//It assumes that the directory nane can not contain a . (period)
|
//It assumes that the directory nane can not contain a . (period)
|
||||||
|
Loading…
Reference in New Issue
Block a user