Make Doku_Form constructor more flexible

The Doku_Form constructor used to take up to four arguments setting specific
parameters of the resulting form HTML element. Instead, a generic array is
passed to the constructor specifying HTML parameters.

darcs-hash:20091022120138-e4919-3a42baf8c12b15e6df20e1f28152a992e347859d.gz

1 files changed, 4 insertions, 2 deletions

diff --git a/inc/media.php b/inc/media.php
index c9b7cfc56..d8ca288c1 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -646,7 +646,9 @@ function media_uploadform($ns, $auth){
     if($auth < AUTH_UPLOAD) return; //fixme print info on missing permissions?
 
     // The default HTML upload form
-    $form = new Doku_Form('dw__upload', DOKU_BASE.'lib/exe/mediamanager.php', false, 'multipart/form-data');
+    $form = new Doku_Form(array('id'      => 'dw__upload',
+                                'action'  => DOKU_BASE.'lib/exe/mediamanager.php',
+                                'enctype' => 'multipart/form-data'));
     $form->addElement('<div class="upload">' . $lang['mediaupload'] . '</div>');
     $form->addElement(formSecurityToken());
     $form->addHidden('ns', hsc($ns));
@@ -711,7 +713,7 @@ function media_searchform($ns,$query=''){
     global $lang;
 
     // The default HTML search form
-    $form = new Doku_Form('dw__mediasearch', DOKU_BASE.'lib/exe/mediamanager.php', false);
+    $form = new Doku_Form(array('id' => 'dw__mediasearch', 'action' => DOKU_BASE.'lib/exe/mediamanager.php'));
     $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>');
     $form->addElement(formSecurityToken());
     $form->addHidden('ns', $ns);