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

Unified statements

Browse Source
This commit is contained in:
Tobias Reich 2014-08-29 19:31:50 +02:00
parent 01d367beb9
commit 52b530f85e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
php/modules/Album.php
View File

@ -85,7 +85,7 @@ class Album extends Module {
$return = $albums->fetch_assoc(); $return = $albums->fetch_assoc();
$return['sysdate'] = date('d M. Y', $return['sysstamp']); $return['sysdate'] = date('d M. Y', $return['sysstamp']);
$return['password'] = ($return['password']=='' ? false : true); $return['password'] = ($return['password']=='' ? false : true);
$query = "SELECT id, title, tags, public, star, album, thumbUrl, takestamp FROM lychee_photos WHERE album = '$this->albumIDs' " . $this->settings['sorting']; $query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp FROM ? WHERE album = '?' " . $this->settings['sorting'], [LYCHEE_TABLE_PHOTOS, $this->albumIDs]);
break; break;
} }
@ -490,7 +490,7 @@ class Album extends Module {
$this->plugins(__METHOD__, 0, func_get_args()); $this->plugins(__METHOD__, 0, func_get_args());
# Get public # Get public
$query = Database::prepare($this->database, "SELECT id, public FROM ? WHERE id IN ('?')", [LYCHEE_TABLE_ALBUMS, $this->albumIDs]); $query = Database::prepare($this->database, "SELECT id, public FROM ? WHERE id IN (?)", [LYCHEE_TABLE_ALBUMS, $this->albumIDs]);
$albums = $this->database->query($query); $albums = $this->database->query($query);
while ($album = $albums->fetch_object()) { while ($album = $albums->fetch_object()) {
@ -550,13 +550,13 @@ class Album extends Module {
# Set hashed password # Set hashed password
# Do not prepare $password because it is hashed and save # Do not prepare $password because it is hashed and save
# Preparing (escaping) the password would destroy the hash # Preparing (escaping) the password would destroy the hash
$query = Database::prepare($this->database, "UPDATE ? SET password = '$password' WHERE id IN ('?')", [LYCHEE_TABLE_ALBUMS, $this->albumIDs]); $query = Database::prepare($this->database, "UPDATE ? SET password = '$password' WHERE id IN (?)", [LYCHEE_TABLE_ALBUMS, $this->albumIDs]);
$result = $this->database->query($query); $result = $this->database->query($query);
} else { } else {
# Unset password # Unset password
$query = Database::prepare($this->database, "UPDATE ? SET password = NULL WHERE id IN ('?')", [LYCHEE_TABLE_ALBUMS, $this->albumIDs]); $query = Database::prepare($this->database, "UPDATE ? SET password = NULL WHERE id IN (?)", [LYCHEE_TABLE_ALBUMS, $this->albumIDs]);
$result = $this->database->query($query); $result = $this->database->query($query);
} }