3 files changed, 97 insertions, 1 deletions

diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 01496c0d..5e0d5feb 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -99,6 +99,7 @@ class Admin_View_Core extends Gallery_View {
       }
 
       if ($function == "admin_head") {
+        array_unshift($blocks, $this->combine_css());
         array_unshift($blocks, $this->combine_script());
       }
 
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 659b24dc..9d4fe5c0 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -20,6 +20,7 @@
 class Gallery_View_Core extends View {
   protected $theme_name = null;
   protected $scripts = array();
+  protected $css = array();
 
   /**
    * Add a script to the combined scripts list.
@@ -86,4 +87,97 @@ class Gallery_View_Core extends View {
     return "<script type=\"text/javascript\" src=\"" . url::site("combined/javascript/$key") .
       "\"></script>";
   }
+
+  /**
+   * Add a css file to the combined css list.
+   * @param $file  the relative path to a script from the gallery3 directory
+   */
+  public function css($file, $theme_relative=false) {
+    $this->css[$file] = 1;
+  }
+
+  /**
+   * Add a css file to the combined css list.
+   * @param $file  the relative path to a script from the base of the active theme
+   * @param
+   */
+  public function theme_css($file) {
+    $file = "themes/{$this->theme_name}/$file";
+    $this->css[$file] = 1;
+  }
+
+  /**
+   * Combine a series of Javascript files into a single one and cache it in the database, then
+   * return a single <script> element to refer to it.
+   */
+  protected function combine_css() {
+    $links = array();
+    $key = "";
+
+    foreach (array_keys($this->css) as $file) {
+      $path = DOCROOT . $file;
+      if (file_exists($path)) {
+        $stats = stat($path);
+        $links[] = $path;
+        // 7 == size, 9 == mtime, see http://php.net/stat
+        $key = "{$key}$file $stats[7] $stats[9],";
+      } else {
+        Kohana::log("alert", "CSS file missing: " . $file);
+      }
+    }
+
+    $key = md5($key);
+    $cache = Cache::instance();
+    $contents = $cache->get($key);
+
+    $contents = "";
+    if (empty($contents)) {
+      $contents = "";
+      foreach ($links as $link) {
+        $contents .= $this->process_css($link);
+      }
+      $cache->set($key, $contents, array("css"), 30 * 84600);
+      if (function_exists("gzencode")) {
+        $cache->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP),
+                    array("css", "gzip"), 30 * 84600);
+      }
+    }
+    return "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
+      url::site("combined/css/$key") . "\" />";
+  }
+
+  private function process_css($css_file) {
+    static $PATTERN = "#url\(\s*['|\"]{0,1}(.*?)['|\"]{0,1}\s*\)#";
+    $docroot_length = strlen(DOCROOT);
+
+    $css = file_get_contents($css_file);
+    if (preg_match_all($PATTERN, $css, $matches, PREG_SET_ORDER)) {
+      $search = $replace = array();
+      foreach ($matches as $match) {
+        $relative = substr(realpath(dirname($css_file) . "/$match[1]"), $docroot_length);
+        if (!empty($relative)) {
+          $search[] = $match[0];
+          $replace[] = "url('" . url::abs_file($relative) . "')";
+        } else {
+          Kohana::log("alert", sprintf("Missing URL reference '%s' in CSS file '%s' ",
+                                       $match[1], $css_file));
+        }
+      }
+      $css = str_replace($search, $replace, $css);
+    }
+    $imports = preg_match_all("#@import\s*['|\"]{0,1}(.*?)['|\"]{0,1};#",
+                              $css, $matches, PREG_SET_ORDER);
+
+    if ($imports) {
+      $search = $replace = array();
+      foreach ($matches as $match) {
+        Kohana::log("error", dirname($css_file) . "/$match[1]");
+        $search[] = $match[0];
+        $replace[] = $this->process_css(dirname($css_file) . "/$match[1]");
+      }
+      $css = str_replace($search, $replace, $css);
+    }
+
+    return $css;
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 8e320f44..bc8e540a 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -201,8 +201,8 @@ class Theme_View_Core extends Gallery_View {
             array("gallery_theme", $function),
             array_merge(array($this), $args));
         }
-
       }
+
       foreach (module::active() as $module) {
         if ($module->name == "gallery") {
           continue;
@@ -216,6 +216,7 @@ class Theme_View_Core extends Gallery_View {
       }
 
       if ($function == "head") {
+        array_unshift($blocks, $this->combine_css());
         array_unshift($blocks, $this->combine_script());
       }