[Limacute-commit] r96 - trunk/RPM/SRC/kolab-webadmin

[jhf at projects.linpro.no]

Author: jhf
Date: 2007-01-15 13:43:35 +0100 (Mon, 15 Jan 2007)
New Revision: 96

Modified:
   trunk/RPM/SRC/kolab-webadmin/kolab-webadmin-2.0.99.patch
Log:
Fixed bug where domain maintainer could not delete member of domain.

Modified: trunk/RPM/SRC/kolab-webadmin/kolab-webadmin-2.0.99.patch
===================================================================
--- trunk/RPM/SRC/kolab-webadmin/kolab-webadmin-2.0.99.patch	2007-01-12 13:30:26 UTC (rev 95)
+++ trunk/RPM/SRC/kolab-webadmin/kolab-webadmin-2.0.99.patch	2007-01-15 12:43:35 UTC (rev 96)
@@ -333,3 +333,14 @@
  		   foreach( $ldap_object as $k => $v ) {
  			 if( $v == array() ) unset($ldap_object[$k]);
  		   }
+--- www/admin/user/user.php.in.orig	2007-01-15 13:39:33.000000000 +0100
++++ www/admin/user/user.php.in	2007-01-15 13:40:46.000000000 +0100
+@@ -768,7 +768,7 @@
+    break;
+  case 'kill':
+    if (!$dn) array_push($errors, _("Error: need DN for delete operation"));
+-   elseif ($auth->group() != "maintainer" && $auth->group() != "admin") 
++   elseif ($auth->group() != 'domain-maintainer' && $auth->group() != "maintainer" && $auth->group() != "admin") 
+      array_push($errors, _("Error: you need administrative permissions to delete users"));
+ 
+    // Check for distribution lists with only this user as member