Ticket #124: better_404_errors.patch

plog-includes/plog-functions.php

@@ -679 +679 @@
         return $thumburl;
 }
 
+function check_picture_id($id) {
+        $sql = "SELECT `parent_album` FROM ".TABLE_PREFIX."pictures WHERE `id` = ".intval($id);
+        $result = run_query($sql);
+        if (mysql_num_rows($result) > 0) {
+                return true;
+        } else {
+                $GLOBALS['plogger_level'] = "404";
+                return false;
+        }
+}
+
 function get_picture_by_id($id, $album_id = null) {
         global $config;
 
@@ -761 +772 @@
         return $pictures;
 }
 
+function check_album_id($id) {
+        $sql = "SELECT `thumbnail_id` FROM ".TABLE_PREFIX."albums WHERE `id` = ".intval($id);
+        $result = run_query($sql);
+        if (mysql_num_rows($result) > 0) {
+                return true;
+        } else {
+                $GLOBALS['plogger_level'] = "404";
+                return false;
+        }
+}
+
 function get_album_by_id($id) {
         global $config;
 
@@ -817 +839 @@
         return $album;
 }
 
+function check_collection_id($id) {
+        $sql = "SELECT `thumbnail_id` FROM ".TABLE_PREFIX."collections WHERE `id` = ".intval($id);
+        $result = run_query($sql);
+        if (mysql_num_rows($result) > 0) {
+                return true;
+        } else {
+                $GLOBALS['plogger_level'] = "404";
+                return false;
+        }
+}
+
 function get_collection_by_id($id) {
         global $config;
 
@@ -1456 +1489 @@
                 'from' => $from,
                 'limit' => $lim));
         } else if ($GLOBALS["plogger_level"] == "album") {
-                plogger_init_pictures(array(
-                'type' => 'album',
-                'value' => $id,
-                'from' => $from,
-                'limit' => $lim,
-                'sortby' => isset($_SESSION['plogger_sortby']) ? $_SESSION['plogger_sortby'] : '',
-                'sortdir' => isset($_SESSION['plogger_sortdir']) ? $_SESSION['plogger_sortdir'] : ''));
+                if (check_album_id($id)) {
+                        plogger_init_pictures(array(
+                        'type' => 'album',
+                        'value' => $id,
+                        'from' => $from,
+                        'limit' => $lim,
+                        'sortby' => isset($_SESSION['plogger_sortby']) ? $_SESSION['plogger_sortby'] : '',
+                        'sortdir' => isset($_SESSION['plogger_sortdir']) ? $_SESSION['plogger_sortdir'] : ''));
+                }
         } else if ($GLOBALS["plogger_level"] == "collection") {
-                plogger_init_albums(array(
-                'from' => $from,
-                'limit' => $lim,
-                'collection_id' => $id,
-                'sortby' => !empty($config['album_sortby']) ? $config['album_sortby'] : 'id',
-                'sortdir' => !empty($config['album_sortdir']) ? $config['album_sortdir'] : 'DESC'));
+                if (check_collection_id($id)) {
+                        plogger_init_albums(array(
+                        'from' => $from,
+                        'limit' => $lim,
+                        'collection_id' => $id,
+                        'sortby' => !empty($config['album_sortby']) ? $config['album_sortby'] : 'id',
+                        'sortdir' => !empty($config['album_sortdir']) ? $config['album_sortdir'] : 'DESC'));
+                }
         } else if ($GLOBALS["plogger_level"] == "picture") {
-                // first lets load the thumbnail of the picture at the correct size
-                plogger_init_picture(array('id' => $id));
+                if (check_picture_id($id)) {
+                        // first lets load the thumbnail of the picture at the correct size
+                        plogger_init_picture(array('id' => $id));
+                }
         } else {
                 // Show all of the collections
                 plogger_init_collections(array(
@@ -1491 +1530 @@
         $row = mysql_fetch_assoc($result);
 
         if (!$row) {
-                $GLOBALS['plogger_level'] = "404";
                 return false;
         }
 
@@ -1680 +1718 @@
         $result = run_query("SELECT p.*,
         UNIX_TIMESTAMP(`date_submitted`) AS `unix_date_submitted`,
         UNIX_TIMESTAMP(`EXIF_date_taken`) AS `unix_exif_date_taken` " . $sql);
-        if (!mysql_num_rows($result)){
-                $GLOBALS['plogger_level'] = "404";
-                return false;
-        }
+
         $GLOBALS["available_pictures"] = mysql_num_rows($result);
         $GLOBALS["picture_counter"] = 0;
         $GLOBALS["picture_dbh"] = $result;
@@ -1829 +1864 @@
         $sql = "SELECT * FROM `".TABLE_PREFIX."collections`
         $cond $ordering LIMIT $from,$lim";
         $result = run_query($sql);
-        if (!mysql_num_rows($result)){
-                $GLOBALS['plogger_level'] = "404";
-                return false;
-        }
+
         $GLOBALS["available_collections"] = mysql_num_rows($result);
         $GLOBALS["collection_counter"] = 0;
         $GLOBALS["collection_dbh"] = $result;
@@ -1878 +1910 @@
         WHERE `parent_id` = '$collection_id' $cond $order LIMIT $from,$lim";
 
         $result = run_query($sql);
-        if (!mysql_num_rows($result)){
-                $GLOBALS['plogger_level'] = "404";
-                return false;
-        }
+
         $GLOBALS["available_albums"] = mysql_num_rows($result);
         $GLOBALS["album_counter"] = 0;
         $GLOBALS["album_dbh"] = $result;