Commit 34cae0db authored by Tobias Reich's avatar Tobias Reich
Browse files

Merge branch 'pyro2927-feature/photo_checksum'

parents 8e8fd914 c064c1c0
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
var lychee = { var lychee = {
title: "", title: "",
version: "2.5", version: "2.5.5",
version_code: "020500", version_code: "020505",
api_path: "php/api.php", api_path: "php/api.php",
update_path: "http://lychee.electerious.com/version/index.php", update_path: "http://lychee.electerious.com/version/index.php",
......
This diff is collapsed.
This diff is collapsed.
...@@ -23,5 +23,6 @@ CREATE TABLE IF NOT EXISTS `lychee_photos` ( ...@@ -23,5 +23,6 @@ CREATE TABLE IF NOT EXISTS `lychee_photos` (
`star` tinyint(1) NOT NULL, `star` tinyint(1) NOT NULL,
`thumbUrl` varchar(50) NOT NULL, `thumbUrl` varchar(50) NOT NULL,
`album` varchar(30) NOT NULL DEFAULT '0', `album` varchar(30) NOT NULL DEFAULT '0',
`checksum` VARCHAR(100) DEFAULT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
\ No newline at end of file
<?php
###
# @name Update to version 2.5.5
# @author Tobias Reich
# @copyright 2014 by Tobias Reich
###
# Add `checksum`
if (!$database->query("SELECT `checksum` FROM `lychee_photos` LIMIT 1;")) {
$result = $database->query("ALTER TABLE `lychee_photos` ADD `checksum` VARCHAR(100) DEFAULT NULL");
if (!$result) {
Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
return false;
}
}
# Set version
$result = $database->query("UPDATE lychee_settings SET value = '020505' WHERE `key` = 'version';");
if (!$result) {
Log::error($database, 'update_020505', __LINE__, 'Could not update database (' . $database->error . ')');
return false;
}
?>
\ No newline at end of file
...@@ -46,7 +46,8 @@ class Database extends Module { ...@@ -46,7 +46,8 @@ class Database extends Module {
'020100', #2.1 '020100', #2.1
'020101', #2.1.1 '020101', #2.1.1
'020200', #2.2 '020200', #2.2
'020500' #2.5 '020500', #2.5
'020505' #2.5.5
); );
# For each update # For each update
......
...@@ -130,7 +130,7 @@ class Photo extends Module { ...@@ -130,7 +130,7 @@ class Photo extends Module {
} }
# Save to DB # Save to DB
$query = "INSERT INTO lychee_photos (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star) $query = "INSERT INTO lychee_photos (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum)
VALUES ( VALUES (
'" . $id . "', '" . $id . "',
'" . $info['title'] . "', '" . $info['title'] . "',
...@@ -151,7 +151,8 @@ class Photo extends Module { ...@@ -151,7 +151,8 @@ class Photo extends Module {
'" . md5($id) . ".jpeg', '" . md5($id) . ".jpeg',
'" . $albumID . "', '" . $albumID . "',
'" . $public . "', '" . $public . "',
'" . $star . "');"; '" . $star . "',
'" . md5_file($path) . "');";
$result = $this->database->query($query); $result = $this->database->query($query);
if (!$result) { if (!$result) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment