|
@@ -384,6 +384,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
|
|
|
} else {
|
|
|
$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
|
|
|
}
|
|
|
+ // Added by MMI Mathieu Moulin iProspective
|
|
|
+ // Hypertext links
|
|
|
+ } elseif (is_string($value) && (preg_match('/^http/', $value) || preg_match('/^[a-z0-9\._-]+@[a-z0-9\._-]+/i', $value))) // link
|
|
|
+ {
|
|
|
+ //var_dump($key); var_dump($value); die();
|
|
|
+ $odfHandler->setVars($key, '<a href="'.$value.'">'.$value.'</a>', false, 'UTF-8');
|
|
|
} else // Text
|
|
|
{
|
|
|
$odfHandler->setVars($key, $value, true, 'UTF-8');
|
|
@@ -404,6 +410,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
|
|
|
} else {
|
|
|
$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
|
|
|
}
|
|
|
+ // Added by MMI Mathieu Moulin iProspective
|
|
|
+ // Hypertext links
|
|
|
+ } elseif (is_string($value) && (preg_match('/^http/', $value) || preg_match('/^[a-z0-9\._-]+@[a-z0-9\._-]+/i', $value))) // link
|
|
|
+ {
|
|
|
+ //var_dump($key); var_dump($value); die();
|
|
|
+ $odfHandler->setVars($key, '<a href="'.$value.'">'.$value.'</a>', false, 'UTF-8');
|
|
|
} else // Text
|
|
|
{
|
|
|
$odfHandler->setVars($key, $value, true, 'UTF-8');
|
|
@@ -426,6 +438,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
|
|
|
} else {
|
|
|
$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
|
|
|
}
|
|
|
+ // Added by MMI Mathieu Moulin iProspective
|
|
|
+ // Hypertext links
|
|
|
+ } elseif (is_string($value) && (preg_match('/^http/', $value) || preg_match('/^[a-z0-9\._-]+@[a-z0-9\._-]+/i', $value))) // link
|
|
|
+ {
|
|
|
+ //var_dump($key); var_dump($value); die();
|
|
|
+ $odfHandler->setVars($key, '<a href="'.$value.'">'.$value.'</a>', false, 'UTF-8');
|
|
|
} else // Text
|
|
|
{
|
|
|
$odfHandler->setVars($key, $value, true, 'UTF-8');
|
|
@@ -445,6 +463,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
|
|
|
} else {
|
|
|
$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
|
|
|
}
|
|
|
+ // Added by MMI Mathieu Moulin iProspective
|
|
|
+ // Hypertext links
|
|
|
+ } elseif (is_string($value) && (preg_match('/^http/', $value) || preg_match('/^[a-z0-9\._-]+@[a-z0-9\._-]+/i', $value))) // link
|
|
|
+ {
|
|
|
+ //var_dump($key); var_dump($value); die();
|
|
|
+ $odfHandler->setVars($key, '<a href="'.$value.'">'.$value.'</a>', false, 'UTF-8');
|
|
|
} else // Text
|
|
|
{
|
|
|
$odfHandler->setVars($key, $value, true, 'UTF-8');
|
|
@@ -470,6 +494,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
|
|
|
} else {
|
|
|
$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
|
|
|
}
|
|
|
+ // Added by MMI Mathieu Moulin iProspective
|
|
|
+ // Hypertext links
|
|
|
+ } elseif (is_string($value) && (preg_match('/^http/', $value) || preg_match('/^[a-z0-9\._-]+@[a-z0-9\._-]+/i', $value))) // link
|
|
|
+ {
|
|
|
+ //var_dump($key); var_dump($value); die();
|
|
|
+ $odfHandler->setVars($key, '<a href="'.$value.'">'.$value.'</a>', false, 'UTF-8');
|
|
|
} else // Text
|
|
|
{
|
|
|
$odfHandler->setVars($key, $value, true, 'UTF-8');
|
|
@@ -497,7 +527,24 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
|
|
|
$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
|
|
foreach ($tmparray as $key => $val) {
|
|
|
try {
|
|
|
- $listlines->setVars($key, $val, true, 'UTF-8');
|
|
|
+ // Added by MMI Mathieu Moulin iProspective
|
|
|
+ // Logo
|
|
|
+ if (preg_match('/logo$/', $key) || preg_match('/logo2$/', $key)) { // Image
|
|
|
+ //var_dump($key); var_dump($val); die();
|
|
|
+ if (empty($val)) {
|
|
|
+ $listlines->setVars($key, $val, true, 'UTF-8');
|
|
|
+ }
|
|
|
+ elseif (file_exists($val)) {
|
|
|
+ //var_dump($key); var_dump($val); die();
|
|
|
+ $listlines->setImage($key, $val);
|
|
|
+ } else {
|
|
|
+ $listlines->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
|
|
|
+ }
|
|
|
+ } else // Text
|
|
|
+ {
|
|
|
+ //var_dump($key); var_dump($val); die();
|
|
|
+ $listlines->setVars($key, $val, true, 'UTF-8');
|
|
|
+ }
|
|
|
} catch (OdfException $e) {
|
|
|
dol_syslog($e->getMessage(), LOG_INFO);
|
|
|
} catch (SegmentException $e) {
|