From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/admin/list/server_ip.list.php | 137 ++++++++++++++++++++++++++++-----------------
1 files changed, 86 insertions(+), 51 deletions(-)
diff --git a/interface/web/admin/list/server_ip.list.php b/interface/web/admin/list/server_ip.list.php
index e8a1148..3812080 100644
--- a/interface/web/admin/list/server_ip.list.php
+++ b/interface/web/admin/list/server_ip.list.php
@@ -1,73 +1,108 @@
-<?php
-
+<?php
/*
- Datentypen:
- - INTEGER (Wandelt Ausdr�cke in Int um)
- - DOUBLE
- - CURRENCY (Formatiert Zahlen nach W�hrungsnotation)
- - VARCHAR (kein weiterer Format Check)
- - TEXT (kein weiterer Format Check)
- - DATE (Datumsformat, Timestamp Umwandlung)
+ Datatypes:
+ - INTEGER
+ - DOUBLE
+ - CURRENCY
+ - VARCHAR
+ - TEXT
+ - DATE
*/
+//* Name of list
+$liste['name'] = 'server_ip';
+//* Database table
+$liste['table'] = 'server_ip';
-// Name der Liste
-$liste["name"] = "server_ip";
+//* Primary index column
+$liste['table_idx'] = 'server_ip_id';
-// Datenbank Tabelle
-$liste["table"] = "server_ip";
+//* Search Field Prefix
+$liste['search_prefix'] = 'search_';
-// Index Feld der datenbank
-$liste["table_idx"] = "server_ip_id";
+//* Records per page
+$liste['records_per_page'] = "15";
-// Search Field Prefix
-$liste["search_prefix"] = "search_";
+//* Script file for listing
+$liste['file'] = 'server_ip_list.php';
-// Eintr�ge pro Seite
-$liste["records_per_page"] = 15;
+//* Script file to edit
+$liste['edit_file'] = 'server_ip_edit.php';
-// Script File der Liste
-$liste["file"] = "server_ip_list.php";
+//* Script file to delete
+$liste['delete_file'] = 'server_ip_del.php';
-// Script File der Liste
-$liste["edit_file"] = "server_ip_edit.php";
+//* Paging template
+$liste['paging_tpl'] = 'templates/paging.tpl.htm';
-// Script File der Liste
-$liste["delete_file"] = "server_ip_del.php";
-
-// Paging Template
-$liste["paging_tpl"] = "templates/paging.tpl.htm";
-
-// Script File der Liste
-$liste["auth"] = "no";
+//* Enable auth
+$liste['auth'] = 'no';
/*****************************************************
* Suchfelder
*****************************************************/
-$liste["item"][] = array( 'field' => "server_id",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
- 'keyfield'=> 'server_id',
- 'valuefield'=> 'server_name'
- ),
- 'width' => "",
- 'value' => "");
+$liste['item'][] = array( 'field' => 'server_id',
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'op' => '=',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
+ 'keyfield'=> 'server_id',
+ 'valuefield'=> 'server_name'
+ ),
+ 'width' => '',
+ 'value' => '');
-$liste["item"][] = array( 'field' => "ip_address",
- 'datatype' => "VARCHAR",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'width' => "");
+$liste['item'][] = array( 'field' => 'client_id',
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'op' => '=',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT client_id,contact_name FROM client WHERE {AUTHSQL} ORDER BY contact_name',
+ 'keyfield'=> 'client_id',
+ 'valuefield'=> 'contact_name'
+ ),
+ 'width' => '',
+ 'value' => '');
+
+$liste['item'][] = array( 'field' => 'ip_type',
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'op' => '=',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'width' => '',
+ 'value' => array('IPv4' => 'IPv4', 'IPv6' => 'IPv6'));
+
+$liste['item'][] = array( 'field' => 'ip_address',
+ 'datatype' => 'VARCHAR',
+ 'op' => '=',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'width' => '');
+
+$liste["item"][] = array( 'field' => "virtualhost",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "SELECT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'width' => "",
+ 'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>".$app->lng('yes_txt')."</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>".$app->lng('no_txt')."</span></div>"));
+$liste['item'][] = array( 'field' => 'virtualhost_port',
+ 'datatype' => 'VARCHAR',
+ 'op' => '=',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'width' => '');
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1