Cache: item cache now has an autodelete of old files. The pages plugin now sets a...

diff --git a/addon/pages/pages.php b/addon/pages/pages.php
index 6b242be316e637f79b2d9ab3cbdcfc04293830d3..9e90cc24ddc2040e81faa11f08c90cbd5c98e3cf 100755 (executable)
--- a/addon/pages/pages.php
+++ b/addon/pages/pages.php
@@ -55,7 +55,7 @@ function pages_getpages($uid) {
        // Look if the profile is a community page
        foreach($contacts as $contact) {
                if (pages_iscommunity($contact["url"], $pagelist))
-                       $pages[] = array("url"=>$contact["url"], "Name"=>$contact["Name"]);
+                       $pages[] = array("url"=>$contact["url"], "Name"=>$contact["Name"], "id"=>$contact["id"]);
        }
 
        // Write back cached pagelist
@@ -76,7 +76,8 @@ function pages_page_end($a,&$b) {
        $contacts = pages_getpages($a->user['uid']);
 
        foreach($contacts as $contact) {
-               $pages .= '<li class="tool"><a href="'.$contact["url"].'" class="label" target="external-link">'.$contact["Name"]."</a></li>";
+               $pages .= '<li class="tool"><a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" class="label" target="external-link">'.
+                               $contact["Name"]."</a></li>";
        }
        $pages .= "</ul></div></div>";
        if (sizeof($contacts) > 0)

diff --git a/include/poller.php b/include/poller.php
index f165ad590520003e037f32d13e28a0d416b1cc9b..65fafda4c86fb42c1d26768fa3869a0d8190b17a 100755 (executable)
--- a/include/poller.php
+++ b/include/poller.php
@@ -69,6 +69,19 @@ function poller_run($argv, $argc){
        // clear old cache
        Cache::clear();
 
+       // clear item cache files if they are older than one day
+       $cache = get_config('system','itemcache');
+       if (($cache != '') and is_dir($cache)) {
+               if ($dh = opendir($cache)) {
+                       while (($file = readdir($dh)) !== false) {
+                               $fullpath = $cache."/".$file;
+                               if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - 1800))
+                                       unlink($fullpath);
+                       }
+                       closedir($dh);
+               }
+       }
+
        $manual_id  = 0;
        $generation = 0;
        $hub_update = false;

diff --git a/include/text.php b/include/text.php
index 5bf815105b71eafecfd4331cde2e5049c9b96138..08c5a542464ffa189e66a6391cdd6b0162231970 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -879,7 +879,7 @@ function prepare_body($item,$attach = false) {
        $cache = get_config('system','itemcache');
 
        if (($cache != '')) {
-               $cachefile = $cache."/".$item["guid"]."-".strtotime($item["edited"])."-".$attach."-".hash("crc32", $item['body']);
+               $cachefile = $cache."/".$item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']);
 
                if (file_exists($cachefile))
                        $s = file_get_contents($cachefile);