Added function to disable/enable reorder options

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

diff --git a/gosa-core/include/class_sortableListing.inc b/gosa-core/include/class_sortableListing.inc
index 3cd08a5baf9750c65c8b10dd62d5a219b18ad662..3c8ad5917ed60483c2db3459f5df196eaba053d4 100644 (file)
--- a/gosa-core/include/class_sortableListing.inc
+++ b/gosa-core/include/class_sortableListing.inc
@@ -60,9 +60,27 @@ class sortableListing {
     // Save data to display
     $this->setListData($data, $displayData);
 
+    // Get list of used IDs 
+    if(!session::is_set('sortableListing_USED_IDS')){
+        session::set('sortableListing_USED_IDS',array());
+    }
+    $usedIds = session::get('sortableListing_USED_IDS');
+
     // Generate instance wide unique ID
-    $tmp= gettimeofday();
-    $this->id= 'l'.md5(microtime().$tmp['sec']);
+    $id = "";
+    while($id == "" || in_array($id, $usedIds)){
+
+        // Wait 1 msec to ensure that we definately get a new id
+        if($id != "") usleep(1);
+        $tmp= gettimeofday();
+        $id =  'l'.md5(microtime().$tmp['sec']);
+    }
+
+    // Only keep the last 10 list IDsi
+    $usedIds = array_slice($usedIds, count($usedIds) -10, 10);
+    $usedIds[] = $id;
+    session::set('sortableListing_USED_IDS',$usedIds);
+    $this->id = $id;
 
     // Set reorderable flag
     $this->reorderable= $reorderable;
@@ -71,6 +89,15 @@ class sortableListing {
     }
   }
 
+  public function setReorderable($bool)
+  {
+    $this->reorderable= $bool;
+  }
+   
+  public function setDefaultSortColumn($id)
+  {
+    $this->sortColumn = $id;
+  }
 
   public function setListData($data, $displayData= null)
   {
@@ -319,16 +346,14 @@ class sortableListing {
 
   public function update()
   {
-    // Do not do anything if this is not our PID, or there's even no PID available...
-    if(isset($_REQUEST['PID']) && $_REQUEST['PID'] != $this->id) {
-      return;
-    }
 
     // Filter GET with "act" attributes
     if (!$this->reorderable){
-      if(isset($_GET['act'])) {
+      if(isset($_GET['act']) && isset($_GET['PID']) && $this->id == $_GET['PID']) {
+    
         $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) {
@@ -339,7 +364,7 @@ class sortableListing {
 
         }
       }
-
+  
       // Update mapping according to sort parameters
       $this->sortData();
     }
@@ -475,6 +500,8 @@ class sortableListing {
 
   public function sortData()
   {
+    if(!count($this->data)) return;
+
     // Extract data
     $tmp= array();
     foreach($this->displayData as $item) {
@@ -530,6 +557,23 @@ class sortableListing {
     $this->mapping[]= count($this->mapping);
     $this->modified= true;
 
+    // Find the number of coluns
+    reset($this->displayData);
+    $first= current($this->displayData);
+    if (is_array($first)) {
+        $this->columns= count($first);
+    } else {
+        $this->columns= 1;
+    }
+
+    // Preset sort orders to 'down'
+    for ($column= 0; $column<$this->columns; $column++) {
+        if(!isset($this->sortDirection[$column])){
+            $this->sortDirection[$column]= true;
+        }
+    }
+
+
     // Sort data after we've added stuff
     $this->sortData();
   }