Qual: Use dolBuildUrl() instead of manual urlencode() concatenation in ecm (#39557)
* Qual: Use dolBuildUrl() instead of manual urlencode() concatenation in ecm Replaces manual '?key='.urlencode($val).'&key2='.urlencode($val2) string-building with dolBuildUrl($path, $params) across the ECM directory-tree/file-manager code, for consistency with the rest of the codebase (see htdocs/core/lib/ecm.lib.php, which already uses this pattern for the same page) and to benefit from dolBuildUrl()'s buildurl hook. - core/ajax/ajaxdirtree.php: the dir_card.php edit link built from the sql tree loop. - ecm/dir_card.php: the edit/add-section action buttons and the two delete confirmation URLs. Also switches the three buttons that used to manually concatenate '&token='.newToken() to dolBuildUrl()'s own $addtoken parameter. - ecm/class/ecmfiles.class.php: EcmFiles::getNomUrl()'s document.php and file_card.php URLs. - ecm/tpl/enablefiletreeajax.tpl.php: the ajaxdirtree.php script URL and the ajaxdirpreview.php URL. The token here intentionally stays currentToken() (not dolBuildUrl()'s own newToken()-based $addtoken), per the existing comment: ajaxdirtree.php has NOTOKENRENEWAL defined, so the token must match the one already valid on the calling page. $paramwithoutsection is a pre-built raw query-string fragment from an external caller and is appended as-is after the dolBuildUrl() result rather than folded into it. Verified all five refactored URL-building expressions produce byte- identical output to the original code for representative inputs (including values with '/', '&' and spaces), except for query parameter order (which has no effect) and one real, minor pre- existing bug this incidentally fixes: the delete-section confirm URL in dir_card.php was building '&module='.$module without urlencode(), now correctly encoded by dolBuildUrl()/http_build_query(). Could not do a live browser check (no Chrome available for Playwright in this environment) - verified via php -l, phpcs, and a standalone script comparing old vs new output for each call site instead. * Qual: Use dolBuildUrl() instead of manual urlencode() concatenation in filemanager.tpl.php Same refactor as the previous commit, applied to the 7 remaining manually-concatenated URLs in core/tpl/filemanager.tpl.php (used by the ECM/medias file manager): the delete-file/delete-section/ convert-to-webp confirm URLs, the create-directory and refresh-list toolbar buttons (now using dolBuildUrl()'s $addtoken instead of a manual '&token='.newToken()), the two generate-webp buttons, and the "Root" link. $websitekeyandpageid is kept as a helper to build the raw sub-query string embedded once (single-encoded) as the create-directory button's 'backtopage' value - it is not itself passed to dolBuildUrl. Verified all 7 refactored URL-building expressions produce the same query parameters as the original code for representative inputs (compared as parsed, order-independent query strings, since http_build_query() does not preserve insertion order the same way as the original manual concatenation), including one case (convertimgwebp confirm with sortfield/sortorder) where the original code had a harmless but sloppy leading '?&' that dolBuildUrl() no longer produces. * fix * Qual: Use dolBuildUrl() instead of manual urlencode() concatenation in index_auto.php Same refactor as the previous commits, applied to the 4 manually- concatenated URLs in ecm/index_auto.php: the delete-file and delete-section confirm URLs, the refresh-list toolbar link, and the per-directory link in the auto-directories list. Verified all 4 refactored URL-building expressions produce the same query parameters as the original code for representative inputs (including an empty-module/empty-section case for the refresh link, and values with '/' and spaces for the others). * Qual: Use dolBuildUrl() instead of manual urlencode() concatenation in ecm (file_card, dir_add_card, index_medias) Same refactor as the previous commits, applied to the remaining manually-concatenated URLs in: - ecm/file_card.php: the cancel and rename-file redirects, the internal download link (document.php), the delete-file confirm URL and the edit button. - ecm/dir_add_card.php: the delete-section confirm URL and the delete button (now using dolBuildUrl()'s $addtoken instead of a manual '&token='.newToken()). - ecm/index_medias.php: the $backtopage URL used by core/actions_linkedfiles.inc.php after a confirm_deletefile. Left ecm/search.php's '$param = "§ion=".urlencode($section)' alone: it is a raw query-string fragment (starting with '&', no leading path) passed into FormFile::list_of_documents(), not a base+params URL build, so it does not fit the dolBuildUrl($path, $params) shape - same reasoning as $paramwithoutsection in the already-refactored enablefiletreeajax.tpl.php. Verified all 8 refactored URL-building expressions produce the same query parameters as the original code for representative inputs (order-independent comparison, since http_build_query() does not preserve the original insertion order).
This commit is contained in:
Frédéric FRANCE
GitHub
parent
7748738f12
commit
585afa14de
9 changed files with 132 additions and 45 deletions
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2007-2026 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2018-2026 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -503,8 +503,12 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
|
|||
// Edit link
|
||||
print '<!-- edit link -->';
|
||||
print '<td class="right" width="18"><a class="editfielda" href="';
|
||||
print DOL_URL_ROOT.'/ecm/dir_card.php?module='.urlencode($modulepart).'§ion='.urlencode($val['id']).'&relativedir='.urlencode($val['fullrelativename']);
|
||||
print '&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
|
||||
print dolBuildUrl(DOL_URL_ROOT.'/ecm/dir_card.php', array(
|
||||
'module' => $modulepart,
|
||||
'section' => $val['id'],
|
||||
'relativedir' => $val['fullrelativename'],
|
||||
'backtopage' => $_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid,
|
||||
));
|
||||
print '">'.img_edit($langs->trans("Edit").' - '.$langs->trans("View"), 0, 'class="valignmiddle opacitymedium"').'</a></td>';
|
||||
|
||||
// Add link
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2017 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2026 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -55,6 +55,7 @@ if (empty($conf) || !is_object($conf)) {
|
|||
@phan-var-force EcmDirectory $ecmdir
|
||||
@phan-var-force ?string $module
|
||||
@phan-var-force int $section
|
||||
@phan-var-force string $websitekey
|
||||
';
|
||||
|
||||
?>
|
||||
|
|
@ -95,7 +96,7 @@ if (!isset($section)) {
|
|||
// Confirm remove file (for non javascript users)
|
||||
if (($action == 'delete' || $action == 'file_manager_delete') && empty($conf->use_javascript_ajax)) {
|
||||
// TODO Add website, pageid, filemanager if defined
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section).'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
|
||||
print $form->formconfirm(dolBuildUrl($_SERVER["PHP_SELF"], array('section' => $section, 'urlfile' => GETPOST("urlfile"))), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
|
||||
}
|
||||
|
||||
// Start container of all panels
|
||||
|
|
@ -111,7 +112,15 @@ print '<div class="inline-block toolbarbutton centpercent">';
|
|||
// Toolbar
|
||||
if ($permtoadd) {
|
||||
$websitekeyandpageid = (!empty($websitekey) ? '&website='.urlencode($websitekey) : '').(!empty($pageid) ? '&pageid='.urlencode((string) $pageid) : '');
|
||||
print '<a id="acreatedir" href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).$websitekeyandpageid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1'.$websitekeyandpageid).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
|
||||
$paramscreatedir = array('action' => 'create', 'module' => $module);
|
||||
if (!empty($websitekey)) {
|
||||
$paramscreatedir['website'] = $websitekey;
|
||||
}
|
||||
if (!empty($pageid)) {
|
||||
$paramscreatedir['pageid'] = $pageid;
|
||||
}
|
||||
$paramscreatedir['backtopage'] = $_SERVER["PHP_SELF"].'?file_manager=1'.$websitekeyandpageid;
|
||||
print '<a id="acreatedir" href="'.dolBuildUrl(DOL_URL_ROOT.'/ecm/dir_add_card.php', $paramscreatedir).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
|
||||
print img_picto('', 'folder-plus', '', 0, 0, 0, '', 'size15x marginrightonly');
|
||||
print '</a>';
|
||||
} else {
|
||||
|
|
@ -120,19 +129,27 @@ if ($permtoadd) {
|
|||
print '</a>';
|
||||
}
|
||||
if ($module == 'ecm') {
|
||||
$tmpurl = ((!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&module='.$module : '').($section ? '§ion='.urlencode($section) : '')));
|
||||
if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
|
||||
$tmpurl = '#';
|
||||
} else {
|
||||
$paramsrefresh = array('action' => 'refreshmanual', 'module' => $module);
|
||||
if ($section) {
|
||||
$paramsrefresh['section'] = $section;
|
||||
}
|
||||
$tmpurl = dolBuildUrl($_SERVER["PHP_SELF"], $paramsrefresh);
|
||||
}
|
||||
print '<a id="arefreshbutton" href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
|
||||
print img_picto('', 'refresh', 'id="refreshbutton"', 0, 0, 0, '', 'size15x marginrightonly');
|
||||
print '</a>';
|
||||
}
|
||||
if ($permtoadd && GETPOSTISSET('website')) { // If on file manager to manage medias of a web site
|
||||
// @phan-suppress-next-line PhanTypeExpectedObjectPropAccess
|
||||
print '<a id="agenerateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp&token='.newToken().'&website='.urlencode($website->ref).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
|
||||
print '<a id="agenerateimgwebp" href="'.dolBuildUrl($_SERVER["PHP_SELF"], array('action' => 'confirmconvertimgwebp', 'website' => $website->ref), true).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
|
||||
print img_picto('', 'images', '', 0, 0, 0, '', 'size15x flip marginrightonly');
|
||||
print '</a>';
|
||||
} elseif ($permtoadd && $module == 'ecm') { // If on file manager medias in ecm
|
||||
if (getDolGlobalInt('ECM_SHOW_GENERATE_WEBP_BUTTON')) {
|
||||
print '<a id="agenerateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp&token='.newToken().'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
|
||||
print '<a id="agenerateimgwebp" href="'.dolBuildUrl($_SERVER["PHP_SELF"], array('action' => 'confirmconvertimgwebp'), true).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
|
||||
print img_picto('', 'images', '', 0, 0, 0, '', 'size15x flip marginrightonly');
|
||||
print '</a>';
|
||||
}
|
||||
|
|
@ -222,7 +239,7 @@ print '</div>';
|
|||
|
||||
// Ask confirmation of deletion of directory
|
||||
if ($action == 'delete_section') {
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
|
||||
print $form->formconfirm(dolBuildUrl($_SERVER["PHP_SELF"], array('section' => $section)), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
|
||||
}
|
||||
// End confirm
|
||||
|
||||
|
|
@ -241,14 +258,14 @@ if ($action == 'confirmconvertimgwebp') {
|
|||
if ($module == 'medias') {
|
||||
$formquestion['website'] = array('type' => 'hidden', 'value' => $website->ref, 'name' => 'website'); // @phan-suppress-current-line PhanTypeExpectedObjectPropAccess
|
||||
}
|
||||
$param = '';
|
||||
$paramsconvertimgwebp = array();
|
||||
if (!empty($sortfield)) {
|
||||
$param .= '&sortfield='.urlencode($sortfield);
|
||||
$paramsconvertimgwebp['sortfield'] = $sortfield;
|
||||
}
|
||||
if (!empty($sortorder)) {
|
||||
$param .= '&sortorder='.urlencode($sortorder);
|
||||
$paramsconvertimgwebp['sortorder'] = $sortorder;
|
||||
}
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].($param ? '?'.$param : ''), empty($file) ? $langs->trans('ConfirmImgWebpCreation') : $langs->trans('ConfirmChosenImgWebpCreation'), empty($file) ? $langs->trans('ConfirmGenerateImgWebp') : $langs->trans('ConfirmGenerateChosenImgWebp', basename($file)), 'convertimgwebp', $formquestion, "yes", 1);
|
||||
print $form->formconfirm(dolBuildUrl($_SERVER["PHP_SELF"], $paramsconvertimgwebp), empty($file) ? $langs->trans('ConfirmImgWebpCreation') : $langs->trans('ConfirmChosenImgWebpCreation'), empty($file) ? $langs->trans('ConfirmGenerateImgWebp') : $langs->trans('ConfirmGenerateChosenImgWebp', basename($file)), 'convertimgwebp', $formquestion, "yes", 1);
|
||||
$action = 'file_manager';
|
||||
}
|
||||
|
||||
|
|
@ -326,7 +343,12 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
|
|||
if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
|
||||
// Show the link to "Root"
|
||||
if ($showroot) {
|
||||
print '<tr class="oddeven nohover"><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1'.(!empty($websitekey) ? '&website='.urlencode($websitekey) : '').'&pageid='.urlencode((string) $pageid).'">';
|
||||
$paramsroot = array('file_manager' => 1);
|
||||
if (!empty($websitekey)) {
|
||||
$paramsroot['website'] = $websitekey;
|
||||
}
|
||||
$paramsroot['pageid'] = $pageid;
|
||||
print '<tr class="oddeven nohover"><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.dolBuildUrl($_SERVER["PHP_SELF"], $paramsroot).'">';
|
||||
if ($module == 'medias') {
|
||||
print $langs->trans("RootOfMedias");
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* Copyright (C) 2015 Florian Henry <florian.henry@open-concept.pro>
|
||||
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2018 Francis Appels <francis.appels@yahoo.com>
|
||||
* Copyright (C) 2019-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2019-2026 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -1055,9 +1055,9 @@ class EcmFiles extends CommonObject
|
|||
$tmppath = preg_replace('/^[^\/]+\//', '', $this->filepath);
|
||||
}
|
||||
}
|
||||
$url = DOL_URL_ROOT.'/document.php?modulepart='.urlencode($option).'&file='.urlencode($tmppath.'/'.$this->filename).'&entity='.((int) $this->entity);
|
||||
$url = dolBuildUrl(DOL_URL_ROOT.'/document.php', array('modulepart' => $option, 'file' => $tmppath.'/'.$this->filename, 'entity' => (int) $this->entity));
|
||||
} else {
|
||||
$url = DOL_URL_ROOT.'/ecm/file_card.php?id='.$this->id;
|
||||
$url = dolBuildUrl(DOL_URL_ROOT.'/ecm/file_card.php', array('id' => $this->id));
|
||||
}
|
||||
|
||||
$linkclose = '';
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ if (empty($action) || $action == 'delete_section') {
|
|||
|
||||
// Generate form to confirm deletion of a category line
|
||||
if ($action == 'delete_section') {
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection');
|
||||
print $form->formconfirm(dolBuildUrl($_SERVER["PHP_SELF"], array('section' => $section)), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection');
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -300,7 +300,7 @@ if (empty($action) || $action == 'delete_section') {
|
|||
print '<div class="tabsAction">';
|
||||
|
||||
// Delete
|
||||
print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER["PHP_SELF"].'?section='.urlencode($section).'&action=delete_section&token='.newToken(), '', $user->hasRight('ecm', 'setup'));
|
||||
print dolGetButtonAction($langs->trans('Delete'), '', 'delete', dolBuildUrl($_SERVER["PHP_SELF"], array('section' => $section, 'action' => 'delete_section'), true), '', $user->hasRight('ecm', 'setup'));
|
||||
|
||||
print '</div>';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -463,16 +463,25 @@ if ($action != 'edit' && $action != 'delete' && $action != 'deletefile') {
|
|||
print '<div class="tabsAction">';
|
||||
|
||||
if ($permissiontoadd) {
|
||||
print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&module='.urlencode($module).'§ion='.urlencode($section).'">'.$langs->trans('Edit').'</a>';
|
||||
print '<a class="butAction" href="'.dolBuildUrl($_SERVER['PHP_SELF'], array('action' => 'edit', 'module' => $module, 'section' => $section), true).'">'.$langs->trans('Edit').'</a>';
|
||||
}
|
||||
|
||||
if ($permissiontoadd) {
|
||||
print '<a class="butAction" href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&token='.newToken().'&module='.urlencode($module).'&catParent='.urlencode($section).'">'.$langs->trans('ECMAddSection').'</a>';
|
||||
print '<a class="butAction" href="'.dolBuildUrl(DOL_URL_ROOT.'/ecm/dir_add_card.php', array('action' => 'create', 'module' => $module, 'catParent' => $section), true).'">'.$langs->trans('ECMAddSection').'</a>';
|
||||
} else {
|
||||
print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('ECMAddSection').'</a>';
|
||||
}
|
||||
|
||||
print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&module='.urlencode($module).'§ion='.urlencode($section).($backtopage ? '&backtopage='.urlencode($backtopage) : ''), '', $permissiontoadd);
|
||||
$paramsdelete = array(
|
||||
'id' => $object->id,
|
||||
'action' => 'delete',
|
||||
'module' => $module,
|
||||
'section' => $section,
|
||||
);
|
||||
if ($backtopage) {
|
||||
$paramsdelete['backtopage'] = $backtopage;
|
||||
}
|
||||
print dolGetButtonAction($langs->trans('Delete'), '', 'delete', dolBuildUrl($_SERVER["PHP_SELF"], $paramsdelete, true), '', $permissiontoadd);
|
||||
|
||||
print '</div>';
|
||||
}
|
||||
|
|
@ -480,7 +489,14 @@ if ($action != 'edit' && $action != 'delete' && $action != 'deletefile') {
|
|||
|
||||
// Confirm remove file
|
||||
if ($action == 'deletefile') {
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode(GETPOST("section", 'alpha')).'&urlfile='.urlencode(GETPOST("urlfile")).($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile');
|
||||
$paramsdeletefile = array(
|
||||
'section' => GETPOST("section", 'alpha'),
|
||||
'urlfile' => GETPOST("urlfile"),
|
||||
);
|
||||
if ($backtopage) {
|
||||
$paramsdeletefile['backtopage'] = $backtopage;
|
||||
}
|
||||
print $form->formconfirm(dolBuildUrl($_SERVER["PHP_SELF"], $paramsdeletefile), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile');
|
||||
}
|
||||
|
||||
// Confirm remove dir
|
||||
|
|
@ -495,7 +511,14 @@ if ($action == 'delete' || $action == 'delete_dir') {
|
|||
);
|
||||
}
|
||||
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode(GETPOST('section', 'alpha')).'&module='.$module.($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $relativepathwithoutslash), 'confirm_deletedir', $formquestion, 1, 1);
|
||||
$paramsdeletedir = array(
|
||||
'section' => GETPOST('section', 'alpha'),
|
||||
'module' => $module,
|
||||
);
|
||||
if ($backtopage) {
|
||||
$paramsdeletedir['backtopage'] = $backtopage;
|
||||
}
|
||||
print $form->formconfirm(dolBuildUrl($_SERVER["PHP_SELF"], $paramsdeletedir), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $relativepathwithoutslash), 'confirm_deletedir', $formquestion, 1, 1);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -135,7 +135,11 @@ if ($cancel) {
|
|||
header("Location: ".$backtopage);
|
||||
exit;
|
||||
} else {
|
||||
header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'§ion='.urlencode($section).($module ? '&module='.urlencode($module) : ''));
|
||||
$paramscancel = array('urlfile' => $urlfile, 'section' => $section);
|
||||
if ($module) {
|
||||
$paramscancel['module'] = $module;
|
||||
}
|
||||
header('Location: '.dolBuildUrl($_SERVER["PHP_SELF"], $paramscancel));
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
|
@ -236,7 +240,7 @@ if ($action == 'update' && $permissiontoadd) {
|
|||
$urlfile .= '.noexe';
|
||||
}
|
||||
|
||||
header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'§ion='.urlencode($section));
|
||||
header('Location: '.dolBuildUrl($_SERVER["PHP_SELF"], array('urlfile' => $urlfile, 'section' => $section)));
|
||||
exit;
|
||||
} else {
|
||||
$db->rollback();
|
||||
|
|
@ -343,11 +347,12 @@ print '<tr><td>';
|
|||
print $form->textwithpicto($langs->trans("DirectDownloadInternalLink"), $langs->trans("PrivateDownloadLinkDesc"));
|
||||
print '</td><td>';
|
||||
$modulepart = 'ecm';
|
||||
$rellink = '/document.php?modulepart=' . $modulepart . '&attachment=1';
|
||||
$paramsrellink = array('modulepart' => $modulepart, 'attachment' => 1);
|
||||
if (!empty($object->entity)) {
|
||||
$rellink .= '&entity='.$object->entity;
|
||||
$paramsrellink['entity'] = $object->entity;
|
||||
}
|
||||
$rellink .= '&file='.urlencode($filepath);
|
||||
$paramsrellink['file'] = $filepath;
|
||||
$rellink = dolBuildUrl('/document.php', $paramsrellink);
|
||||
$fulllink = $urlwithroot.$rellink;
|
||||
print img_picto('', 'globe').' ';
|
||||
if ($action != 'edit') {
|
||||
|
|
@ -413,7 +418,7 @@ if ($action == 'edit') {
|
|||
|
||||
// Confirm deletion of a file
|
||||
if ($action == 'deletefile') {
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile', $urlfile), 'confirm_deletefile', '', 1, 1);
|
||||
print $form->formconfirm(dolBuildUrl($_SERVER["PHP_SELF"], array('section' => $section)), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile', $urlfile), 'confirm_deletefile', '', 1, 1);
|
||||
}
|
||||
|
||||
if ($action != 'edit') {
|
||||
|
|
@ -421,7 +426,7 @@ if ($action != 'edit') {
|
|||
print '<div class="tabsAction">';
|
||||
|
||||
if ($user->hasRight('ecm', 'setup')) {
|
||||
print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit§ion='.urlencode($section).'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
|
||||
print '<a class="butAction" href="'.dolBuildUrl($_SERVER['PHP_SELF'], array('action' => 'edit', 'section' => $section, 'urlfile' => $urlfile)).'">'.$langs->trans('Edit').'</a>';
|
||||
}
|
||||
|
||||
print '</div>';
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
/* Copyright (C) 2008-2014 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2008-2010 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2016 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2026 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2025 Joachim Kueter <git-jk@bloxera.com>
|
||||
*
|
||||
|
|
@ -428,7 +428,7 @@ print dol_get_fiche_head($head, 'index_auto', '', -1, '');
|
|||
|
||||
// Confirm remove file (for non javascript users)
|
||||
if ($action == 'deletefile' && empty($conf->use_javascript_ajax)) {
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section).'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
|
||||
print $form->formconfirm(dolBuildUrl($_SERVER["PHP_SELF"], array('section' => $section, 'urlfile' => GETPOST("urlfile"))), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
|
||||
}
|
||||
|
||||
// Start container of all panels
|
||||
|
|
@ -442,7 +442,18 @@ if ($action == 'deletefile' && empty($conf->use_javascript_ajax)) {
|
|||
print '<div class="inline-block toolbarbutton centpercent">';
|
||||
|
||||
// Toolbar
|
||||
$url = ((!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&module='.urlencode($module) : '').($section ? '§ion='.urlencode($section) : '')));
|
||||
if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
|
||||
$url = '#';
|
||||
} else {
|
||||
$paramsrefresh = array('action' => 'refreshmanual');
|
||||
if ($module) {
|
||||
$paramsrefresh['module'] = $module;
|
||||
}
|
||||
if ($section) {
|
||||
$paramsrefresh['section'] = $section;
|
||||
}
|
||||
$url = dolBuildUrl($_SERVER["PHP_SELF"], $paramsrefresh);
|
||||
}
|
||||
print '<a href="'.$url.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('Refresh')).'">';
|
||||
print img_picto('', 'refresh', 'id="refreshbutton"', 0, 0, 0, '', 'size15x marginrightonly');
|
||||
print '</a>';
|
||||
|
|
@ -459,7 +470,7 @@ print '</div>';
|
|||
|
||||
// Generate form to confirm the deletion of a category line
|
||||
if ($action == 'delete_section') {
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
|
||||
print $form->formconfirm(dolBuildUrl($_SERVER["PHP_SELF"], array('section' => $section)), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
|
||||
}
|
||||
// End confirm
|
||||
|
||||
|
|
@ -506,7 +517,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
|
|||
}
|
||||
|
||||
print '<li class="directory collapsed">';
|
||||
print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.urlencode($val['module']).'">';
|
||||
print '<a class="fmdirlia jqft ecmjqft" href="'.dolBuildUrl($_SERVER["PHP_SELF"], array('module' => $val['module'])).'">';
|
||||
print dolPrintLabel($val['label']);
|
||||
print '</a>';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2008-2017 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2008-2010 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2026 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -126,13 +126,22 @@ $websitekey = '';
|
|||
*/
|
||||
|
||||
$savbacktopage = $backtopage;
|
||||
$backtopage = $_SERVER["PHP_SELF"].'?file_manager=1&website='.urlencode((string) ($websitekey)).'&pageid='.urlencode((string) ($pageid)).(GETPOST('section_dir', 'alpha') ? '§ion_dir='.urlencode((string) (GETPOST('section_dir', 'alpha'))) : ''); // used after a confirm_deletefile into actions_linkedfiles.inc.php
|
||||
// used after a confirm_deletefile into actions_linkedfiles.inc.php
|
||||
$paramsbacktopage = array(
|
||||
'file_manager' => 1,
|
||||
'website' => (string) $websitekey,
|
||||
'pageid' => (string) $pageid,
|
||||
);
|
||||
if (GETPOST('section_dir', 'alpha')) {
|
||||
$paramsbacktopage['section_dir'] = GETPOST('section_dir', 'alpha');
|
||||
}
|
||||
if ($sortfield) {
|
||||
$backtopage .= '&sortfield='.urlencode($sortfield);
|
||||
$paramsbacktopage['sortfield'] = $sortfield;
|
||||
}
|
||||
if ($sortorder) {
|
||||
$backtopage .= '&sortorder='.urlencode($sortorder);
|
||||
$paramsbacktopage['sortorder'] = $sortorder;
|
||||
}
|
||||
$backtopage = dolBuildUrl($_SERVER["PHP_SELF"], $paramsbacktopage);
|
||||
include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; // This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file.
|
||||
|
||||
$backtopage = $savbacktopage;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2018 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2025-2026 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2026 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -54,6 +54,20 @@ $paramwithoutsection = preg_replace('/&?section=(\d+)/', '', $param);
|
|||
$openeddir = '/'; // The root directory shown
|
||||
// $preopened // The dir to have preopened
|
||||
|
||||
// We must use token=currentToken() and not newToken() here because ajaxdirtree has NOTOKENRENEWAL define so there
|
||||
// is no rollup of token so we must compare with the one valid on main page.
|
||||
$paramsdirtree = array(
|
||||
'token' => currentToken(),
|
||||
'modulepart' => $module,
|
||||
'openeddir' => $openeddir,
|
||||
);
|
||||
if (!empty($preopened)) {
|
||||
$paramsdirtree['preopened'] = $preopened;
|
||||
}
|
||||
// $paramwithoutsection is a raw, already-built query string fragment (starting with '&' when not empty), so it is
|
||||
// appended as-is after the encoded params above, not merged into $paramsdirtree.
|
||||
$dirtreeurl = dolBuildUrl(DOL_URL_ROOT.'/core/ajax/ajaxdirtree.php', $paramsdirtree).(empty($paramwithoutsection) ? '' : $paramwithoutsection);
|
||||
|
||||
?>
|
||||
|
||||
$(document).ready(function() {
|
||||
|
|
@ -61,8 +75,7 @@ $(document).ready(function() {
|
|||
$('#filetree').fileTree({
|
||||
root: '<?php print dol_escape_js($openeddir); ?>',
|
||||
// Ajax called if we click to expand a dir (not a file). Parameter 'dir' is provided as a POST parameter by fileTree code to this following URL.
|
||||
// We must use token=currentToken() and not newToken() here because ajaxdirtree has NOTOKENRENEWAL define so there is no rollup of token so we must compare with the one valid on main page
|
||||
script: '<?php echo DOL_URL_ROOT.'/core/ajax/ajaxdirtree.php?token='.currentToken().'&modulepart='.urlencode($module).(empty($preopened) ? '' : '&preopened='.urlencode($preopened)).'&openeddir='.urlencode($openeddir).(empty($paramwithoutsection) ? '' : $paramwithoutsection); ?>',
|
||||
script: '<?php echo $dirtreeurl; ?>',
|
||||
folderEvent: 'click', // 'dblclick'
|
||||
multiFolder: false },
|
||||
// Called if we click on a file (not a dir)
|
||||
|
|
@ -115,7 +128,7 @@ function loadandshowpreview(filedirname,section)
|
|||
|
||||
$('#ecmfileview').empty();
|
||||
|
||||
var url = '<?php echo dol_escape_js(dol_buildpath('/core/ajax/ajaxdirpreview.php', 1).'?action=preview&module='.urlencode($module)); ?>§ion='+urlencode(section)+'&file='+urlencode(filedirname)<?php echo (empty($paramwithoutsection) ? '' : "+'".dol_escape_js($paramwithoutsection)."'"); ?>;
|
||||
var url = '<?php echo dol_escape_js(dolBuildUrl(dol_buildpath('/core/ajax/ajaxdirpreview.php', 1), array('action' => 'preview', 'module' => $module))); ?>§ion='+urlencode(section)+'&file='+urlencode(filedirname)<?php echo (empty($paramwithoutsection) ? '' : "+'".dol_escape_js($paramwithoutsection)."'"); ?>;
|
||||
$.get(url, function(data) {
|
||||
//alert('Load of url '+url+' was performed : '+data);
|
||||
pos=data.indexOf("TYPE=directory",0);
|
||||
|
|
|
|||
Loading…
Reference in a new issue