Index: mollom.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.admin.inc,v
retrieving revision 1.39
diff -u -p -r1.39 mollom.admin.inc
--- mollom.admin.inc	20 Sep 2010 03:39:10 -0000	1.39
+++ mollom.admin.inc	20 Sep 2010 21:47:12 -0000
@@ -12,11 +12,22 @@
 function mollom_admin_form_list() {
   _mollom_testing_mode_warning();
 
+  // Reset the cached list of protected forms.
+  mollom_form_cache(TRUE);
+
   $modes = array(
     MOLLOM_MODE_DISABLED => t('None'),
     MOLLOM_MODE_CAPTCHA => t('CAPTCHA'),
     MOLLOM_MODE_ANALYSIS => t('Text analysis'),
   );
+  $all_permissions = array();
+  foreach (module_implements('permission') as $module) {
+    $module_permissions = module_invoke($module, 'permission');
+    foreach ($module_permissions as $permission => &$info) {
+      $info['module'] = $module;
+    }
+    $all_permissions += $module_permissions;
+  }
 
   $header = array(
     t('Form'),
@@ -27,8 +38,18 @@ function mollom_admin_form_list() {
   $result = db_query('SELECT form_id FROM {mollom_form}')->fetchCol();
   foreach ($result as $form_id) {
     $mollom_form = mollom_form_load($form_id);
+    $title = $mollom_form['title'];
+    if (!empty($mollom_form['bypass access'])) {
+      $permissions = array();
+      foreach ($mollom_form['bypass access'] as $permission) {
+        $permissions[] = l($all_permissions[$permission]['title'], 'admin/people/permissions', array('html' => TRUE, 'fragment' => 'module-' . $all_permissions[$permission]['module']));
+      }
+      $title .= '<br /><small>';
+      $title .= t('Bypass permissions: !permissions', array('!permissions' => implode(', ', $permissions)));
+      $title .= '</small>';
+    }
     $rows[] = array(
-      $mollom_form['title'],
+      $title,
       $modes[$mollom_form['mode']],
       l(t('Configure'), 'admin/config/content/mollom/manage/' . $form_id),
       l(t('Unprotect'), 'admin/config/content/mollom/unprotect/' . $form_id),
Index: mollom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v
retrieving revision 1.83
diff -u -p -r1.83 mollom.module
--- mollom.module	20 Sep 2010 03:39:10 -0000	1.83
+++ mollom.module	20 Sep 2010 21:42:24 -0000
@@ -370,7 +370,7 @@ function mollom_permission() {
       'title' => t('Administer Mollom-protected forms and Mollom settings'),
     ),
     'bypass mollom protection' => array(
-      'title' => t('Bypass Mollom protection on forms'),
+      'title' => t('Bypass any form protection'),
     ),
   );
 }