Merge pull request dokufreaks#275 from dokufreaks/newforms

support new form events. fixes 274

Author: michitux

action.php

@@ -3,40 +3,43 @@
  * Include Plugin:  Display a wiki page within another wiki page
  *
  * Action plugin component, for cache validity determination
- * 
+ *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     Christopher Smith <[email protected]>  
+ * @author     Christopher Smith <[email protected]>
  * @author     Michael Klier <[email protected]>
  */
- 
+
 /**
  * All DokuWiki plugins to extend the parser/rendering mechanism
  * need to inherit from this class
  */
 class action_plugin_include extends DokuWiki_Action_Plugin {
- 
+
     /* @var helper_plugin_include $helper */
     var $helper = null;
 
     function __construct() {
         $this->helper = plugin_load('helper', 'include');
     }
- 
+
     /**
      * plugin should use this method to register its handlers with the dokuwiki's event controller
      */
     function register(Doku_Event_Handler $controller) {
         /* @var Doku_event_handler $controller */
         $controller->register_hook('INDEXER_PAGE_ADD', 'BEFORE', $this, 'handle_indexer');
         $controller->register_hook('INDEXER_VERSION_GET', 'BEFORE', $this, 'handle_indexer_version');
-      $controller->register_hook('PARSER_CACHE_USE','BEFORE', $this, '_cache_prepare');
-      $controller->register_hook('HTML_EDITFORM_OUTPUT', 'BEFORE', $this, 'handle_form');
-      $controller->register_hook('HTML_CONFLICTFORM_OUTPUT', 'BEFORE', $this, 'handle_form');
-      $controller->register_hook('HTML_DRAFTFORM_OUTPUT', 'BEFORE', $this, 'handle_form');
-      $controller->register_hook('ACTION_SHOW_REDIRECT', 'BEFORE', $this, 'handle_redirect');
-      $controller->register_hook('PARSER_HANDLER_DONE', 'BEFORE', $this, 'handle_parser');
-      $controller->register_hook('PARSER_METADATA_RENDER', 'AFTER', $this, 'handle_metadata');
-      $controller->register_hook('HTML_SECEDIT_BUTTON', 'BEFORE', $this, 'handle_secedit_button');
+        $controller->register_hook('PARSER_CACHE_USE','BEFORE', $this, '_cache_prepare');
+        $controller->register_hook('HTML_EDITFORM_OUTPUT', 'BEFORE', $this, 'handle_form'); // todo remove
+        $controller->register_hook('FORM_EDIT_OUTPUT', 'BEFORE', $this, 'handle_form');
+        $controller->register_hook('HTML_CONFLICTFORM_OUTPUT', 'BEFORE', $this, 'handle_form'); // todo remove
+        $controller->register_hook('FORM_CONFLICT_OUTPUT', 'BEFORE', $this, 'handle_form');
+        $controller->register_hook('HTML_DRAFTFORM_OUTPUT', 'BEFORE', $this, 'handle_form'); // todo remove
+        $controller->register_hook('FORM_DRAFT_OUTPUT', 'BEFORE', $this, 'handle_form');
+        $controller->register_hook('ACTION_SHOW_REDIRECT', 'BEFORE', $this, 'handle_redirect');
+        $controller->register_hook('PARSER_HANDLER_DONE', 'BEFORE', $this, 'handle_parser');
+        $controller->register_hook('PARSER_METADATA_RENDER', 'AFTER', $this, 'handle_metadata');
+        $controller->register_hook('HTML_SECEDIT_BUTTON', 'BEFORE', $this, 'handle_secedit_button');
         $controller->register_hook('PLUGIN_MOVE_HANDLERS_REGISTER', 'BEFORE', $this, 'handle_move_register');
     }
 
@@ -172,10 +175,16 @@ function handle_parser(Doku_Event $event, $param) {
     /**
      * Add a hidden input to the form to preserve the redirect_id
      */
-    function handle_form(Doku_Event &$event, $param) {
-      if (array_key_exists('redirect_id', $_REQUEST)) {
-        $event->data->addHidden('redirect_id', cleanID($_REQUEST['redirect_id']));
-      }
+    function handle_form(Doku_Event $event, $param)
+    {
+        if (!array_key_exists('redirect_id', $_REQUEST)) return;
+
+        if(is_a($event->data, \dokuwiki\Form\Form::class)) {
+            $event->data->setHiddenField('redirect_id', cleanID($_REQUEST['redirect_id']));
+        } else {
+            // todo remove when old FORM events are no longer supported
+            $event->data->addHidden('redirect_id', cleanID($_REQUEST['redirect_id']));
+        }
     }
 
     /**