steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include attributeaccess.php, 1.1, 1.2 form.class.php, 1.15, 1.16
cvs at intevation.de
cvs at intevation.de
Thu Feb 24 13:59:06 CET 2005
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv10752/kolab-webadmin/php/admin/include
Modified Files:
attributeaccess.php form.class.php
Log Message:
support for marking entries as mandatory (ie. nonempty)
Index: attributeaccess.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/attributeaccess.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- attributeaccess.php 23 Feb 2005 22:17:59 -0000 1.1
+++ attributeaccess.php 24 Feb 2005 12:59:04 -0000 1.2
@@ -7,6 +7,7 @@
* 'ro' (readonly)
* 'rw' (read/write)
* 'hidden' (atribute removed from display)
+ * 'mandatory' (read/write and must not be empty)
*
* If an attribute is not in this array, it defaults to 'rw'
*
@@ -24,7 +25,7 @@
'mail' => 'ro',
'uid' => 'ro',
'title' => 'ro',
- 'roomNumber' => 'ro',
+ 'roomNumber' => 'mandatory',
'kolabdelegate' => 'ro',
'telephoneNumber' => 'hidden'
*/
Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- form.class.php 16 Dec 2004 21:03:29 -0000 1.15
+++ form.class.php 24 Feb 2005 12:59:04 -0000 1.16
@@ -214,30 +214,34 @@
$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 if( $value['type'] == 'resourcepolicy' ) {
- $i = 0;
- $data = array();
- while( isset($_REQUEST['user_'.$key.'_'.$i] ) ) {
- $data[] = $_REQUEST['user_'.$key.'_'.$i++];
+ $vv = $value['validation'];
+ if( !is_array($vv) ) $va = array($vv);
+ else $va = $vv;
+ foreach( $va as $v ) {
+ //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 {
- $data = $_REQUEST[$key];
- }
- $errstr = $v( $this, $key, $data );
- if( !empty( $errstr ) ) {
- $this->errors[] = $errstr;
+ 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;
+ }
}
}
}
More information about the commits
mailing list