Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ldestailleur
2025-03-09 22:29:21 +01:00
parent 5db341a3e8 1b2522d385
commit 3658bc20b6
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/system/security.php
View File

@@ -395,7 +395,7 @@ print '<span class="bold"> &nbsp; -> Current PHP streams allowed = </span>';
$arrayofstreams = stream_get_wrappers(); $arrayofstreams = stream_get_wrappers();
if (!empty($arrayofstreams)) { if (!empty($arrayofstreams)) {
sort($arrayofstreams); sort($arrayofstreams);
print '<span class="wordbreakall">'.implode(',', $arrayofstreams).'</span>'; print '<span class="wordbreak">'.implode(',', $arrayofstreams).'</span>';
print ' &nbsp; &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("TryToKeepOnly", 'file,http,https,php,zip').')</span>'."\n"; print ' &nbsp; &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("TryToKeepOnly", 'file,http,https,php,zip').')</span>'."\n";
} }
print '</div>'; print '</div>';

3
htdocs/comm/action/peruser.php
View File

@@ -1468,10 +1468,11 @@ if (!empty($hookmanager->resArray['eventarray'])) {
} }
// Sort events // Sort events
/*
foreach ($eventarray as $keyDate => &$dateeventarray) { foreach ($eventarray as $keyDate => &$dateeventarray) {
usort($dateeventarray, 'sort_events_by_date'); usort($dateeventarray, 'sort_events_by_date');
} }
*/
$maxnbofchar = 18; $maxnbofchar = 18;
$cachethirdparties = array(); $cachethirdparties = array();

8
htdocs/core/class/html.formfile.class.php
View File

@@ -1511,7 +1511,7 @@ class FormFile
// File name // File name
print '<td class="minwidth200 tdoverflowmax500" title="'.dolPrintHTMLForAttribute($file['name']).'">'; print '<td class="minwidth200imp tdoverflowmax500" title="'.dolPrintHTMLForAttribute($file['name']).'">';
// Show file name with link to download // Show file name with link to download
//print "XX".$file['name']; //$file['name'] must be utf8 //print "XX".$file['name']; //$file['name'] must be utf8
@@ -1544,7 +1544,7 @@ class FormFile
} }
print '<input type="hidden" name="section_dir" value="'.$section_dir.'">'; print '<input type="hidden" name="section_dir" value="'.$section_dir.'">';
print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">'; print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">'; print '<input type="text" name="renamefileto" class="centpercentminusx" value="'.dol_escape_htmltag($file['name']).'">';
$editline = 1; $editline = 1;
} else { } else {
$filenametoshow = preg_replace('/\.noexe$/', '', $file['name']); $filenametoshow = preg_replace('/\.noexe$/', '', $file['name']);
@@ -1616,7 +1616,7 @@ class FormFile
} }
// Shared or not - Hash of file // Shared or not - Hash of file
print '<td class="center">'; print '<td class="center minwidth100 nowraponsmartphone">';
if ($relativedir && $filearray[$key]['rowid'] > 0) { // only if we are in a mode where a scan of dir were done and we have id of file in ECM table if ($relativedir && $filearray[$key]['rowid'] > 0) { // only if we are in a mode where a scan of dir were done and we have id of file in ECM table
if ($editline) { if ($editline) {
print '<label for="idshareenabled'.$key.'">'.$langs->trans("FileSharedViaALink").'</label> '; print '<label for="idshareenabled'.$key.'">'.$langs->trans("FileSharedViaALink").'</label> ';
@@ -1641,7 +1641,7 @@ class FormFile
$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : ''); $fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
print '<a href="'.$fulllink.'" target="_blank" rel="noopener">'.img_picto($langs->trans("FileSharedViaALink"), 'globe').'</a> '; print '<a href="'.$fulllink.'" target="_blank" rel="noopener">'.img_picto($langs->trans("FileSharedViaALink"), 'globe').'</a> ';
print '<input type="text" class="quatrevingtpercent minwidth200imp nopadding small" id="downloadlink'.$filearray[$key]['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'">'; print '<input type="text" class="centpercentminusx minwidth200imp nopadding small" id="downloadlink'.$filearray[$key]['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'">';
} else { } else {
//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>'; //print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
} }

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

@@ -6103,7 +6103,7 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss
if ($picto == 'warning') { if ($picto == 'warning') {
$fa = 'exclamation-triangle'; $fa = 'exclamation-triangle';
} }
$result = ($nodiv ? '' : '<div class="wordbreakall '.$class.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-'.$fa.'" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> '; $result = ($nodiv ? '' : '<div class="wordbreak '.$class.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-'.$fa.'" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> ';
$result .= dol_escape_htmltag($text, 1, 0, 'div,span,b,br,a'); $result .= dol_escape_htmltag($text, 1, 0, 'div,span,b,br,a');
$result .= ($nodiv ? '' : '</div>'); $result .= ($nodiv ? '' : '</div>');

2
htdocs/theme/eldy/global.inc.php
View File

@@ -1078,7 +1078,7 @@ textarea.centpercent {
word-break: break-word !important; word-break: break-word !important;
} }
.wordbreak { .wordbreak {
word-break: break-word; /* cut fist between word, inside word if not possible */ word-break: break-word; /* cut first between word, inside word if not possible */
} }
.wordbreakall { .wordbreakall {
word-break: break-all; word-break: break-all;

2
htdocs/theme/md/style.css.php
View File

@@ -1251,7 +1251,7 @@ textarea.centpercent {
word-break: break-word !important; word-break: break-word !important;
} }
.wordbreak { .wordbreak {
word-break: break-word; /* cut fist between word, inside word if not possible */ word-break: break-word; /* cut first between word, inside word if not possible */
} }
.wordbreakall { .wordbreakall {
word-break: break-all; word-break: break-all;