change event naming scheme

FORM_*_OUTPUT scheme had been introduced since Apriil 2018, see dokuwiki#2286

inc/Form/Form.php

@@ -469,7 +469,7 @@ protected function balanceFieldsets()
     /**
      * The HTML representation of the whole form
      *
-     * @param string $eventName  (optional) name of the event: HTMLFORM_{$name}_OUTPUT
+     * @param string $eventName  (optional) name of the event: FORM_{$name}_OUTPUT
      * @return string
      */
     public function toHTML($eventName = null)
@@ -478,9 +478,7 @@ public function toHTML($eventName = null)
 
         // trigger event to provide an opportunity to modify this form
         if (isset($eventName)) {
-            if (!preg_match('/^HTMLFORM_[A-Z]+?_OUTPUT$/', $eventName)) {
-                $eventName = 'HTMLFORM_'.strtoupper($eventName).'_OUTPUT';
-            }
+            $eventName = 'FORM_'.strtoupper($eventName).'_OUTPUT';
             Event::createAndTrigger($eventName, $this, null, false);
         }
 

inc/Ui/Editor.php

@@ -19,7 +19,6 @@ class Editor extends Ui
      * @author   Andreas Gohr <andi@splitbrain.org>
      *
      * @triggers HTML_EDIT_FORMSELECTION
-     * @triggers HTMLFORM_EDIT_OUTPUT
      * @return void
      */
     public function show()
@@ -174,8 +173,7 @@ public function show()
         }
         echo '</div>';
 
-        // print form that might be modified by HTMLFORM_EDIT_OUTPUT event handlers
-        echo $form->toHTML('edit');
+        echo $form->toHTML('Edit');
 
         echo '</div>'; // close div editBox class
     }

inc/Ui/Login.php

@@ -28,7 +28,6 @@ public function __construct($showIcon = false)
      *
      * @author   Andreas Gohr <andi@splitbrain.org>
      *
-     * @triggers HTMLFORM_LOGIN_OUTPUT
      * @return void
      */
     public function show()
@@ -75,8 +74,7 @@ public function show()
             $form->addHTML('<p>'.$lang['pwdforget'].': '. $resendPwLink .'</p>');
         }
 
-        // print form that might be modified by HTMLFORM_LOGIN_OUTPUT event handlers
-        print $form->toHTML('login');
+        print $form->toHTML('Login');
 
         print '</div>';
     }

inc/Ui/PageConflict.php

@@ -31,7 +31,6 @@ public function __construct($text = '', $summary = '')
      *
      * @author   Andreas Gohr <andi@splitbrain.org>
      *
-     * @triggers HTMLFORM_CONFLICT_OUTPUT
      * @return void
      */
     public function show()
@@ -53,8 +52,7 @@ public function show()
         $form->addButton('do[cancel]', $lang['btn_cancel'] )->attrs(['type' => 'submit']);
         $form->addTagClose('div');
 
-        // print form that might be modified by HTMLFORM_CONFLICT_OUTPUT event handlers
-        print $form->toHTML('conflict');
+        print $form->toHTML('Conflict');
 
         print '<br /><br /><br /><br />';
 

inc/Ui/PageDraft.php

@@ -17,7 +17,6 @@ class PageDraft extends Ui
      *
      * @author   Andreas Gohr <andi@splitbrain.org>
      *
-     * @triggers HTMLFORM_DRAFT_OUTPUT
      * @return void
      */
     public function show()
@@ -49,8 +48,7 @@ public function show()
         $form->addButton('do[show]',     $lang['btn_cancel']  )->attrs(['type' => 'submit', 'tabindex' => '3']);
         $form->addTagClose('div');
 
-        // print form that might be modified by HTMLFORM_DRAFT_OUTPUT event handlers
-        print $form->toHTML('draft');
+        print $form->toHTML('Draft');
     }
 
 }

inc/Ui/Recent.php

@@ -36,7 +36,6 @@ public function __construct($first = 0, $show_changes = 'both')
      * @author Kate Arzamastseva <pshns@ukr.net>
      * @author Satoshi Sahara <sahara.satoshi@gmail.com>
      *
-     * @triggers HTMLFORM_RECENT_OUTPUT
      * @return void
      */
     public function show()
@@ -98,8 +97,7 @@ public function show()
         // provide navigation for pagenated recent list (of pages and/or media files)
         $form->addHTML($this->htmlNavigation($first, $hasNext));
 
-        // print form that might be modified by HTMLFORM_RECENT_OUTPUT event handlers
-        print $form->toHTML('recent');
+        print $form->toHTML('Recent');
     }
 
     /**

inc/Ui/Revisions.php

@@ -36,7 +36,6 @@ public function __construct($first = 0, $media_id = false)
      * @author Kate Arzamastseva <pshns@ukr.net>
      * @author Satoshi Sahara <sahara.satoshi@gmail.com>
      *
-     * @triggers HTMLFORM_REVISIONS_OUTPUT
      * @return void
      */
     public function show()
@@ -115,8 +114,7 @@ protected function showMediaRevisions($id)
 
         $form->addTagClose('div'); // close div class=no
 
-        // print form that might be modified by HTMLFORM_REVISIONS_OUTPUT event handlers
-        print $form->toHTML('revisions');
+        print $form->toHTML('Revisions');
 
         // provide navigation for pagenated revision list (of pages and/or media files)
         print $this->htmlNavigation($id, $first, $hasNext);
@@ -182,8 +180,7 @@ protected function showPageRevisions($id)
 
         $form->addTagClose('div'); // close div class=no
 
-        // print form that might be modified by HTMLFORM_REVISIONS_OUTPUT event handlers
-        print $form->toHTML('revisions');
+        print $form->toHTML('Revisions');
 
         // provide navigation for pagenated revision list (of pages and/or media files)
         print $this->htmlNavigation($id, $first, $hasNext);

inc/Ui/Search.php

@@ -87,9 +87,7 @@ protected function getSearchFormHTML($query)
 
         $searchForm->addFieldsetClose();
 
-        Event::createAndTrigger('FORM_SEARCH_OUTPUT', $searchForm);
-
-        return $searchForm->toHTML();
+        return $searchForm->toHTML('Search');
     }
 
     /**

inc/Ui/Subscribe.php

@@ -16,7 +16,6 @@ class Subscribe extends Ui
      *
      * @author Adrian Lang <lang@cosmocode.de>
      *
-     * @triggers HTMLFORM_SUBSCRIBE_OUTPUT
      * @return void
      */
     public function show()
@@ -108,8 +107,7 @@ public function show()
         $form->addButton('do[subscribe]', $lang['subscr_m_subscribe'])->attr('type', 'submit');
         $form->addTagClose('div');
 
-        // print form that might be modified by HTMLFORM_SUBSCRIBE_OUTPUT event handlers
-        print $form->toHTML('subscribe');
+        print $form->toHTML('Subscribe');
 
         echo '</div>';
     }

inc/Ui/UserProfile.php

@@ -16,8 +16,6 @@ class UserProfile extends Ui
      *
      * @author   Andreas Gohr <andi@splitbrain.org>
      *
-     * @triggers HTMLFORM_UPDATEPROFILE_OUTPUT
-     * @triggers HTMLFORM_PROFILEDELETE_OUTPUT
      * @return void
      */
     public function show()
@@ -88,8 +86,7 @@ public function show()
         $form->addFieldsetClose();
         $form->addTagClose('div');
 
-        // print form that might be modified by HTMLFORM_UPDATEPROFILE_OUTPUT event handlers
-        print $form->toHTML('updateprofile');
+        print $form->toHTML('UpdateProfile');
 
 
         if ($auth->canDo('delUser') && actionOK('profile_delete')) {
@@ -119,8 +116,7 @@ public function show()
             $form->addFieldsetClose();
             $form->addTagClose('div');
 
-            // print form that might be modified by HTMLFORM_PROFILEDELETE_OUTPUT event handlers
-            print $form->toHTML('profiledelete');
+            print $form->toHTML('ProfileDelete');
         }
 
         print '</div>';

inc/Ui/UserRegister.php

@@ -16,7 +16,6 @@ class UserRegister extends Ui
      *
      * @author   Andreas Gohr <andi@splitbrain.org>
      *
-     * @triggers HTMLFORM_REGISTER_OUTPUT
      * @return void
      */
     public function show()
@@ -67,8 +66,7 @@ public function show()
         $form->addFieldsetClose();
         $form->addTagClose('div');
 
-        // print form that might be modified by HTMLFORM_REGISTER_OUTPUT event handlers
-        print $form->toHTML('register');
+        print $form->toHTML('Register');
 
         print '</div>';
     }

inc/Ui/UserResendPwd.php

@@ -17,7 +17,6 @@ class UserResendPwd extends Ui
      * @author   Benoit Chesneau <benoit@bchesneau.info>
      * @author   Andreas Gohr <andi@splitbrain.org>
      *
-     * @triggers HTMLFORM_RESENDPWD_OUTPUT
      * @return void
      */
     public function show()
@@ -37,8 +36,7 @@ public function show()
             $form = $this->formResendPassword();
         }
 
-        //print form that might be modified by HTMLFORM_RESENDPWD_OUTPUT event handlers
-        print $form->toHTML('resendpwd');
+        print $form->toHTML('ResendPwd');
 
         print '</div>';
     }

inc/media.php

@@ -1883,8 +1883,7 @@ function media_uploadform($ns, $auth, $fullscreen = false) {
     }
 
     echo '<div id="mediamanager__uploader">'.DOKU_LF;
-    // print form that might be modified by HTMLFORM_UPLOAD_OUTPUT event handlers
-    echo $form->toHTML('upload');
+    echo $form->toHTML('Upload');
     echo '</div>'.DOKU_LF;
 
     echo '<p class="maxsize">';
@@ -1948,9 +1947,7 @@ function media_searchform($ns, $query = '', $fullscreen = false) {
     $form->addButton('', $lang['btn_search'])->attr('type', 'submit');
     $form->addTagClose('p');
     $form->addTagClose('div');
-
-    // print form that might be modified by HTMLFORM_SEARCHMEDIA_OUTPUT event handlers
-    print $form->toHTML('searchmedia');
+    print $form->toHTML('SearchMedia');
 }
 
 /**

inc/template.php

@@ -705,9 +705,8 @@ function tpl_searchform($ajax = true, $autocomplete = true) {
         $searchForm->addTagClose('div');
     }
     $searchForm->addTagClose('div');
-    Event::createAndTrigger('FORM_QUICKSEARCH_OUTPUT', $searchForm);
 
-    echo $searchForm->toHTML();
+    echo $searchForm->toHTML('QuickSearch');
 
     return true;
 }

lib/plugins/authad/action.php

@@ -18,7 +18,7 @@ class action_plugin_authad extends DokuWiki_Action_Plugin
     public function register(Doku_Event_Handler $controller)
     {
         $controller->register_hook('AUTH_LOGIN_CHECK', 'BEFORE', $this, 'handleAuthLoginCheck');
-        $controller->register_hook('HTMLFORM_LOGIN_OUTPUT', 'BEFORE', $this, 'handleHtmlFormLoginOutput');
+        $controller->register_hook('FORM_LOGIN_OUTPUT', 'BEFORE', $this, 'handleFormLoginOutput');
     }
 
     /**
@@ -52,7 +52,7 @@ public function handleAuthLoginCheck(Doku_Event $event, $param)
      * @param Doku_Event $event
      * @param array      $param
      */
-    public function handleHtmlFormLoginOutput(Doku_Event $event, $param)
+    public function handleFormLoginOutput(Doku_Event $event, $param)
     {
         global $INPUT;
         /** @var auth_plugin_authad $auth */