|
@@ -7,9 +7,11 @@
|
|
|
###
|
|
|
|
|
|
# Add `plugins`
|
|
|
-$result = $database->query("SELECT `key` FROM `lychee_settings` WHERE `key` = 'plugins' LIMIT 1;");
|
|
|
+$query = Database::prepare($database, "SELECT `key` FROM `?` WHERE `key` = 'plugins' LIMIT 1", [LYCHEE_TABLE_SETTINGS]);
|
|
|
+$result = $database->query($query);
|
|
|
if ($result->num_rows===0) {
|
|
|
- $result = $database->query("INSERT INTO `lychee_settings` (`key`, `value`) VALUES ('plugins', '')");
|
|
|
+ $query = Database::prepare($database, "INSERT INTO `?` (`key`, `value`) VALUES ('plugins', '')", [LYCHEE_TABLE_SETTINGS]);
|
|
|
+ $result = $database->query($query);
|
|
|
if (!$result) {
|
|
|
Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
|
|
|
return false;
|
|
@@ -17,8 +19,10 @@ if ($result->num_rows===0) {
|
|
|
}
|
|
|
|
|
|
# Add `takestamp`
|
|
|
-if (!$database->query("SELECT `takestamp` FROM `lychee_photos` LIMIT 1;")) {
|
|
|
- $result = $database->query("ALTER TABLE `lychee_photos` ADD `takestamp` INT(11) DEFAULT NULL");
|
|
|
+$query = Database::prepare($database, "SELECT `takestamp` FROM `?` LIMIT 1;", [LYCHEE_TABLE_PHOTOS]);
|
|
|
+if (!$database->query($query)) {
|
|
|
+ $query = Database::prepare($database, "ALTER TABLE `?` ADD `takestamp` INT(11) DEFAULT NULL", [LYCHEE_TABLE_PHOTOS]);
|
|
|
+ $result = $database->query($query);
|
|
|
if (!$result) {
|
|
|
Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
|
|
|
return false;
|
|
@@ -26,34 +30,46 @@ if (!$database->query("SELECT `takestamp` FROM `lychee_photos` LIMIT 1;")) {
|
|
|
}
|
|
|
|
|
|
# Convert to `takestamp`
|
|
|
-if ($database->query("SELECT `takedate`, `taketime` FROM `lychee_photos` LIMIT 1;")) {
|
|
|
- $result = $database->query("SELECT `id`, `takedate`, `taketime` FROM `lychee_photos` WHERE `takedate` <> '' AND `taketime` <> '';");
|
|
|
+$query = Database::prepare($database, "SELECT `takedate`, `taketime` FROM `?` LIMIT 1;", [LYCHEE_TABLE_PHOTOS]);
|
|
|
+if ($database->query($query)) {
|
|
|
+ $query = Database::prepare($database, "SELECT `id`, `takedate`, `taketime` FROM `?` WHERE `takedate` <> '' AND `taketime` <> ''", [LYCHEE_TABLE_PHOTOS]);
|
|
|
+ $result = $database->query($query);
|
|
|
if (!$result) {
|
|
|
Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
|
|
|
return false;
|
|
|
}
|
|
|
while ($photo = $result->fetch_object()) {
|
|
|
- $takestamp = strtotime($photo->takedate . $photo->taketime);
|
|
|
- $database->query("UPDATE `lychee_photos` SET `takestamp` = '$takestamp' WHERE `id` = '$photo->id';");
|
|
|
+ $takestamp = strtotime($photo->takedate . $photo->taketime);
|
|
|
+ $query = Database::prepare($database, "UPDATE `?` SET `takestamp` = '?' WHERE `id` = '?'", [LYCHEE_TABLE_PHOTOS, $takestamp, $photo->id]);
|
|
|
+ $database->query($query);
|
|
|
}
|
|
|
- $result = $database->query("ALTER TABLE `lychee_photos` DROP COLUMN `takedate`;");
|
|
|
- $result = $database->query("ALTER TABLE `lychee_photos` DROP COLUMN `taketime`;");
|
|
|
+ $query = Database::prepare($database, "ALTER TABLE `?` DROP COLUMN `takedate`;", [LYCHEE_TABLE_PHOTOS]);
|
|
|
+ $result = $database->query($query);
|
|
|
+ $query = Database::prepare($database, "ALTER TABLE `?` DROP COLUMN `taketime`", [LYCHEE_TABLE_PHOTOS]);
|
|
|
+ $result = $database->query($query);
|
|
|
}
|
|
|
|
|
|
# Remove `import_name`
|
|
|
-if ($database->query("SELECT `import_name` FROM `lychee_photos` LIMIT 1;")) {
|
|
|
- $result = $database->query("ALTER TABLE `lychee_photos` DROP COLUMN `import_name`;");
|
|
|
+$query = Database::prepare($database, "SELECT `import_name` FROM `?` LIMIT 1", [LYCHEE_TABLE_PHOTOS]);
|
|
|
+if ($database->query($query)) {
|
|
|
+ $query = Database::prepare($database, "ALTER TABLE `?` DROP COLUMN `import_name`", [LYCHEE_TABLE_PHOTOS]);
|
|
|
+ $result = $database->query($query);
|
|
|
}
|
|
|
|
|
|
# Remove `sysdate` and `systime`
|
|
|
-if ($database->query("SELECT `sysdate`, `systime` FROM `lychee_photos` LIMIT 1;")) {
|
|
|
- $result = $database->query("ALTER TABLE `lychee_photos` DROP COLUMN `sysdate`;");
|
|
|
- $result = $database->query("ALTER TABLE `lychee_photos` DROP COLUMN `systime`;");
|
|
|
+$query = Database::prepare($database, "SELECT `sysdate`, `systime` FROM `?` LIMIT 1", [LYCHEE_TABLE_PHOTOS]);
|
|
|
+if ($database->query($query)) {
|
|
|
+ $query = Database::prepare($database, "ALTER TABLE `?` DROP COLUMN `sysdate`", [LYCHEE_TABLE_PHOTOS]);
|
|
|
+ $result = $database->query($query);
|
|
|
+ $query = Database::prepare($database, "ALTER TABLE `?` DROP COLUMN `systime`", [LYCHEE_TABLE_PHOTOS]);
|
|
|
+ $result = $database->query($query);
|
|
|
}
|
|
|
|
|
|
# Add `sysstamp`
|
|
|
-if (!$database->query("SELECT `sysstamp` FROM `lychee_albums` LIMIT 1;")) {
|
|
|
- $result = $database->query("ALTER TABLE `lychee_albums` ADD `sysstamp` INT(11) DEFAULT NULL");
|
|
|
+$query = Database::prepare($database, "SELECT `sysstamp` FROM `?` LIMIT 1", [LYCHEE_TABLE_ALBUMS]);
|
|
|
+if (!$database->query($query)) {
|
|
|
+ $query = Database::prepare($database, "ALTER TABLE `?` ADD `sysstamp` INT(11) DEFAULT NULL", [LYCHEE_TABLE_ALBUMS]);
|
|
|
+ $result = $database->query($query);
|
|
|
if (!$result) {
|
|
|
Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
|
|
|
return false;
|
|
@@ -61,17 +77,21 @@ if (!$database->query("SELECT `sysstamp` FROM `lychee_albums` LIMIT 1;")) {
|
|
|
}
|
|
|
|
|
|
# Convert to `sysstamp`
|
|
|
-if ($database->query("SELECT `sysdate` FROM `lychee_albums` LIMIT 1;")) {
|
|
|
- $result = $database->query("SELECT `id`, `sysdate` FROM `lychee_albums`;");
|
|
|
+$query = Database::prepare($database, "SELECT `sysdate` FROM `?` LIMIT 1", [LYCHEE_TABLE_ALBUMS]);
|
|
|
+if ($database->query($query)) {
|
|
|
+ $query = Database::prepare($database, "SELECT `id`, `sysdate` FROM `?`", [LYCHEE_TABLE_ALBUMS]);
|
|
|
+ $result = $database->query($query);
|
|
|
if (!$result) {
|
|
|
Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
|
|
|
return false;
|
|
|
}
|
|
|
while ($album = $result->fetch_object()) {
|
|
|
- $sysstamp = strtotime($album->sysdate);
|
|
|
- $database->query("UPDATE `lychee_albums` SET `sysstamp` = '$sysstamp' WHERE `id` = '$album->id';");
|
|
|
+ $sysstamp = strtotime($album->sysdate);
|
|
|
+ $query = Database::prepare($database, "UPDATE `?` SET `sysstamp` = '?' WHERE `id` = '?'", [LYCHEE_TABLE_ALBUMS, $sysstamp, $album->id]);
|
|
|
+ $database->query($query);
|
|
|
}
|
|
|
- $result = $database->query("ALTER TABLE `lychee_albums` DROP COLUMN `sysdate`;");
|
|
|
+ $query = Database::prepare($database, "ALTER TABLE `?` DROP COLUMN `sysdate`", [LYCHEE_TABLE_ALBUMS]);
|
|
|
+ $result = $database->query($query);
|
|
|
}
|
|
|
|
|
|
# Set character of database
|
|
@@ -82,49 +102,56 @@ if (!$result) {
|
|
|
}
|
|
|
|
|
|
# Set character
|
|
|
-$result = $database->query("ALTER TABLE `lychee_albums` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;");
|
|
|
+$query = Database::prepare($database, "ALTER TABLE `?` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci", [LYCHEE_TABLE_ALBUMS]);
|
|
|
+$result = $database->query($query);
|
|
|
if (!$result) {
|
|
|
Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
# Set character
|
|
|
-$result = $database->query("ALTER TABLE `lychee_photos` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;");
|
|
|
+$query = Database::prepare($database, "ALTER TABLE `?` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci", [LYCHEE_TABLE_PHOTOS]);
|
|
|
+$result = $database->query($query);
|
|
|
if (!$result) {
|
|
|
Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
# Set character
|
|
|
-$result = $database->query("ALTER TABLE `lychee_settings` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;");
|
|
|
+$query = Database::prepare($database, "ALTER TABLE `?` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci", [LYCHEE_TABLE_SETTINGS]);
|
|
|
+$result = $database->query($query);
|
|
|
if (!$result) {
|
|
|
Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
# Set album password length to 100 (for longer hashes)
|
|
|
-$result = $database->query("ALTER TABLE `lychee_albums` CHANGE `password` `password` VARCHAR(100);");
|
|
|
+$query = Database::prepare($database, "ALTER TABLE `?` CHANGE `password` `password` VARCHAR(100)", [LYCHEE_TABLE_ALBUMS]);
|
|
|
+$result = $database->query($query);
|
|
|
if (!$result) {
|
|
|
Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
# Set make length to 50
|
|
|
-$result = $database->query("ALTER TABLE `lychee_photos` CHANGE `make` `make` VARCHAR(50);");
|
|
|
+$query = Database::prepare($database, "ALTER TABLE `?` CHANGE `make` `make` VARCHAR(50)", [LYCHEE_TABLE_PHOTOS]);
|
|
|
+$result = $database->query($query);
|
|
|
if (!$result) {
|
|
|
Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
# Reset sorting
|
|
|
-$result = $database->query("UPDATE lychee_settings SET value = 'ORDER BY takestamp DESC' WHERE `key` = 'sorting' AND `value` LIKE '%UNIX_TIMESTAMP%';");
|
|
|
+$query = Database::prepare($database, "UPDATE ? SET value = 'ORDER BY takestamp DESC' WHERE `key` = 'sorting' AND `value` LIKE '%UNIX_TIMESTAMP%'", [LYCHEE_TABLE_SETTINGS]);
|
|
|
+$result = $database->query($query);
|
|
|
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 = '020500' WHERE `key` = 'version';");
|
|
|
+$query = Database::prepare($database, "UPDATE ? SET value = '020500' WHERE `key` = 'version'", [LYCHEE_TABLE_SETTINGS]);
|
|
|
+$result = $database->query($query);
|
|
|
if (!$result) {
|
|
|
Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
|
|
|
return false;
|