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

Moved a function and fixed a wrong plugins call

Browse Source
This commit is contained in:
Tobias Reich 2014-04-05 15:59:31 +02:00
parent 14f4d918a4
commit d722801a5f
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
php/modules/Album.php
View File

@ -335,6 +335,27 @@ class Album extends Module {
} }
public function getPublic() {
if (!isset($this->database, $this->albumIDs)) return false;
# Call plugins
$this->plugins(__METHOD__, 0, func_get_args());
if ($this->albumIDs==='0'||$this->albumIDs==='s'||$this->albumIDs==='f') return false;
# Execute query
$albums = $this->database->query("SELECT public FROM lychee_albums WHERE id = '$this->albumIDs' LIMIT 1;");
$album = $albums->fetch_object();
# Call plugins
$this->plugins(__METHOD__, 1, func_get_args());
if ($album->public==1) return true;
return false;
}
public function setPublic($password) { public function setPublic($password) {
if (!isset($this->database, $this->albumIDs)) return false; if (!isset($this->database, $this->albumIDs)) return false;
@ -372,39 +393,18 @@ class Album extends Module {
} }
public function getPublic() { public function setPassword($password) {
if (!isset($this->database, $this->albumIDs)) return false; if (!isset($this->database, $this->albumIDs)) return false;
# Call plugins # Call plugins
$this->plugins(__METHOD__, 0, func_get_args()); $this->plugins(__METHOD__, 0, func_get_args());
if ($this->albumIDs==='0'||$this->albumIDs==='s'||$this->albumIDs==='f') return false;
# Execute query
$albums = $this->database->query("SELECT public FROM lychee_albums WHERE id = '$this->albumIDs' LIMIT 1;");
$album = $albums->fetch_object();
# Call plugins
$this->plugins(__METHOD__, 1, func_get_args());
if ($album->public==1) return true;
return false;
}
public function setPassword($password) {
if (!isset($this->database, $this->albumIDs)) return false;
# Call plugins
$this->plugins('setPassword:before', func_get_args());
# Execute query # Execute query
$result = $this->database->query("UPDATE lychee_albums SET password = '$password' WHERE id IN ('$this->albumIDs');"); $result = $this->database->query("UPDATE lychee_albums SET password = '$password' WHERE id IN ('$this->albumIDs');");
# Call plugins # Call plugins
$this->plugins('setPassword:after', func_get_args()); $this->plugins(__METHOD__, 1, func_get_args());
if (!$result) return false; if (!$result) return false;
return true; return true;
@ -442,11 +442,15 @@ class Album extends Module {
$error = false; $error = false;
# Execute query # Execute query
$result = $this->database->query("SELECT id FROM lychee_photos WHERE album IN ($albumIDs);"); $photos = $this->database->query("SELECT id FROM lychee_photos WHERE album IN ($albumIDs);");
# For each album delete photo # For each album delete photo
while ($row = $result->fetch_object()) while ($row = $photos->fetch_object()) {
if (!deletePhoto($row->id)) $error = true;
$photo = new Photo($this->database, $this->plugins, $row->id);
if (!$photo->delete($row->id)) $error = true;
}
# Delete albums # Delete albums
$result = $this->database->query("DELETE FROM lychee_albums WHERE id IN ($albumIDs);"); $result = $this->database->query("DELETE FROM lychee_albums WHERE id IN ($albumIDs);");