From 7d6ec3d7c30e64d37dedd4ace570a97c1fd2149b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 22 Jun 2010 10:20:03 +0000
Subject: [PATCH] Implemented: FS#479 - Which domains belong to which Client
---
interface/web/mail/list/mail_domain.list.php | 22 ++++++++++++-
interface/web/sites/list/database.list.php | 22 ++++++++++++-
interface/web/sites/list/web_domain.list.php | 31 +++++++++++++++----
.../web/sites/templates/web_domain_list.htm | 2 +-
4 files changed, 68 insertions(+), 9 deletions(-)
diff --git a/interface/web/mail/list/mail_domain.list.php b/interface/web/mail/list/mail_domain.list.php
index 2476b067f0..b6e4ae4286 100644
--- a/interface/web/mail/list/mail_domain.list.php
+++ b/interface/web/mail/list/mail_domain.list.php
@@ -13,7 +13,11 @@
// Name of the list
-$liste["name"] = "mail_domain";
+if($_SESSION['s']['user']['typ'] == 'admin') {
+ $liste["name"] = "mail_domain_admin";
+} else {
+ $liste["name"] = "mail_domain";
+}
// Database table
$liste["table"] = "mail_domain";
@@ -58,6 +62,22 @@ $liste["item"][] = array( 'field' => "active",
'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
+if($_SESSION['s']['user']['typ'] == 'admin') {
+$liste["item"][] = array( 'field' => "sys_groupid",
+ 'datatype' => "INTEGER",
+ 'formtype' => "SELECT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
+ 'keyfield'=> 'groupid',
+ 'valuefield'=> 'name'
+ ),
+ 'width' => "",
+ 'value' => "");
+}
+
$liste["item"][] = array( 'field' => "server_id",
'datatype' => "VARCHAR",
diff --git a/interface/web/sites/list/database.list.php b/interface/web/sites/list/database.list.php
index 2fce7631a4..68b4b960b7 100644
--- a/interface/web/sites/list/database.list.php
+++ b/interface/web/sites/list/database.list.php
@@ -13,7 +13,11 @@
// Name of the list
-$liste["name"] = "database";
+if($_SESSION['s']['user']['typ'] == 'admin') {
+ $liste["name"] = "database_admin";
+} else {
+ $liste["name"] = "database";
+}
// Database table
$liste["table"] = "web_database";
@@ -66,6 +70,22 @@ $liste["item"][] = array( 'field' => "remote_access",
'width' => "",
'value' => array('y' => "Yes",'n' => "No"));
+if($_SESSION['s']['user']['typ'] == 'admin') {
+$liste["item"][] = array( 'field' => "sys_groupid",
+ 'datatype' => "INTEGER",
+ 'formtype' => "SELECT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
+ 'keyfield'=> 'groupid',
+ 'valuefield'=> 'name'
+ ),
+ 'width' => "",
+ 'value' => "");
+}
+
$liste["item"][] = array( 'field' => "server_id",
'datatype' => "VARCHAR",
'formtype' => "SELECT",
diff --git a/interface/web/sites/list/web_domain.list.php b/interface/web/sites/list/web_domain.list.php
index 271c8354ae..c55ee58362 100644
--- a/interface/web/sites/list/web_domain.list.php
+++ b/interface/web/sites/list/web_domain.list.php
@@ -13,7 +13,11 @@
// Name of the list
-$liste["name"] = "web_domain";
+if($_SESSION['s']['user']['typ'] == 'admin') {
+ $liste["name"] = "web_domain_admin";
+} else {
+ $liste["name"] = "web_domain";
+}
// Database table
$liste["table"] = "web_domain";
@@ -66,13 +70,28 @@ $liste["item"][] = array( 'field' => "active",
'width' => "",
'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>",'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
-
+if($_SESSION['s']['user']['typ'] == 'admin') {
+$liste["item"][] = array( 'field' => "sys_groupid",
+ 'datatype' => "INTEGER",
+ 'formtype' => "SELECT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
+ 'keyfield'=> 'groupid',
+ 'valuefield'=> 'name'
+ ),
+ 'width' => "",
+ 'value' => "");
+}
+
$liste["item"][] = array( 'field' => "server_id",
- 'datatype' => "VARCHAR",
+ 'datatype' => "INTEGER",
'formtype' => "SELECT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT a.server_id, a.server_name FROM server a, web_domain b WHERE (a.server_id = b.server_id) AND ({AUTHSQL-B}) ORDER BY a.server_name',
'keyfield'=> 'server_id',
diff --git a/interface/web/sites/templates/web_domain_list.htm b/interface/web/sites/templates/web_domain_list.htm
index e96df5b2a4..e887f63082 100644
--- a/interface/web/sites/templates/web_domain_list.htm
+++ b/interface/web/sites/templates/web_domain_list.htm
@@ -25,7 +25,7 @@
<th class="tbl_col_buttons" scope="col"> </th>
</tr>
<tr>
- <td class="tbl_col_domain_id"><input type="text" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td>
+ <td class="tbl_col_domain_id"><input type="text" size="5" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td>
<td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_active'}</select></td>
<td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_server_id'}</select></td>
<td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
--
GitLab