Skip to content
Snippets Groups Projects
Commit 69014bdb authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

parents cf8227a8 d4b75bca
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
install/tpl/apache_ispconfig.vhost.master
+ 48
− 38
View file @ 69014bdb
...@@ -8,101 +8,111 @@ NameVirtualHost *:<tmpl_var name="vhost_port"> ...@@ -8,101 +8,111 @@ NameVirtualHost *:<tmpl_var name="vhost_port">
<VirtualHost _default_:<tmpl_var name="vhost_port">> <VirtualHost _default_:<tmpl_var name="vhost_port">>
ServerAdmin webmaster@localhost ServerAdmin webmaster@localhost
<FilesMatch "\.ph(p3?|tml)$"> <FilesMatch "\.ph(p3?|tml)$">
SetHandler None SetHandler None
</FilesMatch> </FilesMatch>
<IfModule mod_fcgid.c> <IfModule mod_fcgid.c>
DocumentRoot /var/www/ispconfig/ DocumentRoot /var/www/ispconfig/
SuexecUserGroup ispconfig ispconfig SuexecUserGroup ispconfig ispconfig
<Directory /var/www/ispconfig/> <Directory /var/www/ispconfig/>
Options -Indexes +FollowSymLinks +MultiViews +ExecCGI Options -Indexes +FollowSymLinks +MultiViews +ExecCGI
AllowOverride AuthConfig Indexes Limit Options FileInfo AllowOverride AuthConfig Indexes Limit Options FileInfo
<FilesMatch "\.php$"> <FilesMatch "\.php$">
SetHandler fcgid-script SetHandler fcgid-script
</FilesMatch> </FilesMatch>
FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
<tmpl_if name='apache_version' op='>' value='2.2' format='version'> <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted Require all granted
<tmpl_else> <tmpl_else>
Order allow,deny Order allow,deny
Allow from all Allow from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
IPCCommTimeout 7200 IPCCommTimeout 7200
MaxRequestLen 15728640 MaxRequestLen 15728640
</IfModule> </IfModule>
<IfModule mpm_itk_module> <IfModule mpm_itk_module>
DocumentRoot /usr/local/ispconfig/interface/web/ DocumentRoot /usr/local/ispconfig/interface/web/
AssignUserId ispconfig ispconfig AssignUserId ispconfig ispconfig
AddType application/x-httpd-php .php AddType application/x-httpd-php .php
<Directory /usr/local/ispconfig/interface/web> <Directory /usr/local/ispconfig/interface/web>
# php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp" # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
Options +FollowSymLinks Options +FollowSymLinks
AllowOverride None AllowOverride None
<tmpl_if name='apache_version' op='>' value='2.2' format='version'> <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted Require all granted
<tmpl_else> <tmpl_else>
Order allow,deny Order allow,deny
Allow from all Allow from all
</tmpl_if> </tmpl_if>
php_value magic_quotes_gpc 0 php_value magic_quotes_gpc 0
</Directory> </Directory>
</IfModule> </IfModule>
# ErrorLog /var/log/apache2/error.log # ErrorLog /var/log/apache2/error.log
# CustomLog /var/log/apache2/access.log combined # CustomLog /var/log/apache2/access.log combined
ServerSignature Off ServerSignature Off
<IfModule mod_security2.c> <IfModule mod_security2.c>
SecRuleEngine Off SecRuleEngine Off
</IfModule> </IfModule>
# SSL Configuration # SSL Configuration
<tmpl_var name="ssl_comment">SSLEngine On <tmpl_var name="ssl_comment">SSLEngine On
<tmpl_if name='apache_version' op='>=' value='2.3.16' format='version'>
<tmpl_var name="ssl_comment">SSLProtocol All -SSLv3
<tmpl_else>
<tmpl_var name="ssl_comment">SSLProtocol All -SSLv2 -SSLv3 <tmpl_var name="ssl_comment">SSLProtocol All -SSLv2 -SSLv3
</tmpl_if>
<tmpl_var name="ssl_comment">SSLCertificateFile /usr/local/ispconfig/interface/ssl/ispserver.crt <tmpl_var name="ssl_comment">SSLCertificateFile /usr/local/ispconfig/interface/ssl/ispserver.crt
<tmpl_var name="ssl_comment">SSLCertificateKeyFile /usr/local/ispconfig/interface/ssl/ispserver.key <tmpl_var name="ssl_comment">SSLCertificateKeyFile /usr/local/ispconfig/interface/ssl/ispserver.key
<tmpl_var name="ssl_bundle_comment">SSLCACertificateFile /usr/local/ispconfig/interface/ssl/ispserver.bundle <tmpl_var name="ssl_bundle_comment">SSLCACertificateFile /usr/local/ispconfig/interface/ssl/ispserver.bundle
<tmpl_var name="ssl_comment">SSLCipherSuite ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4 <tmpl_var name="ssl_comment">SSLCipherSuite ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
<tmpl_var name="ssl_comment">SSLHonorCipherOrder On <tmpl_var name="ssl_comment">SSLHonorCipherOrder On
<tmpl_if name='apache_version' op='>=' value='2.4.3' format='version'>
<tmpl_var name="ssl_comment">SSLCompression Off
</tmpl_if>
<tmpl_if name='apache_version' op='>=' value='2.4.11' format='version'>
<tmpl_var name="ssl_comment">SSLSessionTickets Off
</tmpl_if>
<IfModule mod_headers.c> <IfModule mod_headers.c>
Header always add Strict-Transport-Security "max-age=15768000" Header always add Strict-Transport-Security "max-age=15768000"
</IfModule> </IfModule>
<tmpl_if name='apache_version' op='>=' value='2.4' format='version'> <tmpl_if name='apache_version' op='>=' value='2.3.3' format='version'>
<tmpl_var name="ssl_comment">SSLUseStapling on <tmpl_var name="ssl_comment">SSLUseStapling On
<tmpl_var name="ssl_comment">SSLStaplingResponderTimeout 5 <tmpl_var name="ssl_comment">SSLStaplingResponderTimeout 5
<tmpl_var name="ssl_comment">SSLStaplingReturnResponderErrors off <tmpl_var name="ssl_comment">SSLStaplingReturnResponderErrors Off
</tmpl_if> </tmpl_if>
</VirtualHost> </VirtualHost>
<tmpl_if name='apache_version' op='>=' value='2.4' format='version'> <tmpl_if name='apache_version' op='>=' value='2.3.3' format='version'>
<IfModule mod_ssl.c> <IfModule mod_ssl.c>
<tmpl_var name="ssl_comment">SSLStaplingCache shmcb:/var/run/ocsp(128000) <tmpl_var name="ssl_comment">SSLStaplingCache shmcb:/var/run/ocsp(128000)
</IfModule> </IfModule>
</tmpl_if> </tmpl_if>
<Directory /var/www/php-cgi-scripts> <Directory /var/www/php-cgi-scripts>
AllowOverride None AllowOverride None
<tmpl_if name='apache_version' op='>' value='2.2' format='version'> <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all denied Require all denied
<tmpl_else> <tmpl_else>
Order Deny,Allow Order Deny,Allow
Deny from all Deny from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
<Directory /var/www/php-fcgi-scripts> <Directory /var/www/php-fcgi-scripts>
AllowOverride None AllowOverride None
<tmpl_if name='apache_version' op='>' value='2.2' format='version'> <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all denied Require all denied
<tmpl_else> <tmpl_else>
Order Deny,Allow Order Deny,Allow
Deny from all Deny from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
\ No newline at end of file
interface/lib/classes/tform_base.inc.php
+ 11
− 0
View file @ 69014bdb
...@@ -973,13 +973,22 @@ class tform_base { ...@@ -973,13 +973,22 @@ class tform_base {
$this->errorMessage .= $errmsg."<br />\r\n"; $this->errorMessage .= $errmsg."<br />\r\n";
} }
} }
break;
case 'ISEMAIL': case 'ISEMAIL':
$error = false;
if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n'; if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
if($validator['allowempty'] == 'y' && $field_value == '') { if($validator['allowempty'] == 'y' && $field_value == '') {
//* Do nothing //* Do nothing
} else { } else {
if(function_exists('filter_var')) { if(function_exists('filter_var')) {
if(filter_var($field_value, FILTER_VALIDATE_EMAIL) === false) { if(filter_var($field_value, FILTER_VALIDATE_EMAIL) === false) {
$error = true;
} else {
if (!preg_match("/^[^\\+]+$/", $field_value)) { // * disallow + in local-part
$error = true;
}
}
if ($error) {
$errmsg = $validator['errmsg']; $errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) { if(isset($this->wordbook[$errmsg])) {
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n"; $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
...@@ -987,8 +996,10 @@ class tform_base { ...@@ -987,8 +996,10 @@ class tform_base {
$this->errorMessage .= $errmsg."<br />\r\n"; $this->errorMessage .= $errmsg."<br />\r\n";
} }
} }
} else $this->errorMessage .= "function filter_var missing <br />\r\n"; } else $this->errorMessage .= "function filter_var missing <br />\r\n";
} }
unset($error);
break; break;
case 'ISINT': case 'ISINT':
if(function_exists('filter_var') && $field_value < 2147483647) { if(function_exists('filter_var') && $field_value < 2147483647) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment