--- administerusersbyrole.module.orig	2010-10-10 12:08:39.301777879 +0200
+++ administerusersbyrole.module	2010-10-10 12:10:28.281777570 +0200
@@ -55,8 +55,6 @@
 
 function _administerusersbyrole_can_edit_user($account) {
   global $user;
-  $androles = variable_get('administerusersbyrole_androles',1);
-
   if ($account->uid == $user->uid) {
     return TRUE;
   }
@@ -70,12 +68,12 @@
     if ($rid === DRUPAL_AUTHENTICATED_RID) {
       continue;
     }
-    if($androles == 1){
-      if (!user_access('edit users with role '. $role)) 
-        return FALSE;
-    } else {
-      if (user_access('edit users with role '. $role)) 
-        return TRUE;
+    if (!user_access('edit users with role '. $role)) {
+      return FALSE;
+/* modifica per avere i ruoli in OR invece che in AND
+ *    if (user_access('edit users with role '. $role)) {
+ *     return TRUE;
+*/
     }
   }
   return TRUE;
@@ -126,33 +124,3 @@
     }
   }
 }
-
-function administerusersbyrole_admin() {
-  $form = array();
-
-  $form['administerusersbyrole_androles'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Need permissions on all its roles to edit a user'),
-    '#default_value' => variable_get('administerusersbyrole_androles', 1),
-    '#description' => t("If checked, you need permissions on all of the user's roles to modify the user, otherwise you need permissions on just one of the user's roles."),
-    '#required' => TRUE,
-  );
-
-  return system_settings_form($form);
-}
-
-function administerusersbyrole_menu() {
-
-  $items = array();
-
-  $items['admin/settings/administerusersbyrole'] = array(
-    'title' => 'Administer Users By Role settings',
-    'description' => 'Management of administer user by role behavior',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('administerusersbyrole_admin'),
-    'access arguments' => array('access administration pages'),
-    'type' => MENU_NORMAL_ITEM,
-   );
-
-  return $items;
-}