X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_listing.inc;h=ab6d5944354bdf8f56ebf12bbe5a68886a6d80a5;hb=37a863af6c001e5760070adb1d74dc77e4df61f9;hp=c50453a8ee75fee3228fa7cb581af8febb00310b;hpb=2bc36b4f6cc2bcbed445b83e245cc5779ac8c884;p=gosa.git

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index c50453a8e..ab6d59443 100644
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -45,13 +45,20 @@ class listing {
   var $pid;
   var $objectTypes= array();
   var $objectTypeCount= array();
+  var $objectDnMapping= array();
   var $copyPasteHandler= null;
   var $snapshotHandler= null;
+  var $exporter= array();
+  var $exportColumns= array();
+  var $useSpan= false;
+  var $height= 0;
+  var $scrollPosition= 0;
 
 
   function listing($filename)
   {
     global $config;
+    global $class_mapping;
 
     // Initialize pid
     $this->pid= preg_replace("/[^0-9]/", "", microtime(TRUE));
@@ -61,11 +68,15 @@ class listing {
     }
 
     // Set base for filter
-    $this->base= session::global_get("CurrentMainBase");
-    if ($this->base == null) {
+    if ($this->baseMode) {
+      $this->base= session::global_get("CurrentMainBase");
+      if ($this->base == null) {
+        $this->base= $config->current['BASE'];
+      }
+      $this->refreshBasesList();
+    } else {
       $this->base= $config->current['BASE'];
     }
-    $this->refreshBasesList();
 
     // Move footer information
     $this->showFooter= ($config->get_cfg_value("listSummary") == "true");
@@ -75,6 +86,16 @@ class listing {
     $this->registerElementFilter("departmentLink", "listing::filterDepartmentLink");
     $this->registerElementFilter("link", "listing::filterLink");
     $this->registerElementFilter("actions", "listing::filterActions");
+
+    // Load exporters
+    foreach($class_mapping as $class => $dummy) {
+      if (preg_match('/Exporter$/', $class)) {
+        $info= call_user_func(array($class, "getInfo"));
+        if ($info != null) {
+          $this->exporter= array_merge($this->exporter, $info);
+        }
+      }
+    }
   }
 
 
@@ -84,6 +105,12 @@ class listing {
   }
 
 
+  function setHeight($height)
+  {
+    $this->height= $height;
+  }
+
+
   function setSnapshotHandler($handler)
   {
     $this->snapshotHandler= &$handler;
@@ -97,7 +124,6 @@ class listing {
       $this->departments= $this->getDepartments();
     }
     $this->filter->setBase($this->base);
-    $this->entries= $this->filter->query();
   }
 
 
@@ -140,6 +166,9 @@ class listing {
     }
     $this->categories= array();
     if (isset($this->xmlData['definition']['objectType'])) {
+      if(isset($this->xmlData['definition']['objectType']['label'])) {
+        $this->xmlData['definition']['objectType']= array($this->xmlData['definition']['objectType']);
+      }
       foreach ($this->xmlData['definition']['objectType'] as $index => $otype) {
         $this->objectTypes[]= $this->xmlData['definition']['objectType'][$index];
         if (isset($this->xmlData['definition']['objectType'][$index]['category'])){
@@ -161,6 +190,15 @@ class listing {
       $this->categories= array($this->categories);
     }
 
+    // Evaluate columns to be exported
+    if (isset($this->xmlData['table']['column'])){
+      foreach ($this->xmlData['table']['column'] as $index => $config) {
+        if (isset($config['export']) && $config['export'] == "true"){
+          $this->exportColumns[]= $index;
+        }
+      }
+    }
+
     return true;  
   }
 
@@ -168,6 +206,7 @@ class listing {
   function renderHeader()
   {
     $this->header= array();
+    $this->plainHeader= array();
 
     // Initialize sort?
     $sortInit= false;
@@ -205,17 +244,20 @@ class listing {
           } else {
             $this->header[$index]= "<td class='listheader' ".$this->colprops[$index].">"._($config['label'])."</td>";
           }
+          $this->plainHeader[]= _($config['label']);
         } else {
           if ($sortable) {
             $this->header[$index]= "<td class='listheader' ".$this->colprops[$index]."><a $link>&nbsp;$sorter</a></td>";
           } else {
             $this->header[$index]= "<td class='listheader' ".$this->colprops[$index].">&nbsp;</td>";
           }
+          $this->plainHeader[]= "";
         }
       }
     }
   }
 
+
   function render()
   {
     // Check for exeeded sizelimit
@@ -223,27 +265,47 @@ class listing {
       return($message);
     }
 
+    // Some browsers don't have the ability do do scrollable table bodies, filter them
+    // here.
+    $switch= false;
+    if (preg_match('/(Opera|Konqueror|Safari|msie)/i', $_SERVER['HTTP_USER_AGENT'])){
+      $switch= true;
+    }
+
     // Initialize list
-    $result= "<input type='hidden' value='$this->pid' name='PID'>";
-    $result.= "<div class='contentboxb' id='listing_container' style='border-top:1px solid #B0B0B0;'>";
-    $result.= "<table summary='$this->headline' style='width:600px;height:450px;' cellspacing='0' id='t_scrolltable'>
-<tr><td class='scrollhead'><table summary='' style='width:100%;' cellspacing='0' id='t_scrollhead'>";
+    $result= "<input type='hidden' value='$this->pid' name='PID'>\n";
+    $result.= "<input type='hidden' name='position_".$this->pid."' id='position_".$this->pid."'>\n";
+    $height= 450;
+    if ($this->height != 0) {
+      $result.= "<input type='hidden' value='$this->height' id='d_height'>\n";
+      $height= $this->height;
+    }
+    
+    $result.= "<table cellpadding='0' cellspacing='0' border='0'><tr><td><div class='listContainer' id='d_scrollbody' style='border-top:1px solid #B0B0B0;width:700px;min-height:".($height+25)."px;'>\n";
+
+    $height= "";
+    if ($switch){
+      $height= "height:100%;";
+    }
+    $result.= "<table summary='$this->headline' style='${height}width:100%; table-layout:fixed;' cellspacing='0' cellpadding='0' id='t_scrolltable'>\n";
     $this->numColumns= count($this->colprops) + ($this->multiSelect?1:0);
 
     // Build list header
-    $result.= "<tr>";
+    $result.= "<thead class='fixedListHeader listHeaderFormat'><tr>\n";
     if ($this->multiSelect) {
-      $result.= "<td class='listheader' style='width:20px;'><input type='checkbox' id='select_all' name='select_all' title='"._("Select all")."' onClick='toggle_all_(\"listing_selected_[0-9]*$\",\"select_all\");' ></td>";
+      $width= "24px";
+      if (preg_match('/Konqueror/i', $_SERVER['HTTP_USER_AGENT'])){
+        $width= "28px";
+      }
+      $result.= "<td class='listheader' style='text-align:center;padding:0;width:$width;'><input type='checkbox' id='select_all' name='select_all' title='"._("Select all")."' onClick='toggle_all_(\"listing_selected_[0-9]*$\",\"select_all\");' ></td>\n";
     }
     foreach ($this->header as $header) {
       $result.= $header;
     }
+    $result.= "</tr></thead>\n";
 
-    // Add 13px for scroller
-    $result.= "<td class='listheader' style='width:13px;border-right:0px;'>&nbsp;</td></table></td></tr>";
-
-    // New table for the real list contents
-    $result.= "<tr><td colspan='$this->numColumns' class='scrollbody'><div style='width:600px;height:430px;' id='d_scrollbody' class='scrollbody'><table summary='' style='height:100%;width:581px;' cellspacing='0' id='t_scrollbody'>";
+    // Build list body
+    $result.= "<tbody class='listScrollContent listBodyFormat' id='t_nscrollbody' style='height:".$height."px;'>\n";
 
     // No results? Just take an empty colspanned row
     if (count($this->entries) + count($this->departments) == 0) {
@@ -255,6 +317,7 @@ class listing {
     $deps= 0;
 
     // Draw department browser if configured and we're not in sub mode
+    $this->useSpan= false;
     if ($this->departmentBrowser && $this->filter->scope != "sub") {
       // Fill with department browser if configured this way
       $departmentIterator= new departmentSortIterator($this->departments, $this->sortDirection[$this->sortColumn]);
@@ -263,15 +326,23 @@ class listing {
 
         // Render multi select if needed
         if ($this->multiSelect) {
-          $result.="<td style='text-align:center;width:20px;' class='list1'>&nbsp;</td>";
+          $result.="<td style='text-align:center;padding:0;' class='list1'>&nbsp;</td>";
         }
 
         // Render defined department columns, fill the rest with some stuff
+        $rest= $this->numColumns - 1;
         foreach ($this->xmlData['table']['department'] as $index => $config) {
-          $result.="<td ".$this->colprops[$index]." class='list1'>".$this->renderCell($config['value'], $entry, $row)."</td>";
+          $colspan= 1;
+          if (isset($config['span'])){
+            $colspan= $config['span'];
+            $this->useSpan= true;
+          }
+          $result.="<td colspan='$colspan' ".$this->colprops[$index]." class='list1'>".$this->renderCell($config['value'], $entry, $row)."</td>";
+          $rest-= $colspan;
         }
-        $last= count($this->xmlData['table']['department']) + 1;
-        $rest= $this->numColumns - $last;
+
+        // Fill remaining cols with nothing
+        $last= $this->numColumns - $rest;
         for ($i= 0; $i<$rest; $i++){
           $result.= "<td ".$this->colprops[$last+$i-1]." class='list1'>&nbsp;</td>";
         }
@@ -283,26 +354,43 @@ class listing {
     }
 
     // Fill with contents, sort as configured
-    $entryIterator= new listingSortIterator($this->entries, $this->sortDirection[$this->sortColumn], $this->sortAttribute, $this->sortType);
-    foreach ($entryIterator as $row => $entry){
-      $result.="<tr class='rowxp".($alt&1)."'>";
+    foreach ($this->entries as $row => $entry) {
+      $trow= "";
 
       // Render multi select if needed
       if ($this->multiSelect) {
-        $result.="<td style='text-align:center;width:20px;' class='list0'><input type='checkbox' id='listing_selected_$row' name='listing_selected_$row'></td>";
+        $trow.="<td style='text-align:center;width:20px;' class='list0'><input type='checkbox' id='listing_selected_$row' name='listing_selected_$row'></td>\n";
       }
 
       foreach ($this->xmlData['table']['column'] as $index => $config) {
-        $result.="<td ".$this->colprops[$index]." class='list0'>".$this->renderCell($config['value'], $entry, $row)."</td>";
+        $renderedCell= $this->renderCell($config['value'], $entry, $row);
+        $trow.="<td ".$this->colprops[$index]." class='list0'>".$renderedCell."</td>\n";
+
+        // Save rendered column
+        $sort= preg_replace('/.*>([^<]+)<.*$/', '$1', $renderedCell);
+        $sort= preg_replace('/&nbsp;/', '', $sort);
+        if (preg_match('/</', $sort)){
+          $sort= "";
+        }
+        $this->entries[$row]["_sort$index"]= $sort;
       }
-      $result.="</tr>";
 
+      // Save rendered entry
+      $this->entries[$row]['_rendered']= $trow;
+    }
+
+    // Complete list by sorting entries for _sort$index and appending them to the output
+    $entryIterator= new listingSortIterator($this->entries, $this->sortDirection[$this->sortColumn], "_sort".$this->sortColumn, $this->sortType);
+    foreach ($entryIterator as $row => $entry){
       $alt++;
+      $result.="<tr class='rowxp".($alt&1)."'>\n";
+      $result.= $entry['_rendered'];
+      $result.="</tr>\n";
     }
 
     // Need to fill the list if it's not full (nobody knows why this is 22 ;-))
-    $emptyListStyle= (count($this->entries) + count($deps) == 0)?"border:0;":"";
-    if (count($this->entries) + count($deps) < 22) {
+    $emptyListStyle= (count($this->entries) + (($this->useSpan && count($this->entries))?$deps:0) == 0)?"border:0;":"";
+    if ((count($this->entries) + $deps) < 22) {
       $result.= "<tr>";
       for ($i= 0; $i<$this->numColumns; $i++) {
         if ($i == 0) {
@@ -318,11 +406,12 @@ class listing {
       $result.= "</tr>";
     }
 
-    $result.= "</table></div></td></tr>";
+    // Close list body
+    $result.= "</tbody></table></div></td></tr>";
 
     // Add the footer if requested
     if ($this->showFooter) {
-      $result.= "<tr><td class='scrollhead'><table summary='' style='width:100%' cellspacing='0' id='t_scrollfoot'><tr><td class='listfooter' style='border-bottom:0px;'>";
+      $result.= "<tr><td class='nlistFooter'>";
 
       foreach ($this->objectTypes as $objectType) {
         if (isset($this->objectTypeCount[$objectType['label']])) {
@@ -331,12 +420,21 @@ class listing {
         }
       }
 
-      $result.= "<td class='listfooter' style='width:13px;border-right:0px;'>&nbsp;</td></table></td></tr>";
+      $result.= "</td></tr>";
     }
 
-    $result.= "</table></div>";
+    // Close list
+    $result.= "</table>";
+    $result.= $switch?"<input type='hidden' id='list_workaround'>":"";
+
+    // Add scroll positioner
+    $result.= '<script type="text/javascript" language="javascript">';
+    $result.= '$("t_nscrollbody").scrollTop= '.$this->scrollPosition.';';
+    $result.= 'var box = $("t_nscrollbody").onscroll= function() {$("position_'.$this->pid.'").value= this.scrollTop;}';
+    $result.= '</script>';
 
     $smarty= get_smarty();
+    $smarty->assign("usePrototype", "true");
     $smarty->assign("FILTER", $this->filter->render());
     $smarty->assign("SIZELIMIT", print_sizelimit_warning());
     $smarty->assign("LIST", $result);
@@ -357,7 +455,15 @@ class listing {
     // Assign summary
     $smarty->assign("HEADLINE", $this->headline);
 
-    return ($smarty->fetch(get_template_path($this->xmlData['definition']['template'], true)));
+    // Try to load template from plugin the folder first...
+    $file = get_template_path($this->xmlData['definition']['template'], true);
+
+    // ... if this fails, try to load the file from the theme folder.
+    if(!file_exists($file)){
+      $file = get_template_path($this->xmlData['definition']['template']);
+    }
+
+    return ($smarty->fetch($file));
   }
 
 
@@ -366,16 +472,26 @@ class listing {
     global $config;
     $ui= get_userinfo();
 
+    // Reset object counter / DN mapping
+    $this->objectTypeCount= array();
+    $this->objectDnMapping= array();
+
     // Do not do anything if this is not our PID
     if(isset($_REQUEST['PID']) && $_REQUEST['PID'] != $this->pid) {
       return;
     }
 
+    // Save position if set
+    if (isset($_POST['position_'.$this->pid]) && is_numeric($_POST['position_'.$this->pid])) {
+      $this->scrollPosition= $_POST['position_'.$this->pid];
+    }
+
     // Save base
-    if (isset($_POST['BASE']) && $this->baseMode == true) {
-      $base= validate($_POST['BASE']);
+    if (isset($_POST['BASE']) && $this->baseMode) {
+      $base= get_post('BASE');
       if (isset($this->bases[$base])) {
         $this->base= $base;
+        session::global_set("CurrentMainBase", $this->base);
       }
     }
 
@@ -384,7 +500,25 @@ class listing {
       if (preg_match('/^department_([0-9]+)$/', validate($_GET['act']), $match)){
         if (isset($this->departments[$match[1]])){
           $this->base= $this->departments[$match[1]]['dn'];
+          session::global_set("CurrentMainBase", $this->base);
+        }
+      }
+    }
+
+    // Filter POST with "act" attributes -> posted from action menu
+    if (isset($_POST['exec_act']) && $_POST['act'] != '') {
+      if (preg_match('/^export.*$/', $_POST['act']) && isset($this->exporter[$_POST['act']])) {
+        $exporter= $this->exporter[$_POST['act']];
+        $userinfo= ", "._("created by")." ".$ui->cn." - ".strftime('%A, %d. %B %Y, %H:%M:%S');
+        $entryIterator= new listingSortIterator($this->entries, $this->sortDirection[$this->sortColumn], "_sort".$this->sortColumn, $this->sortType);
+        $sortedEntries= array();
+        foreach ($entryIterator as $entry){
+          $sortedEntries[]= $entry;
         }
+        $instance= new $exporter['class']($this->headline.$userinfo, $this->plainHeader, $sortedEntries, $this->exportColumns);
+        $type= call_user_func(array($exporter['class'], "getInfo"));
+        $type= $type[$_POST['act']];
+        send_binary_content($instance->query(), $type['filename'], $type= $type['mime']);
       }
     }
 
@@ -428,7 +562,7 @@ class listing {
     }
     if ($action == 'HOME') {
       $ui= get_userinfo();
-      $this->base= get_base_from_people($ui->dn);
+      $this->base= $this->filter->getObjectBase($ui->dn);
     }
 
     // Reload departments
@@ -442,38 +576,56 @@ class listing {
   }
 
 
+  function setBase($base)
+  {
+    $this->base= $base;
+  }
+
+
+  function getBase()
+  {
+    return $this->base;
+  }
+
+
   function parseLayout($layout)
   {
     $result= array();
     $layout= preg_replace("/^\|/", "", $layout);
     $layout= preg_replace("/\|$/", "", $layout);
     $cols= split("\|", $layout);
+
     foreach ($cols as $index => $config) {
       if ($config != "") {
+        $res= "";
         $components= split(';', $config);
-        $config= "";
         foreach ($components as $part) {
           if (preg_match("/^r$/", $part)) {
-            $config.= "text-align:right;";
+            $res.= "text-align:right;";
             continue;
           }
           if (preg_match("/^l$/", $part)) {
-            $config.= "text-align:left;";
+            $res.= "text-align:left;";
             continue;
           }
           if (preg_match("/^c$/", $part)) {
-            $config.= "text-align:center;";
+            $res.= "text-align:center;";
             continue;
           }
           if (preg_match("/^[0-9]+(|px|%)$/", $part)) {
-            $config.= "width:$part;";
+            $res.= "width:$part;min-width:$part;";
             continue;
           }
         }
 
-        $result[$index]= " style='$config' ";
+        // Add minimum width for scalable columns
+        if (!preg_match('/width:/', $res)){
+          $res.= "min-width:200px;";
+        }
+
+        $result[$index]= " style='$res' ";
       } else {
-        $result[$index]= null;
+        $result[$index]= " style='min-width:100px'";
       }
     }
 
@@ -501,12 +653,20 @@ class listing {
     // Watch out for filters and prepare to execute them
     $data= $this->processElementFilter($data, $config, $row);
 
+    // Replace all non replaced %{...} instances because they
+    // are non resolved attributes or filters
+    $data= preg_replace('/%{[^}]+}/', '&nbsp;', $data);
+
     return $data;
   }
 
 
   function renderBase()
   {
+    if (!$this->baseMode) {
+      return;
+    }
+
     $result= "<select name='BASE' onChange='mainform.submit()' size='1'>";
     $firstDN= null;
     $found= false;
@@ -523,8 +683,10 @@ class listing {
         $selected= " selected";
         $found= true;
       }
-      $result.= "<option value='".$key."'$selected>".$value."</option>";
+      $key = htmlentities($key,ENT_QUOTES);
+      $result.= "\n<option value=\"".$key."\"$selected>".$value."</option>";
     }
+
     $result.= "</select>";
 
     // Reset the currently used base to the first DN we found if there
@@ -542,11 +704,18 @@ class listing {
     preg_match_all("/%\{filter:([^(]+)\((.*)\)\}/", $data, $matches, PREG_SET_ORDER);
 
     foreach ($matches as $match) {
-      if (!isset($this->filters[$match[1]])) {
-        continue;
+      $cl= "";
+      $method= "";
+      if (preg_match('/::/', $match[1])) {
+        $cl= preg_replace('/::.*$/', '', $match[1]);
+        $method= preg_replace('/^.*::/', '', $match[1]);
+      } else {
+        if (!isset($this->filters[$match[1]])) {
+          continue;
+        }
+        $cl= preg_replace('/::.*$/', '', $this->filters[$match[1]]);
+        $method= preg_replace('/^.*::/', '', $this->filters[$match[1]]);
       }
-      $cl= preg_replace('/::.*$/', '', $this->filters[$match[1]]);
-      $method= preg_replace('/^.*::/', '', $this->filters[$match[1]]);
 
       // Prepare params for function call
       $params= array();
@@ -556,16 +725,31 @@ class listing {
         // Row is replaced by the row number
         if ($param == "row") {
           $params[]= $row;
+          continue;
         }
 
         // pid is replaced by the current PID
         if ($param == "pid") {
           $params[]= $this->pid;
+          continue;
+        }
+
+        // base is replaced by the current base
+        if ($param == "base") {
+          $params[]= $this->getBase();
+          continue;
         }
 
         // Fixie with "" is passed directly
         if (preg_match('/^".*"$/', $param)){
           $params[]= preg_replace('/"/', '', $param);
+          continue;
+        }
+
+        // Move dn if needed
+        if ($param == "dn") {
+          $params[]= LDAP::fix($config["dn"]);
+          continue;
         }
 
         // LDAP variables get replaced by their objects
@@ -576,13 +760,9 @@ class listing {
               unset($values['count']);
             }
             $params[]= $values;
+            break;
           }
         }
-
-        // Move dn if needed
-        if ($param == "dn") {
-          $params[]= LDAP::fix($config["dn"]);
-        }
       }
 
       // Replace information
@@ -638,12 +818,14 @@ class listing {
 
     $objectType= $this->getObjectType($this->objectTypes, $classes);
     if ($objectType) {
+      $this->objectDnMapping[$dn]= $objectType["objectClass"];
       $result= "<img class='center' title='".LDAP::fix($dn)."' src='".$objectType["image"]."'>";
       if (!isset($this->objectTypeCount[$objectType['label']])) {
         $this->objectTypeCount[$objectType['label']]= 0;
       }
       $this->objectTypeCount[$objectType['label']]++;
     }
+
     return $result;
   }
 
@@ -661,9 +843,28 @@ class listing {
     foreach($actions as $action) {
       // Skip the entry completely if there's no permission to execute it
       if (!$this->hasActionPermission($action, $dn)) {
+        $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
         continue;
       }
 
+      // Skip entry if the pseudo filter does not fit
+      if (isset($action['filter']) && preg_match('/^[a-z0-9_]+!?=[a-z0-9_]+$/i', $action['filter'])) {
+        list($fa, $fv)= split('=', $action['filter']);
+        if (preg_match('/^(.*)!$/', $fa, $m)){
+          $fa= $m[1];
+          if (isset($this->entries[$row][$fa]) && $this->entries[$row][$fa][0] == $fv) {
+            $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+            continue;
+          }
+        } else {
+          if (!isset($this->entries[$row][$fa]) && !$this->entries[$row][$fa][0] == $fv) {
+            $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+            continue;
+          }
+        }
+      }
+
+
       // If there's an objectclass definition and we don't have it
       // add an empty picture here.
       if (isset($action['objectclass'])){
@@ -674,11 +875,16 @@ class listing {
             $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
             continue;
           }
-        } else {
+        } elseif (is_string($objectclass)) {
           if(!in_array($objectclass, $classes)) {
             $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
             continue;
           }
+        } elseif (is_array($objectclass)) {
+          if(count(array_intersect($objectclass, $classes)) != count($objectclass)){
+            $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+            continue;
+          }
         }
       }
 
@@ -701,7 +907,9 @@ class listing {
         }
 
         if ($action['type'] == "copypaste") {
-          $result.= $this->renderCopyPasteActions($row, $this->entries[$row]['dn'], $category, $class);
+          $copy = !isset($action['copy']) || $action['copy'] == "true";
+          $cut = !isset($action['cut']) || $action['cut'] == "true";
+          $result.= $this->renderCopyPasteActions($row, $this->entries[$row]['dn'], $category, $class,$copy,$cut);
         } else {
           $result.= $this->renderSnapshotActions($row, $this->entries[$row]['dn'], $category, $class);
         }
@@ -773,7 +981,7 @@ class listing {
     $listhead ="";
 
     /* Check if we are in users home  department */
-    if(!count($deps) ||$this->filter->base == get_base_from_people($ui->dn)){
+    if(!count($deps) || $this->filter->base == $this->filter->getObjectBase($ui->dn)){
       $enableHome = false;
     }
 
@@ -811,11 +1019,16 @@ class listing {
 
   function getAction()
   {
-    // Do not do anything if this is not our PID
-    if(isset($_REQUEST['PID']) && $_REQUEST['PID'] != $this->pid) {
+    // Do not do anything if this is not our PID, or there's even no PID available...
+    if(!isset($_REQUEST['PID']) || $_REQUEST['PID'] != $this->pid) {
       return;
     }
 
+    // Save position if set
+    if (isset($_POST['position_'.$this->pid]) && is_numeric($_POST['position_'.$this->pid])) {
+      $this->scrollPosition= $_POST['position_'.$this->pid];
+    }
+
     $result= array("targets" => array(), "action" => "");
 
     // Filter GET with "act" attributes
@@ -865,7 +1078,9 @@ class listing {
 
     // Filter POST with "act" attributes -> posted from action menu
     if (isset($_POST['act']) && $_POST['act'] != '') {
-      $result['action']= validate($_POST['act']);
+      if (!preg_match('/^export.*$/', $_POST['act'])){
+        $result['action']= validate($_POST['act']);
+      }
     }
 
     // Drop targets if empty
@@ -883,11 +1098,16 @@ class listing {
       return "";
     }
 
+    // Array?
+    if (isset($this->xmlData['actionmenu']['action']['type'])){
+      $this->xmlData['actionmenu']['action']= array($this->xmlData['actionmenu']['action']);
+    }
+
     // Load shortcut
     $actions= &$this->xmlData['actionmenu']['action'];
-    $result= "<input type='hidden' name='act' id='actionmenu' value=''>".
-             "<ul class='level1' id='root'><li><a href='#'>Aktionen&nbsp;<img ".
-             "border=0 src='images/lists/sort-down.png'></a>";
+    $result= "<input type='hidden' name='act' id='actionmenu' value=''><div style='display:none'><input type='submit' name='exec_act' id='exec_act' value=''></div>".
+             "<ul class='level1' id='root'><li><a href='#'>"._("Actions")."&nbsp;<img ".
+             "border=0 class='center' src='images/lists/sort-down.png'></a>";
 
     // Build ul/li list
     $result.= $this->recurseActions($actions);
@@ -898,6 +1118,7 @@ class listing {
 
   function recurseActions($actions)
   {
+    global $class_mapping;
     static $level= 2;
     $result= "<ul class='level$level'>";
     $separator= "";
@@ -909,10 +1130,20 @@ class listing {
         continue;
       }
 
+      // Skip entry if there're missing dependencies
+      if (isset($action['depends'])) {
+        $deps= is_array($action['depends'])?$action['depends']:array($action['depends']);
+        foreach($deps as $clazz) {
+          if (!isset($class_mapping[$clazz])){
+            continue 2;
+          }
+        }
+      }
+
       // Fill image if set
       $img= "";
       if (isset($action['image'])){
-        $img= "<img border=0 src='".$action['image']."'>&nbsp;";
+        $img= "<img border='0' class='center' src='".$action['image']."'>&nbsp;";
       }
 
       if ($action['type'] == "separator"){
@@ -926,6 +1157,12 @@ class listing {
         if (isset($action['label'])){
           $result.= "<li$separator><a href='#'>$img"._($action['label'])."&nbsp;<img border='0' src='images/forward-arrow.png'></a>";
         }
+
+        // Ensure we've an array of actions, this enables sub menus with only one action.
+        if(isset($action['action']['type'])){
+          $action['action'] = array($action['action']);
+        }
+
         $result.= $this->recurseActions($action['action'])."</li>";
         $level--;
         $separator= "";
@@ -940,13 +1177,19 @@ class listing {
       // Check for special types
       switch ($action['type']) {
         case 'copypaste':
-          $result.= $this->renderCopyPasteMenu($separator);
+          $cut = !isset($action['cut']) || $action['cut'] != "false";
+          $copy = !isset($action['copy']) || $action['copy'] != "false";
+          $result.= $this->renderCopyPasteMenu($separator, $copy , $cut);
           break;
 
         case 'snapshot':
           $result.= $this->renderSnapshotMenu($separator);
           break;
 
+        case 'exporter':
+          $result.= $this->renderExporterMenu($separator);
+          break;
+
         case 'daemon':
           $result.= $this->renderDaemonMenu($separator);
           break;
@@ -973,7 +1216,7 @@ class listing {
       // Every ACL has to pass
       foreach ($acls as $acl) {
         $module= $this->module;
-        $acllist= array();
+        $aclList= array();
 
         // Split for category and plugins if needed
         // match for "[rw]" style entries
@@ -1071,7 +1314,7 @@ class listing {
       $attrs[]= $data['ATTR'];
     }
     $filter.= "))";
-    $res= get_list($filter, $this->module, $this->base, $attrs, GL_NONE | GL_SIZELIMIT);
+    $res= get_list($filter, $this->module, $this->base, $attrs, GL_NONE);
 
     // Analyze list of departments
     foreach ($res as $department) {
@@ -1122,13 +1365,13 @@ class listing {
 
       // Copy entry
       if($copy){
-        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"copy\";mainform.submit();'><img src='images/lists/copy.png' alt='' border='0' class='center'>&nbsp;"._("Copy")."</a></li>";
+        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"copy\";document.getElementById(\"exec_act\").click();'><img src='images/lists/copy.png' alt='' border='0' class='center'>&nbsp;"._("Copy")."</a></li>";
         $separator= "";
       }
 
       // Cut entry
       if($cut){
-        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"cut\";mainform.submit();'><img src='images/lists/cut.png' alt='' border='0' class='center'>&nbsp;"._("Cut")."</a></li>";
+        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"cut\";document.getElementById(\"exec_act\").click();'><img src='images/lists/cut.png' alt='' border='0' class='center'>&nbsp;"._("Cut")."</a></li>";
         $separator= "";
       }
     }
@@ -1136,7 +1379,7 @@ class listing {
     // Draw entries that allow pasting entries
     if($paste){
       if($this->copyPasteHandler->entries_queued()){
-        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"paste\";mainform.submit();'><img src='images/lists/paste.png' alt='' border='0' class='center'>&nbsp;"._("Paste")."</a></li>";
+        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"paste\";document.getElementById(\"exec_act\").click();'><img src='images/lists/paste.png' alt='' border='0' class='center'>&nbsp;"._("Paste")."</a></li>";
       }else{
         $result.= "<li$separator><a href='#'><img src='images/lists/paste-grey.png' alt='' border='0' class='center'>&nbsp;"._("Paste")."</a></li>";
       }
@@ -1204,7 +1447,7 @@ class listing {
 
       // Draw icons according to the restore flag
       if($restore){
-        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"restore\";mainform.submit();'><img src='images/lists/restore.png' alt='' border='0' class='center'>&nbsp;"._("Restore snapshots")."</a></li>";
+        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"restore\";document.getElementById(\"exec_act\").click();'><img src='images/lists/restore.png' alt='' border='0' class='center'>&nbsp;"._("Restore snapshots")."</a></li>";
       }else{
         $result.= "<li$separator><a href='#'><img src='images/lists/restore_grey.png' alt='' border='0' class='center'>&nbsp;"._("Restore snapshots")."</a></li>";
       }
@@ -1214,6 +1457,26 @@ class listing {
   }
 
 
+  function renderExporterMenu($separator)
+  {
+    // Presets
+    $result = "";
+
+    // Draw entries
+    $result.= "<li$separator><a href='#'><img border='0' class='center' src='images/lists/export.png'>&nbsp;"._("Export list")."&nbsp;<img border='0' src='images/forward-arrow.png'></a><ul class='level3'>";
+
+    // Export CVS as build in exporter
+    foreach ($this->exporter as $action => $exporter) {
+      $result.= "<li><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"$action\";document.getElementById(\"exec_act\").click();'><img border='0' class='center' src='".$exporter['image']."'>&nbsp;".$exporter['label']."</a></li>";
+    }
+
+    // Finalize list
+    $result.= "</ul></li>";
+
+    return($result);
+  }
+
+
   function renderSnapshotActions($row, $dn, $category, $class, $copy= true, $cut= true)
   {
     // We can only provide information if we've got a snapshot handler
@@ -1263,9 +1526,9 @@ class listing {
     // If there is a daemon registered, draw the menu entries
     if(class_available("DaemonEvent")){
       $events= DaemonEvent::get_event_types_by_category($this->categories);
-      if(count($events['BY_CLASS'])){
+      if(isset($events['BY_CLASS']) && count($events['BY_CLASS'])){
         foreach($events['BY_CLASS'] as $name => $event){
-          $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"$name\";mainform.submit();'><img src='".$event['MenuImage']."' alt='' border='0' class='center'>&nbsp;".$event['s_Menu_Name']."</a></li>";
+          $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value=\"$name\";document.getElementById(\"exec_act\").click();'>".$event['MenuImage']."&nbsp;".$event['s_Menu_Name']."</a></li>";
           $separator= "";
         }
       }
@@ -1274,6 +1537,26 @@ class listing {
     return $result;
   }
 
+
+  function getEntry($dn)
+  {
+    foreach ($this->entries as $entry) {
+      if (isset($entry['dn']) && strcasecmp($dn, $entry['dn']) == 0){
+        return $entry;
+      }
+    }
+    return null;
+  }
+
+
+  function getType($dn)
+  {
+    if (isset($this->objectDnMapping[$dn])) {
+      return $this->objectDnMapping[$dn];
+    }
+    return null;
+  }
+
 }
 
 ?>