From 8c8cb5a0d7a6c8e24980b886776fdd8ab597f6e8 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Sun, 13 Oct 2013 16:42:53 +0200
Subject: [PATCH] remove sort-by-path as it does not work anyway (and makes not
 much sense), fixes #692

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 customer_domains.php                              | 4 +---
 templates/Froxlor/customer/domains/domainlist.tpl | 2 +-
 templates/Sparkle/customer/domains/domainlist.tpl | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/customer_domains.php b/customer_domains.php
index 7c5985e2..352a9a6b 100644
--- a/customer_domains.php
+++ b/customer_domains.php
@@ -45,9 +45,7 @@ elseif($page == 'domains')
 	{
 		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_domains::domains");
 		$fields = array(
-			'd.domain' => $lng['domains']['domainname'],
-			'd.documentroot' => $lng['panel']['path'],
-			'd.aliasdomain' => $lng['domains']['aliasdomain']
+			'd.domain' => $lng['domains']['domainname']
 		);
 		$paging = new paging($userinfo, $db, TABLE_PANEL_DOMAINS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
 		$result = $db->query("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`caneditdomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`, `da`.`id` AS `domainaliasid`, `da`.`domain` AS `domainalias` FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `ad` ON `d`.`aliasdomain`=`ad`.`id` LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `da` ON `da`.`aliasdomain`=`d`.`id` WHERE `d`.`customerid`='" . (int)$userinfo['customerid'] . "' AND `d`.`email_only`='0' AND `d`.`id` <> " . (int)$userinfo['standardsubdomain'] . " " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
diff --git a/templates/Froxlor/customer/domains/domainlist.tpl b/templates/Froxlor/customer/domains/domainlist.tpl
index 4b880c4f..3b08cf87 100644
--- a/templates/Froxlor/customer/domains/domainlist.tpl
+++ b/templates/Froxlor/customer/domains/domainlist.tpl
@@ -26,7 +26,7 @@
 				<thead>
 					<tr>
 						<th>{$lng['domains']['domainname']}&nbsp;&nbsp;{$arrowcode['d.domain']}</th>
-						<th>{$lng['panel']['path']}&nbsp;&nbsp;{$arrowcode['d.documentroot']}
+						<th>{$lng['panel']['path']}</th>
 						<th>{$lng['panel']['options']}</th>
 					</tr>
 				</thead>
diff --git a/templates/Sparkle/customer/domains/domainlist.tpl b/templates/Sparkle/customer/domains/domainlist.tpl
index 93af8f34..fb7a5daf 100644
--- a/templates/Sparkle/customer/domains/domainlist.tpl
+++ b/templates/Sparkle/customer/domains/domainlist.tpl
@@ -26,7 +26,7 @@
 				<thead>
 					<tr>
 						<th>{$lng['domains']['domainname']}&nbsp;{$arrowcode['d.domain']}</th>
-						<th>{$lng['panel']['path']}&nbsp;{$arrowcode['d.documentroot']}</th>
+						<th>{$lng['panel']['path']}</th>
 						<th>{$lng['panel']['options']}</th>
 					</tr>
 				</thead>