From 222ea214ffc25abac78e9d520ef34865280a0bab Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Tue, 17 Jul 2012 08:33:47 +0000
Subject: [PATCH] standard sorting by main characteristic for most lists
---
interface/web/client/client_edit.php | 2 +-
interface/web/client/client_template_list.php | 1 +
interface/web/client/form/client.tform.php | 57 +++++----
interface/web/client/list/client.list.php | 119 +++++++++---------
interface/web/client/list/reseller.list.php | 101 ++++++++-------
.../web/client/templates/clients_list.htm | 2 +-
.../web/client/templates/resellers_list.htm | 2 +-
interface/web/dns/dns_template_list.php | 1 +
interface/web/dns/dns_wizard.php | 2 +-
interface/web/dns/list/dns_slave.list.php | 98 +++++++--------
interface/web/dns/list/dns_template.list.php | 58 ++++-----
interface/web/domain/domain_list.php | 1 +
interface/web/mail/mail_domain_list.php | 1 +
interface/web/sites/database_list.php | 1 +
interface/web/sites/ftp_user_list.php | 1 +
interface/web/sites/shell_user_list.php | 1 +
interface/web/sites/user_quota_stats.php | 2 +-
interface/web/sites/web_aliasdomain_list.php | 2 +-
interface/web/sites/web_domain_list.php | 2 +-
interface/web/sites/web_sites_stats.php | 2 +-
interface/web/sites/web_subdomain_list.php | 2 +-
interface/web/sites/webdav_user_list.php | 2 +-
interface/web/vm/openvz_ip_list.php | 2 +-
23 files changed, 226 insertions(+), 236 deletions(-)
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 76616fc26f..fd760af139 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -101,7 +101,7 @@ class page_action extends tform_actions {
global $app;
- $sql = "SELECT template_id,template_name FROM client_template WHERE template_type = 'a'";
+ $sql = "SELECT template_id,template_name FROM client_template WHERE template_type = 'a' ORDER BY template_name ASC";
$tpls = $app->db->queryAllRecords($sql);
$option = '';
$tpl = array();
diff --git a/interface/web/client/client_template_list.php b/interface/web/client/client_template_list.php
index da316a75d8..f0d1752850 100644
--- a/interface/web/client/client_template_list.php
+++ b/interface/web/client/client_template_list.php
@@ -44,5 +44,6 @@ $app->auth->check_module_permissions('client');
if(!$_SESSION["s"]["user"]["typ"] == 'admin') die('Client-Templates are only for Admins.');
$app->uses('listform_actions');
+$app->listform_actions->SQLOrderBy = 'ORDER BY template_name';
$app->listform_actions->onLoad();
?>
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index d29a54c8df..8a76281bba 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -38,16 +38,16 @@
*/
-$form["title"] = "Client";
-$form["description"] = "";
-$form["name"] = "client";
-$form["action"] = "client_edit.php";
-$form["db_table"] = "client";
+$form["title"] = "Client";
+$form["description"] = "";
+$form["name"] = "client";
+$form["action"] = "client_edit.php";
+$form["db_table"] = "client";
$form["db_table_idx"] = "client_id";
-$form["db_history"] = "yes";
+$form["db_history"] = "yes";
$form["tab_default"] = "address";
$form["list_default"] = "client_list.php";
-$form["auth"] = 'yes';
+$form["auth"] = 'yes';
$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
@@ -101,9 +101,9 @@ $form["tabs"]['address'] = array (
'contact_name' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'contact_error_empty'),
- ),
+ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'contact_error_empty'),
+ ),
'default' => '',
'value' => '',
'separator' => '',
@@ -129,19 +129,19 @@ $form["tabs"]['address'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'username_error_empty'),
- 1 => array ( 'type' => 'CUSTOM',
- 'class' => 'validate_client',
- 'function' => 'username_unique',
- 'errmsg'=> 'username_error_unique'),
- 2 => array ( 'type' => 'CUSTOM',
- 'class' => 'validate_client',
- 'function' => 'username_collision',
- 'errmsg'=> 'username_error_collision'),
- 3 => array ( 'type' => 'REGEX',
- 'regex' => '/^[\w\.\-\_]{0,64}$/',
- 'errmsg'=> 'username_error_regex'),
- ),
+ 'errmsg'=> 'username_error_empty'),
+ 1 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_client',
+ 'function' => 'username_unique',
+ 'errmsg'=> 'username_error_unique'),
+ 2 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_client',
+ 'function' => 'username_collision',
+ 'errmsg'=> 'username_error_collision'),
+ 3 => array ( 'type' => 'REGEX',
+ 'regex' => '/^[\w\.\-\_]{0,64}$/',
+ 'errmsg'=> 'username_error_regex'),
+ ),
'default' => '',
'value' => '',
'separator' => '',
@@ -235,14 +235,13 @@ $form["tabs"]['address'] = array (
),
'country' => array (
'datatype' => 'VARCHAR',
-
'formtype' => 'SELECT',
'default' => (isset($conf['language']) ? strtoupper($conf['language']) : ''),
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name',
- 'keyfield'=> 'iso',
- 'valuefield'=> 'printable_name'
- ),
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT iso,printable_name FROM country ORDER BY iso ASC',
+ 'keyfield' => 'iso',
+ 'valuefield' => 'printable_name'
+ ),
'value' => ''
),
'telephone' => array (
diff --git a/interface/web/client/list/client.list.php b/interface/web/client/list/client.list.php
index 03ce0d9c9d..2d45179814 100644
--- a/interface/web/client/list/client.list.php
+++ b/interface/web/client/list/client.list.php
@@ -13,13 +13,13 @@
// Name of the list
-$liste["name"] = "clients";
+$liste["name"] = "clients";
// Database table
-$liste["table"] = "client";
+$liste["table"] = "client";
// Index index field of the database table
-$liste["table_idx"] = "client_id";
+$liste["table_idx"] = "client_id";
// Search Field Prefix
$liste["search_prefix"] = "search_";
@@ -28,10 +28,10 @@ $liste["search_prefix"] = "search_";
$liste["records_per_page"] = "15";
// Script File of the list
-$liste["file"] = "client_list.php";
+$liste["file"] = "client_list.php";
// Script file of the edit form
-$liste["edit_file"] = "client_edit.php";
+$liste["edit_file"] = "client_edit.php";
// Script File of the delete script
$liste["delete_file"] = "client_del.php";
@@ -40,66 +40,65 @@ $liste["delete_file"] = "client_del.php";
$liste["paging_tpl"] = "templates/paging.tpl.htm";
// Enable authe
-$liste["auth"] = "yes";
+$liste["auth"] = "yes";
/*****************************************************
* Suchfelder
*****************************************************/
-$liste["item"][] = array( 'field' => "client_id",
- 'datatype' => "INTEGER",
- 'formtype' => "TEXT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "company_name",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "contact_name",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "username",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "city",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "country",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
+$liste["item"][] = array( 'field' => "client_id",
+ 'datatype' => "INTEGER",
+ 'formtype' => "TEXT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "company_name",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "contact_name",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "username",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "city",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "country",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "SELECT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'width' => "",
+ 'value' => "");
?>
\ No newline at end of file
diff --git a/interface/web/client/list/reseller.list.php b/interface/web/client/list/reseller.list.php
index 06be49f219..2e2fbe7f81 100644
--- a/interface/web/client/list/reseller.list.php
+++ b/interface/web/client/list/reseller.list.php
@@ -13,13 +13,13 @@
// Name of the list
-$liste["name"] = "resellers";
+$liste["name"] = "resellers";
// Database table
-$liste["table"] = "client";
+$liste["table"] = "client";
// Index index field of the database table
-$liste["table_idx"] = "client_id";
+$liste["table_idx"] = "client_id";
// Search Field Prefix
$liste["search_prefix"] = "search_";
@@ -28,10 +28,10 @@ $liste["search_prefix"] = "search_";
$liste["records_per_page"] = "15";
// Script File of the list
-$liste["file"] = "reseller_list.php";
+$liste["file"] = "reseller_list.php";
// Script file of the edit form
-$liste["edit_file"] = "reseller_edit.php";
+$liste["edit_file"] = "reseller_edit.php";
// Script File of the delete script
$liste["delete_file"] = "reseller_del.php";
@@ -40,57 +40,56 @@ $liste["delete_file"] = "reseller_del.php";
$liste["paging_tpl"] = "templates/paging.tpl.htm";
// Enable authe
-$liste["auth"] = "yes";
+$liste["auth"] = "yes";
/*****************************************************
* Suchfelder
*****************************************************/
-$liste["item"][] = array( 'field' => "client_id",
- 'datatype' => "INTEGER",
- 'formtype' => "TEXT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "company_name",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "contact_name",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "city",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "country",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
+$liste["item"][] = array( 'field' => "client_id",
+ 'datatype' => "INTEGER",
+ 'formtype' => "TEXT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "company_name",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "contact_name",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "city",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "country",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "SELECT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'width' => "",
+ 'value' => "");
?>
\ No newline at end of file
diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm
index c3b3d57b0b..cb3ee9cc08 100644
--- a/interface/web/client/templates/clients_list.htm
+++ b/interface/web/client/templates/clients_list.htm
@@ -32,7 +32,7 @@
<td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" style="width:120px;" /></td>
<td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" style="width:120px;" /></td>
<td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" style="width:120px;" /></td>
- <td class="tbl_col_country"><input type="text" name="search_country" value="{tmpl_var name='search_country'}" style="width:30px;" /></td>
+ <td class="tbl_col_country"><select name="search_country" style="width:120px;">{tmpl_var name='search_country'}</select></td>
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
</tr>
</thead>
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm
index 5ed9e94a55..ace481515a 100644
--- a/interface/web/client/templates/resellers_list.htm
+++ b/interface/web/client/templates/resellers_list.htm
@@ -30,7 +30,7 @@
<td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" style="width:120px;" /></td>
<td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" style="width:120px;" /></td>
<td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" style="width:120px;" /></td>
- <td class="tbl_col_country"><input type="text" name="search_country" value="{tmpl_var name='search_country'}" style="width:30px;" /></td>
+ <td class="tbl_col_country"><select name="search_country" style="width:120px;">{tmpl_var name='search_country'}</select></td>
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/reseller_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
</tr>
</thead>
diff --git a/interface/web/dns/dns_template_list.php b/interface/web/dns/dns_template_list.php
index 20efa8d43d..37648a1efc 100644
--- a/interface/web/dns/dns_template_list.php
+++ b/interface/web/dns/dns_template_list.php
@@ -18,6 +18,7 @@ $app->auth->check_module_permissions('dns');
$app->uses('listform_actions');
// $app->listform_actions->SQLExtWhere = "access = 'REJECT'";
+$app->listform_actions->SQLOrderBy = 'ORDER BY name';
$app->listform_actions->onLoad();
diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php
index cdb24480dc..18c75298aa 100644
--- a/interface/web/dns/dns_wizard.php
+++ b/interface/web/dns/dns_wizard.php
@@ -56,7 +56,7 @@ if($_SESSION['s']['user']['typ'] == 'admin') {
// Load the templates
-$records = $app->db->queryAllRecords("SELECT * FROM dns_template WHERE visible = 'Y'");
+$records = $app->db->queryAllRecords("SELECT * FROM dns_template WHERE visible = 'Y' ORDER BY name ASC");
$template_id_option = '';
$n = 0;
foreach($records as $rec){
diff --git a/interface/web/dns/list/dns_slave.list.php b/interface/web/dns/list/dns_slave.list.php
index aaa09e0343..1e6354434f 100644
--- a/interface/web/dns/list/dns_slave.list.php
+++ b/interface/web/dns/list/dns_slave.list.php
@@ -13,13 +13,13 @@
// Name of the list
-$liste["name"] = "dns_slave";
+$liste["name"] = "dns_slave";
// Database table
-$liste["table"] = "dns_slave";
+$liste["table"] = "dns_slave";
// Index index field of the database table
-$liste["table_idx"] = "id";
+$liste["table_idx"] = "id";
// Search Field Prefix
$liste["search_prefix"] = "search_";
@@ -28,10 +28,10 @@ $liste["search_prefix"] = "search_";
$liste["records_per_page"] = "15";
// Script File of the list
-$liste["file"] = "dns_slave_list.php";
+$liste["file"] = "dns_slave_list.php";
// Script file of the edit form
-$liste["edit_file"] = "dns_slave_edit.php";
+$liste["edit_file"] = "dns_slave_edit.php";
// Script File of the delete script
$liste["delete_file"] = "dns_slave_del.php";
@@ -40,7 +40,7 @@ $liste["delete_file"] = "dns_slave_del.php";
$liste["paging_tpl"] = "templates/paging.tpl.htm";
// Enable auth
-$liste["auth"] = "yes";
+$liste["auth"] = "yes";
/*****************************************************
@@ -48,50 +48,46 @@ $liste["auth"] = "yes";
*****************************************************/
-$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' => "server_id",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'datasource' => array ( 'type' => 'CUSTOM',
- 'class'=> 'custom_datasource',
- 'function'=> 'dns_servers'
- ),
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "origin",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-
-$liste["item"][] = array( 'field' => "ns",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-
-
-
+$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' => "server_id",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "SELECT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'datasource'=> array ( 'type' => 'CUSTOM',
+ 'class'=> 'custom_datasource',
+ 'function'=> 'dns_servers'
+ ),
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "origin",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
+
+
+$liste["item"][] = array( 'field' => "ns",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
?>
\ No newline at end of file
diff --git a/interface/web/dns/list/dns_template.list.php b/interface/web/dns/list/dns_template.list.php
index 90316d26e5..58055fbb4a 100644
--- a/interface/web/dns/list/dns_template.list.php
+++ b/interface/web/dns/list/dns_template.list.php
@@ -13,13 +13,13 @@
// Name of the list
-$liste["name"] = "dns_template";
+$liste["name"] = "dns_template";
// Database table
-$liste["table"] = "dns_template";
+$liste["table"] = "dns_template";
// Index index field of the database table
-$liste["table_idx"] = "template_id";
+$liste["table_idx"] = "template_id";
// Search Field Prefix
$liste["search_prefix"] = "search_";
@@ -28,10 +28,10 @@ $liste["search_prefix"] = "search_";
$liste["records_per_page"] = "15";
// Script File of the list
-$liste["file"] = "dns_template_list.php";
+$liste["file"] = "dns_template_list.php";
// Script file of the edit form
-$liste["edit_file"] = "dns_template_edit.php";
+$liste["edit_file"] = "dns_template_edit.php";
// Script File of the delete script
$liste["delete_file"] = "dns_template_del.php";
@@ -40,7 +40,7 @@ $liste["delete_file"] = "dns_template_del.php";
$liste["paging_tpl"] = "templates/paging.tpl.htm";
// Enable auth
-$liste["auth"] = "yes";
+$liste["auth"] = "yes";
/*****************************************************
@@ -48,33 +48,23 @@ $liste["auth"] = "yes";
*****************************************************/
-$liste["item"][] = array( 'field' => "visible",
- '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' => "name",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-
-
-
-
-
-
-
-
-
+$liste["item"][] = array( 'field' => "visible",
+ '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' => "name",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
?>
\ No newline at end of file
diff --git a/interface/web/domain/domain_list.php b/interface/web/domain/domain_list.php
index 381285e367..65a889774f 100644
--- a/interface/web/domain/domain_list.php
+++ b/interface/web/domain/domain_list.php
@@ -46,6 +46,7 @@ $app->auth->check_module_permissions('domain');
$app->uses('listform_actions');
+$app->listform_actions->SQLOrderBy = 'ORDER BY domain';
$app->listform_actions->onLoad();
?>
\ No newline at end of file
diff --git a/interface/web/mail/mail_domain_list.php b/interface/web/mail/mail_domain_list.php
index 5bdfb69044..d07855c050 100644
--- a/interface/web/mail/mail_domain_list.php
+++ b/interface/web/mail/mail_domain_list.php
@@ -21,6 +21,7 @@ $app->uses('listform_actions');
// Limit the results to alias domains
// $app->listform_actions->SQLExtWhere = "type = 'local'";
+$app->listform_actions->SQLOrderBy = 'ORDER BY domain';
$app->listform_actions->onLoad();
diff --git a/interface/web/sites/database_list.php b/interface/web/sites/database_list.php
index 9ced595f4c..dfe11bef24 100644
--- a/interface/web/sites/database_list.php
+++ b/interface/web/sites/database_list.php
@@ -67,6 +67,7 @@ class list_action extends listform_actions {
}
$list = new list_action;
+$list->SQLOrderBy = 'ORDER BY database_name';
$list->onLoad();
diff --git a/interface/web/sites/ftp_user_list.php b/interface/web/sites/ftp_user_list.php
index ef94dc246d..250efcfd0e 100644
--- a/interface/web/sites/ftp_user_list.php
+++ b/interface/web/sites/ftp_user_list.php
@@ -68,6 +68,7 @@ class list_action extends listform_actions {
}
$list = new list_action;
+$list->SQLOrderBy = 'ORDER BY username';
$list->onLoad();
diff --git a/interface/web/sites/shell_user_list.php b/interface/web/sites/shell_user_list.php
index a9c95fdf92..3307d63d26 100644
--- a/interface/web/sites/shell_user_list.php
+++ b/interface/web/sites/shell_user_list.php
@@ -49,6 +49,7 @@ $app->uses('listform_actions');
// Limit the results to alias domains
//$app->listform_actions->SQLExtWhere = "type = 'subdomain'";
+$app->listform_actions->SQLOrderBy = 'ORDER BY username';
$app->listform_actions->onLoad();
diff --git a/interface/web/sites/user_quota_stats.php b/interface/web/sites/user_quota_stats.php
index 0b23b1a162..539d4ff35e 100644
--- a/interface/web/sites/user_quota_stats.php
+++ b/interface/web/sites/user_quota_stats.php
@@ -88,7 +88,7 @@ class list_action extends listform_actions {
$list = new list_action;
$list->SQLExtWhere = "type = 'vhost'";
-
+$list->SQLOrderBy = 'ORDER BY domain';
$list->onLoad();
diff --git a/interface/web/sites/web_aliasdomain_list.php b/interface/web/sites/web_aliasdomain_list.php
index 9417bb3bdb..ef4a181ad4 100644
--- a/interface/web/sites/web_aliasdomain_list.php
+++ b/interface/web/sites/web_aliasdomain_list.php
@@ -48,7 +48,7 @@ $app->uses('listform_actions');
// Limit the results to alias domains
$app->listform_actions->SQLExtWhere = "type = 'alias'";
-
+$app->listform_actions->SQLOrderBy = 'ORDER BY domain';
$app->listform_actions->onLoad();
diff --git a/interface/web/sites/web_domain_list.php b/interface/web/sites/web_domain_list.php
index da46e761cb..16cac5a46b 100644
--- a/interface/web/sites/web_domain_list.php
+++ b/interface/web/sites/web_domain_list.php
@@ -53,7 +53,7 @@ class list_action extends listform_actions {
$list = new list_action;
$list->SQLExtWhere = "type = 'vhost'";
+$list->SQLOrderBy = 'ORDER BY domain';
$list->onLoad();
-
?>
\ No newline at end of file
diff --git a/interface/web/sites/web_sites_stats.php b/interface/web/sites/web_sites_stats.php
index 076858bcb9..e9a6c8dd0a 100644
--- a/interface/web/sites/web_sites_stats.php
+++ b/interface/web/sites/web_sites_stats.php
@@ -59,7 +59,7 @@ class list_action extends listform_actions {
$list = new list_action;
$list->SQLExtWhere = "type = 'vhost'";
-
+$list->SQLOrderBy = 'ORDER BY domain';
$list->onLoad();
diff --git a/interface/web/sites/web_subdomain_list.php b/interface/web/sites/web_subdomain_list.php
index 78855cab7f..f5feaf7cf5 100644
--- a/interface/web/sites/web_subdomain_list.php
+++ b/interface/web/sites/web_subdomain_list.php
@@ -48,7 +48,7 @@ $app->uses('listform_actions');
// Limit the results to alias domains
$app->listform_actions->SQLExtWhere = "type = 'subdomain'";
-
+$app->listform_actions->SQLOrderBy = 'ORDER BY domain';
$app->listform_actions->onLoad();
diff --git a/interface/web/sites/webdav_user_list.php b/interface/web/sites/webdav_user_list.php
index bac3de98c9..cc4532c09c 100644
--- a/interface/web/sites/webdav_user_list.php
+++ b/interface/web/sites/webdav_user_list.php
@@ -44,7 +44,7 @@ $list_def_file = "list/webdav_user.list.php";
$app->auth->check_module_permissions('sites');
$app->uses('listform_actions');
-
+$app->listform_actions->SQLOrderBy = 'ORDER BY username';
$app->listform_actions->onLoad();
diff --git a/interface/web/vm/openvz_ip_list.php b/interface/web/vm/openvz_ip_list.php
index 2a63788076..8892efcc80 100644
--- a/interface/web/vm/openvz_ip_list.php
+++ b/interface/web/vm/openvz_ip_list.php
@@ -47,8 +47,8 @@ if($_SESSION["s"]["user"]["typ"] != 'admin') die('permission denied');
$app->uses('listform_actions');
-// $app->listform_actions->SQLOrderBy = 'ORDER BY company_name, contact_name, client_id';
// $app->listform_actions->SQLExtWhere = "limit_client = 0";
+$app->listform_actions->SQLOrderBy = 'ORDER BY server_id,ip_address';
$app->listform_actions->onLoad();
--
GitLab