From dd1afa99b17596d4150d4b9b2741189f42d655d1 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 30 Nov 2010 05:09:10 -0500
Subject: [PATCH] Fixed syntax error in apache plugin.
---
interface/lib/classes/tform.inc.php | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index 49fd2bd..4f9b8a9 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -362,7 +362,8 @@
// If Datasource is set, get the data from there
if(isset($field['datasource']) && is_array($field['datasource'])) {
if(is_array($field["value"])) {
- $field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));
+ //$field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));
+ $field["value"] = $field["value"]+$this->getDatasourceData($field, $record);
} else {
$field["value"] = $this->getDatasourceData($field, $record);
}
@@ -379,6 +380,8 @@
if(is_array($field['value'])) {
foreach($field['value'] as $k => $v) {
$selected = ($k == $val)?' SELECTED':'';
+ if(!empty($this->wordbook[$v]))
+ $v = $this->wordbook[$v];
$out .= "<option value='$k'$selected>$v</option>\r\n";
}
}
@@ -492,6 +495,8 @@
$out = '';
foreach($field['value'] as $k => $v) {
$selected = ($k == $field["default"])?' SELECTED':'';
+ if(!empty($this->wordbook[$v]))
+ $v = $this->wordbook[$v];
$out .= "<option value='$k'$selected>$v</option>\r\n";
}
}
@@ -734,7 +739,7 @@
}
break;
case 'ISEMAIL':
- if(!preg_match("/^\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-z]{2,10}$/i", $field_value)) {
+ if(!preg_match("/^\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-z\-]{2,10}$/i", $field_value)) {
$errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) {
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
--
Gitblit v1.9.1