aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2018-08-10 17:09:51 +0200
committerArthurHoaro <arthur@hoa.ro>2018-08-10 17:09:51 +0200
commitb5c368b85885b82e7db7e509c8a7e2035d51e0a1 (patch)
tree2ebd2175478bc631f5633ecee3117e5087b6fb9a
parentfa5012cb04fc112517c348f067c8e43e90563372 (diff)
downloadShaarli-b5c368b85885b82e7db7e509c8a7e2035d51e0a1.tar.gz
Shaarli-b5c368b85885b82e7db7e509c8a7e2035d51e0a1.tar.zst
Shaarli-b5c368b85885b82e7db7e509c8a7e2035d51e0a1.zip
Fix issue 'You are not authorized to add a link' with thumbnails enabled
Do not try to alter the datastore by updating thumbnails if the user isn't logged in. Also, do not enable thumbnails if PHP GD extension is not installed/loaded
-rw-r--r--application/Updater.php2
-rw-r--r--index.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/application/Updater.php b/application/Updater.php
index c2aa1568..480bff82 100644
--- a/application/Updater.php
+++ b/application/Updater.php
@@ -502,7 +502,7 @@ class Updater
502 return true; 502 return true;
503 } 503 }
504 504
505 $thumbnailsEnabled = $this->conf->get('thumbnail.enable_thumbnails', true); 505 $thumbnailsEnabled = extension_loaded('gd') && $this->conf->get('thumbnail.enable_thumbnails', true);
506 $this->conf->set('thumbnails.mode', $thumbnailsEnabled ? Thumbnailer::MODE_ALL : Thumbnailer::MODE_NONE); 506 $this->conf->set('thumbnails.mode', $thumbnailsEnabled ? Thumbnailer::MODE_ALL : Thumbnailer::MODE_NONE);
507 $this->conf->set('thumbnails.width', 125); 507 $this->conf->set('thumbnails.width', 125);
508 $this->conf->set('thumbnails.height', 90); 508 $this->conf->set('thumbnails.height', 90);
diff --git a/index.php b/index.php
index 925d47a5..4b86a3e2 100644
--- a/index.php
+++ b/index.php
@@ -1635,9 +1635,9 @@ function buildLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager)
1635 uasort($taglist, 'strcasecmp'); 1635 uasort($taglist, 'strcasecmp');
1636 $link['taglist'] = $taglist; 1636 $link['taglist'] = $taglist;
1637 1637
1638 // Thumbnails enabled, not a note, 1638 // Logged in, thumbnails enabled, not a note,
1639 // and (never retrieved yet or no valid cache file) 1639 // and (never retrieved yet or no valid cache file)
1640 if ($thumbnailsEnabled && $link['url'][0] != '?' 1640 if ($loginManager->isLoggedIn() && $thumbnailsEnabled && $link['url'][0] != '?'
1641 && (! isset($link['thumbnail']) || ($link['thumbnail'] !== false && ! is_file($link['thumbnail']))) 1641 && (! isset($link['thumbnail']) || ($link['thumbnail'] !== false && ! is_file($link['thumbnail'])))
1642 ) { 1642 ) {
1643 $elem = $LINKSDB[$keys[$i]]; 1643 $elem = $LINKSDB[$keys[$i]];