Skip to content

Commit 427cd2f

Browse files
author
Marius Cramer
committed
Merge branch 'master' into 'master'
Master See merge request !164
2 parents 4a596d4 + 54afe0e commit 427cd2f

31 files changed

+1570
-1068
lines changed

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,5 @@ ALTER TABLE `web_backup` CHANGE `filesize` `filesize` VARCHAR(20) NOT NULL DEFAU
3838
ALTER TABLE `sys_datalog` ADD INDEX `dbtable` (`dbtable` (25), `dbidx` (25)), ADD INDEX (`action`);
3939
ALTER TABLE `mail_user` ADD `greylisting` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `postfix`;
4040
ALTER TABLE `mail_forwarding` ADD `greylisting` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `active`;
41+
42+
ALTER TABLE `openvz_ip` CHANGE `ip_address` `ip_address` VARCHAR(39) DEFAULT NULL;

‎interface/web/tools/form/resync.tform.php‎

Lines changed: 2 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
$form["title"] = "Resync Tool";
33
$form["description"] = "";
44
$form["name"] = "resync";
5-
$form["action"] = "resync_do.php";
5+
$form["action"] = "resync.php";
66
$form["db_history"] = "no";
77
$form["tab_default"] = "resync";
8-
$form["list_default"] = "resync_show.php";
8+
$form["list_default"] = "resync.php";
99
$form["auth"] = 'yes';
1010

1111
$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
@@ -18,96 +18,6 @@
1818
'title' => "Resync",
1919
'width' => 100,
2020
'template' => "templates/resync.htm",
21-
'fields' => array (
22-
'mail_server_id' => array (
23-
'datatype' => 'INTEGER',
24-
'formtype' => 'SELECT',
25-
'default' => '',
26-
'datasource' => array ( 'type' => 'SQL',
27-
'querystring' => 'SELECT server_id FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
28-
'keyfield'=> 'server_id',
29-
'valuefield'=> 'server_name'
30-
),
31-
'value' => ''
32-
),
33-
'web_server_id' => array (
34-
'datatype' => 'INTEGER',
35-
'formtype' => 'SELECT',
36-
'default' => '',
37-
'datasource' => array ( 'type' => 'SQL',
38-
'querystring' => 'SELECT server_id FROM server WHERE web_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
39-
'keyfield'=> 'server_id',
40-
'valuefield'=> 'server_name'
41-
),
42-
'value' => ''
43-
),
44-
'dns_server_id' => array (
45-
'datatype' => 'INTEGER',
46-
'formtype' => 'SELECT',
47-
'default' => '',
48-
'datasource' => array ( 'type' => 'SQL',
49-
'querystring' => 'SELECT server_id FROM server WHERE dns_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
50-
'keyfield'=> 'server_id',
51-
'valuefield'=> 'server_name'
52-
),
53-
'value' => ''
54-
),
55-
'file_server_id' => array (
56-
'datatype' => 'INTEGER',
57-
'formtype' => 'SELECT',
58-
'default' => '',
59-
'datasource' => array ( 'type' => 'SQL',
60-
'querystring' => 'SELECT server_id FROM server WHERE file_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
61-
'keyfield'=> 'server_id',
62-
'valuefield'=> 'server_name'
63-
),
64-
'value' => ''
65-
),
66-
'db_server_id' => array (
67-
'datatype' => 'INTEGER',
68-
'formtype' => 'SELECT',
69-
'default' => '',
70-
'datasource' => array ( 'type' => 'SQL',
71-
'querystring' => 'SELECT server_id FROM server WHERE db_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
72-
'keyfield'=> 'server_id',
73-
'valuefield'=> 'server_name'
74-
),
75-
'value' => ''
76-
),
77-
'vserver_server_id' => array (
78-
'datatype' => 'INTEGER',
79-
'formtype' => 'SELECT',
80-
'default' => '',
81-
'datasource' => array ( 'type' => 'SQL',
82-
'querystring' => 'SELECT server_id FROM server WHERE vserver_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
83-
'keyfield'=> 'server_id',
84-
'valuefield'=> 'server_name'
85-
),
86-
'value' => ''
87-
),
88-
'proxy_server_id' => array (
89-
'datatype' => 'INTEGER',
90-
'formtype' => 'SELECT',
91-
'default' => '',
92-
'datasource' => array ( 'type' => 'SQL',
93-
'querystring' => 'SELECT server_id FROM server WHERE proxy_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
94-
'keyfield'=> 'server_id',
95-
'valuefield'=> 'server_name'
96-
),
97-
'value' => ''
98-
),
99-
'firewall_server_id' => array (
100-
'datatype' => 'INTEGER',
101-
'formtype' => 'SELECT',
102-
'default' => '',
103-
'datasource' => array ( 'type' => 'SQL',
104-
'querystring' => 'SELECT server_id FROM server WHERE firewall_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
105-
'keyfield'=> 'server_id',
106-
'valuefield'=> 'server_name'
107-
),
108-
'value' => ''
109-
),
110-
)
11121
);
11222

11323

‎interface/web/tools/lib/lang/ar_resync.lng‎

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
11
<?php
22
$wb['head_txt'] = 'Resync Tool';
33
$wb['legend_txt'] = 'Resync';
4-
$wb['resync_sites_txt'] = 'Resync Websites';
5-
$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
6-
$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
7-
$wb['resync_shell_txt'] = 'Resync shell users';
8-
$wb['resync_cron_txt'] = 'Resync cronjobs';
9-
$wb['resync_db_txt'] = 'Resync Client Database config';
10-
$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
11-
$wb['resync_mail_txt'] = 'Resync Maildomains';
12-
$wb['resync_dns_txt'] = 'Resync DNS records';
13-
$wb['resync_vserver_txt'] = 'Resync vServer';
14-
$wb['resync_client_txt'] = 'Resync Client records';
15-
$wb['resync_firewall_txt'] = 'Resync Firewall';
16-
$wb['resync_no_server_txt'] = 'No active server found';
4+
$wb['resync_all_txt'] = 'All services';
5+
$wb['resync_sites_txt'] = 'Websites';
6+
$wb['resync_ftp_txt'] = 'FTP-Accounts';
7+
$wb['resync_webdav_txt'] = 'WebDAV-Users';
8+
$wb['resync_shell_txt'] = 'Shell users';
9+
$wb['resync_cron_txt'] = 'Cronjobs';
10+
$wb['resync_db_txt'] = 'Client Database config';
11+
$wb['resync_mailbox_txt'] = 'Mailboxes';
12+
$wb['resync_mail_txt'] = 'Maildomains';
13+
$wb['resync_mailfilter_txt'] = 'Mailfilter';
14+
$wb['resync_mailinglist_txt'] = 'Mailinglist';
15+
$wb['resync_dns_txt'] = 'DNS records';
16+
$wb['resync_vserver_txt'] = 'vServer';
17+
$wb['resync_client_txt'] = 'Client and reseller';
18+
$wb['all_active_txt'] = 'All active server';
19+
$wb['all_active_mail_txt'] = 'All active Mail-Server';
20+
$wb['all_active_web_txt'] = 'All active Web-Server';
21+
$wb['all_active_dns_txt'] = 'All active DNS-Server';
22+
$wb['all_active_file_txt'] = 'All active File-Server';
23+
$wb['all_active_db_txt'] = 'All active Database-Server';
24+
$wb['all_active_vserver_txt'] = 'All active vServer';
25+
$wb['do_sites_txt'] = 'Resynced Website';
26+
$wb['do_ftp_txt'] = 'Resynced FTP user';
27+
$wb['do_webdav_txt'] = 'Resynced WebDav user';
28+
$wb['do_shell_txt'] = 'Resynced Shell user';
29+
$wb['do_cron_txt'] = 'Resynced Cronjob';
30+
$wb['do_db_user_txt'] = 'Resynced Database User';
31+
$wb['do_db_txt'] = 'Resynced Database';
32+
$wb['do_mail_txt'] = 'Resynced Maildomain';
33+
$wb['do_mailbox_txt'] = 'Resynced Mailbox';
34+
$wb['do_mail_alias_txt'] = 'Resynced Alias';
35+
$wb['do_mail_access_txt'] = 'Resynced Mail access';
36+
$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
37+
$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
38+
$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
39+
$wb['do_dns_txt'] = 'Resynced DNS zone';
40+
$wb['do_vserver_txt'] = 'Resynced vServer';
41+
$wb['do_clients_txt'] = 'Resynced clients and reseller';
42+
$wb['no_results_txt'] = 'Nothing found';
1743
$wb['btn_start_txt'] = 'Start';
1844
$wb['btn_cancel_txt'] = 'Cancel';
1945
?>

‎interface/web/tools/lib/lang/bg_resync.lng‎

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
11
<?php
2-
$wb['head_txt'] = 'Повторно синхронизиране Инструменти';
3-
$wb['legend_txt'] = 'Повторно синхронизиране';
4-
$wb['resync_sites_txt'] = 'Resync Websites';
5-
$wb['resync_ftp_txt'] = 'Resync FTP users';
6-
$wb['resync_shell_txt'] = 'Resync shell users';
7-
$wb['resync_cron_txt'] = 'Resync cronjobs';
8-
$wb['resync_db_txt'] = 'Resync clientdb config';
9-
$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
10-
$wb['resync_dns_txt'] = 'Resync DNS records';
11-
$wb['btn_start_txt'] = 'Стартирай';
12-
$wb['btn_cancel_txt'] = 'Отказ';
13-
$wb['resync_client_txt'] = 'Resync Client records';
14-
$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
15-
$wb['resync_mail_txt'] = 'Resync Maildomains';
16-
$wb['resync_vserver_txt'] = 'Resync vServer';
17-
$wb['resync_firewall_txt'] = 'Resync Firewall';
18-
$wb['resync_no_server_txt'] = 'No active server found';
2+
$wb['head_txt'] = 'Resync Tool';
3+
$wb['legend_txt'] = 'Resync';
4+
$wb['resync_all_txt'] = 'All services';
5+
$wb['resync_sites_txt'] = 'Websites';
6+
$wb['resync_ftp_txt'] = 'FTP-Accounts';
7+
$wb['resync_webdav_txt'] = 'WebDAV-Users';
8+
$wb['resync_shell_txt'] = 'Shell users';
9+
$wb['resync_cron_txt'] = 'Cronjobs';
10+
$wb['resync_db_txt'] = 'Client Database config';
11+
$wb['resync_mailbox_txt'] = 'Mailboxes';
12+
$wb['resync_mail_txt'] = 'Maildomains';
13+
$wb['resync_mailfilter_txt'] = 'Mailfilter';
14+
$wb['resync_mailinglist_txt'] = 'Mailinglist';
15+
$wb['resync_dns_txt'] = 'DNS records';
16+
$wb['resync_vserver_txt'] = 'vServer';
17+
$wb['resync_client_txt'] = 'Client and reseller';
18+
$wb['all_active_txt'] = 'All active server';
19+
$wb['all_active_mail_txt'] = 'All active Mail-Server';
20+
$wb['all_active_web_txt'] = 'All active Web-Server';
21+
$wb['all_active_dns_txt'] = 'All active DNS-Server';
22+
$wb['all_active_file_txt'] = 'All active File-Server';
23+
$wb['all_active_db_txt'] = 'All active Database-Server';
24+
$wb['all_active_vserver_txt'] = 'All active vServer';
25+
$wb['do_sites_txt'] = 'Resynced Website';
26+
$wb['do_ftp_txt'] = 'Resynced FTP user';
27+
$wb['do_webdav_txt'] = 'Resynced WebDav user';
28+
$wb['do_shell_txt'] = 'Resynced Shell user';
29+
$wb['do_cron_txt'] = 'Resynced Cronjob';
30+
$wb['do_db_user_txt'] = 'Resynced Database User';
31+
$wb['do_db_txt'] = 'Resynced Database';
32+
$wb['do_mail_txt'] = 'Resynced Maildomain';
33+
$wb['do_mailbox_txt'] = 'Resynced Mailbox';
34+
$wb['do_mail_alias_txt'] = 'Resynced Alias';
35+
$wb['do_mail_access_txt'] = 'Resynced Mail access';
36+
$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
37+
$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
38+
$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
39+
$wb['do_dns_txt'] = 'Resynced DNS zone';
40+
$wb['do_vserver_txt'] = 'Resynced vServer';
41+
$wb['do_clients_txt'] = 'Resynced clients and reseller';
42+
$wb['no_results_txt'] = 'Nothing found';
43+
$wb['btn_start_txt'] = 'Start';
44+
$wb['btn_cancel_txt'] = 'Cancel';
1945
?>

‎interface/web/tools/lib/lang/br_resync.lng‎

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
11
<?php
22
$wb['head_txt'] = 'Resync Tool';
33
$wb['legend_txt'] = 'Resync';
4-
$wb['resync_sites_txt'] = 'Resync Websites';
5-
$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
6-
$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
7-
$wb['resync_shell_txt'] = 'Resync shell users';
8-
$wb['resync_cron_txt'] = 'Resync cronjobs';
9-
$wb['resync_db_txt'] = 'Resync Client Database config';
10-
$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
11-
$wb['resync_mail_txt'] = 'Resync Maildomains';
12-
$wb['resync_dns_txt'] = 'Resync DNS records';
13-
$wb['resync_vserver_txt'] = 'Resync vServer';
14-
$wb['resync_client_txt'] = 'Resync Client records';
15-
$wb['resync_firewall_txt'] = 'Resync Firewall';
16-
$wb['resync_no_server_txt'] = 'No active server found';
4+
$wb['resync_all_txt'] = 'All services';
5+
$wb['resync_sites_txt'] = 'Websites';
6+
$wb['resync_ftp_txt'] = 'FTP-Accounts';
7+
$wb['resync_webdav_txt'] = 'WebDAV-Users';
8+
$wb['resync_shell_txt'] = 'Shell users';
9+
$wb['resync_cron_txt'] = 'Cronjobs';
10+
$wb['resync_db_txt'] = 'Client Database config';
11+
$wb['resync_mailbox_txt'] = 'Mailboxes';
12+
$wb['resync_mail_txt'] = 'Maildomains';
13+
$wb['resync_mailfilter_txt'] = 'Mailfilter';
14+
$wb['resync_mailinglist_txt'] = 'Mailinglist';
15+
$wb['resync_dns_txt'] = 'DNS records';
16+
$wb['resync_vserver_txt'] = 'vServer';
17+
$wb['resync_client_txt'] = 'Client and reseller';
18+
$wb['all_active_txt'] = 'All active server';
19+
$wb['all_active_mail_txt'] = 'All active Mail-Server';
20+
$wb['all_active_web_txt'] = 'All active Web-Server';
21+
$wb['all_active_dns_txt'] = 'All active DNS-Server';
22+
$wb['all_active_file_txt'] = 'All active File-Server';
23+
$wb['all_active_db_txt'] = 'All active Database-Server';
24+
$wb['all_active_vserver_txt'] = 'All active vServer';
25+
$wb['do_sites_txt'] = 'Resynced Website';
26+
$wb['do_ftp_txt'] = 'Resynced FTP user';
27+
$wb['do_webdav_txt'] = 'Resynced WebDav user';
28+
$wb['do_shell_txt'] = 'Resynced Shell user';
29+
$wb['do_cron_txt'] = 'Resynced Cronjob';
30+
$wb['do_db_user_txt'] = 'Resynced Database User';
31+
$wb['do_db_txt'] = 'Resynced Database';
32+
$wb['do_mail_txt'] = 'Resynced Maildomain';
33+
$wb['do_mailbox_txt'] = 'Resynced Mailbox';
34+
$wb['do_mail_alias_txt'] = 'Resynced Alias';
35+
$wb['do_mail_access_txt'] = 'Resynced Mail access';
36+
$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
37+
$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
38+
$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
39+
$wb['do_dns_txt'] = 'Resynced DNS zone';
40+
$wb['do_vserver_txt'] = 'Resynced vServer';
41+
$wb['do_clients_txt'] = 'Resynced clients and reseller';
42+
$wb['no_results_txt'] = 'Nothing found';
1743
$wb['btn_start_txt'] = 'Start';
1844
$wb['btn_cancel_txt'] = 'Cancel';
1945
?>

‎interface/web/tools/lib/lang/cz_resync.lng‎

Lines changed: 43 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,45 @@
11
<?php
2-
$wb['head_txt'] = 'Resynchronizační nástroje';
3-
$wb['legend_txt'] = 'Resynchronizace';
4-
$wb['resync_sites_txt'] = 'Resynchronizovat webové stránky';
5-
$wb['resync_ftp_txt'] = 'Resynchronizovat FTP uživatele';
6-
$wb['resync_shell_txt'] = 'Resynchronizovat shell uživatele';
7-
$wb['resync_cron_txt'] = 'Resynchronizovat cron úlohy';
8-
$wb['resync_db_txt'] = 'Resynchronizovat clientdb konfigurace';
9-
$wb['resync_mailbox_txt'] = 'Resynchronizovat e-mailové schránky';
10-
$wb['resync_dns_txt'] = 'Resynchronizovat DNS záznamy';
11-
$wb['btn_start_txt'] = 'Zahájit';
12-
$wb['btn_cancel_txt'] = 'Zrušit';
13-
$wb['resync_client_txt'] = 'Resync Client records';
14-
$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
15-
$wb['resync_mail_txt'] = 'Resync Maildomains';
16-
$wb['resync_vserver_txt'] = 'Resync vServer';
17-
$wb['resync_firewall_txt'] = 'Resync Firewall';
18-
$wb['resync_no_server_txt'] = 'No active server found';
2+
$wb['head_txt'] = 'Resync Tool';
3+
$wb['legend_txt'] = 'Resync';
4+
$wb['resync_all_txt'] = 'All services';
5+
$wb['resync_sites_txt'] = 'Websites';
6+
$wb['resync_ftp_txt'] = 'FTP-Accounts';
7+
$wb['resync_webdav_txt'] = 'WebDAV-Users';
8+
$wb['resync_shell_txt'] = 'Shell users';
9+
$wb['resync_cron_txt'] = 'Cronjobs';
10+
$wb['resync_db_txt'] = 'Client Database config';
11+
$wb['resync_mailbox_txt'] = 'Mailboxes';
12+
$wb['resync_mail_txt'] = 'Maildomains';
13+
$wb['resync_mailfilter_txt'] = 'Mailfilter';
14+
$wb['resync_mailinglist_txt'] = 'Mailinglist';
15+
$wb['resync_dns_txt'] = 'DNS records';
16+
$wb['resync_vserver_txt'] = 'vServer';
17+
$wb['resync_client_txt'] = 'Client and reseller';
18+
$wb['all_active_txt'] = 'All active server';
19+
$wb['all_active_mail_txt'] = 'All active Mail-Server';
20+
$wb['all_active_web_txt'] = 'All active Web-Server';
21+
$wb['all_active_dns_txt'] = 'All active DNS-Server';
22+
$wb['all_active_file_txt'] = 'All active File-Server';
23+
$wb['all_active_db_txt'] = 'All active Database-Server';
24+
$wb['all_active_vserver_txt'] = 'All active vServer';
25+
$wb['do_sites_txt'] = 'Resynced Website';
26+
$wb['do_ftp_txt'] = 'Resynced FTP user';
27+
$wb['do_webdav_txt'] = 'Resynced WebDav user';
28+
$wb['do_shell_txt'] = 'Resynced Shell user';
29+
$wb['do_cron_txt'] = 'Resynced Cronjob';
30+
$wb['do_db_user_txt'] = 'Resynced Database User';
31+
$wb['do_db_txt'] = 'Resynced Database';
32+
$wb['do_mail_txt'] = 'Resynced Maildomain';
33+
$wb['do_mailbox_txt'] = 'Resynced Mailbox';
34+
$wb['do_mail_alias_txt'] = 'Resynced Alias';
35+
$wb['do_mail_access_txt'] = 'Resynced Mail access';
36+
$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
37+
$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
38+
$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
39+
$wb['do_dns_txt'] = 'Resynced DNS zone';
40+
$wb['do_vserver_txt'] = 'Resynced vServer';
41+
$wb['do_clients_txt'] = 'Resynced clients and reseller';
42+
$wb['no_results_txt'] = 'Nothing found';
43+
$wb['btn_start_txt'] = 'Start';
44+
$wb['btn_cancel_txt'] = 'Cancel';
1945
?>
20-

0 commit comments

Comments
 (0)