From 8fab6e9cfa7f96b6994e0fea436ff59e048dbffd Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 23 Nov 2005 11:26:46 -0500
Subject: [PATCH] Added Domain relay and exim4 config
---
interface/lib/classes/listform_actions.inc.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index 0df5391..c76a23c 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -99,11 +99,15 @@
// 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);
--
Gitblit v1.9.1