From efdf0c903b27945c4cf57c628005ffc3a5263a93 Mon Sep 17 00:00:00 2001 From: cajus Date: Thu, 10 Sep 2009 07:18:25 +0000 Subject: [PATCH] Sort exported lists, too git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14222 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/include/class_listing.inc | 7 ++++++- gosa-core/include/class_pluglist.inc | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc index 4ec646bdd..315226131 100644 --- a/gosa-core/include/class_listing.inc +++ b/gosa-core/include/class_listing.inc @@ -467,7 +467,12 @@ class listing { 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'); - $instance= new $exporter['class']($this->headline.$userinfo, $this->plainHeader, $this->entries, $this->exportColumns); + $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']); diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc index 0bed2a8a7..9789a5776 100644 --- a/gosa-core/include/class_pluglist.inc +++ b/gosa-core/include/class_pluglist.inc @@ -31,8 +31,8 @@ class pluglist { var $current= ""; var $info= array(); var $headlines = array(); - var $allowed_plugins = array(); - var $silly_cache= array(); + var $allowed_plugins = array(); + var $silly_cache= array(); function pluglist(&$config, &$ui) { -- 2.30.2