maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #235 from rzeka/master

Browse Source 
Better customers sorting based on name and company
This commit is contained in:
Michael Kaufmann
2015-04-28 14:25:40 +02:00
parent e0ef3e9984 a3f2fa1b16
commit e4a262eb7b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin_domains.php
View File

@@ -397,7 +397,7 @@ if ($page == 'domains'
$documentroot = $_POST['documentroot']; $documentroot = $_POST['documentroot'];
} }
} elseif (isset($_POST['documentroot']) } elseif (isset($_POST['documentroot'])
&& ($_POST['documentroot'] == '') && ($_POST['documentroot'] == '')
&& (Settings::Get('system.documentroot_use_default_value') == 1) && (Settings::Get('system.documentroot_use_default_value') == 1)
) { ) {
$documentroot = makeCorrectDir($customer['documentroot'] . '/' . $domain); $documentroot = makeCorrectDir($customer['documentroot'] . '/' . $domain);
@@ -832,7 +832,7 @@ if ($page == 'domains'
SELECT `customerid`, `loginname`, `name`, `firstname`, `company` SELECT `customerid`, `loginname`, `name`, `firstname`, `company`
FROM `" . TABLE_PANEL_CUSTOMERS . "` " . FROM `" . TABLE_PANEL_CUSTOMERS . "` " .
($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = '" . (int)$userinfo['adminid'] . "' ") . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = '" . (int)$userinfo['adminid'] . "' ") .
" ORDER BY `name` ASC" " ORDER BY COALESCE(NULLIF(`name`,''), `company`) ASC"
); );
$params = array(); $params = array();
if ($userinfo['customers_see_all'] == '0') { if ($userinfo['customers_see_all'] == '0') {