Skip to content

Commit 3f478f7

Browse files
tbrehmtbrehm
committed
Merged revisions 3922-3958 from stable branch.
1 parent 2a4acdb commit 3f478f7

File tree

485 files changed

+280
-671
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

485 files changed

+280
-671
lines changed

‎install/dist/lib/fedora.lib.php‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,8 @@ public function configure_mailman($status = 'insert') {
5959
}
6060
}
6161

62-
$config_dir = $conf['mailman']['config_dir'].'/';
63-
$full_file_name = $config_dir.'virtual_to_transport.sh';
64-
65-
//* Backup exiting virtual_to_transport.sh script
66-
if(is_file($full_file_name)) {
67-
copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
68-
}
69-
70-
copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
71-
chgrp($full_file_name,'mailman');
72-
chmod($full_file_name,0750);
73-
7462
if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
7563
exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
76-
77-
exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
7864

7965
$virtual_domains = '';
8066
if($status == 'update')
@@ -101,6 +87,25 @@ public function configure_mailman($status = 'insert') {
10187
$content = str_replace('{virtual_domains}', $virtual_domains, $content);
10288

10389
wf($full_file_name, $content);
90+
91+
//* Write virtual_to_transport.sh script
92+
$config_dir = $conf['mailman']['config_dir'].'/';
93+
$full_file_name = $config_dir.'virtual_to_transport.sh';
94+
95+
//* Backup exiting virtual_to_transport.sh script
96+
if(is_file($full_file_name)) {
97+
copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
98+
}
99+
100+
if(is_dir('/etc/mailman')) {
101+
copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
102+
chgrp($full_file_name,'mailman');
103+
chmod($full_file_name,0750);
104+
}
105+
106+
//* Create aliasaes
107+
exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
108+
104109
}
105110

106111
function configure_postfix($options = '')
@@ -204,6 +209,16 @@ function configure_postfix($options = '')
204209
touch($config_dir.'/nested_header_checks');
205210
touch($config_dir.'/body_checks');
206211

212+
//* Create the mailman files
213+
if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
214+
//if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
215+
if(is_file('/var/lib/mailman/data/aliases')) unlink('/var/lib/mailman/data/aliases');
216+
if(!is_link('/var/lib/mailman/data/aliases')) symlink('/etc/mailman/aliases','/var/lib/mailman/data/aliases');
217+
exec('postalias /var/lib/mailman/data/aliases');
218+
if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman');
219+
exec('postmap /var/lib/mailman/data/virtual-mailman');
220+
if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
221+
exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
207222

208223
//* Make a backup copy of the main.cf file
209224
copy($config_dir.'/main.cf', $config_dir.'/main.cf~');

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,8 @@ public function configure_mailman($status = 'insert') {
5959
}
6060
}
6161

62-
$config_dir = $conf['mailman']['config_dir'].'/';
63-
$full_file_name = $config_dir.'virtual_to_transport.sh';
64-
65-
//* Backup exiting virtual_to_transport.sh script
66-
if(is_file($full_file_name)) {
67-
copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
68-
}
69-
70-
copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
71-
chgrp($full_file_name,'mailman');
72-
chmod($full_file_name,0750);
73-
7462
if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
7563
exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
76-
77-
exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
7864

7965
$virtual_domains = '';
8066
if($status == 'update')
@@ -101,6 +87,24 @@ public function configure_mailman($status = 'insert') {
10187
$content = str_replace('{virtual_domains}', $virtual_domains, $content);
10288

10389
wf($full_file_name, $content);
90+
91+
//* Write virtual_to_transport.sh script
92+
$config_dir = $conf['mailman']['config_dir'].'/';
93+
$full_file_name = $config_dir.'virtual_to_transport.sh';
94+
95+
//* Backup exiting virtual_to_transport.sh script
96+
if(is_file($full_file_name)) {
97+
copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
98+
}
99+
100+
if(is_dir('/etc/mailman')) {
101+
copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
102+
chgrp($full_file_name,'mailman');
103+
chmod($full_file_name,0750);
104+
}
105+
106+
//* Create aliasaes
107+
exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
104108
}
105109

106110
function configure_postfix($options = '')
@@ -218,6 +222,14 @@ function configure_postfix($options = '')
218222
touch($config_dir.'/nested_header_checks');
219223
touch($config_dir.'/body_checks');
220224

225+
//* Create the mailman files
226+
if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
227+
if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
228+
exec('postalias /var/lib/mailman/data/aliases');
229+
if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman');
230+
exec('postmap /var/lib/mailman/data/virtual-mailman');
231+
if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
232+
exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
221233

222234
//* Make a backup copy of the main.cf file
223235
copy($config_dir.'/main.cf', $config_dir.'/main.cf~');

‎install/sql/incremental/upd_0050.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE `dns_slave` DROP INDEX `origin`;
2+
ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ CREATE TABLE `dns_slave` (
418418
`active` enum('N','Y') NOT NULL,
419419
`xfer` varchar(255) NOT NULL,
420420
PRIMARY KEY (`id`),
421-
UNIQUE KEY `origin` (`origin`),
421+
UNIQUE KEY `slave` (`origin`,`server_id`),
422422
KEY `active` (`active`)
423423
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
424424

@@ -2169,6 +2169,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
21692169
-- Dumping data for table `sys_config`
21702170
--
21712171

2172-
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.1');
2172+
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.2');
21732173

21742174
SET FOREIGN_KEY_CHECKS = 1;

‎install/tpl/apache_ispconfig.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
5151
Alias /awstats-icon "/usr/share/awstats/icon"
5252

5353
NameVirtualHost *:80
54-
NameVirtualHost *:443
54+
NameVirtualHost *:443

‎install/tpl/apache_ispconfig.vhost.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ NameVirtualHost *:{vhost_port}
2626
Allow from all
2727
</Directory>
2828
IPCCommTimeout 7200
29+
MaxRequestLen 15728640
2930
</IfModule>
3031

3132
<IfModule mpm_itk_module>

‎install/tpl/config.inc.php.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
5656

5757
//** Application
5858
define('ISPC_APP_TITLE', 'ISPConfig');
59-
define('ISPC_APP_VERSION', '3.0.5.1');
59+
define('ISPC_APP_VERSION', '3.0.5.2');
6060
define('DEVSYSTEM', 0);
6161

6262

‎interface/lib/lang/cz.lng‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,5 +132,3 @@ $wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavení uživatele pro
132132
$wb['datalog_status_d_web_folder_user'] = 'Odstranění uživatele pro adresáře chráněné heslem';
133133
$wb['login_as_txt'] = 'Přihlaste se jako';
134134
?>
135-
136-

‎interface/lib/lang/pl.lng‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,3 @@ $wb['datalog_status_u_web_folder_user'] = 'Edytuj konto zabezpieczonego folderu'
132132
$wb['datalog_status_d_web_folder_user'] = 'Usuń konto zabezpieczonego folderu';
133133
$wb['login_as_txt'] = 'Zaloguj jako';
134134
?>
135-

‎interface/web/admin/form/system_config.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
'datatype' => 'VARCHAR',
215215
'formtype' => 'TEXT',
216216
'validators' => array ( 0 => array ( 'type' => 'REGEX',
217-
'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
217+
'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}(\?.+)?$/',
218218
'errmsg'=> 'webmail_url_error_regex'),
219219
),
220220
'default' => '',

0 commit comments

Comments
 (0)