lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prepare to generalize usage of get_exdir

Browse Source
This commit is contained in:
Laurent Destailleur 2015-05-18 21:47:44 +02:00
parent 6d03ba228d
commit 4d6b25eb45
3 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/class/html.formfile.class.php
View File

@ -265,7 +265,6 @@ class FormFile
if (! is_object($form)) $form=new Form($this->db); if (! is_object($form)) $form=new Form($this->db);
// filedir = $conf->...->dir_ouput."/".get_exdir(id)
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
// For backward compatibility // For backward compatibility

30
htdocs/core/lib/functions.lib.php
View File

@ -3701,26 +3701,42 @@ function yn($yesno, $case=1, $color=0)
/** /**
* Return a path to have a directory according to an id * Return a path to have a directory according to object.
* Examples: '001' with level 3->"0/0/1/", '015' with level 3->"0/1/5/" * Examples: '001' with level 3->"0/0/1/", '015' with level 3->"0/1/5/"
* Examples: 'ABC-1' with level 3 ->"0/0/1/", '015' with level 1->"5/" * Examples: 'ABC-1' with level 3 ->"0/0/1/", '015' with level 1->"5/"
* *
* @param string $num Id to develop * @param string $num Id of object
* @param int $level Level of development (1, 2 or 3 level) * @param int $level Level of subdirs to return (1, 2 or 3 levels)
* @param int $alpha Use alpha ref * @param int $alpha Use alpha ref
* @param int $withoutslash 0=With slash at end, 1=without slash at end * @param int $withoutslash 0=With slash at end, 1=without slash at end (except if '/', we return '')
* @return string Dir to use * @param string $ref Not used yet. May be used to manage different option of directory path according to element.
* @param string $modulepart Not used yet. May be used to manage different option of directory path according to element.
* @return string Dir to use ending. Example '' or '1/' or '1/2/'
*/ */
function get_exdir($num,$level=3,$alpha=0,$withoutslash=0) function get_exdir($num,$level,$alpha=0,$withoutslash=0,$ref='',$modulepart='')
{ {
global $conf;
$path = ''; $path = '';
if (in_array($modulepart, array('don','donation','supplier_invoice','invoice_supplier')))
{
if (empty($alpha)) $num = preg_replace('/([^0-9])/i','',$num); if (empty($alpha)) $num = preg_replace('/([^0-9])/i','',$num);
else $num = preg_replace('/^.*\-/i','',$num); else $num = preg_replace('/^.*\-/i','',$num);
$num = substr("000".$num, -$level); $num = substr("000".$num, -$level);
if ($level == 1) $path = substr($num,0,1); if ($level == 1) $path = substr($num,0,1);
if ($level == 2) $path = substr($num,1,1).'/'.substr($num,0,1); if ($level == 2) $path = substr($num,1,1).'/'.substr($num,0,1);
if ($level == 3) $path = substr($num,2,1).'/'.substr($num,1,1).'/'.substr($num,0,1); if ($level == 3) $path = substr($num,2,1).'/'.substr($num,1,1).'/'.substr($num,0,1);
if (empty($withoutslash)) $path.='/'; }
else
{
// TODO
// We will introduce here a common way of forging path for document storage
// Here, $num=id, ref and modulepart are required.
}
if (empty($withoutslash) && ! empty($path)) $path.='/';
return $path; return $path;
} }

4
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -184,8 +184,8 @@ class pdf_azur extends ModelePDFPropales
} }
else else
{ {
$pdir[0] = dol_sanitizeFileName($objphoto->ref).'/'; $pdir[0] = dol_sanitizeFileName($objphoto->ref).'/'; // default
$pdir[1] = get_exdir($objphoto->id,2) . $objphoto->id ."/photos/"; $pdir[1] = get_exdir($objphoto->id,2) . $objphoto->id ."/photos/"; // alternative
} }
$arephoto = false; $arephoto = false;