Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX #25996 FIX #25997

Browse Source
This commit is contained in:
Laurent Destailleur
2023-10-01 17:24:25 +02:00
parent 2a49ebb114
commit 2e431468a0
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@@ -1046,7 +1046,7 @@ class doc_generic_project_odt extends ModelePDFProjects
), ),
); );
//Insert reference // Insert list of objects into the project
try { try {
$listlines = $odfHandler->setSegment('projectrefs'); $listlines = $odfHandler->setSegment('projectrefs');
@@ -1122,6 +1122,8 @@ class doc_generic_project_odt extends ModelePDFProjects
} }
$odfHandler->mergeSegment($listlines); $odfHandler->mergeSegment($listlines);
} }
} catch (OdfExceptionSegmentNotFound $e) {
// Do nothing
} catch (OdfException $e) { } catch (OdfException $e) {
$this->error = $e->getMessage(); $this->error = $e->getMessage();
dol_syslog($this->error, LOG_WARNING); dol_syslog($this->error, LOG_WARNING);

11
htdocs/includes/odtphp/odf.php
View File

@@ -9,6 +9,13 @@ class OdfException extends Exception
{ {
} }
/**
* Class of ODT Exception
*/
class OdfExceptionSegmentNotFound extends Exception
{
}
/** /**
* Templating class for odt file * Templating class for odt file
* You need PHP 5.2 at least * You need PHP 5.2 at least
@@ -662,7 +669,7 @@ IMG;
* Extract the segment and store it into $this->segments[]. Return it for next call. * Extract the segment and store it into $this->segments[]. Return it for next call.
* *
* @param string $segment Segment * @param string $segment Segment
* @throws OdfException * @throws OdfExceptionSegmentNotFound
* @return Segment * @return Segment
*/ */
public function setSegment($segment) public function setSegment($segment)
@@ -674,7 +681,7 @@ IMG;
$reg = "#\[!--\sBEGIN\s$segment\s--\](.*)\[!--\sEND\s$segment\s--\]#sm"; $reg = "#\[!--\sBEGIN\s$segment\s--\](.*)\[!--\sEND\s$segment\s--\]#sm";
$m = array(); $m = array();
if (preg_match($reg, html_entity_decode($this->contentXml), $m) == 0) { if (preg_match($reg, html_entity_decode($this->contentXml), $m) == 0) {
throw new OdfException("'".$segment."' segment not found in the document. The tag [!-- BEGIN xxx --] or [!-- END xxx --] is not present into content file."); throw new OdfExceptionSegmentNotFound("'".$segment."' segment not found in the document. The tag [!-- BEGIN xxx --] or [!-- END xxx --] is not present into content file.");
} }
$this->segments[$segment] = new Segment($segment, $m[1], $this); $this->segments[$segment] = new Segment($segment, $m[1], $this);
return $this->segments[$segment]; return $this->segments[$segment];