From e0599e58ff5a1cfe633bc74c192e3db1fd4550c4 Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Fri, 31 Aug 2012 05:34:23 -0400
Subject: [PATCH] branding options file

---
 interface/lib/classes/remoting_lib.inc.php |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 7a70632..fcde405 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -44,9 +44,9 @@
 *        Tabellendefinition
 *
 *        Datentypen:
-*        - INTEGER (Wandelt Ausdr�cke in Int um)
+*        - INTEGER (Wandelt Ausdr�cke in Int um)
 *        - DOUBLE
-*        - CURRENCY (Formatiert Zahlen nach W�hrungsnotation)
+*        - CURRENCY (Formatiert Zahlen nach W�hrungsnotation)
 *        - VARCHAR (kein weiterer Format Check)
 *        - DATE (Datumsformat, Timestamp Umwandlung)
 *
@@ -60,10 +60,10 @@
 *        - Wert oder Array
 *
 *        SEPARATOR
-*        - Trennzeichen f�r multiple Felder
+*        - Trennzeichen f�r multiple Felder
 *
 *        Hinweis:
-*        Das ID-Feld ist nicht bei den Table Values einzuf�gen.
+*        Das ID-Feld ist nicht bei den Table Values einzuf�gen.
 */
 
 class remoting_lib {
@@ -121,7 +121,7 @@
     	function loadFormDef($file) {
 			global $app,$conf;
             
-			include_once($file);
+			include($file);
 				
 			$this->formDef = $form;
 			unset($this->formDef['tabs']);
@@ -474,7 +474,7 @@
                                 break;
                                 case 'ISINT':
 									if(function_exists('filter_var')) {
-										if(!filter_var($field_value, FILTER_VALIDATE_INT)) {
+										if($vield_value != '' && filter_var($field_value, FILTER_VALIDATE_INT) === false) {
 											$errmsg = $validator['errmsg'];
                                             if(isset($this->wordbook[$errmsg])) {
                                                 $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
@@ -552,6 +552,27 @@
 									}
 								}
                                 break;
+								case 'RANGE':
+                                        //* Checks if the value is within the given range or above / below a value
+										//* Range examples: < 10 = ":10", between 2 and 10 = "2:10", above 5 = "5:".
+										$range_parts = explode(':',trim($validator['range']));
+										$ok = true;
+                                        if($range_parts[0] != '' && $field_value < $range_parts[0]) {
+											$ok = false;
+										}
+										if($range_parts[1] != '' && $field_value > $range_parts[1]) {
+											$ok = false;
+										}
+										if($ok != true) {
+											$errmsg = $validator['errmsg'];
+											if(isset($this->wordbook[$errmsg])) {
+												$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+											} else {
+												$this->errorMessage .= $errmsg."<br />\r\n";
+											}
+                                        }
+										unset($range_parts);
+                                break;
                                 case 'CUSTOM':
                                         // Calls a custom class to validate this record
                                         if($validator['class'] != '' and $validator['function'] != '') {

--
Gitblit v1.9.1