Changeset 2266

Timestamp:

11/28/10 10:40:27 (18 months ago)

Author:

petsagouris

Message:

[Branch 1.5] Some touch up of the Breadcrumps code.

Files:

• branches/1.5/libs/Breadcrumbs.php (modified) (1 diff)

branches/1.5/libs/Breadcrumbs.php

@@ -26 +26 @@
 class Breadcrumbs
 {
+
         /**
          * Build breadcrumbs
+         *
+         * @param Hotaru $h
+         * @return string The breadcrumps line
          */
-        public function buildBreadcrumbs($h)
+        public function buildBreadcrumbs(Hotaru $h)
         {
-                $output = '';           
-                
-                // Admin only:
-                if ($h->isAdmin) {
-                        $output .= "<a href='" . SITEURL . "'>" . SITE_NAME . " (" . $h->lang['main_theme_breadcrumbs_home'] . ")</a>\n";
+                $output = '<a href="'.SITEURL.'">'.$h->lang['main_theme_breadcrumbs_home'].'</a>'.(($h->isAdmin) ? ' &raquo; <a href="'.$h->url(array(), 'admin').'">'.$h->lang['admin_theme_main_admin_cp'].'</a>' : '');
 
-                        $output .= " &raquo; <a href='" . $h->url(array(), 'admin') . "'>";
-                        $output .= $h->lang['admin_theme_main_admin_cp'] . "</a>\n";
-                } else {
-                        $output .= "<a href='" . SITEURL . "'>" . $h->lang['main_theme_breadcrumbs_home'] . "</a>\n"; 
+                $crumbs = $h->pluginHook('breadcrumbs');
+                if ($crumbs) {
+                        return $output.' &raquo; '.array_pop($crumbs);
+                }
+                return $output." &raquo; ".$h->pageTitle;
+        }
+
+        /**
+         * Prepares the RSS breadcrumbs link
+         *
+         * @param Hotaru $h
+         * @param string $status post status, e.g. new, top, etc.
+         * @param array $vars key -> value pairs
+         * @return string
+         */
+        public function rssBreadcrumbsLink(Hotaru $h, $status = '', $vars = array())
+        {
+                $url_array = array('page' => 'rss');
+
+                if ($status) {
+                        $url_array['status'] = $status;
                 }
 
-
-                
-                // plugin hook:
-                $crumbs = $h->pluginHook('breadcrumbs');
-                if ($crumbs) {
-                        $crumbs = array_reverse($crumbs); // so the last one gets used.
-                        foreach ($crumbs as $key => $value) {
-                                $output .= " &raquo; " . $value;
-                                return $output; // we only want the first result so return now.
-                        }
-                } 
-                
-                // in case of no plugins:
-                $output .= " &raquo; " . $h->pageTitle;
-                return $output;
-        }
-        
-        
-        /**
-         * prepares the RSS breadcrumbs link
-         *
-         * @param string $status - post status, e.g. new, top, etc.
-         * @param array $vars - array of key -> value pairs
-         * @return string
-         */    
-        public function rssBreadcrumbsLink($h, $status = '', $vars)
-        {
-                if ($status) {
-                        $url_array = array('page'=>'rss', 'status'=>$status);
-                } else {
-                        $url_array = array('page'=>'rss'); // defaults to all
-                }
-                
                 foreach ($vars as $k => $v) {
                         $url_array[$k] = $v;
                 }
-                $rss = "<a href='" . $h->url($url_array) . "'>";
-                $rss .= " <img src='" . SITEURL . "content/themes/" . THEME . "images/rss_10.png' alt='" . $h->pageTitle . " RSS' /></a>";
-                return $rss;
+
+                return '<a href="'.$h->url($url_array).'"><img src="'.SITEURL.'content/themes/'.THEME.'images/rss_10.png" alt="'.$h->pageTitle.' RSS" /></a>';
         }
+
 }
-?>