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

Add error management to avoid blank page when there is no permission to

Browse Source 
read file.
This commit is contained in:
Laurent Destailleur 2013-10-23 19:19:54 +02:00
parent fe4df6770a
commit 16bcd6b5e5
7 changed files with 132 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@ -392,15 +392,22 @@ class doc_generic_order_odt extends ModelePDFCommandes
// Open and load template // Open and load template
require_once ODTPHP_PATH.'odf.php'; require_once ODTPHP_PATH.'odf.php';
$odfHandler = new odf( try {
$srctemplatepath, $odfHandler = new odf(
array( $srctemplatepath,
'PATH_TO_TMP' => $conf->commande->dir_temp, array(
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy. 'PATH_TO_TMP' => $conf->commande->dir_temp,
'DELIMITER_LEFT' => '{', 'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_RIGHT' => '}' 'DELIMITER_LEFT' => '{',
) 'DELIMITER_RIGHT' => '}'
); )
);
}
catch(Exception $e)
{
$this->error=$e->getMessage();
return -1;
}
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by // [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
// [!-- BEGIN lines --]*[!-- END lines --] // [!-- BEGIN lines --]*[!-- END lines --]

25
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
View File

@ -392,15 +392,22 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
// Open and load template // Open and load template
require_once ODTPHP_PATH.'odf.php'; require_once ODTPHP_PATH.'odf.php';
$odfHandler = new odf( try {
$srctemplatepath, $odfHandler = new odf(
array( $srctemplatepath,
'PATH_TO_TMP' => $conf->expedition->dir_temp, array(
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy. 'PATH_TO_TMP' => $conf->expedition->dir_temp,
'DELIMITER_LEFT' => '{', 'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_RIGHT' => '}' 'DELIMITER_LEFT' => '{',
) 'DELIMITER_RIGHT' => '}'
); )
);
}
catch(Exception $e)
{
$this->error=$e->getMessage();
return -1;
}
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by // [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
// [!-- BEGIN lines --]*[!-- END lines --] // [!-- BEGIN lines --]*[!-- END lines --]

25
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -423,15 +423,22 @@ class doc_generic_invoice_odt extends ModelePDFFactures
// Open and load template // Open and load template
require_once ODTPHP_PATH.'odf.php'; require_once ODTPHP_PATH.'odf.php';
$odfHandler = new odf( try {
$srctemplatepath, $odfHandler = new odf(
array( $srctemplatepath,
'PATH_TO_TMP' => $conf->facture->dir_temp, array(
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy. 'PATH_TO_TMP' => $conf->facture->dir_temp,
'DELIMITER_LEFT' => '{', 'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_RIGHT' => '}' 'DELIMITER_LEFT' => '{',
) 'DELIMITER_RIGHT' => '}'
); )
);
}
catch(Exception $e)
{
$this->error=$e->getMessage();
return -1;
}
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by // [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
// [!-- BEGIN lines --]*[!-- END lines --] // [!-- BEGIN lines --]*[!-- END lines --]

25
htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
View File

@ -469,15 +469,22 @@ class doc_generic_project_odt extends ModelePDFProjects
// Open and load template // Open and load template
require_once ODTPHP_PATH.'odf.php'; require_once ODTPHP_PATH.'odf.php';
$odfHandler = new odf( try {
$srctemplatepath, $odfHandler = new odf(
array( $srctemplatepath,
'PATH_TO_TMP' => $conf->projet->dir_temp, array(
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy. 'PATH_TO_TMP' => $conf->projet->dir_temp,
'DELIMITER_LEFT' => '{', 'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_RIGHT' => '}' 'DELIMITER_LEFT' => '{',
) 'DELIMITER_RIGHT' => '}'
); )
);
}
catch(Exception $e)
{
$this->error=$e->getMessage();
return -1;
}
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by // [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
// [!-- BEGIN lines --]*[!-- END lines --] // [!-- BEGIN lines --]*[!-- END lines --]

25
htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php
View File

@ -455,15 +455,22 @@ class doc_generic_task_odt extends ModelePDFTask
// Open and load template // Open and load template
require_once ODTPHP_PATH.'odf.php'; require_once ODTPHP_PATH.'odf.php';
$odfHandler = new odf( try {
$srctemplatepath, $odfHandler = new odf(
array( $srctemplatepath,
'PATH_TO_TMP' => $conf->projet->dir_temp, array(
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy. 'PATH_TO_TMP' => $conf->projet->dir_temp,
'DELIMITER_LEFT' => '{', 'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_RIGHT' => '}' 'DELIMITER_LEFT' => '{',
) 'DELIMITER_RIGHT' => '}'
); )
);
}
catch(Exception $e)
{
$this->error=$e->getMessage();
return -1;
}
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by // [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
// [!-- BEGIN lines --]*[!-- END lines --] // [!-- BEGIN lines --]*[!-- END lines --]

25
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@ -344,15 +344,22 @@ class doc_generic_proposal_odt extends ModelePDFPropales
// Open and load template // Open and load template
require_once ODTPHP_PATH.'odf.php'; require_once ODTPHP_PATH.'odf.php';
$odfHandler = new odf( try {
$srctemplatepath, $odfHandler = new odf(
array( $srctemplatepath,
'PATH_TO_TMP' => $conf->propal->dir_temp, array(
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy. 'PATH_TO_TMP' => $conf->propal->dir_temp,
'DELIMITER_LEFT' => '{', 'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_RIGHT' => '}' 'DELIMITER_LEFT' => '{',
) 'DELIMITER_RIGHT' => '}'
); )
);
}
catch(Exception $e)
{
$this->error=$e->getMessage();
return -1;
}
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by // [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
// [!-- BEGIN lines --]*[!-- END lines --] // [!-- BEGIN lines --]*[!-- END lines --]

26
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
View File

@ -236,16 +236,22 @@ class doc_generic_odt extends ModeleThirdPartyDoc
// Open and load template // Open and load template
require_once ODTPHP_PATH.'odf.php'; require_once ODTPHP_PATH.'odf.php';
$odfHandler = new odf( try {
$srctemplatepath, $odfHandler = new odf(
array( $srctemplatepath,
'PATH_TO_TMP' => $conf->societe->multidir_temp[$object->entity], array(
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy. 'PATH_TO_TMP' => $conf->societe->multidir_temp[$object->entity],
'DELIMITER_LEFT' => '{', 'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_RIGHT' => '}' 'DELIMITER_LEFT' => '{',
) 'DELIMITER_RIGHT' => '}'
); )
);
}
catch(Exception $e)
{
$this->error=$e->getMessage();
return -1;
}
//print $odfHandler->__toString()."\n"; //print $odfHandler->__toString()."\n";
// Make substitutions into odt of user info // Make substitutions into odt of user info