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

Merge pull request #950 from thewilli/delete-fix

Browse source 
fixed link deletion
This commit is contained in:
ArthurHoaro 2017-09-01 18:25:44 +02:00 committed by GitHub
parent c5f5365ae6 a74f52a8d2
commit 87d019986e
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

@ -1330,10 +1330,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;
} }
}); });
} }