Updated copy & paste

[gosa.git] / gosa-core / include / class_pathNavigator.inc

diff --git a/gosa-core/include/class_pathNavigator.inc b/gosa-core/include/class_pathNavigator.inc
index 645626f231d84e6bac182b8901b50bb62928120a..6140e0e0146290e591bf152726ecba82c2dccc21 100644 (file)
--- a/gosa-core/include/class_pathNavigator.inc
+++ b/gosa-core/include/class_pathNavigator.inc
@@ -53,26 +53,47 @@ class pathNavigator
     
     if(!empty($str)){
       $cur = session::get('pathNavigator::position');
-
-      if(!empty($title)) $title = " title='{$title}' ";
-
-      $cur.= "\n<li {$title} class='left path-element'>{$str}</li>";
+      $entry = array('TITLE' => $title, 'NAME' => $str);
+      $cur[] = $entry;
       session::set('pathNavigator::position', $cur);
     }
   }
 
   static function getCurrentPath()
   {
-    $path = session::get('pathNavigator::position');
+    // Ensure that we've a position value initialized. 
+    if(!session::is_set('pathNavigator::position')) {
+        session::set('pathNavigator::position',array());
+    }
+
+    // Get position and validate its value
+    $list = session::get('pathNavigator::position');
+    if(!is_array($list)){
+        $list = array();
+    }
+
+    // Build up title and path string.
+    $path = "";
+    $sTitle = "";
+    foreach($list as $entry){
+        $title = (!empty($entry['TITLE']))? 'title="'.htmlentities(LDAP::fix($entry['TITLE']),ENT_COMPAT,'UTF-8').'"': '';
+        $path.= "\n<li {$title} class='left path-element'>{$entry['NAME']}</li>";
+        $sTitle .= " - ".$entry['NAME'];
+    }
+
+    // If no path is given then show a simple 'Welcome to GOsa' string.
     if(empty($path)){
       $path = "<li class='left path-element'>"._("Welcome to GOsa")."</li>";
     }
+
+    $smarty = get_smarty();
+    $smarty->assign('title', 'GOsa '.$sTitle);
     return($path);
   }
 
   static function clear()
   {
-    session::set('pathNavigator::position','');
+    session::set('pathNavigator::position', array());
   }
 }