@@ -8,6 +8,10 @@
# Holds all Module instantiations.
static $instances = array();
+ # Boolean: $cancelled
+ # Is the module's execution cancelled?
+ public $cancelled = false;
+
/**
* Function: setPriority
* Sets the priority of an action for the module this function is called from.
includes/class/Modules.php
@@ -100,12 +100,18 @@
else
$response = false;
- if ($response !== false or $call !== false)
- return $this->success = true;
+ if ($response !== false or $call !== false) {
+ $this->success = true;
+ break;
+ }
if (++$count == count($try) and isset($this->controller->fallback) and method_exists($this->controller, "display"))
call_user_func_array(array($this->controller, "display"), $this->controller->fallback);
}
+
+ $trigger->call("route_done", $this);
+
+ return true;
}
/**
includes/class/Route.php
@@ -1,7 +1,5 @@
<?php
class Cacher extends Modules {
- public $cancelled = false;
-
public function __init() {
$this->user = (logged_in()) ? Visitor::current()->login : "guest" ;
$this->path = INCLUDES_DIR."/caches/".sanitize($this->user);
@@ -19,30 +17,32 @@
# Remove all expired files.
$this->remove_expired();
+
+ $config = Config::current();
+ $config->cache_exclude = (array) $config->cache_exclude;
}
static function __install() {
$config = Config::current();
$config->set("cache_expire", 1800);
+ $config->set("cache_exclude", array());
}
static function __uninstall() {
$config = Config::current();
$config->remove("cache_expire");
+ $config->remove("cache_exclude");
}
public function route_init($route) {
- if (!($route->controller instanceof MainController) or
+ if (!empty($_POST) or
+ !($route->controller instanceof MainController) or
+ in_array($this->url, Config::current()->cache_exclude) or
$this->cancelled or
!file_exists($this->file) or
Flash::exists())
return;
- $action = $route->action;
-
- if (!empty($_POST))
- return;
-
if (DEBUG)
error_log("SERVING cache file for ".$this->url."...");
@@ -56,6 +56,7 @@
public function end($route) {
if (!($route->controller instanceof MainController) or
+ in_array($this->url, Config::current()->cache_exclude) or
$this->cancelled or
file_exists($this->file) or
Flash::exists())
@@ -147,7 +148,8 @@
if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey)
show_403(__("Access Denied"), __("Invalid security key."));
- if (Config::current()->set("cache_expire", $_POST['cache_expire']))
+ $config = Config::current();
+ if ($config->set("cache_expire", $_POST['cache_expire']) and $config->set("cache_exclude", explode(", ", $_POST['cache_exclude'])))
Flash::notice(__("Settings updated."), "/admin/?action=cache_settings");
}
modules/cacher/cacher.php
@@ -10,6 +10,10 @@
<label for="cache_expire">${ "Expire Cache After…" | translate("cacher") }</label>
<input class="text" type="text" name="cache_expire" value="${ site.cache_expire | escape }" id="cache_expire" /> <span class="sub">${ "(seconds)" | translate("cacher") }</span>
</p>
+ <p>
+ <label for="cache_exclude">${ "Exclude URLs" | translate("cacher") }</label>
+ <input class="text" type="text" name="cache_exclude" value="${ site.cache_exclude | join(", ") | escape }" id="cache_exclude" /> <span class="sub">${ "(comma separated)" | translate("cacher") }</span>
+ </p>
<p class="buttons">
<p>
modules/cacher/pages/admin/cache_settings.twig
69cb90bf89a13fc7ec09e1bd28d867a29a153910
Alex Suraci
i.am@toogeneric.com
http://github.com/vito/chyrp/commit/48203516d0630d46d32b962f69edb8bae21353ef
48203516d0630d46d32b962f69edb8bae21353ef
2008-11-06T13:37:52-08:00
2008-11-06T13:37:52-08:00
* You can now set certain URLs to exclude from being cached.
* Moved the "cancelled" attribute to the Modules class.
* Added a "route_done" trigger, called after route_init tries all
possible calls.
f3412154847398053fbcecccedd8f83bc855307d
Alex Suraci
i.am@toogeneric.com