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

remove unnecessary domains_see_all column

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-12-26 12:12:06 +01:00
parent 15ed0521c5
commit c696542cf5
18 changed files with 7 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Froxlor/Api/Commands/Admins.php
View File

@@ -198,8 +198,6 @@ class Admins extends ApiCommand implements ResourceEntity
* optional, default false
* @param bool $customers_see_all
* optional, default false
* @param bool $domains_see_all
* optional, default false
* @param bool $caneditphpsettings
* optional, default false
* @param bool $change_serversettings
@@ -239,7 +237,6 @@ class Admins extends ApiCommand implements ResourceEntity
$mysqls = $this->getUlParam('mysqls', 'mysqls_ul', true, 0);
$customers_see_all = $this->getBoolParam('customers_see_all', true, 0);
$domains_see_all = $this->getBoolParam('domains_see_all', true, 0);
$caneditphpsettings = $this->getBoolParam('caneditphpsettings', true, 0);
$change_serversettings = $this->getBoolParam('change_serversettings', true, 0);
$ipaddress = $this->getParam('ipaddress', true, -1);
@@ -299,10 +296,6 @@ class Admins extends ApiCommand implements ResourceEntity
$customers_see_all = '0';
}
if ($domains_see_all != '1') {
$domains_see_all = '0';
}
if ($caneditphpsettings != '1') {
$caneditphpsettings = '0';
}
@@ -328,7 +321,6 @@ class Admins extends ApiCommand implements ResourceEntity
'customers' => $customers,
'customers_see_all' => $customers_see_all,
'domains' => $domains,
'domains_see_all' => $domains_see_all,
'caneditphpsettings' => $caneditphpsettings,
'diskspace' => $diskspace,
'traffic' => $traffic,
@@ -357,7 +349,6 @@ class Admins extends ApiCommand implements ResourceEntity
`customers` = :customers,
`customers_see_all` = :customers_see_all,
`domains` = :domains,
`domains_see_all` = :domains_see_all,
`caneditphpsettings` = :caneditphpsettings,
`diskspace` = :diskspace,
`traffic` = :traffic,
@@ -496,8 +487,6 @@ class Admins extends ApiCommand implements ResourceEntity
* optional, default false
* @param bool $customers_see_all
* optional, default false
* @param bool $domains_see_all
* optional, default false
* @param bool $caneditphpsettings
* optional, default false
* @param bool $change_serversettings
@@ -547,7 +536,6 @@ class Admins extends ApiCommand implements ResourceEntity
$ftps = $result['ftps'];
$mysqls = $result['mysqls'];
$customers_see_all = $result['customers_see_all'];
$domains_see_all = $result['domains_see_all'];
$caneditphpsettings = $result['caneditphpsettings'];
$change_serversettings = $result['change_serversettings'];
$diskspace = $result['diskspace'];
@@ -571,7 +559,6 @@ class Admins extends ApiCommand implements ResourceEntity
$mysqls = $this->getUlParam('mysqls', 'mysqls_ul', true, $result['mysqls']);
$customers_see_all = $this->getBoolParam('customers_see_all', true, $result['customers_see_all']);
$domains_see_all = $this->getBoolParam('domains_see_all', true, $result['domains_see_all']);
$caneditphpsettings = $this->getBoolParam('caneditphpsettings', true, $result['caneditphpsettings']);
$change_serversettings = $this->getBoolParam('change_serversettings', true, $result['change_serversettings']);
$ipaddress = $this->getParam('ipaddress', true, ($result['ip'] != -1 ? json_decode($result['ip'], true) : -1));
@@ -608,10 +595,6 @@ class Admins extends ApiCommand implements ResourceEntity
$customers_see_all = '0';
}
if ($domains_see_all != '1') {
$domains_see_all = '0';
}
if ($caneditphpsettings != '1') {
$caneditphpsettings = '0';
}
@@ -675,7 +658,6 @@ class Admins extends ApiCommand implements ResourceEntity
'customers' => $customers,
'customers_see_all' => $customers_see_all,
'domains' => $domains,
'domains_see_all' => $domains_see_all,
'caneditphpsettings' => $caneditphpsettings,
'diskspace' => $diskspace,
'traffic' => $traffic,
@@ -705,7 +687,6 @@ class Admins extends ApiCommand implements ResourceEntity
`customers` = :customers,
`customers_see_all` = :customers_see_all,
`domains` = :domains,
`domains_see_all` = :domains_see_all,
`caneditphpsettings` = :caneditphpsettings,
`diskspace` = :diskspace,
`traffic` = :traffic,

2
lib/Froxlor/Api/Commands/Domains.php
View File

@@ -76,7 +76,7 @@ class Domains extends ApiCommand implements ResourceEntity
$query_fields = [];
$result_stmt = Database::prepare("
SELECT
`d`.*, `c`.`loginname`, `c`.`deactivated`, `c`.`name`, `c`.`firstname`, `c`.`company`, `c`.`standardsubdomain`,
`d`.*, `c`.`loginname`, `c`.`deactivated`, `c`.`name`, `c`.`firstname`, `c`.`company`, `c`.`standardsubdomain`, `c`.`adminid` as customeradmin,
`ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`
FROM `" . TABLE_PANEL_DOMAINS . "` `d`
LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`)

2
lib/Froxlor/Api/Commands/PhpSettings.php
View File

@@ -89,7 +89,7 @@ class PhpSettings extends ApiCommand implements ResourceEntity
$query .= " AND `parentdomainid` = '0'";
}
if ((int)$this->getUserDetail('domains_see_all') == 0) {
if ((int)$this->getUserDetail('customers_see_all') == 0) {
$query .= " AND `adminid` = :adminid";
$query_params['adminid'] = $this->getUserDetail('adminid');
}

2
lib/Froxlor/Dns/Dns.php
View File

@@ -41,7 +41,7 @@ class Dns
$where_clause = '';
if ($area == 'admin') {
if ($userinfo['domains_see_all'] != '1') {
if ((int)$userinfo['customers_see_all'] == 0) {
$where_clause = '`adminid` = :uid AND ';
$dom_data['uid'] = $userinfo['userid'];
}

1
lib/Froxlor/Install/Install/Core.php
View File

@@ -585,7 +585,6 @@ class Core
`customers_see_all` = 1,
`caneditphpsettings` = 1,
`domains` = -1,
`domains_see_all` = 1,
`change_serversettings` = 1,
`diskspace` = -1024,
`mysqls` = -1,