Changeset 559 for trunk/plog-includes/plog-functions.php

Timestamp:

07/15/08 14:08:55 (4 months ago)

Author:

sidtheduck

Message:

+ Partial fix for ticket #184 - truncating the collections and albums if only 1 album or 1 collection is present

Files:

• trunk/plog-includes/plog-functions.php (modified) (5 diffs)

trunk/plog-includes/plog-functions.php

@@ -6 +6 @@
 }
 
-function generate_breadcrumb($collections = 'Collections', $sep = ' » ', $translate = true) {
+function generate_breadcrumb($collections = 'Collections', $sep = ' » '){
         global $config;
 
         $id = $GLOBALS['plogger_id'];
 
-        if ($translate === true){
-                $collections = plog_tr(SmartStripSlashes($collections));
-        }
         $collections_link = '<a href="'.generate_url("collections").'">' . $collections . '</a>';
         $collections_name = '<strong>' . $collections . '</strong>';
@@ -22 +19 @@
                         $collection_name = '<strong>' . SmartStripSlashes($row['name']) . '</strong>';
 
-                        $breadcrumbs = $collections_link . $sep . $collection_name;
+                        if ($config['truncate_breadcrumb'] == "collection"){
+                                $breadcrumbs = $collection_name;
+                        } else {
+                                $breadcrumbs = $collections_link . $sep . $collection_name;
+                        }
 
                         // Does this ever happen?  Collection level + slideshow mode ends in SQL error
-                        if ($GLOBALS['plogger_mode'] == "slideshow") $breadcrumbs .= $sep . '<strong>' . plog_tr('Slideshow');
+                        //if ($GLOBALS['plogger_mode'] == "slideshow") $breadcrumbs .= $sep . '<strong>' . plog_tr('Slideshow');
 
                 break;
@@ -37 +38 @@
                         $collection_link = '<a accesskey="/" href="' . generate_url("collection", $row['id']) . '">' . SmartStripSlashes($row['name']) . '</a>';
 
-                        if ($GLOBALS['plogger_mode'] == "slideshow") {
-                                $breadcrumbs = $collections_link . $sep . $collection_link . $sep . $album_link . $sep . '<strong>' . plog_tr('Slideshow') . '</strong>';
+                        if ($config['truncate_breadcrumb'] == "album"){
+                                $breadcrumbs = $album_name;
+                        } else if ($config['truncate_breadcrumb'] == "collection"){
+                                $breadcrumbs = $collection_link . $sep . $album_name;
                         } else {
                                 $breadcrumbs = $collections_link . $sep . $collection_link . $sep . $album_name;
+                        }
+
+                        if ($GLOBALS['plogger_mode'] == "slideshow") {
+                                $breadcrumbs = str_replace($album_name, $album_link . $sep . '<strong>' . plog_tr('Slideshow') . '</strong>', $breadcrumbs);
                         }
 
@@ -48 +55 @@
                         $picture_name = '<span id="image_name"><strong>' . SmartStripSlashes(get_caption_filename($row)) . '</strong></span>';
 
-                        $row = get_album_by_id($row["parent_album"]);
+                        $row = get_album_by_id($row['parent_album']);
                         $album_link = '<a accesskey="/" href="' . generate_url("album", $row['id']) . '">' . SmartStripSlashes($row['name']) . '</a>';
 
-                        $row = get_collection_by_id($row["parent_id"]);
+                        $row = get_collection_by_id($row['parent_id']);
                         $collection_link = '<a accesskey="/" href="' . generate_url("collection", $row['id']) . '">' . SmartStripSlashes($row['name']) . '</a>';
 
-                        $breadcrumbs = $collections_link . $sep . $collection_link . $sep . $album_link . $sep . $picture_name;
+                        if ($config['truncate_breadcrumb'] == "album"){
+                                $breadcrumbs = $album_link . $sep . $picture_name;
+                        } else if ($config['truncate_breadcrumb'] == "collection") {
+                                $breadcrumbs = $collection_link . $sep . $album_link . $sep . $picture_name;
+                        } else {
+                                $breadcrumbs = $collections_link . $sep . $collection_link . $sep . $album_link . $sep . $picture_name;
+                        }
 
                         // Does this ever happen?  Picture level + slideshow adds 'Slideshow' to breadcrumbs only
-                        if ($GLOBALS['plogger_mode'] == "slideshow") $breadcrumbs .= $sep . '<strong>' . plog_tr('Slideshow');
+                        //if ($GLOBALS['plogger_mode'] == "slideshow") $breadcrumbs .= $sep . '<strong>' . plog_tr('Slideshow');
 
                 break;
                 case 'search':
-                        $breadcrumbs = $collections_link . $sep . '<strong>'.plog_tr('Search').'</strong>' . $sep . plog_tr('You searched for') . ' <strong>'.htmlspecialchars(SmartStripSlashes($_GET['searchterms'])).'</strong>.';
+                        if ($config['truncate_breadcrumb'] == "album"){
+                                $row = get_album_by_id($id);
+                                $album_link = '<a accesskey="/" href="' . generate_url("album", $row['id']) . '">' . SmartStripSlashes($row['name']) . '</a>';
+                                $breadcrumbs = $album_link . $sep . '<strong>'.plog_tr('Search').'</strong>' . $sep . plog_tr('You searched for') . ' <strong>'.htmlspecialchars(SmartStripSlashes($_GET['searchterms'])).'</strong>.';
+                        } else if ($config['truncate_breadcrumb'] == "collection") {
+                                $row = get_collection_by_id($id);
+                                $collection_link = '<a accesskey="/" href="' . generate_url("collection", $row['id']) . '">' . SmartStripSlashes($row['name']) . '</a>';
+                                $breadcrumbs = $collection_link . $sep . '<strong>'.plog_tr('Search').'</strong>' . $sep . plog_tr('You searched for') . ' <strong>'.htmlspecialchars(SmartStripSlashes($_GET['searchterms'])).'</strong>.';
+                        } else {
+                                $breadcrumbs = $collections_link . $sep . '<strong>'.plog_tr('Search').'</strong>' . $sep . plog_tr('You searched for') . ' <strong>'.htmlspecialchars(SmartStripSlashes($_GET['searchterms'])).'</strong>.';
+                        }
                 break;
                 default:
@@ -503 +526 @@
                 }
         }
+
+function get_active_collections_albums() {
+        $return = array(
+                "collections" => '',
+                "albums" => '');
+
+        $sql = "SELECT parent_collection,parent_album,COUNT(*) AS imagecount
+        FROM `".TABLE_PREFIX."pictures` GROUP BY parent_collection,parent_album";
+        $result = run_query($sql);
+        while($row = mysql_fetch_assoc($result)) {
+                $image_collection_count[$row["parent_collection"]] = $row["imagecount"];
+                $image_album_count[$row["parent_album"]] = $row["imagecount"];
+        }
+        $return['collections'] = array_keys($image_collection_count);
+        $return['albums'] = array_keys($image_album_count);
+        return $return;
+}
 
         function generate_thumb($path, $prefix, $type = THUMB_SMALL) {