2 files changed, 32 insertions, 25 deletions
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index adf7d217a..1cdab607f 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -279,10 +279,10 @@ if (!class_exists('configuration')) {
       }
 
       // the same for the active template
-      if (@file_exists(DOKU_TPLINC.$file)){
+      if (@file_exists(tpl_incdir().$file)){
         $meta = array();
-        @include(DOKU_TPLINC.$file);
-        @include(DOKU_TPLINC.$class);
+        @include(tpl_incdir().$file);
+        @include(tpl_incdir().$class);
         if (!empty($meta)) {
           $metadata['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] = array('fieldset');
         }
@@ -314,9 +314,9 @@ if (!class_exists('configuration')) {
       }
 
       // the same for the active template
-      if (@file_exists(DOKU_TPLINC.$file)){
+      if (@file_exists(tpl_incdir().$file)){
         $conf = array();
-        @include(DOKU_TPLINC.$file);
+        @include(tpl_incdir().$file);
         foreach ($conf as $key => $value){
           $default['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
         }
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index bb034f2db..675dca6cc 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -104,6 +104,7 @@ $meta['allowdebug']  = array('onoff');
 
 $meta['_display']    = array('fieldset');
 $meta['recent']      = array('numeric');
+$meta['recent_days'] = array('numeric');
 $meta['breadcrumbs'] = array('numeric','_min' => 0);
 $meta['youarehere']  = array('onoff');
 $meta['fullpath']    = array('onoff');
@@ -118,8 +119,8 @@ $meta['maxseclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5)); //
 $meta['camelcase']   = array('onoff');
 $meta['deaccent']    = array('multichoice','_choices' => array(0,1,2));
 $meta['useheading']  = array('multichoice','_choices' => array(0,'navigation','content',1));
-$meta['refcheck']    = array('onoff');
-$meta['refshow']     = array('numeric');
+$meta['sneaky_index'] = array('onoff');
+$meta['hidepages']   = array('string');
 
 $meta['_authentication'] = array('fieldset');
 $meta['useacl']      = array('onoff');
@@ -127,21 +128,19 @@ $meta['usewildcards']    = array('onoff');
 $meta['groupwildcards']  = array('onoff');
 $meta['autopasswd']  = array('onoff');
 $meta['authtype']    = array('authtype');
-$meta['passcrypt']   = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5'));
+$meta['passcrypt']   = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5','bcrypt'));
 $meta['defaultgroup']= array('string');
 $meta['superuser']   = array('string');
 $meta['manager']     = array('string');
 $meta['profileconfirm'] = array('onoff');
 $meta['rememberme'] = array('onoff');
-$meta['registernotify'] = array('email');
 $meta['disableactions'] = array('disableactions',
                                 '_choices' => array('backlink','index','recent','revisions','search','subscription','register','resendpwd','profile','edit','wikicode','check'),
                                 '_combine' => array('subscription' => array('subscribe','unsubscribe'), 'wikicode' => array('source','export_raw')));
-$meta['sneaky_index'] = array('onoff');
 $meta['auth_security_timeout'] = array('numeric');
 $meta['securecookie'] = array('onoff');
-$meta['xmlrpc']       = array('onoff');
-$meta['xmlrpcuser']   = array('string');
+$meta['remote']       = array('onoff');
+$meta['remoteuser']   = array('string');
 
 $meta['_anti_spam']  = array('fieldset');
 $meta['usewordblock']= array('onoff');
@@ -154,9 +153,6 @@ $meta['_editing']    = array('fieldset');
 $meta['usedraft']    = array('onoff');
 $meta['htmlok']      = array('onoff');
 $meta['phpok']       = array('onoff');
-$meta['notify']      = array('email', '_multiple' => true);
-$meta['subscribers'] = array('onoff');
-$meta['subscribe_time'] = array('numeric');
 $meta['locktime']    = array('numeric');
 $meta['cachetime']   = array('numeric');
 
@@ -173,6 +169,26 @@ $meta['gdlib']       = array('multichoice','_choices' => array(0,1,2));
 $meta['im_convert']  = array('im_convert');
 $meta['jpg_quality'] = array('numeric','_pattern' => '/^100$|^[1-9]?[0-9]$/');  //(0-100)
 $meta['fetchsize']   = array('numeric');
+$meta['refcheck']    = array('onoff');
+$meta['refshow']     = array('numeric');
+
+$meta['_notifications'] = array('fieldset');
+$meta['subscribers']    = array('onoff');
+$meta['subscribe_time'] = array('numeric');
+$meta['notify']         = array('email', '_multiple' => true);
+$meta['registernotify'] = array('email');
+$meta['mailfrom']       = array('richemail');
+$meta['mailprefix']     = array('string');
+$meta['htmlmail']       = array('onoff');
+
+$meta['_syndication'] = array('fieldset');
+$meta['sitemap']     = array('numeric');
+$meta['rss_type']    = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1'));
+$meta['rss_linkto']  = array('multichoice','_choices' => array('diff','page','rev','current'));
+$meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html'));
+$meta['rss_media']   = array('multichoice','_choices' => array('both','pages','media'));
+$meta['rss_update']  = array('numeric');
+$meta['rss_show_summary'] = array('onoff');
 
 $meta['_advanced']   = array('fieldset');
 $meta['updatecheck'] = array('onoff');
@@ -182,27 +198,18 @@ $meta['sepchar']     = array('sepchar');
 $meta['canonical']   = array('onoff');
 $meta['fnencode']    = array('multichoice','_choices' => array('url','safe','utf-8'));
 $meta['autoplural']  = array('onoff');
-$meta['mailfrom']    = array('richemail');
-$meta['mailprefix']  = array('string');
 $meta['compress']    = array('onoff');
 $meta['cssdatauri']  = array('numeric','_pattern' => '/^\d+$/');
 $meta['gzip_output'] = array('onoff');
-$meta['hidepages']   = array('string');
 $meta['send404']     = array('onoff');
 $meta['compression'] = array('compression');
-$meta['sitemap']     = array('numeric');
-$meta['rss_type']    = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1'));
-$meta['rss_linkto']  = array('multichoice','_choices' => array('diff','page','rev','current'));
-$meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html'));
-$meta['rss_update']  = array('numeric');
-$meta['recent_days'] = array('numeric');
-$meta['rss_show_summary'] = array('onoff');
 $meta['broken_iua']  = array('onoff');
 $meta['xsendfile']   = array('multichoice','_choices' => array(0,1,2,3));
 $meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml'));
 $meta['readdircache'] = array('numeric');
 
 $meta['_network']    = array('fieldset');
+$meta['dnslookups']  = array('onoff');
 $meta['proxy____host'] = array('string','_pattern' => '#^(|[a-z0-9\-\.+]+)$#i');
 $meta['proxy____port'] = array('numericopt');
 $meta['proxy____user'] = array('string');