? .buildpath
? .bzr
? .git
? .project
? .settings
? image_captcha/fonts/.DS_Store
? image_captcha/fonts/.gitignore
? image_captcha/fonts/1456Gutenberg.TTF
? image_captcha/fonts/Army.ttf
? image_captcha/fonts/BABYK___.TTF
? image_captcha/fonts/LiberationFonts
? image_captcha/fonts/actionj.ttf
? image_captcha/fonts/skinck.ttf
? image_captcha/fonts/subeve.ttf
? image_captcha/fonts/tiza.ttf
Index: captcha.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/captcha/captcha.admin.inc,v
retrieving revision 1.19
diff -u -b -u -p -r1.19 captcha.admin.inc
--- captcha.admin.inc	15 Apr 2009 20:58:01 -0000	1.19
+++ captcha.admin.inc	27 Apr 2009 20:02:28 -0000
@@ -77,12 +77,19 @@ function captcha_admin_settings() {
     '#options' => $captcha_types,
   );
 
-  // Field for the CAPTCHA administration mode
+  // Field for the CAPTCHA administration mode.
   $form['captcha_form_protection']['captcha_administration_mode'] = array(
     '#type' => 'checkbox',
     '#title' => t('Add CAPTCHA administration links to forms'),
     '#default_value' => variable_get('captcha_administration_mode', FALSE),
-    '#description' => t('This option is very helpful to enable/disable challenges on forms. When enabled, users with the "%admincaptcha" permission will see CAPTCHA administration links on all forms (except on administrative pages, which shouldn\'t be accessible to untrusted users in the first place). These links make it possible to enable a challenge of the desired type or disable it.', array('%admincaptcha' => t('administer CAPTCHA settings'))),
+    '#description' => t('This option makes it easy to manage CAPTCHA settings on forms. When enabled, users with the "%admincaptcha" permission will see a fieldsset with CAPTCHA administration links on all forms, except on administrative pages.', array('%admincaptcha' => t('administer CAPTCHA settings'))),
+  );
+  // Field for the CAPTCHAs on admin pages.
+  $form['captcha_form_protection']['captcha_allow_on_admin_pages'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Allow CAPTCHAs and CAPTCHA administration links on administrative pages'),
+    '#default_value' => variable_get('captcha_allow_on_admin_pages', FALSE),
+    '#description' => t('This option makes it possible to add CAPTCHAs to forms on adminstrative pages. CAPTCHAs are disabled by default on administrative pages (which shouldn\'t be accessible to untrusted users normally) to avoid the related overhead. In some situations, e.g. in the case of demo sites, it can be usefull to allow CAPTCHAs on adminstrative pages.'),
   );
 
   // field(s) for setting the additional CAPTCHA description
@@ -183,6 +190,7 @@ function captcha_admin_settings_validate
 function captcha_admin_settings_submit($form, &$form_state) {
 
   variable_set('captcha_administration_mode', $form_state['values']['captcha_administration_mode']);
+  variable_set('captcha_allow_on_admin_pages', $form_state['values']['captcha_allow_on_admin_pages']);
 
   // Process CAPTCHA points
   foreach ($form_state['values']['captcha_form_id_overview']['captcha_captcha_points'] as $captcha_point_form_id => $data) {
Index: captcha.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/captcha/captcha.module,v
retrieving revision 1.82
diff -u -b -u -p -r1.82 captcha.module
--- captcha.module	13 Apr 2009 13:51:52 -0000	1.82
+++ captcha.module	27 Apr 2009 20:02:28 -0000
@@ -317,7 +317,7 @@ function captcha_set_form_id_setting($fo
  */
 function captcha_form_alter(&$form, $form_state, $form_id) {
 
-  if (arg(0) != 'admin') {
+  if (arg(0) != 'admin' || variable_get('captcha_allow_on_admin_pages', FALSE)) {
     if (!user_access('skip CAPTCHA')) {
       // Visitor does not have permission to skip the CAPTCHA