New, shorter intro to styles files that calls a function.

This function sets header information to improve caching (default 5 minutes)

Cookies are also prevented to improve cacheability.

diff --git a/lib/weblib.php b/lib/weblib.php
index a9a53d1c3e1d9924ac13a149ad763f70eff31066..5985c26c2df03683b94cbf1e6aa180dd5c18cd8a 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -780,6 +780,24 @@ function print_footer ($course=NULL) {
     include ("$CFG->dirroot/theme/$CFG->theme/footer.html");
 }
 
+function style_sheet_setup($lastmodified, $lifetime, $themename="") {
+
+    global $CFG;
+
+    header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastmodified) . " GMT");
+    header("Expires: " . gmdate("D, d M Y H:i:s", time() + $lifetime) . " GMT");
+    header("Cache-control: max_age = $lifetime"); 
+    header("Pragma: ");
+    header("Content-type: text/css");  // Correct MIME type
+
+    if (!empty($themename)) {
+        $CFG->theme = $themename;
+    }
+
+    return "$CFG->wwwroot/theme/$CFG->theme";
+
+}
+
 
 function user_login_string($course, $user=NULL) {
     global $USER, $CFG;

diff --git a/theme/brightretro/styles.php b/theme/brightretro/styles.php
index 9f41f51e74d6e082424007ec48657e7d351ab2b2..d7e8d26ebe093881c9fcfd10a8f7d5628e219784 100644 (file)
--- a/theme/brightretro/styles.php
+++ b/theme/brightretro/styles.php
@@ -2,15 +2,9 @@
 
 /// We use PHP so we can do value substitutions into the styles
 
+    $nomoodlecookie = true;
     require_once("../../config.php"); 
-
-    header("Content-type: text/css");  /// Correct MIME type
-
-    if (isset($themename)) {
-        $CFG->theme = $themename;
-    }
-
-    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";
+    $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 
 /// From here on it's nearly a normal stylesheet. 

diff --git a/theme/cordoroyblue/styles.php b/theme/cordoroyblue/styles.php
index 59bb199596fe4a3ce048cacbae93a93f786a04e2..5bd43b9314171e45763029b136bafe13bba64a37 100644 (file)
--- a/theme/cordoroyblue/styles.php
+++ b/theme/cordoroyblue/styles.php
@@ -2,15 +2,10 @@
 
 /// We use PHP so we can do value substitutions into the styles
 
-    require_once("../../config.php"); 
+    $nomoodlecookie = true;
+    require_once("../../config.php");
+    $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
-    header("Content-type: text/css");  /// Correct MIME type
-
-    if (isset($themename)) {
-        $CFG->theme = $themename;
-    }
-
-    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";
 
 /// From here on it's nearly a normal stylesheet. 
 /// First are some CSS definitions for normal tags, 

diff --git a/theme/garden/styles.php b/theme/garden/styles.php
index 169bdc6e22cb9379d21391e76c2edbe9c864ada6..5719fef320aa7b413d629ef3292d921f4aa11d07 100755 (executable)
--- a/theme/garden/styles.php
+++ b/theme/garden/styles.php
@@ -2,15 +2,9 @@
 
 /// We use PHP so we can do value substitutions into the styles
 
-    require_once("../../config.php"); 
-
-    header("Content-type: text/css");  // Correct MIME type
-
-    if (isset($themename)) {
-        $CFG->theme = $themename;
-    }
-
-    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";
+    $nomoodlecookie = true;
+    require_once("../../config.php");
+    $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 /// From here on it's nearly a normal stylesheet. 
 /// First are some CSS definitions for normal tags, 

diff --git a/theme/oceanblue/styles.php b/theme/oceanblue/styles.php
index 07e4e559dce2c70731c446c035d2928727a070e9..dd861fde7b161feb9da262d9194d2d8daef63b38 100644 (file)
--- a/theme/oceanblue/styles.php
+++ b/theme/oceanblue/styles.php
@@ -2,15 +2,9 @@
 
 /// We use PHP so we can do value substitutions into the styles
 
-    require_once("../../config.php"); 
-
-    header("Content-type: text/css");  // Correct MIME type
-
-    if (isset($themename)) {
-        $CFG->theme = $themename;
-    }
-
-    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";
+    $nomoodlecookie = true;
+    require_once("../../config.php");
+    $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 /// From here on it's nearly a normal stylesheet. 
 /// First are some CSS definitions for normal tags, 

diff --git a/theme/poweraid/styles.php b/theme/poweraid/styles.php
index 0a1e9794e0778d908be4b3981843f5d9af88f82b..8970299c09f28ebad97ff70fef526f7b20634750 100644 (file)
--- a/theme/poweraid/styles.php
+++ b/theme/poweraid/styles.php
@@ -26,13 +26,9 @@
 
 /* We use PHP so we can do value substitutions into the styles */
 
-       require_once("../../config.php"); 
-
-       if (isset($themename)) {
-               $CFG->theme = $themename;
-       }
-
-       $themeurl = "$CFG->wwwroot/theme/$CFG->theme";
+    $nomoodlecookie = true;
+    require_once("../../config.php");
+    $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 /*
    From here on it's nearly a normal stylesheet.

diff --git a/theme/standard/styles.php b/theme/standard/styles.php
index b89b8aba50bc5a57167703910caf67cf5becfb8e..731de2122069e635ce5d3270d4df3565109cd74f 100644 (file)
--- a/theme/standard/styles.php
+++ b/theme/standard/styles.php
@@ -2,15 +2,9 @@
 
 /// We use PHP so we can do value substitutions into the styles
 
+    $nomoodlecookie = true;
     require_once("../../config.php"); 
-
-    header("Content-type: text/css");  // Correct MIME type
-
-    if (isset($themename)) {
-        $CFG->theme = $themename;
-    }
-
-    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";
+    $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 /// From here on it's nearly a normal stylesheet. 
 /// First are some CSS definitions for normal tags, 

diff --git a/theme/standardblue/styles.php b/theme/standardblue/styles.php
index b89b8aba50bc5a57167703910caf67cf5becfb8e..3025f069e5190465d1c4de4ade62495412659da7 100644 (file)
--- a/theme/standardblue/styles.php
+++ b/theme/standardblue/styles.php
@@ -2,15 +2,9 @@
 
 /// We use PHP so we can do value substitutions into the styles
 
-    require_once("../../config.php"); 
-
-    header("Content-type: text/css");  // Correct MIME type
-
-    if (isset($themename)) {
-        $CFG->theme = $themename;
-    }
-
-    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";
+    $nomoodlecookie = true;
+    require_once("../../config.php");
+    $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 /// From here on it's nearly a normal stylesheet. 
 /// First are some CSS definitions for normal tags, 

diff --git a/theme/standardgreen/styles.php b/theme/standardgreen/styles.php
index b89b8aba50bc5a57167703910caf67cf5becfb8e..3025f069e5190465d1c4de4ade62495412659da7 100644 (file)
--- a/theme/standardgreen/styles.php
+++ b/theme/standardgreen/styles.php
@@ -2,15 +2,9 @@
 
 /// We use PHP so we can do value substitutions into the styles
 
-    require_once("../../config.php"); 
-
-    header("Content-type: text/css");  // Correct MIME type
-
-    if (isset($themename)) {
-        $CFG->theme = $themename;
-    }
-
-    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";
+    $nomoodlecookie = true;
+    require_once("../../config.php");
+    $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 /// From here on it's nearly a normal stylesheet. 
 /// First are some CSS definitions for normal tags, 

diff --git a/theme/standardlogo/styles.php b/theme/standardlogo/styles.php
index b89b8aba50bc5a57167703910caf67cf5becfb8e..3025f069e5190465d1c4de4ade62495412659da7 100644 (file)
--- a/theme/standardlogo/styles.php
+++ b/theme/standardlogo/styles.php
@@ -2,15 +2,9 @@
 
 /// We use PHP so we can do value substitutions into the styles
 
-    require_once("../../config.php"); 
-
-    header("Content-type: text/css");  // Correct MIME type
-
-    if (isset($themename)) {
-        $CFG->theme = $themename;
-    }
-
-    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";
+    $nomoodlecookie = true;
+    require_once("../../config.php");
+    $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 /// From here on it's nearly a normal stylesheet. 
 /// First are some CSS definitions for normal tags, 

diff --git a/theme/standardred/styles.php b/theme/standardred/styles.php
index b89b8aba50bc5a57167703910caf67cf5becfb8e..3025f069e5190465d1c4de4ade62495412659da7 100644 (file)
--- a/theme/standardred/styles.php
+++ b/theme/standardred/styles.php
@@ -2,15 +2,9 @@
 
 /// We use PHP so we can do value substitutions into the styles
 
-    require_once("../../config.php"); 
-
-    header("Content-type: text/css");  // Correct MIME type
-
-    if (isset($themename)) {
-        $CFG->theme = $themename;
-    }
-
-    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";
+    $nomoodlecookie = true;
+    require_once("../../config.php");
+    $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 /// From here on it's nearly a normal stylesheet. 
 /// First are some CSS definitions for normal tags, 

diff --git a/theme/standardwhite/styles.php b/theme/standardwhite/styles.php
index b89b8aba50bc5a57167703910caf67cf5becfb8e..3025f069e5190465d1c4de4ade62495412659da7 100644 (file)
--- a/theme/standardwhite/styles.php
+++ b/theme/standardwhite/styles.php
@@ -2,15 +2,9 @@
 
 /// We use PHP so we can do value substitutions into the styles
 
-    require_once("../../config.php"); 
-
-    header("Content-type: text/css");  // Correct MIME type
-
-    if (isset($themename)) {
-        $CFG->theme = $themename;
-    }
-
-    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";
+    $nomoodlecookie = true;
+    require_once("../../config.php");
+    $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
 /// From here on it's nearly a normal stylesheet. 
 /// First are some CSS definitions for normal tags,