From daff5cb75bce6d6b0cbed092c3b807bb04fade9b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 31 May 2007 11:15:12 -0400
Subject: [PATCH] diverse updates.
---
interface/lib/classes/listform_actions.inc.php | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index 0df5391..519d661 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -41,12 +41,17 @@
var $idx_key;
var $DataRowColor;
var $SQLExtWhere = '';
+ var $SQLOrderBy = '';
function onLoad() {
global $app, $conf, $list_def_file;
if(!is_object($app->tpl)) $app->uses('tpl');
if(!is_object($app->listform)) $app->uses('listform');
+ if(!is_object($app->tform)) $app->uses('tform');
+
+ // Clear session variable that is used when lists are embedded with the listview plugin
+ $_SESSION["s"]["form"]["return_to"] = '';
// Load list definition
$app->listform->loadListDef($list_def_file);
@@ -56,7 +61,7 @@
$app->listform_tpl_generator->buildHTML($app->listform->listDef);
}
- $app->tpl->newTemplate("form.tpl.htm");
+ $app->tpl->newTemplate("listpage.tpl.htm");
$app->tpl->setInclude('content_tpl','templates/'.$app->listform->listDef["name"].'_list.htm');
// Getting Datasets from DB
@@ -87,6 +92,14 @@
$this->DataRowColor = ($this->DataRowColor == "#FFFFFF")?"#EEEEEE":"#FFFFFF";
$rec["bgcolor"] = $this->DataRowColor;
+ // 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 variable
$rec["id"] = $rec[$this->idx_key];
@@ -99,20 +112,26 @@
// Generate the search sql
if($app->listform->listDef["auth"] != 'no') {
if($_SESSION["s"]["user"]["typ"] == "admin") {
- $sql_where = $this->SQLExtWhere;
+ $sql_where = "";
} else {
- $sql_where = $this->SQLExtWhere ." ". $app->tform->getAuthSQL('r')." and";
+ $sql_where = $app->tform->getAuthSQL('r')." and";
}
+ }
+
+ if($this->SQLExtWhere != '') {
+ $sql_where .= " ".$this->SQLExtWhere." and";
}
$sql_where = $app->listform->getSearchSQL($sql_where);
$app->tpl->setVar($app->listform->searchValues);
+
+ $order_by_sql = $this->SQLOrderBy;
// Generate SQL for paging
$limit_sql = $app->listform->getPagingSQL($sql_where);
$app->tpl->setVar("paging",$app->listform->pagingHTML);
- return "SELECT * FROM ".$app->listform->listDef["table"]." WHERE $sql_where $limit_sql";
+ return "SELECT * FROM ".$app->listform->listDef["table"]." WHERE $sql_where $order_by_sql $limit_sql";
}
--
Gitblit v1.9.1