diff --git a/apps/maarch_entreprise/class/class_lists_Abstract.php b/apps/maarch_entreprise/class/class_lists_Abstract.php index 31120deea8169898685862e7d56caae72d4dde9b..5ecc53e1f0f4d710140874934984e28df5086b00 100755 --- a/apps/maarch_entreprise/class/class_lists_Abstract.php +++ b/apps/maarch_entreprise/class/class_lists_Abstract.php @@ -1049,6 +1049,37 @@ abstract class lists_Abstract extends Database } } + protected function _tmplt_loadEscapeValue($parameter, $resultTheLine) + { + $my_explode = explode('|', $parameter); + + if (!$my_explode[1]) { + return _WRONG_PARAM_FOR_LOAD_VALUE; + } else { + $column = $my_explode[1]; + if (is_array($resultTheLine)) { + for ($i = 0; $i <= count($resultTheLine); ++$i) { + if ($resultTheLine[$i]['column'] == $column) { + if (is_bool($resultTheLine[$i]['value'])) { + //If boolean (convert to string) + if ($resultTheLine[$i]['value']) { + return 'true'; + } else { + return 'false'; + } + } else { + if ($resultTheLine[$i]['column'] == 'subject') { + return preg_replace('/\s+/', ' ', $resultTheLine[$i]['value']); + } else { + return addslashes($resultTheLine[$i]['value']); + } + } + } + } + } + } + } + protected function _tmplt_loadValue($parameter, $resultTheLine) { $my_explode = explode('|', $parameter); @@ -1754,7 +1785,10 @@ abstract class lists_Abstract extends Database //#loadValue|arg1##: load value in the db; arg1= column's value identifier if (preg_match("/^loadValue\|/", $parameter)) { $var = $this->_tmplt_loadValue($parameter, $resultTheLine); - //#sortColumn|arg1## : cretate sort in header; arg1 = name of the column + //#loadValue|arg1##: load value in the db; arg1= column's value identifier + } elseif (preg_match("/^loadEscapeValue\|/", $parameter)) { + $var = $this->_tmplt_loadEscapeValue($parameter, $resultTheLine); + //#defineLang|arg1## : define constant by the lang file; arg1 = constant of lang.php } elseif (preg_match("/^sortColumn\|/", $parameter)) { $var = $this->_tmplt_sortColumn($parameter); //#defineLang|arg1## : define constant by the lang file; arg1 = constant of lang.php diff --git a/apps/maarch_entreprise/template/documents_list_search_adv.html b/apps/maarch_entreprise/template/documents_list_search_adv.html index 371fbdd400b80dd791c7fb2453b16b3844326f7a..65927fd92dea3ccfa910fd6dd8fc317445f4c850 100755 --- a/apps/maarch_entreprise/template/documents_list_search_adv.html +++ b/apps/maarch_entreprise/template/documents_list_search_adv.html @@ -107,8 +107,8 @@ Mods </span> <span style="flex:1;text-align: right;"> <span title="##defineLang|_DEST_USER## - ##defineLang|_SHIPPER##">##loadValue|exp_user_id####loadValue|is_multicontacts## ##func_bool_see_multi_contacts##</span><br/> - ##ifStatement|'#loadValue|real_dest#'!=null|#loadValue|real_dest#|##<br/><br/> - ##ifStatement|'#loadValue|case_label#'!=null|<b>#defineLang|_CASE# : </b>#loadValue|case_label#|## + ##ifStatement|'#loadEscapeValue|real_dest#'!=null|#loadValue|real_dest#|##<br/><br/> + ##ifStatement|'#loadEscapeValue|case_label#'!=null|<b>#defineLang|_CASE# : </b>#loadValue|case_label#|## </span> </span> <span style="display: flex;width: 100%;">