From c696542cf5e49ed7009547755bccbd83b6a02981 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Mon, 26 Dec 2022 12:12:06 +0100 Subject: [PATCH] remove unnecessary domains_see_all column Signed-off-by: Michael Kaufmann --- install/froxlor.sql.php | 1 - install/updates/froxlor/update_2.x.inc.php | 2 ++ lib/Froxlor/Api/Commands/Admins.php | 19 ------------------- lib/Froxlor/Api/Commands/Domains.php | 2 +- lib/Froxlor/Api/Commands/PhpSettings.php | 2 +- lib/Froxlor/Dns/Dns.php | 2 +- lib/Froxlor/Install/Install/Core.php | 1 - .../admin/admin/formfield.admin_add.php | 6 ------ .../admin/admin/formfield.admin_edit.php | 6 ------ lng/cz.lng.php | 1 - lng/de.lng.php | 3 +-- lng/en.lng.php | 3 +-- lng/fr.lng.php | 1 - lng/it.lng.php | 1 - lng/nl.lng.php | 1 - lng/pt.lng.php | 1 - lng/se.lng.php | 1 - tests/bootstrap.php | 1 - 18 files changed, 7 insertions(+), 47 deletions(-) diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php index 87866349..44a978ed 100644 --- a/install/froxlor.sql.php +++ b/install/froxlor.sql.php @@ -124,7 +124,6 @@ CREATE TABLE `panel_admins` ( `customers_see_all` tinyint(1) NOT NULL default '0', `domains` int(15) NOT NULL default '0', `domains_used` int(15) NOT NULL default '0', - `domains_see_all` tinyint(1) NOT NULL default '0', `caneditphpsettings` tinyint(1) NOT NULL default '0', `change_serversettings` tinyint(1) NOT NULL default '0', `diskspace` int(15) NOT NULL default '0', diff --git a/install/updates/froxlor/update_2.x.inc.php b/install/updates/froxlor/update_2.x.inc.php index beeb4c01..f0a6a12f 100644 --- a/install/updates/froxlor/update_2.x.inc.php +++ b/install/updates/froxlor/update_2.x.inc.php @@ -75,6 +75,8 @@ if (Froxlor::isFroxlorVersion('0.10.38.3')) { // mail_users adjustments Database::query("ALTER TABLE `" . TABLE_MAIL_USERS . "` CHANGE COLUMN `password` `password` varchar(255) NOT NULL default '';"); Database::query("ALTER TABLE `" . TABLE_MAIL_USERS . "` CHANGE COLUMN `password_enc` `password_enc` varchar(255) NOT NULL default '';"); + // drop domains_see_all field from panel_admins + Database::query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` DROP COLUMN `domains_see_all`;"); Update::lastStepStatus(0); Update::showUpdateStep("Checking for multiple mysql-servers to allow acccess to customers for existing databases"); diff --git a/lib/Froxlor/Api/Commands/Admins.php b/lib/Froxlor/Api/Commands/Admins.php index fe64ed53..ae7d12c3 100644 --- a/lib/Froxlor/Api/Commands/Admins.php +++ b/lib/Froxlor/Api/Commands/Admins.php @@ -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, diff --git a/lib/Froxlor/Api/Commands/Domains.php b/lib/Froxlor/Api/Commands/Domains.php index 00ee01c2..ee31f600 100644 --- a/lib/Froxlor/Api/Commands/Domains.php +++ b/lib/Froxlor/Api/Commands/Domains.php @@ -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`) diff --git a/lib/Froxlor/Api/Commands/PhpSettings.php b/lib/Froxlor/Api/Commands/PhpSettings.php index d417b70e..cb5c396b 100644 --- a/lib/Froxlor/Api/Commands/PhpSettings.php +++ b/lib/Froxlor/Api/Commands/PhpSettings.php @@ -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'); } diff --git a/lib/Froxlor/Dns/Dns.php b/lib/Froxlor/Dns/Dns.php index 553eda3c..951fa050 100644 --- a/lib/Froxlor/Dns/Dns.php +++ b/lib/Froxlor/Dns/Dns.php @@ -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']; } diff --git a/lib/Froxlor/Install/Install/Core.php b/lib/Froxlor/Install/Install/Core.php index 57dbeadf..234f4ae2 100644 --- a/lib/Froxlor/Install/Install/Core.php +++ b/lib/Froxlor/Install/Install/Core.php @@ -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, diff --git a/lib/formfields/admin/admin/formfield.admin_add.php b/lib/formfields/admin/admin/formfield.admin_add.php index 544e2ce0..6ade1bfc 100644 --- a/lib/formfields/admin/admin/formfield.admin_add.php +++ b/lib/formfields/admin/admin/formfield.admin_add.php @@ -138,12 +138,6 @@ return [ 'maxlength' => 9, 'mandatory' => true ], - 'domains_see_all' => [ - 'label' => lng('admin.domains_see_all'), - 'type' => 'checkbox', - 'value' => '1', - 'checked' => false - ], 'caneditphpsettings' => [ 'label' => lng('admin.caneditphpsettings'), 'type' => 'checkbox', diff --git a/lib/formfields/admin/admin/formfield.admin_edit.php b/lib/formfields/admin/admin/formfield.admin_edit.php index 7c17b6b4..3d641103 100644 --- a/lib/formfields/admin/admin/formfield.admin_edit.php +++ b/lib/formfields/admin/admin/formfield.admin_edit.php @@ -150,12 +150,6 @@ return [ 'maxlength' => 9, 'mandatory' => true ], - 'domains_see_all' => [ - 'label' => lng('admin.domains_see_all'), - 'type' => 'checkbox', - 'value' => '1', - 'checked' => $result['domains_see_all'] - ], 'caneditphpsettings' => [ 'label' => lng('admin.caneditphpsettings'), 'type' => 'checkbox', diff --git a/lng/cz.lng.php b/lng/cz.lng.php index e3e1f006..dc9671db 100644 --- a/lng/cz.lng.php +++ b/lng/cz.lng.php @@ -57,7 +57,6 @@ return [ 'admin_add' => 'Vytvořit admina', 'admin_edit' => 'Upravit admina', 'customers_see_all' => 'Může vidět všechny zákazníky?', - 'domains_see_all' => 'Může vidět všechny domény?', 'change_serversettings' => 'Může vidět nastavení serveru?', 'server' => 'Systém', 'serversettings' => 'Nastavení', diff --git a/lng/de.lng.php b/lng/de.lng.php index fd82d6c6..4fe88878 100644 --- a/lng/de.lng.php +++ b/lng/de.lng.php @@ -72,8 +72,7 @@ return [ 'admins' => 'Admins', 'admin_add' => 'Admin anlegen', 'admin_edit' => 'Admin bearbeiten', - 'customers_see_all' => 'Kann alle Kunden sehen?', - 'domains_see_all' => 'Kann alle Domains sehen?', + 'customers_see_all' => 'Zugriff auf Resourcen anderer Admins/Reseller?', 'change_serversettings' => 'Kann Servereinstellungen bearbeiten?', 'serversettings' => 'Einstellungen', 'serversettings_desc' => 'Verwalte dein froxlor System', diff --git a/lng/en.lng.php b/lng/en.lng.php index 5ed4cd4c..914a7934 100644 --- a/lng/en.lng.php +++ b/lng/en.lng.php @@ -72,8 +72,7 @@ return [ 'admins' => 'Admins', 'admin_add' => 'Create admin', 'admin_edit' => 'Edit admin', - 'customers_see_all' => 'Can see all customers?', - 'domains_see_all' => 'Can see all domains?', + 'customers_see_all' => 'Can access other admins/resellers resources?', 'change_serversettings' => 'Can change server settings?', 'server' => 'System', 'serversettings' => 'Settings', diff --git a/lng/fr.lng.php b/lng/fr.lng.php index 65b1f50a..44d9d6eb 100644 --- a/lng/fr.lng.php +++ b/lng/fr.lng.php @@ -52,7 +52,6 @@ return [ 'admin_add' => 'Ajouter un administrateur', 'admin_edit' => 'Modifier un administrateur', 'customers_see_all' => 'Peut voir tous les comptes ?', - 'domains_see_all' => 'Peut voir tous les Domaines ?', 'change_serversettings' => 'Peut modifier la configuration du serveur ?', 'server' => 'Système', 'serversettings' => 'Paramètres', diff --git a/lng/it.lng.php b/lng/it.lng.php index c7fac2ff..af5bff91 100644 --- a/lng/it.lng.php +++ b/lng/it.lng.php @@ -52,7 +52,6 @@ return [ 'admin_add' => 'Crea admin', 'admin_edit' => 'Modifica admin', 'customers_see_all' => 'Può vedere tutti i clienti?', - 'domains_see_all' => 'Può vedere tutti i domini?', 'change_serversettings' => 'Può cambiare le impostazioni del server?', 'server' => 'Sistema', 'serversettings' => 'Opzioni', diff --git a/lng/nl.lng.php b/lng/nl.lng.php index 5c3cce38..ad47606f 100644 --- a/lng/nl.lng.php +++ b/lng/nl.lng.php @@ -49,7 +49,6 @@ return [ 'admin_add' => 'Maak beheerder', 'admin_edit' => 'Bewerk beheerder', 'customers_see_all' => 'Kan alle klanten zien?', - 'domains_see_all' => 'Kan alle domeinen zien?', 'change_serversettings' => 'Kan server instellingen aanpassen?', 'serversettings' => 'Instellingen', 'rebuildconf' => 'Configuratie bestanden opnieuw aanmaken', diff --git a/lng/pt.lng.php b/lng/pt.lng.php index b7dd93ef..30a9f885 100644 --- a/lng/pt.lng.php +++ b/lng/pt.lng.php @@ -52,7 +52,6 @@ return [ 'admin_add' => 'Criar administrador', 'admin_edit' => 'Editar administrador', 'customers_see_all' => 'Mostrar todos os clientes', - 'domains_see_all' => 'Mostrar todos os domínios', 'change_serversettings' => 'Alterar configuraççes do servidor?', 'server' => 'Sistema', 'serversettings' => 'Configurações', diff --git a/lng/se.lng.php b/lng/se.lng.php index 46c5547f..3d77700a 100644 --- a/lng/se.lng.php +++ b/lng/se.lng.php @@ -50,7 +50,6 @@ return [ 'admin_add' => '[Skapa en ny admin]', 'admin_edit' => 'Ändra admin', 'customers_see_all' => 'Kan se alla kunder?', - 'domains_see_all' => 'Kan se alla domäner?', 'change_serversettings' => 'Kan ändra serverinställningar?', 'server' => 'Systemet', 'serversettings' => 'Inställningar', diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 8a5bd9cd..4843c47c 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -105,7 +105,6 @@ Database::query("INSERT INTO `" . TABLE_PANEL_ADMINS . "` SET `customers_see_all` = 1, `caneditphpsettings` = 1, `domains` = -1, - `domains_see_all` = 1, `change_serversettings` = 1, `diskspace` = -1024, `mysqls` = -1,