From 466f308b71574434f59a85e4fa6e958d2c55750c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 27 Nov 2013 07:03:23 -0500
Subject: [PATCH] Fixed SMTP commands corresponding to RFC 2821
---
interface/lib/classes/tform.inc.php | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index 03a45f1..2604036 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -146,7 +146,7 @@
}
if(is_array($wb_global)) {
- $wb = array_merge($wb_global, $wb);
+ $wb = $app->functions->array_merge($wb_global, $wb);
}
if(isset($wb_global)) unset($wb_global);
@@ -845,6 +845,15 @@
}
}
break;
+ case 'ISASCII':
+ if(preg_match("/[^\x20-\x7F]/", $field_value)) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+ } else {
+ $this->errorMessage .= $errmsg."<br />\r\n";
+ }
+ }
case 'ISEMAIL':
if(function_exists('filter_var')) {
if(filter_var($field_value, FILTER_VALIDATE_EMAIL) === false) {
--
Gitblit v1.9.1