Skip to content

Commit 1ca8237

Browse files
tbrehmtbrehm
committed
Merged revisions 2181-2262 from stable branch.
1 parent fcac50b commit 1ca8237

File tree

864 files changed

+10597
-8167
lines changed

Some content is hidden

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

864 files changed

+10597
-8167
lines changed

‎install/dist/lib/debian60.lib.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,14 @@ public function configure_dovecot()
9696
chgrp($config_dir.'/'.$configfile, 'root');
9797

9898
}
99+
100+
public function configure_apache() {
101+
global $conf;
102+
103+
if(file_exists('/etc/apache2/mods-available/fcgid.conf')) replaceLine('/etc/apache2/mods-available/fcgid.conf','MaxRequestLen','MaxRequestLen 15728640',0,1);
104+
105+
parent::configure_apache();
106+
}
99107

100108
}
101109

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,6 @@ function configure_postfix($options = '')
105105
'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf',
106106
'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf',
107107
'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf',
108-
'virtual_create_maildirsize = yes',
109-
'virtual_maildir_extended = yes',
110-
'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf',
111-
'virtual_mailbox_limit_override = yes',
112-
'virtual_maildir_limit_message = "The user you are trying to reach is over quota."',
113-
'virtual_overquota_bounce = yes',
114108
'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps',
115109
'smtpd_sender_restrictions = check_sender_access mysql:'.$config_dir.'/mysql-virtual_sender.cf',
116110
'smtpd_client_restrictions = check_client_access mysql:'.$config_dir.'/mysql-virtual_client.cf',

‎install/dist/lib/gentoo.lib.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,6 @@ public function configure_postfix($options = '')
101101
'smtpd_tls_key_file = '.$config_dir.'/smtpd.key',
102102
'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf',
103103
'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf',
104-
'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf',
105-
'virtual_create_maildirsize = yes',
106-
'virtual_maildir_extended = yes',
107-
'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf',
108-
'virtual_mailbox_limit_override = yes',
109-
'virtual_maildir_limit_message = "The user you are trying to reach is over quota."',
110-
'virtual_overquota_bounce = yes',
111104
'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps',
112105
'smtpd_sender_restrictions = check_sender_access mysql:'.$config_dir.'/mysql-virtual_sender.cf',
113106
'smtpd_client_restrictions = check_client_access mysql:'.$config_dir.'/mysql-virtual_client.cf',

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ function configure_postfix($options = '')
7676
caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
7777
__FILE__, __LINE__, 'chgrp on mysql-virtual_*.cf*', 'chgrp on mysql-virtual_*.cf* failed');
7878

79+
if(!is_dir($cf['vmail_mailbox_base'])) mkdir($cf['vmail_mailbox_base']);
80+
7981
//* Creating virtual mail user and group
8082
if(is_group($cf['vmail_groupname'])) {
8183
$command = 'groupmod -g '.$cf['vmail_groupid'].' '.$cf['vmail_groupname'];
@@ -117,12 +119,6 @@ function configure_postfix($options = '')
117119
'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf',
118120
'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf',
119121
'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf',
120-
'virtual_create_maildirsize = yes',
121-
'virtual_maildir_extended = yes',
122-
'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf',
123-
'virtual_mailbox_limit_override = yes',
124-
'virtual_maildir_limit_message = "The user you are trying to reach is over quota."',
125-
'virtual_overquota_bounce = yes',
126122
'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps',
127123
'smtpd_sender_restrictions = check_sender_access mysql:'.$config_dir.'/mysql-virtual_sender.cf',
128124
'smtpd_client_restrictions = check_client_access mysql:'.$config_dir.'/mysql-virtual_client.cf',

‎install/lib/installer_base.lib.php‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function find_installed_apps() {
116116
if(is_installed('mailman')) $conf['mailman']['installed'] = true;
117117
if(is_installed('apache') || is_installed('apache2') || is_installed('httpd')) $conf['apache']['installed'] = true;
118118
if(is_installed('getmail')) $conf['getmail']['installed'] = true;
119-
if(is_installed('courierlogger')) $conf['courier']['installed'] = true;
119+
if(is_installed('courierlogger')) $conf['courier']['installed'] = true;
120120
if(is_installed('dovecot')) $conf['dovecot']['installed'] = true;
121121
if(is_installed('saslsauthd')) $conf['saslauthd']['installed'] = true;
122122
if(is_installed('amavisd-new')) $conf['amavis']['installed'] = true;
@@ -578,12 +578,6 @@ public function configure_postfix($options = '') {
578578
'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf',
579579
'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf',
580580
'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf',
581-
'virtual_create_maildirsize = yes',
582-
'virtual_maildir_extended = yes',
583-
'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf',
584-
'virtual_mailbox_limit_override = yes',
585-
'virtual_maildir_limit_message = "The user you are trying to reach is over quota."',
586-
'virtual_overquota_bounce = yes',
587581
'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps',
588582
'smtpd_sender_restrictions = check_sender_access mysql:'.$config_dir.'/mysql-virtual_sender.cf',
589583
'smtpd_client_restrictions = check_client_access mysql:'.$config_dir.'/mysql-virtual_client.cf',
@@ -622,7 +616,7 @@ public function configure_postfix($options = '') {
622616
if(!stristr($options,'dont-create-certs')) {
623617
//* Create the SSL certificate
624618
$command = 'cd '.$config_dir.'; '
625-
.'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509';
619+
.'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509';
626620
exec($command);
627621

628622
$command = 'chmod o= '.$config_dir.'/smtpd.key';
@@ -1103,7 +1097,8 @@ public function configure_apache() {
11031097
// Check the awsatst script
11041098
if(!is_dir('/usr/share/awstats/tools')) exec('mkdir -p /usr/share/awstats/tools');
11051099
if(!file_exists('/usr/share/awstats/tools/awstats_buildstaticpages.pl') && file_exists('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl')) symlink('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl','/usr/share/awstats/tools/awstats_buildstaticpages.pl');
1106-
1100+
if(file_exists('/etc/awstats/awstats.conf.local')) replaceLine('/etc/awstats/awstats.conf.local','LogFormat=4','LogFormat=1',0,1);
1101+
11071102
//* add a sshusers group
11081103
$command = 'groupadd sshusers';
11091104
if(!is_group('sshusers')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
13621362
-- Dumping data for table `sys_config`
13631363
--
13641364

1365-
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.3.1');
1365+
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.3.3');
13661366

13671367
-- --------------------------------------------------------
13681368

‎install/tpl/apache_apps.vhost.master‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@
1111
ServerAdmin webmaster@localhost
1212
{apps_vhost_servername}
1313

14-
<IfModule mod_fcgid.c>
14+
<IfModule mod_php5.c>
1515
DocumentRoot {apps_vhost_dir}
16-
SuexecUserGroup ispapps ispapps
16+
AddType application/x-httpd-php .php
1717
<Directory {apps_vhost_dir}>
18-
Options Indexes FollowSymLinks MultiViews +ExecCGI
19-
AllowOverride AuthConfig Indexes Limit Options FileInfo
20-
AddHandler fcgid-script .php
21-
FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php
18+
Options FollowSymLinks
19+
AllowOverride None
2220
Order allow,deny
2321
Allow from all
2422
</Directory>
2523
</IfModule>
2624

27-
<IfModule mod_php5.c>
25+
<IfModule mod_fcgid.c>
2826
DocumentRoot {apps_vhost_dir}
29-
AddType application/x-httpd-php .php
27+
SuexecUserGroup ispapps ispapps
3028
<Directory {apps_vhost_dir}>
31-
Options FollowSymLinks
32-
AllowOverride None
29+
Options Indexes FollowSymLinks MultiViews +ExecCGI
30+
AllowOverride AuthConfig Indexes Limit Options FileInfo
31+
AddHandler fcgid-script .php
32+
FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php
3333
Order allow,deny
3434
Allow from all
3535
</Directory>

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

Lines changed: 1 addition & 2 deletions
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.3.2');
59+
define('ISPC_APP_VERSION', '3.0.3.3');
6060

6161

6262
//** Database
@@ -143,7 +143,6 @@ $conf['theme'] = 'default';
143143
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
144144
$conf['logo'] = 'themes/default/images/ispc_logo.png';
145145

146-
147146
//** Default Language
148147
$conf['language'] = '{language}';
149148
$conf['debug_language'] = false;

‎interface/lib/app.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public function lng($text) {
163163
//* Load module wordbook, if it exists
164164
if(isset($_SESSION['s']['module']['name']) && isset($_SESSION['s']['language'])) {
165165
$lng_file = '/web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$_SESSION['s']['language'].'.lng';
166-
if(!file_exists(ISPC_ROOT_PATH.$lng_file)) $lng_file = '/web/'.$_SESSION['s']['module']['name'].'/lib/lang/en.lng';
166+
if(!file_exists(ISPC_ROOT_PATH.'/'.$lng_file)) $lng_file = '/web/'.$_SESSION['s']['module']['name'].'/lib/lang/en.lng';
167167
$this->load_language_file($lng_file);
168168
}
169169
$this->_language_inc = 1;
@@ -183,7 +183,7 @@ public function load_language_file($filename) {
183183
$filename = ISPC_ROOT_PATH.'/'.$filename;
184184
if(substr($filename,-4) != '.lng') $this->error('Language file has wrong extension.');
185185
if(file_exists($filename)) {
186-
@include_once($filename);
186+
@include($filename);
187187
if(is_array($wb)) {
188188
if(is_array($this->_wb)) {
189189
$this->_wb = array_merge($this->_wb,$wb);

‎interface/lib/classes/functions.inc.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,15 @@ public function array_merge($array1,$array2) {
8787
return $out;
8888
}
8989

90+
public function currency_format($number) {
91+
global $app;
92+
$number_format_decimals = (int)$app->lng('number_format_decimals');
93+
$number_format_dec_point = $app->lng('number_format_dec_point');
94+
$number_format_thousands_sep = $app->lng('number_format_thousands_sep');
95+
if($number_format_thousands_sep == 'number_format_thousands_sep') $number_format_thousands_sep = '';
96+
return number_format((double)$number, $number_format_decimals, $number_format_dec_point, $number_format_thousands_sep);
97+
}
98+
9099

91100

92101
}

0 commit comments

Comments
 (0)