From d9b48f40807873fe07620157f3723a2f5795662d Mon Sep 17 00:00:00 2001 From: Tobias Reich Date: Tue, 6 May 2014 21:37:21 +0200 Subject: [PATCH] Added more error logging to Album class (#143) --- php/modules/Album.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/php/modules/Album.php b/php/modules/Album.php index 1ea2d6c..d3cb7c0 100644 --- a/php/modules/Album.php +++ b/php/modules/Album.php @@ -259,13 +259,19 @@ class Album extends Module { # Create zip $zip = new ZipArchive(); - if ($zip->open($filename, ZIPARCHIVE::CREATE)!==TRUE) return false; + if ($zip->open($filename, ZIPARCHIVE::CREATE)!==TRUE) { + Log::error($this->database, __METHOD__, __LINE__, 'Could not create ZipArchive'); + return false; + } # Execute query $photos = $this->database->query($photos); # Check if album empty - if ($photos->num_rows==0) return false; + if ($photos->num_rows==0) { + Log::error($this->database, __METHOD__, __LINE__, 'Could not create ZipArchive without images'); + return false; + } # Parse each path $files = array(); @@ -367,7 +373,7 @@ class Album extends Module { # Parse $description = htmlentities($description); - if (strlen($description)>1000) return false; + if (strlen($description)>1000) $description = substr($description, 0, 1000); # Execute query $result = $this->database->query("UPDATE lychee_albums SET description = '$description' WHERE id IN ($this->albumIDs);"); @@ -532,7 +538,11 @@ class Album extends Module { # Call plugins $this->plugins(__METHOD__, 1, func_get_args()); - if ($error||!$result) return false; + if ($error) return false; + if (!$result) { + Log::error($this->database, __METHOD__, __LINE__, $this->database->error); + return false; + } return true; }