steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include form.class.php, 1.13, 1.14

cvs at intevation.de cvs at intevation.de
Thu Nov 18 14:27:59 CET 2004


Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv22541/kolab-webadmin/php/admin/include

Modified Files:
	form.class.php 
Log Message:
a bit of validation for policies. I dont want to make it too strict because we want to accept both internal addresses, external ones, dist. lists. and uids

Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- form.class.php	2 Nov 2004 13:59:34 -0000	1.13
+++ form.class.php	18 Nov 2004 13:27:56 -0000	1.14
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright (c) 2004 KlarÃ��¤lvdalens Datakonsult AB
+ *  Copyright (c) 2004 KlarÃ��¿½ï¿½Â¤lvdalens Datakonsult AB
  *
  *    Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *
@@ -214,26 +214,32 @@
     $this->errors = array();
     foreach( $this->entries as $key => $value ) {
       if( !empty( $value['validation'] ) && !ereg( 'readonly', $value['attrs'] ) ) {
-	$v = $value['validation'];
-	//print "validating using $v <br/>";
-	if( $v == 'notempty' ) {
-	  //print "checking nonemptiness of $key: ".$_REQUEST[$key]." len=".strlen(trim($_REQUEST[$key]))."<br/>";
-	  if( $value['type'] == 'aclselect' ) {
-	    // ignore
-	  } else if( strlen( trim($_REQUEST[$key]) ) == 0 ) {
-	    $this->errors[] = _('Required field ').$value['name']._(' is empty');
-	  }
-	} else {
-	  if( $value['type'] == 'aclselect' ) {
-	    $data = $_REQUEST['user_'.$key].' '.$_REQUEST['perm_'.$key];
-	  } else {
-	    $data = $_REQUEST[$key];
-	  }
-	  $errstr = $v( $this, $key, $data );
-	  if( !empty( $errstr ) ) {
-	    $this->errors[] = $errstr;
-	  }
-	}
+		$v = $value['validation'];
+		//print "validating using $v <br/>";
+		if( $v == 'notempty' ) {
+		  //print "checking nonemptiness of $key: ".$_REQUEST[$key]." len=".strlen(trim($_REQUEST[$key]))."<br/>";
+		  if( $value['type'] == 'aclselect' ) {
+			// ignore
+		  } else if( strlen( trim($_REQUEST[$key]) ) == 0 ) {
+			$this->errors[] = _('Required field ').$value['name']._(' is empty');
+		  }
+		} else {
+		  if( $value['type'] == 'aclselect' ) {
+			$data = $_REQUEST['user_'.$key].' '.$_REQUEST['perm_'.$key];
+		  } else if( $value['type'] == 'resourcepolicy' ) {
+			$i = 0;
+			$data = array();
+			while( isset($_REQUEST['user_'.$key.'_'.$i] ) ) {
+			  $data[] = $_REQUEST['user_'.$key.'_'.$i++];
+			}
+		  } else {
+			$data = $_REQUEST[$key];
+		  }
+		  $errstr = $v( $this, $key, $data );
+		  if( !empty( $errstr ) ) {
+			$this->errors[] = $errstr;
+		  }
+		}
       }
     }
     //print_r( $this->errors );





More information about the commits mailing list