From b38d352c4bcb273aa73e4f45f9b3538d0f6e4536 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 15 Jun 2010 19:56:55 +0000 Subject: [PATCH] Work on odt generation --- .../modules/societe/doc/doc_generic_odt.modules.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php index 9b53f9d37ce..0f632de5e18 100644 --- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php @@ -314,17 +314,18 @@ class doc_generic_odt extends ModeleThirdPartyDoc 'DELIMITER_LEFT' => '{', 'DELIMITER_RIGHT' => '}') ); - //var_dump($odfHandler); exit; // Make substitutions $tmparray=$this->get_substitutionarray_mysoc($mysoc); + //var_dump($tmparray); exit; foreach($tmparray as $key=>$value) { try { if (preg_match('/logo$/',$key)) // Image { //var_dump($value);exit; - $odfHandler->setImage($key, $value); + if (file_exists($value)) $odfHandler->setImage($key, $value); + else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); } else // Text { @@ -341,7 +342,8 @@ class doc_generic_odt extends ModeleThirdPartyDoc try { if (preg_match('/logo$/',$key)) // Image { - $odfHandler->setImage($key, $value); + if (file_exists($value)) $odfHandler->setImage($key, $value); + else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); } else // Text {