Index: adsense/adsense.module
===================================================================
--- adsense/adsense.module	(revision 13)
+++ adsense/adsense.module	(revision 14)
@@ -54,14 +54,14 @@
       'path'     => '',
       'callback' => '',
       'title'    => '',
-      'access'   => user_access('hide adsense'),
+      'access'   => user_access('view adsense'),
       'weight'   => 0);
    }
    return $items;
 }
 
 function adsense_perm() {
-  return array ('hide adsense');
+  return array ('view adsense');
 }
 
 function adsense_settings() {
@@ -96,9 +96,6 @@
 
   $type = form_group(t('Type and Colors'), $output);
 
-  $output = form_checkbox (t('Disable Google AdSense ads?'), 'adsense_disable', 1,
-    variable_get('adsense_disable', '0'), t('This disables all display of Google AdSense Ads from your web site. This is useful in certain situations, such as site upgrades, or if you make a copy of the site for development and test purposes.'));
-
   $output .= form_checkbox (t('Placeholder when ads are disabled?'), 'adsense_placeholder', 1,
     variable_get('adsense_placeholder', '1'), t('This causes an empty box to be displayed in place of the ads when they are disabled.'));
 
@@ -106,9 +103,6 @@
     variable_get('adsense_placeholder_text', t('Ad placeholder here')), 70, 5,
     t('Enter any text to display as a placeholder when ads are disabled.'));
 
-  $output .= form_checkbox (t('Do not display Google AdSense ads for admin'), 'adsense_admin_disable', 1,
-    variable_get('adsense_admin_disable', '1'), t('When the site admin (uid 1) is logged in, they will not see ads.'));
-
   $adv = form_group(t('Advanced options'), $output);
 
   return $req . $type . $adv;
@@ -142,9 +136,7 @@
 function _adsense_check_disable() {
   global $user;
 
-  $admin_disable = variable_get('adsense_admin_disable', '0');
   $client_id     = variable_get('adsense_client_id', '');
-  $disable_ads   = variable_get('adsense_disable', '0');
 
-  if (($user->uid == 1) && $admin_disable) {
-    // Admin is logged in and Ads are disabled for admin
-    return true;
-  }
-
   if (!$client_id) {
     // Google AdSense Client ID is not configured
     return true;
   }
-
-  if ($disable_ads) {
+  if (user_access('view adsense')) {
     return false;
   }