X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_sortableListing.inc;h=79bc25e7ab45bb4821db12350d818bef09f4e473;hb=652bb3908381dd238ce5bc023203ec8d67ae7bff;hp=cca0df230be90c75999faed364fbac86bfc91fed;hpb=ab8c38b9c4a96542203b64b307d9a7b80dc2534a;p=gosa.git
diff --git a/gosa-core/include/class_sortableListing.inc b/gosa-core/include/class_sortableListing.inc
index cca0df230..79bc25e7a 100644
--- 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($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)
{
@@ -95,7 +122,7 @@ class sortableListing {
private function setDisplayData($data)
{
if (!is_array($data)) {
- die ("sortableList needs an array as data!");
+ trigger_error ("sortableList needs an array as data!");
}
// Transfer information
@@ -127,7 +154,9 @@ class sortableListing {
// Preset sort orders to 'down'
for ($column= 0; $column<$this->columns; $column++) {
- $this->sortDirection[]= true;
+ if(!isset($this->sortDirection[$column])){
+ $this->sortDirection[$column]= true;
+ }
}
}
@@ -203,7 +232,7 @@ class sortableListing {
}
// Do we need colspecs?
- $action_width= ($this->editable?20:0) + ($this->deleteable?20:0);
+ $action_width= ($this->editable?30:0) + ($this->deleteable?30:0);
if ($this->colspecs) {
$result.= "
\n";
for ($i= 0; $i<$this->columns; $i++) {
@@ -229,7 +258,7 @@ class sortableListing {
$link= "href='?plug=".$_GET['plug']."&PID=".$this->id."&act=SORT_$i'";
$sorter= "";
if ($i == $this->sortColumn){
- $sorter= " ".image("images/lists/sort-".($this->sortDirection[$i]?"up":"down").".png", null, $this->sortDirection[$i]?_("Up"):_("Down"));
+ $sorter= " ".image("images/lists/sort-".($this->sortDirection[$i]?"up":"down").".png", null, $this->sortDirection[$i]?_("Sort ascending"):_("Sort descending"));
}
if ($this->reorderable) {
@@ -269,8 +298,14 @@ class sortableListing {
$first= " style='border:0'";
foreach ($this->displayData[$row] as $column) {
- $result.= "
".$column."
\n";
- $first= "";
+
+ // Do NOT use the onClick statement for columns that contain links or buttons.
+ if(preg_match("<.*type=.submit..*>", $column) || preg_match("", $column)){
+ $result.= "
".$column."
\n";
+ }else{
+ $result.= "
".$column."
\n";
+ }
+ $first= "";
}
if ($action_width) {
@@ -291,7 +326,7 @@ class sortableListing {
$result.= "\n";
$result.= " \n\n\n";
- $result.= " \n";
+# $result.= " \n";
$result.= " \n";
$result.= " \n";
@@ -317,26 +352,27 @@ 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 && 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];
- }
+ if (!$this->reorderable){
+ 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) {
+ $this->sortColumn= $column;
+ } else {
+ $this->sortDirection[$column]= !$this->sortDirection[$column];
+ }
- // Update mapping according to sort parameters
- $this->sortData();
+ }
}
+
+ // Update mapping according to sort parameters
+ $this->sortData();
}
}
@@ -344,7 +380,7 @@ class sortableListing {
public function save_object()
{
// 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) {
+ if(isset($_REQUEST['PID']) && $_REQUEST['PID'] != $this->id) {
return;
}
@@ -470,6 +506,8 @@ class sortableListing {
public function sortData()
{
+ if(!count($this->data)) return;
+
// Extract data
$tmp= array();
foreach($this->displayData as $item) {
@@ -525,6 +563,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();
}
@@ -534,4 +589,8 @@ class sortableListing {
return isset($this->keys[$index])?$this->keys[$index]:null;
}
+ public function getData($index) {
+ $realkey = $this->keys[$index];
+ return($this->data[$realkey]);
+ }
}