Fixes #2160 #2678 introducing a more flexible simplecache handler (this requires an htaccess update)

git-svn-id: http://code.elgg.org/elgg/trunk@7464 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 97 insertions, 7 deletions

diff --git a/engine/handlers/cache_handler.php b/engine/handlers/cache_handler.php
new file mode 100644
index 000000000..d08863a00
--- /dev/null
+++ b/engine/handlers/cache_handler.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Cache handler.
+ * 
+ * External access to cached CSS and JavaScript views. The cached file URLS
+ * should be of the form: cache/<type>/<view>/<viewtype>/<unique_id> where
+ * type is either css or js, view is the name of the cached view, and
+ * unique_id is an identifier that is updated every time the cache is flushed.
+ * The simplest way to maintain a unique identifier is to use the lastcache
+ * variable in Elgg's config object.
+ *
+ * @see elgg_view_register_simplecache()
+ *
+ * @package Elgg.Core
+ * @subpackage Cache
+ */
+
+// Get dataroot
+require_once(dirname(dirname(__FILE__)) . '/settings.php');
+$mysql_dblink = mysql_connect($CONFIG->dbhost, $CONFIG->dbuser, $CONFIG->dbpass, true);
+if (!$mysql_dblink) {
+	echo 'Cache error: unable to connect to database server';
+	exit;
+}
+
+if (!mysql_select_db($CONFIG->dbname, $mysql_dblink)) {
+	echo 'Cache error: unable to connect to Elgg database';
+	exit;
+}
+
+$query = "select name, value from {$CONFIG->dbprefix}datalists where name = 'dataroot'";
+$result = mysql_query($query, $mysql_dblink);
+if (!$result) {
+	echo 'Cache error: unable to get the data root';
+	exit;
+}
+$row = mysql_fetch_object($result);
+$dataroot = $row->value;
+
+
+
+$dirty_request = $_GET['request'];
+// only alphanumeric characters plus / and . and no '..'
+$filter = array("options" => array("regexp" => "/^(\.?[a-zA-Z0-9\/]+)+$/"));
+$request = filter_var($dirty_request, FILTER_VALIDATE_REGEXP, $filter);
+if (!$request) {
+	echo 'Cache error: bad request';
+	exit;
+}
+$request = explode('/', $request);
+
+
+//cache/<type>/<view>/<viewtype>/
+$type = $request[0];
+$view = $request[1];
+$viewtype = $request[2];
+
+switch ($type) {
+	case 'css':
+		header("Content-type: text/css", true);
+		header('Expires: ' . date('r', time() + 86400000), true);
+		header("Pragma: public", true);
+		header("Cache-Control: public", true);
+
+		$view = "css/$view";
+		break;
+	case 'js':
+		header('Content-type: text/javascript', true);
+		header('Expires: ' . date('r', time() + 864000000), true);
+		header("Pragma: public", true);
+		header("Cache-Control: public", true);
+
+		$view = "js/$view";
+		break;
+}
+
+$filename = $dataroot . 'views_simplecache/' . md5($viewtype . $view);
+
+if (file_exists($filename)) {
+	$contents = file_get_contents($filename);
+} else {
+	// someone trying to access a non-cached file or a race condition with cache flushing
+	mysql_close($mysql_dblink);
+	require_once(dirname(dirname(__FILE__)) . "/start.php");
+	elgg_set_viewtype($viewtype);
+	$contents = elgg_view($view);
+}
+
+echo $contents;
diff --git a/engine/lib/views.php b/engine/lib/views.php
index bf133f592..6c4cec0f2 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1335,10 +1335,11 @@ function elgg_views_register_core_head_elements() {
 	$lastcache = $CONFIG->lastcache;
 	$viewtype = elgg_get_viewtype();
 
-	$url = "{$base}_css/js.php?lastcache=$lastcache&js=initialise_elgg&viewtype=$viewtype";
+	//$url = "{$base}_css/js.php?lastcache=$lastcache&js=initialise_elgg&viewtype=$viewtype";
+	$url = "{$base}cache/js/initialise_elgg/$viewtype/initialise_elgg.$lastcache.js";
 	elgg_register_js($url, 'initialise_elgg');
 
-	$url = "{$base}_css/css.css?lastcache=$lastcache&viewtype=$viewtype";
+	$url = "{$base}cache/css/elgg/$viewtype/elgg.$lastcache.css";
 	elgg_register_css($url, 'elgg');
 }
 
@@ -1353,7 +1354,7 @@ function elgg_views_register_core_head_elements() {
 function elgg_views_boot() {
 	global $CONFIG;
 
-	elgg_view_register_simplecache('css');
+	elgg_view_register_simplecache('css/elgg');
 	elgg_view_register_simplecache('js/friendsPickerv1');
 	elgg_view_register_simplecache('js/initialise_elgg');
 
diff --git a/engine/start.php b/engine/start.php
index 7a3dee31e..646ddbf72 100644
--- a/engine/start.php
+++ b/engine/start.php
@@ -133,11 +133,11 @@ elgg_trigger_event('init', 'system');
 // Don't do it on upgrade because upgrade does it itself.
 // @todo - move into function and perhaps run off init system event
 if (!defined('UPGRADING')) {
-	$view = get_input('view', 'default');
-	$lastupdate = datalist_get("simplecache_lastupdate_$view");
-	$lastcached = datalist_get("simplecache_lastcached_$view");
+	$viewtype = get_input('view', 'default');
+	$lastupdate = datalist_get("simplecache_lastupdate_$viewtype");
+	$lastcached = datalist_get("simplecache_lastcached_$viewtype");
 	if ($lastupdate == 0 || $lastcached < $lastupdate) {
-		elgg_view_regenerate_simplecache($view);
+		elgg_view_regenerate_simplecache($viewtype);
 	}
 	// needs to be set for links in html head
 	$CONFIG->lastcache = $lastcached;