Skip to content

Commit e4baff7

Browse files
tbrehmtbrehm
committed
Fixed:
FS#665 - Reseller adding email domain FS#666 - Reseller adding mysql database
1 parent 2dadd22 commit e4baff7

File tree

3 files changed

+122
-95
lines changed

3 files changed

+122
-95
lines changed

‎interface/web/client/lib/lang/en_client.lng‎

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,87 @@
1-
<?php
2-
$wb["limit_maildomain_txt"] = 'Max. number of email domains';
3-
$wb["limit_mailbox_txt"] = 'Max. number of mailboxes';
4-
$wb["limit_mailalias_txt"] = 'Max. number of email aliases';
5-
$wb["limit_mailforward_txt"] = 'Max. number of email forwarders';
6-
$wb["limit_mailcatchall_txt"] = 'Max. number of email catchall accounts';
7-
$wb["limit_mailrouting_txt"] = 'Max. number of email routes';
8-
$wb["limit_mailfilter_txt"] = 'Max. number of email filters';
9-
$wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts';
10-
$wb["limit_mailquota_txt"] = 'Mailbox quota';
11-
$wb["limit_spamfilter_wblist_txt"] = 'Max. number of spamfilter white / blacklist filters';
12-
$wb["limit_spamfilter_user_txt"] = 'Max. number of spamfilter users';
13-
$wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policys';
14-
$wb["default_mailserver_txt"] = 'Default Mailserver';
15-
$wb["company_name_txt"] = 'Company name';
16-
$wb["contact_name_txt"] = 'Contact name';
17-
$wb["username_txt"] = 'Username';
18-
$wb["password_txt"] = 'Password';
19-
$wb["password_strength_txt"] = 'Password strength';
20-
$wb["language_txt"] = 'Language';
21-
$wb["usertheme_txt"] = 'Theme';
22-
$wb["street_txt"] = 'Street';
23-
$wb["zip_txt"] = 'ZIP';
24-
$wb["city_txt"] = 'City';
25-
$wb["state_txt"] = 'State';
26-
$wb["country_txt"] = 'Country';
27-
$wb["telephone_txt"] = 'Telephone';
28-
$wb["mobile_txt"] = 'Mobile';
29-
$wb["fax_txt"] = 'Fax';
30-
$wb["email_txt"] = 'Email';
31-
$wb["internet_txt"] = 'Internet';
32-
$wb["icq_txt"] = 'ICQ';
33-
$wb["notes_txt"] = 'Notes';
34-
$wb["company_txt"] = 'Company';
35-
$wb["title_txt"] = 'Title';
36-
$wb["firstname_txt"] = 'Firstname';
37-
$wb["surname_txt"] = 'Surname';
38-
$wb["limit_domain_txt"] = 'limit_domain';
39-
$wb["limit_subdomain_txt"] = 'limit_subdomain';
40-
$wb["limit_webquota_txt"] = 'limit_webquota';
41-
$wb["limit_database_txt"] = 'limit_database';
42-
$wb["ip_address_txt"] = 'ip_address';
43-
$wb["limit_client_error_notint"] = 'Client Limit is not a number.';
44-
$wb["firstname_error_empty"] = 'Firstname is empty.';
45-
$wb["contact_error_empty"] = 'Contact name is empty.';
46-
$wb["default_webserver_txt"] = 'Default Webserver';
47-
$wb["limit_web_domain_txt"] = 'Max. number of web domains';
48-
$wb["limit_web_aliasdomain_txt"] = 'Max. number of web aliasdomains';
49-
$wb["limit_web_subdomain_txt"] = 'Max. number of web subdomains';
50-
$wb["limit_ftp_user_txt"] = 'Max. number of FTP users';
51-
$wb["default_dnsserver_txt"] = 'Default DNS Server';
52-
$wb["limit_dns_zone_txt"] = 'Max. number of DNS zones';
53-
$wb["limit_dns_record_txt"] = 'Max. number DNS records';
54-
$wb["limit_shell_user_txt"] = 'Max. number of Shell users';
55-
$wb["limit_client_txt"] = 'Max. number of Clients';
56-
$wb["username_error_empty"] = 'Username is empty.';
57-
$wb["username_error_unique"] = 'The username must be unique.';
58-
$wb["limit_maildomain_error_notint"] = 'The email domain limit must be a number.';
59-
$wb["limit_mailbox_error_notint"] = 'The mailbox limit must be a number.';
60-
$wb["limit_mailalias_error_notint"] = 'The email alias limit must be a number.';
61-
$wb["limit_mailforward_error_notint"] = 'The email forward limit must be a number.';
62-
$wb["limit_mailcatchall_error_notint"] = 'The email catchall limit must be a number.';
63-
$wb["limit_mailrouting_error_notint"] = 'The email routing limit must be a number.';
64-
$wb["limit_mailfilter_error_notint"] = 'The email filter limit must be a number.';
65-
$wb["limit_mailfetchmail_error_notint"] = 'The fetchmail limit must be a number.';
66-
$wb["limit_mailquota_error_notint"] = 'The email quota limit must be a number.';
67-
$wb["limit_spamfilter_wblist_error_notint"] = 'The spamfilter white / blacklist limit must be a number.';
68-
$wb["limit_spamfilter_user_error_notint"] = 'The spamfilter user limit must be a number.';
69-
$wb["limit_spamfilter_policy_error_notint"] = 'The spamfilter policy limit must be a number.';
70-
$wb["limit_web_domain_error_notint"] = 'The website limit must be a number.';
71-
$wb["limit_web_aliasdomain_error_notint"] = 'The website alias domain limit must be a number.';
72-
$wb["limit_web_subdomain_error_notint"] = 'The website subdomain limit must be a number.';
73-
$wb["limit_ftp_user_error_notint"] = 'The ftp user limit must be a number.';
74-
$wb["limit_shell_user_error_notint"] = 'The shell user limit must be a number.';
75-
$wb["limit_dns_zone_error_notint"] = 'The dns zone limit must be a number.';
76-
$wb["limit_dns_zone_error_notint"] = 'The dns record limit must be a number.';
77-
$wb["limit_client_error_notint"] = 'The sub client limit must be a number.';
78-
$wb["default_dbserver_txt"] = 'Default Database Server';
79-
$wb["limit_database_txt"] = 'Max. number of Databases';
80-
$wb["limit_database_error_notint"] = 'The database limit must be a number.';
81-
$wb["username_error_regex"] = 'The Username contains invalid chracaters.';
82-
$wb["template_master_txt"] = 'Master template';
83-
$wb["template_additional_txt"] = 'Addon template';
84-
$wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
85-
$wb["web_php_options_txt"] = 'PHP Options';
86-
$wb["limit_client_txt"] = 'The max. number of clients is reached.';
87-
?>
1+
<?php
2+
$wb["limit_maildomain_txt"] = 'Max. number of email domains';
3+
$wb["limit_mailbox_txt"] = 'Max. number of mailboxes';
4+
$wb["limit_mailalias_txt"] = 'Max. number of email aliases';
5+
$wb["limit_mailforward_txt"] = 'Max. number of email forwarders';
6+
$wb["limit_mailcatchall_txt"] = 'Max. number of email catchall accounts';
7+
$wb["limit_mailrouting_txt"] = 'Max. number of email routes';
8+
$wb["limit_mailfilter_txt"] = 'Max. number of email filters';
9+
$wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts';
10+
$wb["limit_mailquota_txt"] = 'Mailbox quota';
11+
$wb["limit_spamfilter_wblist_txt"] = 'Max. number of spamfilter white / blacklist filters';
12+
$wb["limit_spamfilter_user_txt"] = 'Max. number of spamfilter users';
13+
$wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policys';
14+
$wb["default_mailserver_txt"] = 'Default Mailserver';
15+
$wb["company_name_txt"] = 'Company name';
16+
$wb["contact_name_txt"] = 'Contact name';
17+
$wb["username_txt"] = 'Username';
18+
$wb["password_txt"] = 'Password';
19+
$wb["password_strength_txt"] = 'Password strength';
20+
$wb["language_txt"] = 'Language';
21+
$wb["usertheme_txt"] = 'Theme';
22+
$wb["street_txt"] = 'Street';
23+
$wb["zip_txt"] = 'ZIP';
24+
$wb["city_txt"] = 'City';
25+
$wb["state_txt"] = 'State';
26+
$wb["country_txt"] = 'Country';
27+
$wb["telephone_txt"] = 'Telephone';
28+
$wb["mobile_txt"] = 'Mobile';
29+
$wb["fax_txt"] = 'Fax';
30+
$wb["email_txt"] = 'Email';
31+
$wb["internet_txt"] = 'Internet';
32+
$wb["icq_txt"] = 'ICQ';
33+
$wb["notes_txt"] = 'Notes';
34+
$wb["company_txt"] = 'Company';
35+
$wb["title_txt"] = 'Title';
36+
$wb["firstname_txt"] = 'Firstname';
37+
$wb["surname_txt"] = 'Surname';
38+
$wb["limit_domain_txt"] = 'limit_domain';
39+
$wb["limit_subdomain_txt"] = 'limit_subdomain';
40+
$wb["limit_webquota_txt"] = 'limit_webquota';
41+
$wb["limit_database_txt"] = 'limit_database';
42+
$wb["ip_address_txt"] = 'ip_address';
43+
$wb["limit_client_error_notint"] = 'Client Limit is not a number.';
44+
$wb["firstname_error_empty"] = 'Firstname is empty.';
45+
$wb["contact_error_empty"] = 'Contact name is empty.';
46+
$wb["default_webserver_txt"] = 'Default Webserver';
47+
$wb["limit_web_domain_txt"] = 'Max. number of web domains';
48+
$wb["limit_web_aliasdomain_txt"] = 'Max. number of web aliasdomains';
49+
$wb["limit_web_subdomain_txt"] = 'Max. number of web subdomains';
50+
$wb["limit_ftp_user_txt"] = 'Max. number of FTP users';
51+
$wb["default_dnsserver_txt"] = 'Default DNS Server';
52+
$wb["limit_dns_zone_txt"] = 'Max. number of DNS zones';
53+
$wb["limit_dns_record_txt"] = 'Max. number DNS records';
54+
$wb["limit_shell_user_txt"] = 'Max. number of Shell users';
55+
$wb["limit_client_txt"] = 'Max. number of Clients';
56+
$wb["username_error_empty"] = 'Username is empty.';
57+
$wb["username_error_unique"] = 'The username must be unique.';
58+
$wb["limit_maildomain_error_notint"] = 'The email domain limit must be a number.';
59+
$wb["limit_mailbox_error_notint"] = 'The mailbox limit must be a number.';
60+
$wb["limit_mailalias_error_notint"] = 'The email alias limit must be a number.';
61+
$wb["limit_mailforward_error_notint"] = 'The email forward limit must be a number.';
62+
$wb["limit_mailcatchall_error_notint"] = 'The email catchall limit must be a number.';
63+
$wb["limit_mailrouting_error_notint"] = 'The email routing limit must be a number.';
64+
$wb["limit_mailfilter_error_notint"] = 'The email filter limit must be a number.';
65+
$wb["limit_mailfetchmail_error_notint"] = 'The fetchmail limit must be a number.';
66+
$wb["limit_mailquota_error_notint"] = 'The email quota limit must be a number.';
67+
$wb["limit_spamfilter_wblist_error_notint"] = 'The spamfilter white / blacklist limit must be a number.';
68+
$wb["limit_spamfilter_user_error_notint"] = 'The spamfilter user limit must be a number.';
69+
$wb["limit_spamfilter_policy_error_notint"] = 'The spamfilter policy limit must be a number.';
70+
$wb["limit_web_domain_error_notint"] = 'The website limit must be a number.';
71+
$wb["limit_web_aliasdomain_error_notint"] = 'The website alias domain limit must be a number.';
72+
$wb["limit_web_subdomain_error_notint"] = 'The website subdomain limit must be a number.';
73+
$wb["limit_ftp_user_error_notint"] = 'The ftp user limit must be a number.';
74+
$wb["limit_shell_user_error_notint"] = 'The shell user limit must be a number.';
75+
$wb["limit_dns_zone_error_notint"] = 'The dns zone limit must be a number.';
76+
$wb["limit_dns_zone_error_notint"] = 'The dns record limit must be a number.';
77+
$wb["limit_client_error_notint"] = 'The sub client limit must be a number.';
78+
$wb["default_dbserver_txt"] = 'Default Database Server';
79+
$wb["limit_database_txt"] = 'Max. number of Databases';
80+
$wb["limit_database_error_notint"] = 'The database limit must be a number.';
81+
$wb["username_error_regex"] = 'The Username contains invalid chracaters.';
82+
$wb["template_master_txt"] = 'Master template';
83+
$wb["template_additional_txt"] = 'Addon template';
84+
$wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
85+
$wb["web_php_options_txt"] = 'PHP Options';
86+
$wb["limit_client_error"] = 'The max. number of clients is reached.';
87+
?>

‎interface/web/mail/mail_domain_edit.php‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function onShowNew() {
7575
function onShowEnd() {
7676
global $app, $conf;
7777

78-
if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
78+
if($_SESSION["s"]["user"]["typ"] == 'admin') {
7979
// Getting Clients of the user
8080
if($_SESSION["s"]["user"]["typ"] == 'admin') {
8181
$sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0";
@@ -92,9 +92,36 @@ function onShowEnd() {
9292
$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
9393
}
9494
}
95-
$app->tpl->setVar("client_group_id",$client_select);
95+
$app->tpl->setVar("client_group_id",$client_select);
96+
97+
} elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
98+
99+
// Get the limits of the client
100+
$client_group_id = $_SESSION["s"]["user"]["default_group"];
101+
$client = $app->db->queryOneRecord("SELECT client.client_id, limit_web_domain, default_webserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
102+
103+
// Set the webserver to the default server of the client
104+
$tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]");
105+
$app->tpl->setVar("server_id","<option value='$client[default_webserver]'>$tmp[server_name]</option>");
106+
unset($tmp);
107+
108+
// Fill the client select field
109+
$sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id'];
110+
$clients = $app->db->queryAllRecords($sql);
111+
$client_select = '';
112+
if(is_array($clients)) {
113+
foreach( $clients as $client) {
114+
$selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
115+
$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
116+
}
117+
}
118+
$app->tpl->setVar("client_group_id",$client_select);
119+
96120
}
97121

122+
123+
124+
98125
// Get the spamfilter policys for the user
99126
$tmp_user = $app->db->queryOneRecord("SELECT policy_id FROM spamfilter_users WHERE email = '@".$this->dataRecord["domain"]."'");
100127
$sql = "SELECT id, policy_name FROM spamfilter_policy WHERE ".$app->tform->getAuthSQL('r');

‎interface/web/sites/database_edit.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ function onShowEnd() {
9191

9292
// Get the limits of the client
9393
$client_group_id = $_SESSION["s"]["user"]["default_group"];
94-
$client = $app->db->queryOneRecord("SELECT client_id, default_dbserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
95-
94+
$client = $app->db->queryOneRecord("SELECT client.client_id, limit_web_domain, default_webserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
95+
9696
// Set the webserver to the default server of the client
97-
$tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_dbserver]");
98-
$app->tpl->setVar("server_id","<option value='$client[default_dbserver]'>$tmp[server_name]</option>");
97+
$tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]");
98+
$app->tpl->setVar("server_id","<option value='$client[default_webserver]'>$tmp[server_name]</option>");
9999
unset($tmp);
100-
100+
101101
// Fill the client select field
102-
$sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.parent_client_id AND client.parent_client_id = ".$client['client_id'];
102+
$sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id'];
103103
$clients = $app->db->queryAllRecords($sql);
104104
$client_select = '';
105105
if(is_array($clients)) {

0 commit comments

Comments
 (0)