Commit 613433fd authored by Marius Burkard's avatar Marius Burkard

Merge branch 'stable-3.1'

parents ab3c7dfb ab0d78da
......@@ -26,13 +26,6 @@ Server
Mail module
--------------------------------------
- Show mail statistics in the interface. The mail statistics are stored
in the database table mail_traffic and are collected by the file
server/cron_daily.php
-- For Courier this works but not Dovecot. Maybe the intention needs
reviewed as some clients think this should be the number of emails
and not the size of the emails. (I agree that size is important)
lathama
Administration module
--------------------------------------
......
......@@ -974,16 +974,21 @@ class tform_base {
}
}
case 'ISEMAIL':
if(function_exists('filter_var')) {
if(filter_var($field_value, FILTER_VALIDATE_EMAIL) === false) {
$errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) {
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
} else {
$this->errorMessage .= $errmsg."<br />\r\n";
if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
if($validator['allowempty'] == 'y' && $field_value == '') {
//* Do nothing
} else {
if(function_exists('filter_var')) {
if(filter_var($field_value, FILTER_VALIDATE_EMAIL) === false) {
$errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) {
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
} else {
$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";
}
break;
case 'ISINT':
if(function_exists('filter_var') && $field_value < 2147483647) {
......
......@@ -501,7 +501,7 @@ $form["tabs"]['address'] = array (
'type' => 'TOLOWER')
),
'validators' => array (
0 => array ( 'type' => 'ISEMAIL', 'errmsg'=> 'email_error_isemail'),
0 => array ( 'type' => 'ISEMAIL', 'allowempty' => 'y', 'errmsg'=> 'email_error_isemail'),
),
'default' => '',
'value' => '',
......
......@@ -499,7 +499,7 @@ $form["tabs"]['address'] = array (
'type' => 'TOLOWER')
),
'validators' => array (
0 => array ( 'type' => 'ISEMAIL', 'errmsg'=> 'paypal_email_error_isemail'),
0 => array ( 'type' => 'ISEMAIL', 'allowempty' => 'y', 'errmsg'=> 'paypal_email_error_isemail'),
),
'default' => '',
'value' => '',
......
......@@ -52,11 +52,14 @@ class mongo_clientdb_plugin {
function onInstall() {
global $conf;
if($conf['services']['db'] == true && class_exists('MongoClient')) {
/*if($conf['services']['db'] == true && class_exists('MongoClient')) {
return true;
} else {
return false;
}
}*/
// Disable mongodb plugin in ISPConfig 3.1
return false;
}
......
Markdown is supported
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