Skip to content

Commit 19af444

Browse files
committed
Notebook: Add cidReq to links to edit/delete notes
1 parent f9a17bf commit 19af444

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

main/inc/lib/notebook.lib.php

+16-8
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ public static function delete_note($notebook_id)
234234
*/
235235
public static function display_notes()
236236
{
237+
$cidReq = api_get_cidreq();
237238
$sessionId = api_get_session_id();
238239
$_user = api_get_user_info();
239240
if (!isset($_GET['direction'])) {
@@ -251,16 +252,16 @@ public static function display_notes()
251252
echo '<div class="actions">';
252253
if (!api_is_anonymous()) {
253254
if ($sessionId == 0 || api_is_allowed_to_session_edit(false, true)) {
254-
echo '<a href="index.php?'.api_get_cidreq().'&action=addnote">'.
255+
echo '<a href="index.php?'.$cidReq.'&action=addnote">'.
255256
Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
256257
}
257258
}
258259

259-
echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=creation_date&direction='.$link_sort_direction.'">'.
260+
echo '<a href="index.php?'.$cidReq.'&action=changeview&view=creation_date&direction='.$link_sort_direction.'">'.
260261
Display::return_icon('notes_order_by_date_new.png', get_lang('OrderByCreationDate'), '', '32').'</a>';
261-
echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=update_date&direction='.$link_sort_direction.'">'.
262+
echo '<a href="index.php?'.$cidReq.'&action=changeview&view=update_date&direction='.$link_sort_direction.'">'.
262263
Display::return_icon('notes_order_by_date_mod.png', get_lang('OrderByModificationDate'), '', '32').'</a>';
263-
echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=title&direction='.$link_sort_direction.'">'.
264+
echo '<a href="index.php?'.$cidReq.'&action=changeview&view=title&direction='.$link_sort_direction.'">'.
264265
Display::return_icon('notes_order_by_title.png', get_lang('OrderByTitle'), '', '32').'</a>';
265266
echo '</div>';
266267

@@ -291,6 +292,8 @@ public static function display_notes()
291292
$cond_extra $order_by
292293
";
293294
$result = Database::query($sql);
295+
$iconEdit = Display::return_icon('edit.png', get_lang('Edit'));
296+
$iconDelete = Display::return_icon('delete.png', get_lang('Delete'));
294297
while ($row = Database::fetch_array($result)) {
295298
// Validation when belongs to a session
296299
$session_img = api_get_session_image($row['session_id'], $_user['status']);
@@ -299,10 +302,15 @@ public static function display_notes()
299302
$updateValue = ', '.get_lang('UpdateDate').': '.Display::dateToStringAgoAndLongDate($row['update_date']);
300303
}
301304

302-
$actions = '<a href="'.api_get_self().'?action=editnote&notebook_id='.$row['notebook_id'].'">'.
303-
Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
304-
$actions .= '<a href="'.api_get_self().'?action=deletenote&notebook_id='.$row['notebook_id'].'" onclick="return confirmation(\''.$row['title'].'\');">'.
305-
Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
305+
$actions = Display::url(
306+
$iconEdit,
307+
api_get_self().'?action=editnote&notebook_id='.$row['notebook_id'].'&'.$cidReq
308+
);
309+
$actions .= Display::url(
310+
$iconDelete,
311+
api_get_self().'?action=deletenote&notebook_id='.$row['notebook_id'].'&'.$cidReq,
312+
['onclick' => 'return confirmation(\''.$row['title'].'\');']
313+
);
306314

307315
echo Display::panel(
308316
Security::remove_XSS($row['description']),

0 commit comments

Comments
 (0)