X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=index.php;h=b4c4347a40c46addc904079ae31f36b6b08da707;hb=9d7a02afcee3c740712a7c95182d332db0504b7e;hp=5c292b04489cf55da21fb2b2071462c960a4ae99;hpb=f210d94f716acd86fd22c9651f591a778490e8a9;p=github%2Fshaarli%2FShaarli.git
diff --git a/index.php b/index.php
index 5c292b04..b4c4347a 100644
--- a/index.php
+++ b/index.php
@@ -686,6 +686,7 @@ function showLinkList($PAGE, $LINKSDB, $conf, $pluginManager) {
* @param ConfigManager $conf Configuration Manager instance.
* @param PluginManager $pluginManager Plugin Manager instance,
* @param LinkDB $LINKSDB
+ * @param History $history instance
*/
function renderPage($conf, $pluginManager, $LINKSDB, $history)
{
@@ -1020,7 +1021,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
// -------- User wants to see only untagged links (toggle)
if (isset($_GET['untaggedonly'])) {
- $_SESSION['untaggedonly'] = !$_SESSION['untaggedonly'];
+ $_SESSION['untaggedonly'] = empty($_SESSION['untaggedonly']);
if (! empty($_SERVER['HTTP_REFERER'])) {
$location = generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('untaggedonly'));
@@ -1198,41 +1199,18 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
die('Wrong token.');
}
- // Delete a tag:
- if (isset($_POST['deletetag']) && !empty($_POST['fromtag'])) {
- $needle = trim($_POST['fromtag']);
- // True for case-sensitive tag search.
- $linksToAlter = $LINKSDB->filterSearch(array('searchtags' => $needle), true);
- foreach($linksToAlter as $key=>$value)
- {
- $tags = explode(' ',trim($value['tags']));
- unset($tags[array_search($needle,$tags)]); // Remove tag.
- $value['tags']=trim(implode(' ',$tags));
- $LINKSDB[$key]=$value;
- $history->updateLink($LINKSDB[$key]);
- }
- $LINKSDB->save($conf->get('resource.page_cache'));
- echo '';
- exit;
- }
-
- // Rename a tag:
- if (isset($_POST['renametag']) && !empty($_POST['fromtag']) && !empty($_POST['totag'])) {
- $needle = trim($_POST['fromtag']);
- // True for case-sensitive tag search.
- $linksToAlter = $LINKSDB->filterSearch(array('searchtags' => $needle), true);
- foreach($linksToAlter as $key=>$value) {
- $tags = preg_split('/\s+/', trim($value['tags']));
- // Replace tags value.
- $tags[array_search($needle, $tags)] = trim($_POST['totag']);
- $value['tags'] = implode(' ', array_unique($tags));
- $LINKSDB[$key] = $value;
- $history->updateLink($LINKSDB[$key]);
- }
- $LINKSDB->save($conf->get('resource.page_cache')); // Save to disk.
- echo '';
- exit;
+ $alteredLinks = $LINKSDB->renameTag(escape($_POST['fromtag']), escape($_POST['totag']));
+ $LINKSDB->save($conf->get('resource.page_cache'));
+ foreach ($alteredLinks as $link) {
+ $history->updateLink($link);
}
+ $delete = empty($_POST['totag']);
+ $redirect = $delete ? 'do=changetag' : 'searchtags='. urlencode(escape($_POST['totag']));
+ $alert = $delete
+ ? sprintf(t('The tag was removed from %d links.'), count($alteredLinks))
+ : sprintf(t('The tag was renamed in %d links.'), count($alteredLinks));
+ echo '';
+ exit;
}
// -------- User wants to add a link without using the bookmarklet: Show form.
@@ -2259,6 +2237,12 @@ if (!isset($_SESSION['LINKS_PER_PAGE'])) {
$_SESSION['LINKS_PER_PAGE'] = $conf->get('general.links_per_page', 20);
}
+try {
+ $history = new History($conf->get('resource.history'));
+} catch(Exception $e) {
+ die($e->getMessage());
+}
+
$linkDb = new LinkDB(
$conf->get('resource.datastore'),
isLoggedIn(),
@@ -2267,12 +2251,6 @@ $linkDb = new LinkDB(
$conf->get('redirector.encode_url')
);
-try {
- $history = new History($conf->get('resource.history'));
-} catch(Exception $e) {
- die($e->getMessage());
-}
-
$container = new \Slim\Container();
$container['conf'] = $conf;
$container['plugins'] = $pluginManager;