Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur
2023-04-13 13:08:59 +02:00
parent 845f888caa 4fc8b40b71
commit 96cb5fac9c
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View File

@@ -1529,7 +1529,7 @@ function dol_escape_json($stringtoescape)
* @param string $noescapetags '' or 'common' or list of tags to not escape. TODO Does not works yet when there is attributes into tag. * @param string $noescapetags '' or 'common' or list of tags to not escape. TODO Does not works yet when there is attributes into tag.
* @param int $escapeonlyhtmltags 1=Escape only html tags, not the special chars like accents. * @param int $escapeonlyhtmltags 1=Escape only html tags, not the special chars like accents.
* @return string Escaped string * @return string Escaped string
* @see dol_string_nohtmltag(), dol_string_nospecial(), dol_string_unaccent() * @see dol_string_nohtmltag(), dol_string_nospecial(), dol_string_unaccent(), dol_htmlentitiesbr()
*/ */
function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapetags = '', $escapeonlyhtmltags = 0) function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapetags = '', $escapeonlyhtmltags = 0)
{ {

4
htdocs/emailcollector/class/emailcollector.class.php
View File

@@ -1034,8 +1034,8 @@ class EmailCollector extends CommonObject
} }
} }
//var_dump($substitutionarray); //var_dump($substitutionarray);
dol_syslog('substitutionarray='.var_export($substitutionarray, true)); //dol_syslog('substitutionarray='.var_export($substitutionarray, true));
//var_dump($substitutionarray);
$valuetouse = make_substitutions($valuetouse, $substitutionarray); $valuetouse = make_substitutions($valuetouse, $substitutionarray);
if (preg_match('/^options_/', $tmpproperty)) { if (preg_match('/^options_/', $tmpproperty)) {
$object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $valuetouse; $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $valuetouse;

2
htdocs/projet/class/project.class.php
View File

@@ -311,7 +311,7 @@ class Project extends CommonObject
'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>410), 'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>410),
'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModification', 'enabled'=>1, 'visible'=>0, 'position'=>415), 'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModification', 'enabled'=>1, 'visible'=>0, 'position'=>415),
'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-1, 'position'=>420), 'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-1, 'position'=>420),
'email_msgid'=>array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'enabled'=>1, 'visible'=>-1, 'position'=>450, 'help'=>'EmailMsgIDWhenSourceisEmail'), 'email_msgid'=>array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'enabled'=>1, 'visible'=>-1, 'position'=>450, 'help'=>'EmailMsgIDWhenSourceisEmail', 'csslist'=>'tdoverflowmax125'),
'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500), 'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
); );
// END MODULEBUILDER PROPERTIES // END MODULEBUILDER PROPERTIES

4
htdocs/projet/list.php
View File

@@ -1861,7 +1861,9 @@ while ($i < $imaxinloop) {
print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($obj->email_msgid).'">'; print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($obj->email_msgid).'">';
print dol_escape_htmltag($obj->email_msgid); print dol_escape_htmltag($obj->email_msgid);
print '</td>'; print '</td>';
if (!$i) $totalarray['nbfield']++; if (!$i) {
$totalarray['nbfield']++;
}
} }
// Import key // Import key
if (!empty($arrayfields['p.import_key']['checked'])) { if (!empty($arrayfields['p.import_key']['checked'])) {

6
htdocs/public/eventorganization/attendee_new.php
View File

@@ -551,8 +551,8 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
// Add link between invoice and the attendee registration // Add link between invoice and the attendee registration
/*if (!$error) { /*if (!$error) {
$facture->add_object_linked($confattendee->element, $confattendee->id); $facture->add_object_linked($confattendee->element, $confattendee->id);
}*/ }*/
} }
if (!$error) { if (!$error) {
@@ -725,7 +725,7 @@ if ($project->location) {
print '<span class="fa fa-map-marked-alt pictofixedwidth opacitymedium"></span>'.dol_escape_htmltag($project->location).'<br>'; print '<span class="fa fa-map-marked-alt pictofixedwidth opacitymedium"></span>'.dol_escape_htmltag($project->location).'<br>';
} }
if ($project->note_public) { if ($project->note_public) {
print '<br><span class="opacitymedium">'.dol_escape_htmltag($project->note_public).'</span><br>'; print '<br><span class="opacitymedium">'.dol_htmlentitiesbr($project->note_public).'</span><br>';
} }
print '</div>'; print '</div>';