Changeset 534 for trunk

Timestamp:

04/25/08 13:24:47 (7 months ago)

Author:

sidtheduck

Message:

+ Fix for ticket #83 - Updated generate_breadcrumbs() function

• Adds 3 variables to the function: $collections, $sep, and $translate . $collections allows you to quickly change the "Collections" text - defaults to "Collections" if nothing submitted. . $sep allows you to quickly change the separator - defaults to ' » ' . $translate allows the user to toggle translation of the $collections variable (whether the submitted text is typed in english or in the user's language) - defaults to true

example usage: generate_breadcrumbs("My Pics", " | ", true);

+ Fix for ticket #95 - Added "Collections" link and "Search" to breadcrumbs if level = search

+ general cleanup of the generate_breadcrumbs() function

Files:

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

trunk/plog-functions.php

@@ -1 +1 @@
 <?php
 
-function generate_breadcrumb(){
-        global $config;
-        
-        $id = $GLOBALS["plogger_id"];
+function generate_breadcrumb($collections = 'Collections', $sep = ' &raquo; ', $translate = true){
+        global $config;
+        
+        $id = $GLOBALS['plogger_id'];
+        
+        if ($translate === true){
+                $collections = plog_tr(SmartStripSlashes($collections));
+        }
+        $collections_link = ' <a href="'.$config['baseurl'].'">' . $collections . '</a>';
+        $collections_name = ' <strong>' . $collections . '</strong>';
         
         switch ($GLOBALS['plogger_level']) {
                 case 'collection':
                         $row = get_collection_by_id($id);
-                        
-                        $breadcrumbs = ' <a accesskey="/" href="'.$config["baseurl"].'">' . plog_tr('Collections') . '</a> &raquo; <b>' . SmartStripSlashes($row["name"]) . '</b>';
-                        if ($GLOBALS['plogger_mode'] == "slideshow") $breadcrumbs .= ' &raquo; ' . plog_tr('Slideshow');
+                        $collection_name = '<strong>' . SmartStripSlashes($row['name']) . '</strong>';
+                        
+                        $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');
                         
                         break;
@@ -17 +26 @@
                 case 'album':
                         $row = get_album_by_id($id);
-                        
-                        $album_name = SmartStripSlashes($row["name"]);
-                        $album_link = generate_url("album",$row["id"]);
-                        
-                        $row = get_collection_by_id($row["parent_id"]);
-                        
-                        $collection_link = '<a accesskey="/" href="' . generate_url("collection",$row["id"]) . '">' . $row["name"] . '</a>';
+                        $album_name = '<strong>' . SmartStripSlashes($row['name']) . '</strong>';
+                        $album_link = '<a accesskey="/" href="' . generate_url("album", $row['id']) . '">' . SmartStripSlashes($row['name']) . '</a>';
+                        
+                        $row = get_collection_by_id($row['parent_id']);
+                        $collection_link = '<a accesskey="/" href="' . generate_url("collection", $row['id']) . '">' . SmartStripSlashes($row['name']) . '</a>';
                         
                         if ($GLOBALS['plogger_mode'] == "slideshow") {
-                                
-                                $breadcrumbs = ' <a href="'.$config["baseurl"].'">' . plog_tr('Collections') . '</a> &raquo; ' . $collection_link . ' &raquo; ' . '<a href="'.$album_link.'">'.$album_name.'</a> &raquo; ' . ' <b>' . plog_tr('Slideshow') . '</b>';
+                                $breadcrumbs = $collections_link . $sep . $collection_link . $sep . $album_link . $sep . '<strong>' . plog_tr('Slideshow') . '</strong>';
                         } else {
-                                
-                                $breadcrumbs = ' <a href="'.$config["baseurl"].'">' . plog_tr('Collections') . '</a> &raquo; ' . $collection_link . ' &raquo; ' . '<b>'.$album_name.'</b>';
+                                $breadcrumbs = $collections_link . $sep . $collection_link . $sep . $album_name;
                         }
                         
@@ -36 +41 @@
                 case 'picture':
                         $row = get_picture_by_id($id);
-                        $picture_name = get_caption_filename($row);
+                        $picture_name = '<span id="image_name"><strong>' . SmartStripSlashes(get_caption_filename($row)) . '</strong></span>';
                         
                         $row = get_album_by_id($row["parent_album"]);
-                        
-                        $album_link = '<a accesskey="/" href="' . generate_url("album",$row["id"]) . '">' . SmartStripSlashes($row["name"]) . '</a>';
+                        $album_link = '<a accesskey="/" href="' . generate_url("album", $row['id']) . '">' . SmartStripSlashes($row['name']) . '</a>';
                         
                         $row = get_collection_by_id($row["parent_id"]);
-                        
-                        $collection_link = ' <a href="'.$config["baseurl"].'">' . plog_tr('Collections') . '</a> ' . ' &raquo; ' . '<a href="' . generate_url("collection",$row["id"]) . '">' . SmartStripSlashes($row["name"]) . '</a>';
-                        
-                        $breadcrumbs = $collection_link . ' &raquo; ' . $album_link . ' &raquo; ' . '<span id="image_name"><b>' . $picture_name.'</b></span>';
-                        
-                        if ($GLOBALS['plogger_mode'] == "slideshow") $breadcrumbs .= ' &raquo; ' . plog_tr('Slideshow');
+                        $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;
+                        
+                        // Does this ever happen?  Picture level + slideshow adds 'Slideshow' to breadcrumbs only
+                        if ($GLOBALS['plogger_mode'] == "slideshow") $breadcrumbs .= $sep . '<strong>' . plog_tr('Slideshow');
                         
                         break;
                 case 'search':
-                        $breadcrumbs = plog_tr('You searched for') . ' <b>'.htmlspecialchars($_GET["searchterms"]).'</b>.';
+                        $breadcrumbs = $collections_link . $sep . '<strong>'.plog_tr('Search').'</strong>' . $sep . plog_tr('You searched for') . ' <strong>'.htmlspecialchars(SmartStripSlashes($_GET['searchterms'])).'</strong>.';
                         break;
                 default:
-                        $breadcrumbs = ' <b>' . plog_tr('Collections') . '</b>';
+                        $breadcrumbs = $collections_name;
                         break;
         }