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

Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2021-07-05 23:07:56 +02:00
parent 2a5699a9a2
commit 0b7b9aae79
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,9 @@
require 'Segment.php'; require 'Segment.php';
/**
* Class of ODT Exception
*/
class OdfException extends Exception class OdfException extends Exception
{ {
} }
@ -148,7 +151,7 @@ class Odf
/** /**
* Replaces html tags in odt tags and returns a compatible string * Replaces html tags in odt tags and returns a compatible string
* @param string $key Name of the variable within the template *
* @param string $value Replacement value * @param string $value Replacement value
* @param bool $encode If true, special XML characters are encoded * @param bool $encode If true, special XML characters are encoded
* @param string $charset Charset * @param string $charset Charset
@ -395,6 +398,7 @@ class Odf
* Function to convert a HTML string into an ODT string * Function to convert a HTML string into an ODT string
* *
* @param string $value String to convert * @param string $value String to convert
* @return string String converted
*/ */
public function htmlToUTFAndPreOdf($value) public function htmlToUTFAndPreOdf($value)
{ {
@ -427,6 +431,7 @@ class Odf
* Function to convert a HTML string into an ODT string * Function to convert a HTML string into an ODT string
* *
* @param string $value String to convert * @param string $value String to convert
* @return string String converted
*/ */
public function preOdfToOdf($value) public function preOdfToOdf($value)
{ {
@ -564,9 +569,9 @@ IMG;
dol_syslog("We found a IF and it was processed"); dol_syslog("We found a IF and it was processed");
//var_dump($sav);exit; //var_dump($sav);exit;
}*/ }*/
} } else {
// Else the value is false, then two cases: no ELSE and we're done, or there is at least one place where there is an ELSE clause, then we replace it // Else the value is false, then two cases: no ELSE and we're done, or there is at least one place where there is an ELSE clause, then we replace it
else {
//dol_syslog("Var ".$key." is not defined, we remove the IF, ELSE and ENDIF "); //dol_syslog("Var ".$key." is not defined, we remove the IF, ELSE and ENDIF ");
//$sav=$this->contentXml; //$sav=$this->contentXml;
// Find all conditional blocks for this variable: from IF to ELSE and to ENDIF // Find all conditional blocks for this variable: from IF to ELSE and to ENDIF