gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder sf.php.in, 1.8, 1.9

cvs at kolab.org cvs at kolab.org
Thu Jul 12 07:17:33 CEST 2007


Author: gunnar

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

Modified Files:
	sf.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: sf.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sf.php.in	11 Jul 2007 14:20:58 -0000	1.8
+++ sf.php.in	12 Jul 2007 05:17:31 -0000	1.9
@@ -25,6 +25,18 @@
    array_push($errors, _("Error: You don't have Permissions to access this Menu"));
 }
 
+// Due to a cyrus imapd bug we can't currently
+// support quotas over 4095 MB, see issue1262
+function checkquota( $form, $key, $value )
+{
+	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 '';
+}
+
 require_once('@kolab_php_module_prefix at admin/include/menu.php');
 
 function fill_form_for_modify( &$form, &$ldap_object ) {
@@ -130,7 +142,8 @@
 							 'value' => '' ),
 
 				  'cyrus-userquota' => array( 'name' => _('Quota Limit'),
-										'comment' => _('MBytes (empty for unlimited)') ),
+											  'comment' => _('MBytes (empty for unlimited)'),
+											  'validation' => 'checkquota' ),
 				  'acl_0' => array( 'name' => _('Permission for UID/GID'),
 									'type' => 'aclselect',
 									'user' => 'anyone',





More information about the commits mailing list