X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_listing.inc;h=d1a2d3d1361be8ef52ab2c5f1ca849811a8a9329;hb=9fee4c10382768e341abef8b0b69751e6b050e19;hp=2ac0c8e4fec2d2b977406138aa6641672d48a057;hpb=46efe9f59e06fa8b506882003523c28583fcc5ae;p=gosa.git

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 2ac0c8e4f..d1a2d3d13 100644
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -41,6 +41,7 @@ class listing {
   var $header= array();
   var $colprops= array();
   var $filters= array();
+  var $filter= null;
   var $pid;
   var $objectTypes= array();
   var $objectTypeCount= array();
@@ -52,6 +53,7 @@ class listing {
   var $useSpan= false;
   var $height= 0;
   var $scrollPosition= 0;
+  var $baseSelector;
 
 
   function listing($filename)
@@ -95,6 +97,9 @@ class listing {
         }
       }
     }
+
+    // Instanciate base selector
+    $this->baseSelector= new baseSelector($this->bases, $this->base);
   }
 
 
@@ -279,13 +284,8 @@ class listing {
       $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";
+    $result.= "<div class='listContainer' id='d_scrollbody' style='border-top:1px solid #B0B0B0;border-right:1px solid #B0B0B0;width:100%;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";
     $this->numColumns= count($this->colprops) + ($this->multiSelect?1:0);
 
     // Build list header
@@ -398,18 +398,18 @@ class listing {
         if ($i != $this->numColumns-1) {
           $result.= "<td class='list1nohighlight' style='$emptyListStyle'>&nbsp;</td>";
         } else {
-          $result.= "<td class='list1nohighlight' style='border-right:1px solid #AAA;$emptyListStyle'>&nbsp;</td>";
+          $result.= "<td class='list1nohighlight' style='border-right:0;$emptyListStyle'>&nbsp;</td>";
         }
       }
       $result.= "</tr>";
     }
 
     // Close list body
-    $result.= "</tbody></table></div></td></tr>";
+    $result.= "</tbody></table></div>";
 
     // Add the footer if requested
     if ($this->showFooter) {
-      $result.= "<tr><td class='nlistFooter'>";
+      $result.= "<div class='nlistFooter'><div style='padding:3px'>";
 
       foreach ($this->objectTypes as $objectType) {
         if (isset($this->objectTypeCount[$objectType['label']])) {
@@ -418,11 +418,10 @@ class listing {
         }
       }
 
-      $result.= "</td></tr>";
+      $result.= "</div></div>";
     }
 
     // Close list
-    $result.= "</table>";
     $result.= $switch?"<input type='hidden' id='list_workaround'>":"";
 
     // Add scroll positioner
@@ -470,97 +469,110 @@ class listing {
     global $config;
     $ui= get_userinfo();
 
+    // Take care of base selector
+    if ($this->baseMode) {
+      $this->baseSelector->update();
+    }
+
+    // Save base
+    $refresh= false;
+    if ($this->baseMode) {
+      $this->base= $this->baseSelector->getBase();
+      session::global_set("CurrentMainBase", $this->base);
+      $refresh= true;
+    }
+
+
     // 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];
-    }
+    if($refresh || !(isset($_REQUEST['PID']) && $_REQUEST['PID'] != $this->pid)) {
 
-    // Save 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);
+      // Save position if set
+      if (isset($_POST['position_'.$this->pid]) && is_numeric($_POST['position_'.$this->pid])) {
+        $this->scrollPosition= $_POST['position_'.$this->pid];
       }
-    }
 
-    // Override the base if we got a message from the browser navigation
-    if ($this->departmentBrowser && isset($_GET['act'])) {
-      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);
+      // Override the base if we got a message from the browser navigation
+      if ($this->departmentBrowser && isset($_GET['act'])) {
+        if (preg_match('/^department_([0-9]+)$/', validate($_GET['act']), $match)){
+          if (isset($this->departments[$match[1]])){
+            $this->base= $this->departments[$match[1]]['dn'];
+            if ($this->baseMode) {
+              $this->baseSelector->setBase($this->base);
+            }
+            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;
+      // 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']);
         }
-        $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']);
       }
-    }
 
-    // Filter GET with "act" attributes
-    if (isset($_GET['act'])) {
-      $key= validate($_GET['act']);
-      if (preg_match('/^SORT_([0-9]+)$/', $key, $match)) {
-        // Switch to new column or invert search order?
-        $column= $match[1];
-        if ($this->sortColumn != $column) {
-          $this->sortColumn= $column;
-        } else {
-          $this->sortDirection[$column]= !$this->sortDirection[$column];
-        }
+      // Filter GET with "act" attributes
+      if (isset($_GET['act'])) {
+        $key= validate($_GET['act']);
+        if (preg_match('/^SORT_([0-9]+)$/', $key, $match)) {
+          // Switch to new column or invert search order?
+          $column= $match[1];
+          if ($this->sortColumn != $column) {
+            $this->sortColumn= $column;
+          } else {
+            $this->sortDirection[$column]= !$this->sortDirection[$column];
+          }
 
-        // Allow header to update itself according to the new sort settings
-        $this->renderHeader();
+          // Allow header to update itself according to the new sort settings
+          $this->renderHeader();
+        }
       }
-    }
 
-    // Override base if we got signals from the navigation elements
-    $action= "";
-    foreach ($_POST as $key => $value) {
-      if (preg_match('/^(ROOT|BACK|HOME)_x$/', $key, $match)) {
-        $action= $match[1];
-        break;
+      // Override base if we got signals from the navigation elements
+      $action= "";
+      foreach ($_POST as $key => $value) {
+        if (preg_match('/^(ROOT|BACK|HOME)_x$/', $key, $match)) {
+          $action= $match[1];
+          break;
+        }
       }
-    }
 
-    // Navigation handling
-    if ($action == 'ROOT') {
-      $deps= $ui->get_module_departments($this->categories);
-      $this->base= $deps[0];
-    }
-    if ($action == 'BACK') {
-      $deps= $ui->get_module_departments($this->categories);
-      $base= preg_replace("/^[^,]+,/", "", $this->base);
-      if(in_array_ics($base, $deps)){
-        $this->base= $base;
+      // Navigation handling
+      if ($action == 'ROOT') {
+        $deps= $ui->get_module_departments($this->categories);
+        $this->base= $deps[0];
+        $this->baseSelector->setBase($this->base);
+        session::global_set("CurrentMainBase", $this->base);
+      }
+      if ($action == 'BACK') {
+        $deps= $ui->get_module_departments($this->categories);
+        $base= preg_replace("/^[^,]+,/", "", $this->base);
+        if(in_array_ics($base, $deps)){
+          $this->base= $base;
+          $this->baseSelector->setBase($this->base);
+          session::global_set("CurrentMainBase", $this->base);
+        }
+      }
+      if ($action == 'HOME') {
+        $ui= get_userinfo();
+        $this->base= get_base_from_people($ui->dn);
+        $this->baseSelector->setBase($this->base);
+        session::global_set("CurrentMainBase", $this->base);
       }
-    }
-    if ($action == 'HOME') {
-      $ui= get_userinfo();
-      $this->base= $this->filter->getObjectBase($ui->dn);
     }
 
     // Reload departments
@@ -571,12 +583,20 @@ class listing {
     // Update filter and refresh entries
     $this->filter->setBase($this->base);
     $this->entries= $this->filter->query();
+
+    // Fix filter if querie returns NULL
+    if ($this->entries == null) {
+      $this->entries= array();
+    }
   }
 
 
   function setBase($base)
   {
     $this->base= $base;
+    if ($this->baseMode) {
+      $this->baseSelector->setBase($this->base);
+    }
   }
 
 
@@ -591,12 +611,12 @@ class listing {
     $result= array();
     $layout= preg_replace("/^\|/", "", $layout);
     $layout= preg_replace("/\|$/", "", $layout);
-    $cols= split("\|", $layout);
+    $cols= explode("|", $layout);
 
     foreach ($cols as $index => $config) {
       if ($config != "") {
         $res= "";
-        $components= split(';', $config);
+        $components= explode(';', $config);
         foreach ($components as $part) {
           if (preg_match("/^r$/", $part)) {
             $res.= "text-align:right;";
@@ -621,15 +641,18 @@ class listing {
           $res.= "min-width:200px;";
         }
 
-        $result[$index]= " style='$res' ";
+        $result[$index]= " style='$res'";
       } else {
-        $result[$index]= " style='min-width:100px'";
+        $result[$index]= " style='min-width:100px;'";
       }
     }
 
     // Save number of columns for later use
     $this->numColumns= count($cols);
 
+    // Add no border to the last column
+    $result[$this->numColumns-1]= preg_replace("/'$/", "border-right:0;'", $result[$this->numColumns-1]);
+
     return $result;
   }
 
@@ -665,35 +688,7 @@ class listing {
       return;
     }
 
-    $result= "<select name='BASE' onChange='mainform.submit()' size='1'>";
-    $firstDN= null;
-    $found= false;
-
-    foreach ($this->bases as $key=>$value) {
-      // Keep first entry to fall back eventually
-      if(!$firstDN) {
-        $firstDN= $key;
-      }
-
-      // Prepare to render entry
-      $selected= "";
-      if ($key == $this->base) {
-        $selected= " selected";
-        $found= true;
-      }
-      $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
-    // was no match.
-    if(!$found){
-      $this->base = $firstDN;
-    }
-
-    return $result;
+    return $this->baseSelector->render();
   }
 
 
@@ -847,7 +842,7 @@ class listing {
 
       // 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']);
+        list($fa, $fv)= explode('=', $action['filter']);
         if (preg_match('/^(.*)!$/', $fa, $m)){
           $fa= $m[1];
           if (isset($this->entries[$row][$fa]) && $this->entries[$row][$fa][0] == $fv) {
@@ -979,7 +974,7 @@ class listing {
     $listhead ="";
 
     /* Check if we are in users home  department */
-    if(!count($deps) || $this->filter->base == $this->filter->getObjectBase($ui->dn)){
+    if(!count($deps) || $this->filter->base == get_base_from_people($ui->dn)){
       $enableHome = false;
     }
 
@@ -1243,7 +1238,7 @@ class listing {
         // match "users/user[userPassword:rw(,...)*]" style entries
         if (preg_match('/^([a-zA-Z0-9]+\/[a-zA-Z0-9]+)\[([a-zA-Z0-9]+:[rwcdm]+(,[a-zA-Z0-9]+:[rwcdm]+)*)\]$/', $acl, $match)){
           $module= $match[1];
-          $aclList= split(',', $match[2]);
+          $aclList= explode(',', $match[2]);
         }
 
         // Walk thru prepared ACL by using $module
@@ -1295,6 +1290,11 @@ class listing {
     foreach($k_ids as $department){
       $this->bases[$department] = $ids[$department];
     }
+
+    // Populate base selector if already present
+    if ($this->baseSelector && $this->baseMode) {
+      $this->baseSelector->setBases($this->bases);
+    }
   }
 
 
@@ -1553,6 +1553,12 @@ class listing {
   }
 
 
+  function getEntries()
+  {
+    return $this->entries;
+  }
+
+
   function getType($dn)
   {
     if (isset($this->objectDnMapping[$dn])) {