From b889edb33e4a09cc1f65d2fb9ad9f9ea16b1eae9 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 04 Sep 2012 11:42:42 -0400
Subject: [PATCH] - Ported changes from Apache plugin to nginx plugin. - Fixed errors in system.inc.php-
---
interface/web/admin/form/server_ip.tform.php | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/interface/web/admin/form/server_ip.tform.php b/interface/web/admin/form/server_ip.tform.php
index 2832efb..b47417c 100644
--- a/interface/web/admin/form/server_ip.tform.php
+++ b/interface/web/admin/form/server_ip.tform.php
@@ -55,6 +55,11 @@
Hinweis:
Das ID-Feld ist nicht bei den Table Values einzuf�gen.
+
+ Search:
+ - searchable = 1 or searchable = 2 include the field in the search
+ - searchable = 1: this field will be the title of the search result
+ - searchable = 2: this field will be included in the description of the search result
*/
@@ -100,9 +105,9 @@
'formtype' => 'SELECT',
'default' => '',
'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT client_id,contact_name FROM client WHERE {AUTHSQL} ORDER BY contact_name',
+ 'querystring' => "SELECT client_id,CONCAT(contact_name,' :: ',username) as name FROM client WHERE {AUTHSQL} ORDER BY contact_name",
'keyfield'=> 'client_id',
- 'valuefield'=> 'contact_name'
+ 'valuefield'=> 'name'
),
'value' => array(0 => ' ')
),
@@ -110,7 +115,8 @@
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => '',
- 'value' => array('IPv4' => 'IPv4', 'IPv6' => 'IPv6')
+ 'value' => array('IPv4' => 'IPv4', 'IPv6' => 'IPv6'),
+ 'searchable' => 2
),
'ip_address' => array (
'datatype' => 'VARCHAR',
@@ -126,7 +132,8 @@
'width' => '15',
'maxlength' => '15',
'rows' => '',
- 'cols' => ''
+ 'cols' => '',
+ 'searchable' => 1
),
'virtualhost' => array (
'datatype' => 'VARCHAR',
@@ -137,7 +144,11 @@
'virtualhost_port' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
- 'default' => '',
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex' => '/^([0-9]{1,5}\,{0,1}){1,}$/i',
+ 'errmsg'=> 'error_port_syntax'),
+ ),
+ 'default' => '80,443',
'value' => '',
'separator' => '',
'width' => '15',
--
Gitblit v1.9.1