Updated listing for minimum column widths

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

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 095bbfbd720b63935f8841f693f0c6026403df47..464f0a0dd38d7db327cf755abca375cbc25a3f52 100644 (file)
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -45,6 +45,7 @@ class listing {
   var $pid;
   var $objectTypes= array();
   var $objectTypeCount= array();
+  var $objectDnMapping= array();
   var $copyPasteHandler= null;
   var $snapshotHandler= null;
   var $exporter= array();
@@ -438,8 +439,9 @@ class listing {
     global $config;
     $ui= get_userinfo();
 
-    // Reset object counter
+    // 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) {
@@ -451,6 +453,7 @@ class listing {
       $base= validate($_POST['BASE']);
       if (isset($this->bases[$base])) {
         $this->base= $base;
+        session::global_set("CurrentMainBase", $this->base);
       }
     }
 
@@ -554,30 +557,35 @@ class listing {
     $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'";
       }
     }
 
@@ -675,6 +683,11 @@ class listing {
           $params[]= $this->pid;
         }
 
+        // base is replaced by the current base
+        if ($param == "base") {
+          $params[]= $this->getBase();
+        }
+
         // Fixie with "" is passed directly
         if (preg_match('/^".*"$/', $param)){
           $params[]= preg_replace('/"/', '', $param);
@@ -750,12 +763,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;
   }
 
@@ -1447,6 +1462,15 @@ class listing {
     return $result;
   }
 
+
+  function getType($dn)
+  {
+    if (isset($this->objectDnMapping[$dn])) {
+      return $this->objectDnMapping[$dn];
+    }
+    return null;
+  }
+
 }
 
 ?>