Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed link deletion

Browse source 
When deleting links, the js of the default theme separated ids by an escaped space ('+').
There was a trailing '+' after the ids which led to the php code detecting multiple values
even for single values. In combination with the id '0' this could led to no id found at all
and a resulting php error.

this commit fixes the behavior and adds an additional error handling and trimming to the php code.
This commit is contained in:
Willi Eggeling 2017-08-27 19:19:59 +02:00
parent fc27141cf6
commit a74f52a8d2
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
index.php
View file

@ -1320,10 +1320,17 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
die('Wrong token.'); die('Wrong token.');
} }
if (strpos($_GET['lf_linkdate'], ' ') !== false) { $ids = trim($_GET['lf_linkdate']);
$ids = array_values(array_filter(preg_split('/\s+/', escape($_GET['lf_linkdate'])))); if (strpos($ids, ' ') !== false) {
// multiple, space-separated ids provided
$ids = array_values(array_filter(preg_split('/\s+/', escape($ids))));
} else { } else {
$ids = [$_GET['lf_linkdate']]; // only a single id provided
$ids = [$ids];
}
// assert at least one id is given
if(!count($ids)){
die('no id provided');
} }
foreach ($ids as $id) { foreach ($ids as $id) {
$id = (int) escape($id); $id = (int) escape($id);

6
tpl/default/js/shaarli.js
View file

@ -401,14 +401,14 @@ window.onload = function () {
var message = 'Are you sure you want to delete '+ links.length +' links?\n'; var message = 'Are you sure you want to delete '+ links.length +' links?\n';
message += 'This action is IRREVERSIBLE!\n\nTitles:\n'; message += 'This action is IRREVERSIBLE!\n\nTitles:\n';
var ids = ''; var ids = [];
links.forEach(function(item) { links.forEach(function(item) {
message += ' - '+ item['title'] +'\n'; message += ' - '+ item['title'] +'\n';
ids += item['id'] +'+'; ids.push(item['id']);
}); });
if (window.confirm(message)) { if (window.confirm(message)) {
window.location = '?delete_link&lf_linkdate='+ ids +'&token='+ token.value; window.location = '?delete_link&lf_linkdate='+ ids.join('+') +'&token='+ token.value;
} }
}); });
} }