? 760450-admin.patch
? patch.patch
Index: secure_permissions.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/secure_permissions/secure_permissions.module,v
retrieving revision 1.4
diff -u -p -r1.4 secure_permissions.module
--- secure_permissions.module	25 Mar 2010 21:03:49 -0000	1.4
+++ secure_permissions.module	2 Apr 2010 17:25:09 -0000
@@ -27,10 +27,6 @@ define('SECURE_PERMISSIONS_ACTIVE', FALS
 define('SECURE_PERMISSIONS_SHOW_PERMISSIONS_PAGE', TRUE);
 // Show the roles page at all?
 define('SECURE_PERMISSIONS_SHOW_ROLES_PAGE', TRUE);
-// Define an 'administrative user' role?
-define('SECURE_PERMISSIONS_ADMINISTRATIVE_ROLE', TRUE);
-// Name of the administrator role.
-define('SECURE_PERMISSIONS_ROLE_NAME', 'administrator');
 // Display message when rebuilding permisisons?
 define('SECURE_PERMISSIONS_VERBOSE', TRUE);
 // Rebuild default site permissions?
@@ -244,10 +240,6 @@ function secure_permissions_secure_permi
       'use text format 1',
     );
   }
-  // Add all permissions to the administrative role?
-  if ($role == secure_permissions_variable('secure_permissions_role_name') && secure_permissions_variable('secure_permissions_administrative_role')) {
-    $permissions[$role] = array_keys(module_invoke_all('permission'));
-  }
   // Return the permissions.
   if (isset($permissions[$role])) {
     return $permissions[$role];
@@ -267,9 +259,6 @@ function secure_permissions_secure_permi
     'anonymous user',
     'authenticated user',
   );
-  if (secure_permissions_variable('secure_permissions_administrative_role')) {
-    $roles[] = secure_permissions_variable('secure_permissions_role_name');
-  }
   return $roles;
 }
 
@@ -435,19 +424,6 @@ function secure_permissions_form() {
     '#title' => t('Reload default permissions on rebuild'),
     '#description' => t('Sets the default Drupal permissions for anonymous and authenticated users.'),
   );
-  $form['code']['secure_permissions_administrative_role'] = array(
-    '#type' => 'checkbox',
-    '#default_value' => secure_permissions_variable('secure_permissions_administrative_role'),
-    '#title' => t('Use administrative role'),
-    '#description' => t('Maintains an administrative role that is granted all permissions.'),
-  );
-  $form['code']['secure_permissions_role_name'] = array(
-    '#type' => 'textfield',
-    '#default_value' => secure_permissions_variable('secure_permissions_role_name'),
-    '#title' => t('Administrative role name'),
-    '#required' => TRUE,
-    '#description' => t('The name of the administrative role. Normally this need not be changed.'),
-  );
   // Make sure the menu is rebuilt correctly.
   $form['#submit'][] = 'secure_permissions_form_submit';
   if (isset($_SESSION['secure_permissions_rebuild'])) {
@@ -471,8 +447,6 @@ function secure_permissions_form_submit(
   if ($form_state['values']['secure_permissions_active']) {
     // We must do this to pass the value to the calling function during submit.
     $conf['secure_permissions_active'] = TRUE;
-    $conf['secure_permissions_administrative_role'] = $form_state['values']['secure_permissions_administrative_role'];
-    $conf['secure_permissions_role_name'] = $form_state['values']['secure_permissions_role_name'];
     $conf['secure_permissions_use_default'] = $form_state['values']['secure_permissions_use_default'];
     secure_permissions_rebuild();
   }