From 8c1761c64a5c6a24575f43e5afe7a1661cb7f34f Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 26 Sep 2012 14:18:20 -0400
Subject: [PATCH] Implemented: FS#1102 - Convert internationalized domains to punycode automatically - need to have the pecl idn and intl modules installed or - have the idna_convert class in the classes/idn/ path
---
interface/lib/classes/tform.inc.php | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index cfb04b4..b6cc343 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -629,7 +629,6 @@
if(isset($field['filters']) && is_array($field['filters'])) {
$record[$key] = $this->filterField($key, (isset($record[$key]))?$record[$key]:'', $field['filters'], 'SAVE');
}
-
//* Validate record value
if(isset($field['validators']) && is_array($field['validators'])) {
$this->validateField($key, (isset($record[$key]))?$record[$key]:'', $field['validators']);
@@ -738,24 +737,16 @@
if($filter['event'] == $filter_event) {
switch ($filter['type']) {
case 'TOLOWER':
- $returnval = strtolower($field_value);
+ $returnval = strtolower($returnval);
break;
case 'TOUPPER':
- $returnval = strtoupper($field_value);
+ $returnval = strtoupper($returnval);
break;
case 'IDNTOASCII':
- if(function_exists('idn_to_ascii')) {
- $returnval = idn_to_ascii($field_value);
- } else {
- $returnval = $field_value;
- }
+ $returnval = $app->functions->idn_encode($returnval);
break;
case 'IDNTOUTF8':
- if(function_exists('idn_to_utf8')) {
- $returnval = idn_to_utf8($field_value);
- } else {
- $returnval = $field_value;
- }
+ $returnval = $app->functions->idn_decode($returnval);
break;
default:
$this->errorMessage .= "Unknown Filter: ".$filter['type'];
@@ -763,8 +754,7 @@
}
}
}
-
- return $returnval;
+ return $returnval;
}
/**
--
Gitblit v1.9.1