update config plugin

- add $conf['compression'] meta data and en lang strings
- remove $conf['usegzip'] meta data and en lang strings

Other language strings will need to be updated.

darcs-hash:20060825223047-9b6ab-b0c8c6af57847690a6d398d0bd98af9a51911c21.gz

3 files changed, 9 insertions, 4 deletions

diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index a86949225..67d515b29 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -69,8 +69,8 @@ $conf['sepchar']     = '_';              //word separator character in page name
                                          //  letter, a digit, '_', '-', or '.'.
 $conf['canonical']   = 0;                //Should all URLs use full canonical http://... style?
 $conf['autoplural']  = 0;                //try (non)plural form of nonexisting files?
-$conf['compression'] = 'gz';            //compress old revisions: (0: off) ('gz': gnuzip) ('bz2': bzip)
-					 // bz2 generates smaller files, but needs more cpu-power
+$conf['compression'] = 'gz';             //compress old revisions: (0: off) ('gz': gnuzip) ('bz2': bzip)
+                                         //  bz2 generates smaller files, but needs more cpu-power
 $conf['cachetime']   = 60*60*24;         //maximum age for cachefile in seconds (defaults to a day)
 $conf['purgeonadd']  = 1;                //purge cache when a new file is added (needed for up to date links)
 $conf['locktime']    = 15*60;            //maximum age for lockfiles (defaults to 15 minutes)
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 5ed638f52..c2bd5aacf 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -102,7 +102,7 @@ $lang['usedraft']    = 'Automatically save a draft while editing';
 $lang['sepchar']     = 'Page name word separator';
 $lang['canonical']   = 'Use fully canonical URLs';
 $lang['autoplural']  = 'Check for plural forms in links';
-$lang['usegzip']     = 'Use gzip for attic files';
+$lang['compression'] = 'Use compression for attic files';
 $lang['cachetime']   = 'Maximum age for cache (sec)';
 $lang['purgeonadd']  = 'Purge cache when new pages are added';
 $lang['locktime']    = 'Maximum age for lock files (sec)';
@@ -174,3 +174,8 @@ $lang['rss_linkto_o_page']    = 'the revised page';
 $lang['rss_linkto_o_rev']     = 'list of revisions';
 $lang['rss_linkto_o_current'] = 'the current page';
 
+/* compression options */
+$lang['compression_o_0']   = 'none';
+$lang['compression_o_gz']  = 'gzip';
+$lang['compression_o_bz2'] = 'bz2';
+
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index 3b8b9d006..0dd9f1de3 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -157,7 +157,7 @@ $meta['compress']    = array('onoff');
 $meta['gzip_output'] = array('onoff');
 $meta['hidepages']   = array('string');
 $meta['send404']     = array('onoff');
-$meta['usegzip']     = array('onoff');
+$meta['compression'] = array('multichoice','_choices' => array('0','gz','bz2'));
 $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'));