config manager fixes

This patch makes the default config widget a textarea, to avoid destroying
multiline configs as used in the SQL auth backends. It also makes HTML in
config descriptions possible and adds an accesskey to the savebutton.

darcs-hash:20060304213457-7ad00-54a32e005601a675b169c297ef9e1cf489372724.gz

3 files changed, 56 insertions, 28 deletions

diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index ba071b4d1..d5e77a261 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -305,7 +305,6 @@ if (!class_exists('setting')) {
      *  @return   array(string $label_html, string $input_html)
      */
     function html(&$plugin, $echo=false) {
-
         $value = '';
         $disable = '';
 
@@ -324,7 +323,7 @@ if (!class_exists('setting')) {
         $value = htmlspecialchars($value);
 
         $label = '<label for="config__'.$key.'">'.$this->prompt($plugin).'</label>';
-        $input = '<input id="config__'.$key.'" name="config['.$key.']" type="text" class="edit" value="'.$value.'" '.$disable.'/>';
+        $input = '<textarea rows="3" cols="40" id="config__'.$key.'" name="config['.$key.']" class="edit" '.$disable.'>'.$value.'</textarea>';
         return array($label,$input);
     }
 
@@ -341,6 +340,7 @@ if (!class_exists('setting')) {
       if ($fmt=='php') {
         // translation string needs to be improved FIXME
         $tr = array("\n"=>'\n', "\r"=>'\r', "\t"=>'\t', "\\" => '\\\\', "'" => '\\\'');
+        $tr = array("\\" => '\\\\', "'" => '\\\'');
 
         $out =  '$'.$var."['".$this->_out_key()."'] = '".strtr($this->_local, $tr)."';\n";
       }
@@ -362,8 +362,35 @@ if (!class_exists('setting')) {
   }
 }
 
+if (!class_exists('setting_string')) {
+  class setting_string extends setting {
+    function html(&$plugin, $echo=false) {
+        $value = '';
+        $disable = '';
+
+        if ($this->is_protected()) {
+          $value = $this->_protected;
+          $disable = 'disabled="disabled"';
+        } else {
+          if ($echo && $this->_error) {
+            $value = $this->_input;
+          } else {
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+          }
+        }
+
+        $key = htmlspecialchars($this->_key);
+        $value = htmlspecialchars($value);
+
+        $label = '<label for="config__'.$key.'">'.$this->prompt($plugin).'</label>';
+        $input = '<input id="config__'.$key.'" name="config['.$key.']" type="text" class="edit" value="'.$value.'" '.$disable.'/>';
+        return array($label,$input);
+    }
+  }
+}
+
 if (!class_exists('setting_password')) {
-  class setting_password extends setting {
+  class setting_password extends setting_string {
 
     function update($input) {
         if ($this->is_protected()) return false;
@@ -394,13 +421,13 @@ if (!class_exists('setting_password')) {
 }
 
 if (!class_exists('setting_email')) {
-  class setting_email extends setting {
+  class setting_email extends setting_string {
     var $_pattern = '#([a-z0-9\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i';
   }
 }
 
 if (!class_exists('setting_numeric')) {
-  class setting_numeric extends setting {
+  class setting_numeric extends setting_string {
     var $_pattern = '/^[-+\/*0-9 ]*$/';
 
     function out($var, $fmt='php') {
@@ -454,8 +481,8 @@ if (!class_exists('setting_onoff')) {
   }
 }
 
-if (!class_exists('setting_mulitchoice')) {
-  class setting_multichoice extends setting {
+if (!class_exists('setting_multichoice')) {
+  class setting_multichoice extends setting_string {
     var $_choices = array();
 
     function html(&$plugin) {
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index 7aa570f63..c34f9fc0b 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -66,25 +66,26 @@ $file['protected'] = "DOKU_CONF.'local.protected.php'";  // optional
 // - any settings not mentioned will come after the last setting listed and
 //   will use the default class with no parameters
 
-$meta['title']    = array('');
-$meta['start']    = array('');
+$meta['title']    = array('string');
+$meta['start']    = array('string');
 $meta['savedir']  = array('savedir');
 $meta['lang']     = array('dirchoice','_dir' => DOKU_INC.'inc/lang/');
 $meta['template'] = array('dirchoice','_dir' => DOKU_INC.'lib/tpl/');
 
 $meta['dmode']    = array('numeric','_pattern' => '/0[0-7]{3}/');  // only accept octal representation
 $meta['fmode']    = array('numeric','_pattern' => '/0[0-7]{3}/');  // only accept octal representation
-$meta['basedir']  = array('');
-$meta['baseurl']  = array('');
+$meta['basedir']  = array('string');
+$meta['baseurl']  = array('string');
 
 $meta['fullpath']    = array('onoff');
 $meta['recent']      = array('numeric');
 $meta['breadcrumbs'] = array('numeric');
+$meta['youarehere']  = array('onoff');
 $meta['typography']  = array('onoff');
 $meta['htmlok']      = array('onoff');
 $meta['phpok']       = array('onoff');
-$meta['dformat']     = array('');
-$meta['signature']   = array('');
+$meta['dformat']     = array('string');
+$meta['signature']   = array('string');
 $meta['toptoclevel'] = array('multichoice','_choices' => array(1,2,3,4,5));   // 5 toc levels
 $meta['maxtoclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5));
 $meta['maxseclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5)); // 0 for no sec edit buttons
@@ -106,8 +107,8 @@ $meta['autopasswd']  = array('onoff');
 $meta['resendpasswd'] = array('onoff');
 $meta['authtype']    = array('authtype');
 $meta['passcrypt']   = array('multichoice','_choices' => array('smd5','md5','sha1','ssha','crypt','mysql','my411'));
-$meta['defaultgroup']= array('');
-$meta['superuser']   = array('');
+$meta['defaultgroup']= array('string');
+$meta['superuser']   = array('string');
 $meta['profileconfirm'] = array('onoff');
 
 $meta['userewrite']  = array('multichoice','_choices' => array(0,1,2));
@@ -126,29 +127,29 @@ $meta['im_convert']  = array('im_convert');
 $meta['spellchecker']= array('onoff');
 $meta['subscribers'] = array('onoff');
 $meta['compress']    = array('onoff');
-$meta['hidepages']   = array('');
+$meta['hidepages']   = array('string');
 $meta['send404']     = array('onoff');
 $meta['sitemap']     = array('numeric');
 
 $meta['rss_type']    = array('multichoice','_choices' => array('rss','rss1','rss2','atom'));
 $meta['rss_linkto']  = array('multichoice','_choices' => array('diff','page','rev','current'));
 
-$meta['target____wiki']      = array('');
-$meta['target____interwiki'] = array('');
-$meta['target____extern']    = array('');
-$meta['target____media']     = array('');
-$meta['target____windows']   = array('');
+$meta['target____wiki']      = array('string');
+$meta['target____interwiki'] = array('string');
+$meta['target____extern']    = array('string');
+$meta['target____media']     = array('string');
+$meta['target____windows']   = array('string');
 
-$meta['proxy____host'] = array('','_pattern' => '#^[a-z0-9\-\.+]+?#i');
+$meta['proxy____host'] = array('string','_pattern' => '#^[a-z0-9\-\.+]+?#i');
 $meta['proxy____port'] = array('numeric');
-$meta['proxy____user'] = array('');
+$meta['proxy____user'] = array('string');
 $meta['proxy____pass'] = array('password');
 $meta['proxy____ssl']  = array('onoff');
 
 $meta['safemodehack'] = array('onoff');
-$meta['ftp____host']  = array('','_pattern' => '#^[a-z0-9\-\.+]+?#i');
+$meta['ftp____host']  = array('string','_pattern' => '#^[a-z0-9\-\.+]+?#i');
 $meta['ftp____port']  = array('numeric');
-$meta['ftp____user']  = array('');
+$meta['ftp____user']  = array('string');
 $meta['ftp____pass']  = array('password');
-$meta['ftp____root']  = array('');
+$meta['ftp____root']  = array('string');
 
diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index 805806e8b..0aafd2400 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -19,7 +19,7 @@ if (!class_exists('setting_sepchar')) {
 }
 
 if (!class_exists('setting_savedir')) {
-  class setting_savedir extends setting {
+  class setting_savedir extends setting_string {
 
     function update($input) {
         if ($this->is_protected()) return false;
@@ -57,7 +57,7 @@ if (!class_exists('setting_authtype')) {
 }
 
 if (!class_exists('setting_im_convert')) {
-  class setting_im_convert extends setting {
+  class setting_im_convert extends setting_string {
 
     function update($input) {
         if ($this->is_protected()) return false;