clones/Froxlor
1
0
Fork 0
mirror of https://github.com/Froxlor/Froxlor.git synced 2024-09-21 02:17:34 +00:00
Code Issues Packages Projects Releases Wiki 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
No known key found for this signature in database
GPG Key ID: C121F97338D7A352
18 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
install/froxlor.sql.php
View File

@ -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',

2
install/updates/froxlor/update_2.x.inc.php
View File

@ -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");

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,

6
lib/formfields/admin/admin/formfield.admin_add.php
View File

@ -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',

6
lib/formfields/admin/admin/formfield.admin_edit.php
View File

@ -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',

1
lng/cz.lng.php
View File

@ -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í',

3
lng/de.lng.php
View File

@ -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',

3
lng/en.lng.php
View File

@ -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',

1
lng/fr.lng.php
View File

@ -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',

1
lng/it.lng.php
View File

@ -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',

1
lng/nl.lng.php
View File

@ -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',

1
lng/pt.lng.php
View File

@ -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',

1
lng/se.lng.php
View File

@ -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',

1
tests/bootstrap.php
View File

@ -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,