gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php.in, 1.6, 1.7

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	addr.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: addr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- addr.php.in	24 May 2007 09:31:05 -0000	1.6
+++ addr.php.in	12 Jul 2007 05:17:31 -0000	1.7
@@ -91,6 +91,13 @@
   return $str;
 }
 
+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 '';
+}
+
 /**** Submenu for current page ***/
 $menuitems[$sidx]['selected'] = 'selected';
 $heading = '';
@@ -129,8 +136,10 @@
 				  'postalCode' => array( 'name' => _('Postal Code') ),
 				  'l' => array( 'name' => _('City') ),
 				  'c' => array( 'name' => _('Country') ),
-				  'telephoneNumber' => array( 'name' => _('Telephone Number') ),
-				  'facsimileTelephoneNumber' => array( 'name' => _('Fax Number') ));
+				  'telephoneNumber' => array( 'name' => _('Telephone Number'),
+											  'validation' => 'checkphone' ),
+				  'facsimileTelephoneNumber' => array( 'name' => _('Fax Number'),
+													   'validation' => 'checkphone' ));
 $entries['action'] = array( 'name' => 'action',
 							'type' => 'hidden' );