Skip to content

Commit a62fc6f

Browse files
theodavidddtheodaviddd
committed
#1045 [QRCode] fix: CRUD
1 parent 18a6991 commit a62fc6f

File tree

5 files changed

+76
-22
lines changed

5 files changed

+76
-22
lines changed

‎admin/qrcode.php

+69-19
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,41 @@
6969

7070
// Add a redirection
7171
if ($action == 'add') {
72+
if (dol_strlen($url) == 0) {
73+
setEventMessage('URLToEncodeRequired', 'errors');
74+
header('Location: ' . $_SERVER['PHP_SELF']);
75+
exit;
76+
}
7277
$saturneQRCode->url = $url;
7378
$saturneQRCode->encoded_qr_code = $saturneQRCode->getQRCodeBase64($url);
7479
$saturneQRCode->module_name = 'saturne';
7580
$saturneQRCode->status = 1;
7681
$saturneQRCode->create($user);
82+
83+
setEventMessage('QRCodeCreated');
84+
header('Location: ' . $_SERVER['PHP_SELF']);
85+
exit;
86+
}
87+
88+
if ($action == 'update') {
89+
$saturneQRCode->fetch(GETPOST('id'));
90+
$saturneQRCode->url = GETPOST('url');
91+
$saturneQRCode->encoded_qr_code = $saturneQRCode->getQRCodeBase64($saturneQRCode->url);
92+
$saturneQRCode->update($user);
93+
94+
setEventMessage('QRCodeUpdated');
95+
header('Location: ' . $_SERVER['PHP_SELF']);
96+
exit;
7797
}
7898

7999
// Remove a redirection
80100
if ($action == 'remove') {
81101
$saturneQRCode->fetch(GETPOST('id'));
82102
$saturneQRCode->delete($user, false, false);
103+
104+
setEventMessage('QRCodeRemoved');
105+
header('Location: ' . $_SERVER['PHP_SELF']);
106+
exit;
83107
}
84108

85109
/*
@@ -120,29 +144,55 @@
120144
print '<td>' . $langs->trans('URL') . '</td>';
121145
print '<td class="center">' . $langs->trans('QR Code') . '</td>';
122146
print '<td class="center">' . $langs->trans('ModuleName') . '</td>';
123-
print '<td class="center">' . $langs->trans('Action') . '</td>';
147+
print '<td class="center">' . $langs->trans('Actions') . '</td>';
124148
print '</tr>';
125149

126150
if (is_array($QRCodes) && !empty($QRCodes)) {
127151
foreach ($QRCodes as $QRCode) {
128-
print '<form method="POST" action="' . $_SERVER['PHP_SELF'] . '?module_name=' . $moduleName . '">';
129-
print '<input type="hidden" name="token" value="' . newToken() . '">';
130-
print '<input type="hidden" name="action" value="remove">';
131-
print '<tr class="oddeven"><td>';
132-
print $QRCode->url;
133-
print '</td>';
134-
print '<td class="right preview-qr-code">';
135-
print '<input hidden class="qrcode-base64" value="'. $QRCode->encoded_qr_code .'">';
136-
print img_picto($langs->trans("QRCodeGeneration"), 'fontawesome_fa-qrcode_fas_blue');
137-
print ' ' . $form->textwithpicto('', $langs->trans('QRCodeGenerationTooltip'));
138-
print '</td>';
139-
print '</td><td class="center">';
140-
print ucfirst($QRCode->module_name);
141-
print '</td><td class="center">';
142-
print '<input type="hidden" name="id" value="' . $QRCode->id . '">';
143-
print '<input type="submit" class="button" value="' . $langs->trans('Remove') . '">';
144-
print '</td></tr>';
145-
print '</form>';
152+
if ($action == 'edit' && $QRCode->id == GETPOST('id')) {
153+
print '<tr class="oddeven" id="qrcode-'. $QRCode->id .'"><td>';
154+
print '<form method="POST" action="' . $_SERVER['PHP_SELF'] . '">';
155+
print '<input type="hidden" name="token" value="' . newToken() . '">';
156+
print '<input type="hidden" name="action" value="update">';
157+
print '<input type="hidden" name="id" value="' . $QRCode->id . '">';
158+
print '<input type="text" class="minwidth500" name="url" value="' . $QRCode->url . '">';
159+
print '</td><td class="center">';
160+
print '</td><td class="center">';
161+
print '</td><td class="center">';
162+
print '<input hidden class="qrcode-base64" value="'. $QRCode->encoded_qr_code .'">';
163+
print '<button type="submit" class="butAction">' . $langs->trans('Save') . '</button>';
164+
print '</td></tr>';
165+
print '</form>';
166+
} else {
167+
print '<tr class="oddeven"><td>';
168+
print $QRCode->url;
169+
print '</td>';
170+
print '<td class="right preview-qr-code">';
171+
print '<input hidden class="qrcode-base64" value="'. $QRCode->encoded_qr_code .'">';
172+
print img_picto($langs->trans("QRCodeGeneration"), 'fontawesome_fa-qrcode_fas_blue');
173+
print ' ' . $form->textwithpicto('', $langs->trans('QRCodeGenerationTooltip'));
174+
print '</td>';
175+
print '</td><td class="center">';
176+
print ucfirst($QRCode->module_name);
177+
print '</td><td class="center">';
178+
179+
// Modify this section to use anchor tags for edit and delete actions
180+
print '<a href="' . $_SERVER['PHP_SELF'] . '?module_name=' . $moduleName . '&action=edit&id=' . $QRCode->id . '#qrcode-'. $QRCode->id .'" class="edit-button">';
181+
print img_picto($langs->trans('Edit'), 'edit');
182+
print '</a> ';
183+
// Form for Remove action using a form with token and a styled submit button
184+
print '<form method="POST" action="' . $_SERVER['PHP_SELF'] . '?module_name=' . $moduleName . '" style="display:inline;">';
185+
print '<input type="hidden" name="token" value="' . newToken() . '">'; // Token for CSRF protection
186+
print '<input type="hidden" name="action" value="remove">'; // Action to remove the QR code
187+
print '<input type="hidden" name="id" value="' . $QRCode->id . '">'; // ID of the QR code to be removed
188+
print '<button type="submit" class="" title="' . $langs->trans('Remove') . '">';
189+
print '<i class="fas fa-trash-alt"></i>'; // Font Awesome icon for the delete action
190+
print '</button>';
191+
print '</form>';
192+
193+
194+
print '</td></tr>';
195+
}
146196
}
147197
}
148198

‎class/saturneqrcode.class.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class SaturneQRCode extends SaturneObject
5858
/**
5959
* @var int Does object support extrafields ? 0 = No, 1 = Yes
6060
*/
61-
public $isextrafieldmanaged = 1;
61+
public $isextrafieldmanaged = 0;
6262

6363
/**
6464
* @var string Last output from end job execution

‎langs/fr_FR/saturne.lang

+4
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,10 @@ ExportData = Exporter mes données
224224
QRCode = QR Code
225225
URLToEncode = URL à encoder
226226
HowToUseURLToEncode = Ecrivez l'URL vers laquelle le QR Code doit pointer
227+
QRCodeCreated = QR Code créé
228+
QRCodeUpdated = QR Code mis à jour
229+
QRCodeRemoved = QR Code supprimé
230+
URLToEncodeRequired = L'URL à encoder est obligatoire
227231

228232

229233
#

‎lib/documents.lib.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ function saturne_show_documents(string $modulepart, $modulesubdir, $filedir, str
453453
if (is_array($documentQRCode) && !empty($documentQRCode)) {
454454
$documentQRCode = array_shift($documentQRCode);
455455
} else {
456-
$QRCode->url = $documenturl . '?modulepart=' . $modulepart . '&amp;file=' . urlencode($relativepath) . ($param ? '&' . $param : '');
456+
$QRCode->url = DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&amp;file=' . urlencode($relativepath) . ($param ? '&' . $param : '');
457457
$QRCode->encoded_qr_code = $QRCode->getQRCodeBase64($QRCode->url);
458458
$QRCode->status = 1;
459459
$QRCode->module_name = $modulepart;

‎lib/saturne.lib.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function saturne_admin_prepare_head(): array
5353
$head[$h][2] = 'information';
5454
$h++;
5555

56-
$head[$h][0] = dol_buildpath('/saturne/admin/qrcode.php', 1) . '?filename=saturne_dev&tab_name=qrcode';
56+
$head[$h][0] = dol_buildpath('/saturne/admin/qrcode.php', 1);
5757
$head[$h][1] = '<i class="fas fa-qrcode pictofixedwidth"></i>' . $langs->trans('QRCode');
5858
$head[$h][2] = 'qrcode';
5959
$h++;

0 commit comments

Comments
 (0)