MDL-32683 use slashargument urls for yui combo loader

danmarsden · May 5, 2012 · 6e7b460 · 6e7b460
1 parent ecbad2a
commit 6e7b460
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php
@@ -152,6 +152,8 @@ class page_requirements_manager {
     public function __construct() {
         global $CFG;
 
+        $sep = empty($CFG->slasharguments) ? '?' : '/';
+
         require_once("$CFG->libdir/yui/phploader/phploader/loader.php");
 
         $this->yui3loader = new stdClass();
@@ -174,8 +176,8 @@ public function __construct() {
         } else {
             $this->yui3loader->base = $CFG->httpswwwroot . '/lib/yui/'. $CFG->yui3version . '/build/';
             $this->yui2loader->base = $CFG->httpswwwroot . '/lib/yui/'. $CFG->yui2version . '/build/';
-            $this->yui3loader->comboBase = $CFG->httpswwwroot . '/theme/yui_combo.php?';
-            $this->yui2loader->comboBase = $CFG->httpswwwroot . '/theme/yui_combo.php?';
+            $this->yui3loader->comboBase = $CFG->httpswwwroot . '/theme/yui_combo.php'.$sep;
+            $this->yui2loader->comboBase = $CFG->httpswwwroot . '/theme/yui_combo.php'.$sep;
         }
 
         // enable combo loader? this significantly helps with caching and performance!
@@ -201,8 +203,8 @@ public function __construct() {
         $this->M_yui_loader->groups       = array(
             'moodle' => array(
                 'name' => 'moodle',
-                'base' => $CFG->httpswwwroot . '/theme/yui_combo.php?moodle/'.$jsrev.'/',
-                'comboBase' => $CFG->httpswwwroot . '/theme/yui_combo.php?',
+                'base' => $CFG->httpswwwroot . '/theme/yui_combo.php'.$sep.'moodle/'.$jsrev.'/',
+                'comboBase' => $CFG->httpswwwroot . '/theme/yui_combo.php'.$sep,
                 'combine' => $this->yui3loader->combine,
                 'filter' => '',
                 'ext' => false,
@@ -218,7 +220,7 @@ public function __construct() {
             'local' => array(
                 'name' => 'gallery',
                 'base' => $CFG->wwwroot.'/lib/yui/gallery/',
-                'comboBase' => $CFG->httpswwwroot . '/theme/yui_combo.php?',
+                'comboBase' => $CFG->httpswwwroot . '/theme/yui_combo.php'.$sep,
                 'combine' => $this->yui3loader->combine,
                 'filter' => $this->M_yui_loader->filter,
                 'ext' => false,

diff --git a/theme/yui_combo.php b/theme/yui_combo.php
@@ -109,20 +109,22 @@
     }
     $filecontent = file_get_contents($contentfile);
 
+    $relroot = preg_replace('|^http.?://[^/]+|', '', $CFG->wwwroot);
+
     if ($mimetype === 'text/css') {
         if ($version == 'moodle') {
-            $filecontent = preg_replace('/([a-z0-9_-]+)\.(png|gif)/', 'yui_image.php?file='.$version.'/'.$frankenstyle.'/'.array_shift($bits).'/$1.$2', $filecontent);
+            $filecontent = preg_replace('/([a-z0-9_-]+)\.(png|gif)/', $relroot.'/theme/yui_image.php?file='.$version.'/'.$frankenstyle.'/'.array_shift($bits).'/$1.$2', $filecontent);
         } else if ($version == 'gallery') {
             // search for all images in gallery module CSS and serve them through the yui_image.php script
-            $filecontent = preg_replace('/([a-z0-9_-]+)\.(png|gif)/', 'yui_image.php?file='.$version.'/'.$bits[0].'/'.$bits[1].'/$1.$2', $filecontent);
+            $filecontent = preg_replace('/([a-z0-9_-]+)\.(png|gif)/', $relroot.'/theme/yui_image.php?file='.$version.'/'.$bits[0].'/'.$bits[1].'/$1.$2', $filecontent);
         } else {
             // First we need to remove relative paths to images. These are used by YUI modules to make use of global assets.
             // I've added this as a separate regex so it can be easily removed once
             // YUI standardise there CSS methods
             $filecontent = preg_replace('#(\.\./\.\./\.\./\.\./assets/skins/sam/)?([a-z0-9_-]+)\.(png|gif)#', '$2.$3', $filecontent);
 
             // search for all images in yui2 CSS and serve them through the yui_image.php script
-            $filecontent = preg_replace('/([a-z0-9_-]+)\.(png|gif)/', 'yui_image.php?file='.$version.'/$1.$2', $filecontent);
+            $filecontent = preg_replace('/([a-z0-9_-]+)\.(png|gif)/', $relroot.'/theme/yui_image.php?file='.$version.'/$1.$2', $filecontent);
         }
     }
 
@@ -195,9 +197,13 @@ function combo_params() {
         $parts = explode('?', $_SERVER['REQUEST_URI'], 2);
         return $parts[1];
 
-    } else if (isset($_SERVER['QUERY_STRING'])) {
+    } else if (isset($_SERVER['QUERY_STRING']) and strpos($_SERVER['QUERY_STRING'], '?') !== false) {
         return $_SERVER['QUERY_STRING'];
 
+    } else if ($slashargument = min_get_slash_argument()) {
+        $slashargument = ltrim($slashargument, '/');
+        return $slashargument;
+
     } else {
         // unsupported server, sorry!
         combo_not_found('Unsupported server - query string can not be determined, try disabling YUI combo loading in admin settings.');