arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed medium option

Browse Source 
Lychee will automatically create medium-sized photos when the photo ist big enough and Imagick installed and activated. It's no longer possible to deactivate it.
This commit is contained in:
Tobias Reich 2016-02-14 14:09:49 +01:00
parent 5aecee4873
commit 46f520e1fe
5 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/Settings.md
View File

@ -52,12 +52,6 @@ This key is required to use the Dropbox import feature from your server. Lychee
If `1`, Lychee will use Imagick when available. Disable [Imagick](http://www.imagemagick.org) if you have problems or if you are using an outdated version. Lychee will use [GD](http://php.net/manual/en/book.image.php) when Imagick is disabled or not available. If `1`, Lychee will use Imagick when available. Disable [Imagick](http://www.imagemagick.org) if you have problems or if you are using an outdated version. Lychee will use [GD](http://php.net/manual/en/book.image.php) when Imagick is disabled or not available.
#### Medium
medium = [0|1]
If `1`, Lychee will create a second, smaller version of your photo. This feature requires [Imagick](http://www.imagemagick.org) on your server and an activated `imagick` option the the settings table.
#### Skip Duplicates on Upload #### Skip Duplicates on Upload
skipDuplicates = [0|1] skipDuplicates = [0|1]

4
php/Modules/Photo.php
View File

@ -380,7 +380,7 @@ final class Photo {
/** /**
* Creates a smaller version of a photo when its size is bigger than a preset size. * Creates a smaller version of a photo when its size is bigger than a preset size.
* Photo must be big enough, medium must be activated and Imagick must be installed and activated. * Photo must be big enough and Imagick must be installed and activated.
* @return boolean Returns true when successful. * @return boolean Returns true when successful.
*/ */
private function createMedium($url, $filename, $width, $height) { private function createMedium($url, $filename, $width, $height) {
@ -413,11 +413,9 @@ final class Photo {
} }
// Is photo big enough? // Is photo big enough?
// Is medium activated?
// Is Imagick installed and activated? // Is Imagick installed and activated?
if (($error===false)&& if (($error===false)&&
($width>$newWidth||$height>$newHeight)&& ($width>$newWidth||$height>$newHeight)&&
(Settings::get()['medium']==='1')&&
(extension_loaded('imagick')&&Settings::get()['imagick']==='1')) { (extension_loaded('imagick')&&Settings::get()['imagick']==='1')) {
$newUrl = LYCHEE_UPLOADS_MEDIUM . $filename; $newUrl = LYCHEE_UPLOADS_MEDIUM . $filename;

1
php/Modules/Session.php
View File

@ -50,7 +50,6 @@ final class Session {
unset($return['config']['login']); unset($return['config']['login']);
unset($return['config']['location']); unset($return['config']['location']);
unset($return['config']['imagick']); unset($return['config']['imagick']);
unset($return['config']['medium']);
unset($return['config']['plugins']); unset($return['config']['plugins']);
} }

1
php/database/settings_content.sql
View File

@ -9,7 +9,6 @@ VALUES
('checkForUpdates','1'), ('checkForUpdates','1'),
('sortingPhotos','ORDER BY id DESC'), ('sortingPhotos','ORDER BY id DESC'),
('sortingAlbums','ORDER BY id DESC'), ('sortingAlbums','ORDER BY id DESC'),
('medium','1'),
('imagick','1'), ('imagick','1'),
('dropboxKey',''), ('dropboxKey',''),
('identifier',''), ('identifier',''),

13
php/database/update_020700.php
View File

@ -31,19 +31,6 @@ if (is_dir(LYCHEE_UPLOADS_MEDIUM)===false) {
} }
// Add medium to settings
$query = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'medium' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
$result = Database::execute($connection, $query, 'update_020700', __LINE__);
if ($result->num_rows===0) {
$query = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('medium', '1')", array(LYCHEE_TABLE_SETTINGS));
$result = Database::execute($connection, $query, 'update_020700', __LINE__);
if ($result===false) return false;
}
// Set version // Set version
if (Database::setVersion($connection, '020700')===false) return false; if (Database::setVersion($connection, '020700')===false) return false;