textual $cacheExpire

keishabien · Jul 2, 2015 · 3a96600 · 3a96600
1 parent af5d4fb
commit 3a96600
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/readme.md b/readme.md
@@ -47,5 +47,12 @@ Download Atom feed from URL:
 $atom = Feed::loadAtom($url);
 ```
 
+You can also enable caching:
+
+```php
+Feed::$cacheDir = __DIR__ . '/tmp';
+Feed::$cacheExpire = '5 hours';
+```
+
 -----
 (c) David Grudl, 2008 (http://davidgrudl.com)
diff --git a/src/Feed.php b/src/Feed.php
@@ -10,7 +10,7 @@
 class Feed
 {
 	/** @var int */
-	public static $cacheExpire = 86400; // 1 day
+	public static $cacheExpire = '1 day';
 
 	/** @var string */
 	public static $cacheDir;
@@ -143,7 +143,8 @@ private static function httpRequest($url, $user, $pass)
 	{
 		if (self::$cacheDir) {
 			$cacheFile = self::$cacheDir . '/feed.' . md5($url) . '.xml';
-			if (@filemtime($cacheFile) + self::$cacheExpire > time()) {
+			$e = self::$cacheExpire;
+			if (time() - @filemtime($cacheFile) <= (is_string($e) ? strtotime($e) - time() : $e)) {
 				return file_get_contents($cacheFile);
 			}
 		}