Skip to content

Fix/compat/23 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atm-jonathan wants to merge 2 commits into
base: 1.4
Choose a base branch
from
Open

Fix/compat/23 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1607f5a
pre commit
atm-jonathan Dec 12, 2025
827a208
delete v17
atm-jonathan Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
## Unreleased

## Release 1.4
- FIX : Compat v23 - *12/12/2025* - 1.4.3
- FIX : Ne pas afficher le bouton actions disponibles si ils sont de type input et donc envoi des données via formulaire - *06/02/2024* - 1.4.2
- FIX : Compat 21 - *10/12/2024* - 1.4.1
- NEW : Dolibarr compatibility V20 - *02/07/2024* - 1.4.0
Expand Down
56 changes: 23 additions & 33 deletions admin/upbuttons_setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,22 @@
* Put some comments here
*/
// Dolibarr environment
$res = @include("../../main.inc.php"); // From htdocs directory
$res = @include "../../main.inc.php"; // From htdocs directory
if (! $res) {
$res = @include("../../../main.inc.php"); // From "custom" directory
$res = @include "../../../main.inc.php"; // From "custom" directory
}

// Libraries
require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
require_once '../lib/upbuttons.lib.php';
require_once __DIR__ . '/../backport/v17/core/lib/functions.lib.php';

// Translations
$langs->load("upbuttons@upbuttons");

$newToken = function_exists('newToken') ? newToken() : $_SESSION['newtoken'];

// Access control
if (! $user->admin) {
accessforbidden();
accessforbidden();
}

// Parameters
Expand All @@ -49,30 +47,22 @@
/*
* Actions
*/
if (preg_match('/set_(.*)/',$action,$reg))
{
if (preg_match('/set_(.*)/', $action, $reg)) {
$code=$reg[1];
if (dolibarr_set_const($db, $code, GETPOST($code), 'chaine', 0, '', $conf->entity) > 0)
{
if (dolibarr_set_const($db, $code, GETPOST($code), 'chaine', 0, '', $conf->entity) > 0) {
header("Location: ".$_SERVER["PHP_SELF"]);
exit;
}
else
{
} else {
dol_print_error($db);
}
}

if (preg_match('/del_(.*)/',$action,$reg))
{
if (preg_match('/del_(.*)/', $action, $reg)) {
$code=$reg[1];
if (dolibarr_del_const($db, $code, 0) > 0)
{
if (dolibarr_del_const($db, $code, 0) > 0) {
Header("Location: ".$_SERVER["PHP_SELF"]);
exit;
}
else
{
} else {
dol_print_error($db);
}
}
Expand All @@ -85,17 +75,17 @@

// Subheader
$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
. $langs->trans("BackToModuleList") . '</a>';
. $langs->trans("BackToModuleList") . '</a>';
print_fiche_titre($langs->trans($page_name), $linkback);

// Configuration header
$head = upbuttonsAdminPrepareHead();
dol_fiche_head(
$head,
'settings',
$langs->trans("Module104830Name"),
-1,
"upbuttons@upbuttons"
$head,
'settings',
$langs->trans("Module104830Name"),
-1,
"upbuttons@upbuttons"
);

dol_fiche_end(-1);
Expand All @@ -114,51 +104,51 @@
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td>';
print $form->textwithtooltip( $langs->trans("ConvertTabToStickyTab") , $langs->trans("ConvertTabToStickyTabHelp"),2,1,img_help(1,''));
print $form->textwithtooltip($langs->trans("ConvertTabToStickyTab"), $langs->trans("ConvertTabToStickyTabHelp"), 2, 1, img_help(1, ''));
print '</td>';
print '<td align="center" width="20">&nbsp;</td>';
print '<td align="right" width="300">';
print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
print '<input type="hidden" name="token" value="'.$newToken.'">';
print '<input type="hidden" name="action" value="set_UPBUTTON_STICKY_TAB">';
print $form->selectyesno("UPBUTTON_STICKY_TAB",getDolGlobalInt('UPBUTTON_STICKY_TAB'),1);
print $form->selectyesno("UPBUTTON_STICKY_TAB", getDolGlobalInt('UPBUTTON_STICKY_TAB'), 1);
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print '</form>';
print '</td></tr>';

$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td>';
print $form->textwithtooltip( $langs->trans("HideAvailableActionButtons") , '',0,1,img_help(1,''));
print $form->textwithtooltip($langs->trans("HideAvailableActionButtons"), '', 0, 1, img_help(1, ''));
print '</td>';
print '<td align="center" width="20">&nbsp;</td>';
print '<td align="right" width="300">';
print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
print '<input type="hidden" name="token" value="'.$newToken.'">';
print '<input type="hidden" name="action" value="set_UPBUTTON_HIDE_AVAILABLE_ACTION">';
print $form->selectyesno("UPBUTTON_HIDE_AVAILABLE_ACTION",getDolGlobalInt('UPBUTTON_HIDE_AVAILABLE_ACTION'),1);
print $form->selectyesno("UPBUTTON_HIDE_AVAILABLE_ACTION", getDolGlobalInt('UPBUTTON_HIDE_AVAILABLE_ACTION'), 1);
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print '</form>';
print '</td></tr>';

$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td>';
print $form->textwithtooltip( $langs->trans("DisplayFloatingMenu") , $langs->trans("DisplayFloatingMenuHelp"),2,1,img_help(1,''));
print $form->textwithtooltip($langs->trans("DisplayFloatingMenu"), $langs->trans("DisplayFloatingMenuHelp"), 2, 1, img_help(1, ''));
print '</td>';
print '<td align="center" width="20">&nbsp;</td>';
print '<td align="right" width="300">';
print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
print '<input type="hidden" name="token" value="'.$newToken.'">';
print '<input type="hidden" name="action" value="set_UPBUTTON_DISPLAY_FLOATING_MENU">';
print $form->selectyesno("UPBUTTON_DISPLAY_FLOATING_MENU",getDolGlobalInt('UPBUTTON_DISPLAY_FLOATING_MENU'),1);
print $form->selectyesno("UPBUTTON_DISPLAY_FLOATING_MENU", getDolGlobalInt('UPBUTTON_DISPLAY_FLOATING_MENU'), 1);
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print '</form>';
print '</td></tr>';



if(getDolGlobalInt('UPBUTTON_DISPLAY_FLOATING_MENU')) {
if (getDolGlobalInt('UPBUTTON_DISPLAY_FLOATING_MENU')) {
$var = ! $var;
print '<tr '.$bc[$var].'>';
print '<td>';
Expand All @@ -169,7 +159,7 @@
print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
print '<input type="hidden" name="token" value="'.$newToken.'">';
print '<input type="hidden" name="action" value="set_UPBUTTON_DISPLAY_FLOATING_MENU_TYPE">';
print Form::selectarray("UPBUTTON_DISPLAY_FLOATING_MENU_TYPE", array('vertical' => 'Vertical', 'horizontal' => 'Horizontal') , getDolGlobalString('UPBUTTON_DISPLAY_FLOATING_MENU_TYPE'));
print Form::selectarray("UPBUTTON_DISPLAY_FLOATING_MENU_TYPE", array('vertical' => 'Vertical', 'horizontal' => 'Horizontal'), getDolGlobalString('UPBUTTON_DISPLAY_FLOATING_MENU_TYPE'));
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print '</form>';
print '</td></tr>';
Expand Down
19 changes: 0 additions & 19 deletions backport/v17/core/lib/functions.lib.php
View file
Open in desktop

This file was deleted.

Loading