From 1ef48604d2474dfbfe23645f5fa5bb0b5ea0fadc Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Fri, 19 Oct 2012 10:19:43 -0400
Subject: [PATCH] - Removed doubled lines from web_domain_edit.htm template.
---
interface/lib/classes/tform.inc.php | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index cfb04b4..7789a81 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -276,6 +276,17 @@
$this->errorMessage .= "Custom datasource class or function is empty<br />\r\n";
}
}
+
+ if(isset($field['filters']) && is_array($field['filters'])) {
+ $new_values = array();
+ foreach($values as $index => $value) {
+ $new_index = $this->filterField($index, $index, $field['filters'], 'SHOW');
+ $new_values[$new_index] = $this->filterField($index, (isset($values[$index]))?$values[$index]:'', $field['filters'], 'SHOW');
+ }
+ $values = $new_values;
+ unset($new_values);
+ unset($new_index);
+ }
return $values;
@@ -629,7 +640,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 +748,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 +765,7 @@
}
}
}
-
- return $returnval;
+ return $returnval;
}
/**
--
Gitblit v1.9.1