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/vm/list/openvz_vm.list.php | 176 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/interface/web/vm/list/openvz_vm.list.php b/interface/web/vm/list/openvz_vm.list.php
index 016165b..51e23b3 100644
--- a/interface/web/vm/list/openvz_vm.list.php
+++ b/interface/web/vm/list/openvz_vm.list.php
@@ -13,120 +13,120 @@
// Name of the list
-$liste["name"] = "openvz_vm";
+$liste["name"] = "openvz_vm";
// Database table
-$liste["table"] = "openvz_vm";
+$liste["table"] = "openvz_vm";
// Index index field of the database table
-$liste["table_idx"] = "vm_id";
+$liste["table_idx"] = "vm_id";
// Search Field Prefix
-$liste["search_prefix"] = "search_";
+$liste["search_prefix"] = "search_";
// Records per page
-$liste["records_per_page"] = 15;
+$liste["records_per_page"] = 15;
// Script File of the list
-$liste["file"] = "openvz_vm_list.php";
+$liste["file"] = "openvz_vm_list.php";
// Script file of the edit form
-$liste["edit_file"] = "openvz_vm_edit.php";
+$liste["edit_file"] = "openvz_vm_edit.php";
// Script File of the delete script
-$liste["delete_file"] = "openvz_vm_del.php";
+$liste["delete_file"] = "openvz_vm_del.php";
// Paging Template
-$liste["paging_tpl"] = "templates/paging.tpl.htm";
+$liste["paging_tpl"] = "templates/paging.tpl.htm";
// Enable authe
-$liste["auth"] = "yes";
+$liste["auth"] = "yes";
/*****************************************************
* Suchfelder
*****************************************************/
-$liste["item"][] = array( 'field' => "active",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- '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>"));
+$liste["item"][] = array( 'field' => "active",
+ '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' => "veid",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "==",
- 'prefix' => "",
- 'suffix' => "",
- 'width' => "",
- 'value' => "");
-
-$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 vserver_server = 1 ORDER BY server_name',
- 'keyfield'=> 'server_id',
- 'valuefield'=> 'server_name'
- ),
- 'width' => "",
- 'value' => "");
+$liste["item"][] = array( 'field' => "veid",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'width' => "",
+ 'value' => "");
-$liste["item"][] = array( 'field' => "ostemplate_id",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "like",
- 'prefix' => "",
- 'suffix' => "",
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT ostemplate_id,template_name FROM openvz_ostemplate WHERE {AUTHSQL} ORDER BY template_name',
- 'keyfield'=> 'ostemplate_id',
- 'valuefield'=> 'template_name'
- ),
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "template_id",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "like",
- 'prefix' => "",
- 'suffix' => "",
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT template_id,template_name FROM openvz_template WHERE {AUTHSQL} ORDER BY template_name',
- 'keyfield'=> 'template_id',
- 'valuefield'=> 'template_name'
- ),
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "hostname",
- 'datatype' => "VARCHAR",
- 'filters' => array( 0 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8')
- ),
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
+$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 vserver_server = 1 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",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
+$liste["item"][] = array( 'field' => "ostemplate_id",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "SELECT",
+ 'op' => "like",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT ostemplate_id,template_name FROM openvz_ostemplate WHERE {AUTHSQL} ORDER BY template_name',
+ 'keyfield'=> 'ostemplate_id',
+ 'valuefield'=> 'template_name'
+ ),
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "template_id",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "SELECT",
+ 'op' => "like",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT template_id,template_name FROM openvz_template WHERE {AUTHSQL} ORDER BY template_name',
+ 'keyfield'=> 'template_id',
+ 'valuefield'=> 'template_name'
+ ),
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "hostname",
+ 'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "ip_address",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1