gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.21, 1.22

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv11635/kolab-webadmin/kolab-webadmin/www/admin/user

Modified Files:
	user.php.in 
Log Message:
	* www/admin/domainmaintainer/domainmaintainer.php.in: 
	* www/admin/sharedfolder/sf.php.in: 
	* www/admin/addressbook/addr.php.in: 
	* www/admin/user/user.php.in: 

	fixed kolab/issue932 (Illegal values in webadmin cause LDAP errors)
	https://intevation.de/roundup/kolab/issue932


Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- user.php.in	10 Jul 2007 16:56:15 -0000	1.21
+++ user.php.in	12 Jul 2007 05:17:31 -0000	1.22
@@ -228,6 +228,24 @@
 	if( empty($value) ) return ''; // OK
 	else if( $value >= 4096 ) return _('Quota must be smaller than 4096');
 	else if( $value < 0 ) return _('Quota can not be negative');
+	else if( !is_numeric($value) ) return _('Quota must be a number');
+	else if( (int) $value != $value ) return _('Quota must be an integer');
+	else return '';
+}
+
+function checkfreebusyfuture( $form, $key, $value )
+{
+	if( empty($value) ) return ''; // OK
+	else if( $value < 0 ) return _('Free/Busy future can not be negative');
+	else if( !is_numeric($value) ) return _('Free/Busy future must be a number');
+	else if( (int) $value != $value ) return _('Free/Busy future must be an integer');
+	else return '';
+}
+
+function checkphone( $form, $key, $value )
+{
+	if( empty($value) ) return ''; // OK
+	else if( !preg_match('/^[a-zA-Z0-9()-+\/.=?:]*$/',$value) ) return _('Phone entries may only contain a-z, numbers and the characters ()-+/.=?:');
 	else return '';
 }
 
@@ -512,8 +530,10 @@
 $entries['postalCode_0'] = array( 'name' => _('Postal Code') );
 $entries['l_0'] = array( 'name' => _('City') );
 $entries['c_0'] = array( 'name' => _('Country') );
-$entries['telephoneNumber_0'] = array( 'name' => _('Telephone Number') );
-$entries['facsimileTelephoneNumber_0'] = array( 'name' => _('Fax Number') );
+$entries['telephoneNumber_0'] = array( 'name' => _('Telephone Number'),
+						'validation' => 'checkphone' );
+$entries['facsimileTelephoneNumber_0'] = array( 'name' => _('Fax Number'),
+						'validation' => 'checkphone' );
 if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer' ) {
   $entries['cyrus-userquota'] = array( 'name' => _('User Quota in MBytes'),
 				       'comment' => _('Leave blank for unlimited'),
@@ -529,7 +549,8 @@
   $entries['uid']['attrs'] = 'readonly';
 }
 $entries['kolabFreeBusyFuture_0'] = array( 'name' => _('Free/Busy interval in days'),
-									 'comment' => _('Leave blank for default (60 days)') );
+					   'comment' => _('Leave blank for default (60 days)'),
+					   'validation' => 'checkfreebusyfuture' );
 $entries['action'] = array( 'name' => 'action',
 			    'type' => 'hidden' );