Made the maximum embed size for datauris configurable

The feature is now disabled by default.
Metadata for config manager was added.

4 files changed, 6 insertions, 2 deletions

diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 67edc46a6..5e185e9c2 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -108,7 +108,7 @@ $conf['subscribers'] = 0;                //enable change notice subscription sup
 $conf['subscribe_time'] = 24*60*60;      //Time after which digests / lists are sent (in sec, default 1 day)
                                          //Should be smaller than the time specified in recent_days
 $conf['compress']    = 1;                //Strip whitespaces and comments from Styles and JavaScript? 1|0
-$conf['cssdatauri']  = 1;                //Embed small images into CSS, won't work on IE<8 1|0
+$conf['cssdatauri']  = 0;                //Maximum byte size of small images to embed into CSS, won't work on IE<8
 $conf['hidepages']   = '';               //Regexp for pages to be skipped from RSS, Search and Recent Changes
 $conf['send404']     = 0;                //Send a HTTP 404 status for non existing pages?
 $conf['sitemap']     = 0;                //Create a google sitemap? How often? In days.
diff --git a/lib/exe/css.php b/lib/exe/css.php
index 02ed169c4..92d198e19 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -289,6 +289,8 @@ function css_loadfile($file,$location=''){
  * Callback for preg_replace_callback
  */
 function css_datauri($match){
+    global $conf;
+
     $pre   = unslash($match[1]);
     $base  = unslash($match[2]);
     $url   = unslash($match[3]);
@@ -296,7 +298,7 @@ function css_datauri($match){
 
     $local = DOKU_INC.$url;
     $size  = @filesize($local);
-    if($size && $size < 600){
+    if($size && $size < $conf['cssdatauri']){
         $data = base64_encode(file_get_contents($local));
     }
     if($data){
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 9b7c643bf..e5dd4707a 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -133,6 +133,7 @@ $lang['jpg_quality'] = 'JPG compression quality (0-100)';
 $lang['subscribers'] = 'Enable page subscription support';
 $lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.';
 $lang['compress']    = 'Compact CSS and javascript output';
+$lang['cssdatauri']  = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. This technique won\'t work in IE < 8! <code>400</code> to <code>600</code> bytes is a good value. Set <code>0</code> to disable.';
 $lang['hidepages']   = 'Hide matching pages (regular expressions)';
 $lang['send404']     = 'Send "HTTP 404/Page Not Found" for non existing pages';
 $lang['sitemap']     = 'Generate Google sitemap (days)';
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index af7e63a61..abea1be1c 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -179,6 +179,7 @@ $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');