Revert "Try an new approach to extending forms. Create an extend_form event. For the first attempt replace the comment_add_form and item_add_form events."

This reverts commit 809e738536b6639bb42ecae8eb1e183543fed93c.

2 files changed, 3 insertions, 31 deletions

diff --git a/modules/recaptcha/config/recaptcha.php b/modules/recaptcha/config/recaptcha.php
deleted file mode 100644
index 04827673..00000000
--- a/modules/recaptcha/config/recaptcha.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-/**
- * The list of forms that recaptcha should append itself to.
- */
-$config["recaptcha"] = array("g-comment-form");
diff --git a/modules/recaptcha/helpers/recaptcha_event.php b/modules/recaptcha/helpers/recaptcha_event.php
index 04af9568..e7ded3ab 100644
--- a/modules/recaptcha/helpers/recaptcha_event.php
+++ b/modules/recaptcha/helpers/recaptcha_event.php
@@ -18,13 +18,9 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class recaptcha_event_Core {
-  static function extend_form($event_data) {
-    // @todo put into an admin interface
-    $config = Kohana::config("recaptcha");
-    if (module::get_var("recaptcha", "public_key") &&
-        in_array($event_data->id, $config["recaptcha"])) {
-      $input = empty($event_data->append_to) ? $event_data->form : $event_data->append_to;
-      $input->recaptcha("recaptcha")->label("")->id("g-recaptcha");
+  static function comment_add_form($form) {
+    if (module::get_var("recaptcha", "public_key")) {
+      $form->add_comment->recaptcha("recaptcha")->label("")->id("g-recaptcha");
     }
   }