Changeset 682 for trunk/lib

Timestamp:

May 19, 2019 10:50:51 PM (5 years ago)

Author:

anonymous

Message:

Add argument to getBreadcrumbs* methods, which enables use of app->ohref(). Fix assumed bugs - hopefully will not cause a regression

File:

• trunk/lib/Navigation.inc.php (modified) (7 diffs)

trunk/lib/Navigation.inc.php

@@ -258 +258 @@
      * @return  string   Breadcrumbs or empty string if breadcrumbs param not set.
      */
-    public function getBreadcrumbsArray()
+    public function getBreadcrumbsArray($carry_args=null)
     {
         $app =& App::getInstance();
@@ -270 +270 @@
                     break;
                 }
+                if (!is_null($carry_args)) {
+                    // If this function is called with $carry_args, employ the ohref() method.
+                    $url = $app->ohref($page['url'], $carry_args);
+                } else {
+                    // Otherwise let the URL pass through as-is (the wise developer must have provided the correct URL when calling $nav->add(
)).
+                    $url = $page['url'];
+                }
                 if ($crumb_count <= 1) {
                     // The last crumb.
                     if ('' == trim($page['url']) || $crumb_count <= $this->getParam('chop_breadcrumb_links')) {
-                        // A crumb with no link.
+                        // A last crumb with no link.
                         $breadcrumbs[] = array(
-                            'url' => $_SERVER['REQUEST_URI'],
+                            'url' => false,
                             'title' => sprintf($this->getParam('last_crumb_format'), $page['title']),
                             'class' => 'current'
                         );
                     } else if ($crumb_count > $this->getParam('chop_breadcrumb_links')) {
-                        // A normal linked crumb.
+                        // A last linked crumb.
                         $breadcrumbs[] = array(
-                            'url' => $page['url'],
+                            'url' => $url,
                             'title' => sprintf($this->getParam('last_crumb_format'), $page['title']),
                             'class' => '',
@@ -298 +305 @@
                         // A normal linked crumb.
                         $breadcrumbs[] = array(
-                            'url' => $page['url'],
+                            'url' => $url,
                             'title' => $page['title'],
                             'class' => '',
@@ -319 +326 @@
      * @return  string   Breadcrumbs or empty string if breadcrumbs param not set.
      */
-    public function getBreadcrumbs()
+    public function getBreadcrumbs($carry_args=null)
     {
         $app =& App::getInstance();
@@ -332 +339 @@
                     break;
                 }
+                if (!is_null($carry_args)) {
+                    // If this function is called with $carry_args, employ the ohref() method.
+                    $url = $app->ohref($page['url'], $carry_args);
+                } else {
+                    // Otherwise let the URL pass through as-is (the wise developer must have provided the correct URL when calling $nav->add(
)).
+                    $url = $page['url'];
+                }
                 if ($crumb_count <= 1) {
                     // The last crumb.
                     if ('' == trim($page['url']) || $crumb_count <= $this->getParam('chop_breadcrumb_links')) {
-                        // A crumb with no link.
+                        // A last crumb with no link.
                         $breadcrumbs[] =  sprintf($this->getParam('last_crumb_format'), oTxt($page['title'], true));
                     } else if ($crumb_count > $this->getParam('chop_breadcrumb_links')) {
-                        // A normal linked crumb.
-                        $breadcrumbs[] =  '<a href="' . $page['url'] . '">' . sprintf($this->getParam('last_crumb_format'), oTxt($page['title'], true)) . '</a>';
+                        // A last linked crumb.
+                        $breadcrumbs[] =  '<a href="' . $url . '">' . sprintf($this->getParam('last_crumb_format'), oTxt($page['title'], true)) . '</a>';
                     }
                 } else {
@@ -347 +361 @@
                     } else {
                         // A normal linked crumb.
-                        $breadcrumbs[] = '<a href="' . $page['url'] . '">' . oTxt($page['title'], true) . '</a>';
+                        $breadcrumbs[] = '<a href="' . $url . '">' . oTxt($page['title'], true) . '</a>';
                     }
                 }
@@ -369 +383 @@
     * @since    07 Sep 2014 12:22:19
     */
-    public function getBreadcrumbsUL()
-    {
+    public function getBreadcrumbsUL($carry_args=null, $ul_open_tag='<ul class="breadcrumbs">')
+    {
+        $app =& App::getInstance();
+
         $out = '';
-        $breadcrumbs = $this->getBreadcrumbsArray();
+        $breadcrumbs = $this->getBreadcrumbsArray($carry_args);
         if (!empty($breadcrumbs)) {
-            $out = '<ul class="breadcrumbs">';
+            $out = $ul_open_tag;
             foreach ($breadcrumbs as $b) {
                 $printclass = '' != $b['class'] ? sprintf(' class="%s"', $b['class']) : '';
-                $out .= sprintf('<li%s><a href="%s">%s</a></li>', $printclass, $b['url'], $b['title']);
+                if ('' == trim($b['url'])) {
+                    // A crumb with no link.
+                    $out .= sprintf('<li%s>%s</li>', $printclass, $b['title']);
+                } else {
+                    // A normal linked crumb.
+                    $out .= sprintf('<li%s><a href="%s">%s</a></li>', $printclass, $b['url'], $b['title']);
+                }
             }
             $out .= '</ul>';