From 25ece9c51091bf98f06a4578deb2175e6dfb1112 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 22 Feb 2007 07:39:22 -0500
Subject: [PATCH] Updated several base libraries and added advanced search functionality.

---
 interface/lib/classes/plugin_listview.inc.php |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/interface/lib/classes/plugin_listview.inc.php b/interface/lib/classes/plugin_listview.inc.php
index fe57834..32fe301 100644
--- a/interface/lib/classes/plugin_listview.inc.php
+++ b/interface/lib/classes/plugin_listview.inc.php
@@ -20,10 +20,13 @@
 
                 $listTpl = new tpl;
                 $listTpl->newTemplate('templates/'.$app->listform->listDef["name"].'_list.htm');
+				
+				//die(print_r($app->tform_actions));
 
                 // Changing some of the list values to reflect that the list is called within a tform page
                 $app->listform->listDef["file"] = $app->tform->formDef["action"];
-                $app->listform->listDef["page_params"] = "&id=".$app->tform_actions->id."&next_tab=".$_SESSION["s"]["form"]["tab"];
+                // $app->listform->listDef["page_params"] = "&id=".$app->tform_actions->id."&next_tab=".$_SESSION["s"]["form"]["tab"];
+				$app->listform->listDef["page_params"] = "&id=".$_REQUEST["id"]."&next_tab=".$_SESSION["s"]["form"]["tab"];
 
 
                 // Generate the SQL for searching
@@ -45,6 +48,8 @@
                 // Generate SQL for paging
                 $limit_sql = $app->listform->getPagingSQL($sql_where);
                 $listTpl->setVar("paging",$app->listform->pagingHTML);
+				
+				
 
                 // Get the data
                 $records = $app->db->queryAllRecords("SELECT * FROM ".$app->listform->listDef["table"]." WHERE $sql_where $limit_sql");
@@ -59,6 +64,14 @@
                                 // Change of color
                                 $bgcolor = ($bgcolor == "#FFFFFF")?"#EEEEEE":"#FFFFFF";
                                 $rec["bgcolor"] = $bgcolor;
+								
+								// substitute value for select fields
+								foreach($app->listform->listDef["item"] as $field) {
+									$key = $field["field"];
+									if($field['formtype'] == "SELECT") {
+										$rec[$key] = $field['value'][$rec[$key]];
+									}
+								}
 
                                 // The variable "id" contains always the index field
                                 $rec["id"] = $rec[$idx_key];

--
Gitblit v1.9.1