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

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur 2022-01-26 14:42:26 +01:00
parent 0d66646052
commit 9180e9a5c6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/includes/odtphp/Segment.php
View File

@ -223,16 +223,17 @@ class Segment implements IteratorAggregate, Countable
*/ */
public function setVars($key, $value, $encode = true, $charset = 'ISO-8859') public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
{ {
if (strpos($this->xml, $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')) === false) { $tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
if (strpos($this->xml, $tag) === false) {
//throw new SegmentException("var $key not found in {$this->getName()}"); //throw new SegmentException("var $key not found in {$this->getName()}");
} }
$tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
$this->vars[$tag] = $this->odf->convertVarToOdf($value, $encode, $charset); $this->vars[$tag] = $this->odf->convertVarToOdf($value, $encode, $charset);
return $this; return $this;
} }
/** /**
* Assign a template variable as a picture * Assign a template variable as a picture
* *

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

@ -122,7 +122,8 @@ class Odf
} }
/** /**
* Assing a template variable * Assing a template variable into ->vars.
* For example, key is {object_date} and value is '2021-01-01'
* *
* @param string $key Name of the variable within the template * @param string $key Name of the variable within the template
* @param string $value Replacement value * @param string $value Replacement value
@ -134,6 +135,7 @@ class Odf
public function setVars($key, $value, $encode = true, $charset = 'ISO-8859') public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
{ {
$tag = $this->config['DELIMITER_LEFT'] . $key . $this->config['DELIMITER_RIGHT']; $tag = $this->config['DELIMITER_LEFT'] . $key . $this->config['DELIMITER_RIGHT'];
// TODO Warning string may be: // TODO Warning string may be:
// <text:span text:style-name="T13">{</text:span><text:span text:style-name="T12">aaa</text:span><text:span text:style-name="T13">}</text:span> // <text:span text:style-name="T13">{</text:span><text:span text:style-name="T12">aaa</text:span><text:span text:style-name="T13">}</text:span>
// instead of {aaa} so we should enhance this function. // instead of {aaa} so we should enhance this function.