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

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index f4c2ed9a0..ab6d59443 100644
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -52,6 +52,7 @@ class listing {
   var $exportColumns= array();
   var $useSpan= false;
   var $height= 0;
+  var $scrollPosition= 0;
 
 
   function listing($filename)
@@ -264,23 +265,39 @@ 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'>\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;height:".($height+25)."px;'>\n";
+    $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";
 
-    $result.= "<table summary='$this->headline' style='width:100%; table-layout:fixed;' cellspacing='0' cellpadding='0' id='t_scrolltable'>\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.= "<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>\n";
+      $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;
@@ -290,8 +307,6 @@ class listing {
     // 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) {
       $result.= "<tr class='rowxp0'><td class='list1nohighlight' colspan='$this->numColumns' style='height:100%;border-right:0px;width:100%;'>&nbsp;</td></tr>";
@@ -311,7 +326,7 @@ 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
@@ -391,23 +406,32 @@ class listing {
       $result.= "</tr>";
     }
 
-    // Close list
-    $result.= "</tbody></table></div></td></tr></table>";
+    // 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;'>";
+    if ($this->showFooter) {
+      $result.= "<tr><td class='nlistFooter'>";
 
-    #  foreach ($this->objectTypes as $objectType) {
-    #    if (isset($this->objectTypeCount[$objectType['label']])) {
-    #      $label= _($objectType['label']);
-    #      $result.= "<img class='center' src='".$objectType['image']."' title='$label' alt='$label'>&nbsp;".$this->objectTypeCount[$objectType['label']]."&nbsp;&nbsp;&nbsp;&nbsp;";
-    #    }
-    #  }
+      foreach ($this->objectTypes as $objectType) {
+        if (isset($this->objectTypeCount[$objectType['label']])) {
+          $label= _($objectType['label']);
+          $result.= "<img class='center' src='".$objectType['image']."' title='$label' alt='$label'>&nbsp;".$this->objectTypeCount[$objectType['label']]."&nbsp;&nbsp;&nbsp;&nbsp;";
+        }
+      }
+
+      $result.= "</td></tr>";
+    }
+
+    // Close list
+    $result.= "</table>";
+    $result.= $switch?"<input type='hidden' id='list_workaround'>":"";
 
-    #  $result.= "<td class='listfooter' style='width:13px;border-right:0px;'>&nbsp;</td></table></td></tr>";
-    #}
+    // 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");
@@ -431,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));
   }
 
 
@@ -449,6 +481,11 @@ class listing {
       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) {
       $base= get_post('BASE');
@@ -463,6 +500,7 @@ 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);
         }
       }
     }
@@ -687,21 +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
@@ -712,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
@@ -831,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;
+          }
         }
       }
 
@@ -858,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);
         }
@@ -973,6 +1024,11 @@ class listing {
       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
@@ -1121,7 +1177,9 @@ 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':
@@ -1480,6 +1538,17 @@ class listing {
   }
 
 
+  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])) {