A lot of fix in phpOdt module

This commit is contained in:
Laurent Destailleur
2010-03-13 16:05:36 +00:00
parent f1d67cba3c
commit ed19e89531
3 changed files with 367 additions and 331 deletions

View File

@@ -280,19 +280,18 @@ class doc_generic_odt extends ModeleThirdPartyDoc
//print "newdir=".$dir;
//print "newfile=".$newfile;
//print "file=".$file;
//exit;
//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
create_exdir($conf->societe->dir_temp);
// Open and load template
require_once(DOL_DOCUMENT_ROOT.'/includes/odtphp/odf.php');
$odfHandler = new odf($srctemplatepath, array(
'PATH_TO_TMP' => $conf->societe->dir_temp.'/',
'PATH_TO_TMP' => $conf->societe->dir_temp,
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got bad compression method when using PhpZipProxy.
'DELIMITER_LEFT' => '{',
'DELIMITER_RIGHT' => '}')
);
//print $odfHandler; exit;
// Make substitutions
@@ -324,6 +323,8 @@ class doc_generic_odt extends ModeleThirdPartyDoc
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));
$odfHandler=null; // Destroy object
return 1; // Success
}
else