From 55e6b63d19cdc6107a6f4981bb973e1ba0652299 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Tue, 19 Jan 2010 07:12:48 -0500 Subject: [PATCH] Fixed: FS#1016 - Client list dropdown misses reasonable sorting --- interface/web/dns/dns_wizard.php | 2 +- interface/web/mail/mail_domain_edit.php | 4 ++-- interface/web/sites/web_domain_edit.php | 4 ++-- interface/web/sites/database_edit.php | 4 ++-- interface/web/dns/dns_soa_edit.php | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/interface/web/dns/dns_soa_edit.php b/interface/web/dns/dns_soa_edit.php index 877bf98..defdb97 100644 --- a/interface/web/dns/dns_soa_edit.php +++ b/interface/web/dns/dns_soa_edit.php @@ -72,7 +72,7 @@ // If user is admin, we will allow him to select to whom this record belongs if($_SESSION["s"]["user"]["typ"] == 'admin') { // Getting Domains of the user - $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0"; + $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER by name"; $clients = $app->db->queryAllRecords($sql); $client_select = ''; if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>"; @@ -90,7 +90,7 @@ $client = $app->db->queryOneRecord("SELECT client.client_id, client.contact_name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); // Fill the client select field - $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']; + $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY name"; $clients = $app->db->queryAllRecords($sql); $client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>'; if(is_array($clients)) { diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php index 61d6bb6..794065c 100644 --- a/interface/web/dns/dns_wizard.php +++ b/interface/web/dns/dns_wizard.php @@ -81,7 +81,7 @@ $app->tpl->setVar("server_id",$server_id_option); // load the list of clients - $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0"; + $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name"; $clients = $app->db->queryAllRecords($sql); $client_select = ''; if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>"; diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php index fe49dc8..0106ebc 100644 --- a/interface/web/mail/mail_domain_edit.php +++ b/interface/web/mail/mail_domain_edit.php @@ -72,7 +72,7 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') { // Getting Clients of the user if($_SESSION["s"]["user"]["typ"] == 'admin') { - $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0"; + $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name"; } else { $client_group_id = $_SESSION["s"]["user"]["default_group"]; $sql = "SELECT client.client_id, limit_web_domain, default_webserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"; @@ -92,7 +92,7 @@ // Get the limits of the client $client_group_id = $_SESSION["s"]["user"]["default_group"]; - $client = $app->db->queryOneRecord("SELECT client.client_id, contact_name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + $client = $app->db->queryOneRecord("SELECT client.client_id, contact_name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id order by contact_name"); // Set the webserver to the default server of the client $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]"); diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php index 17252df..9ffc42b 100644 --- a/interface/web/sites/database_edit.php +++ b/interface/web/sites/database_edit.php @@ -93,7 +93,7 @@ unset($tmp); // Fill the client select field - $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']; + $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY name"; $clients = $app->db->queryAllRecords($sql); $client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>'; if(is_array($clients)) { @@ -130,7 +130,7 @@ unset($ips); // Fill the client select field - $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0"; + $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name"; $clients = $app->db->queryAllRecords($sql); $client_select = "<option value='0'></option>"; if(is_array($clients)) { diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php index 93911c8..a3b3611 100644 --- a/interface/web/sites/web_domain_edit.php +++ b/interface/web/sites/web_domain_edit.php @@ -111,7 +111,7 @@ unset($tmp); // Fill the client select field - $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']; + $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY name"; $clients = $app->db->queryAllRecords($sql); $client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>'; if(is_array($clients)) { @@ -166,7 +166,7 @@ unset($ips); // Fill the client select field - $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0"; + $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name"; $clients = $app->db->queryAllRecords($sql); $client_select = "<option value='0'></option>"; if(is_array($clients)) { -- Gitblit v1.9.1