Changeset 383

Timestamp:

06/21/09 12:18:40 (11 years ago)

Author:

kovell

Message:

page cache enables properly.

Location:

dev/common

Files:

• includes/class.cache.php (modified) (7 diffs)
• includes/globals.php (modified) (2 diffs)
• index.php (modified) (2 diffs)

dev/common/includes/class.cache.php

@@ -32 +32 @@
     }
 
-    function shouldCache()
+    function shouldCache($page = '')
     {
         // never cache for admins
@@ -39 +39 @@
             return false;
         }
-
+                // Don't cache the image files.
+                if (strpos($_SERVER['REQUEST_URI'],'thumb') ||
+                        strpos($_SERVER['REQUEST_URI'],'mapview')) return false;
         if (config::get('auto_reinforced') && config::get('is_reinforced') && count($_POST) == 0)
         {
@@ -46 +48 @@
 
         $cacheignore = explode(',', config::get('cache_ignore'));
-        if (KB_CACHE == 1 && count($_POST) == 0 && !in_array($page, $cacheignore))
+                if (KB_CACHE == 1 && count($_POST) == 0 && !($page != '' && in_array($page, $cacheignore)))
         {
             return true;
         }
-        return false;
+                return false;
     }
 
     function check($page)
     {
-        if (cache::shouldCache())
+        if (cache::shouldCache($page))
         {
             if (!file_exists(KB_CACHEDIR.'/'.KB_SITE))
@@ -61 +63 @@
                 mkdir(KB_CACHEDIR.'/'.KB_SITE);
             }
-            $cachefile = KB_CACHEDIR.'/'.KB_SITE.'/'.md5($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']).'.cache';
-
+                        // Include session info in the hash to support session-based security.
+            $cachefile = KB_CACHEDIR.'/'.KB_SITE.'/'.md5($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].implode($_SESSION)).'.cache';
+/*
             // cache is unlimited in reinforced mode
             if (config::get('is_reinforced') && file_exists($cachefile))
@@ -76 +79 @@
                 $smarty->assign('message', 'Note: This killboard has entered reinforced operation mode.');
             }
-
+*/
             $times = explode(',', config::get('cache_times'));
             foreach ($times as $string)
@@ -90 +93 @@
             else
             {
-                $cachetime = 5;
+                $cachetime = 1;
             }
             $cachetime = $cachetime * 60;
 
-            $timestamp = ((@file_exists($cachefile))) ? @filemtime($cachefile) : 0;
+                        if (config::get('is_reinforced'))
+            {
+                global $smarty;
+                $smarty->assign('message', 'Note: This killboard has entered reinforced operation mode.');
+                                // cache is extended in reinforced mode
+                                $cachetime = $cachetime * 20;
+            }
+                        if(file_exists($cachefile))
+                        {
+                                $timestamp = @filemtime($cachefile);
+                                if(time() - $cachetime > $timestamp) unlink($cachefile);
+                        }
+                        else $timestamp = 0;
+            //$timestamp = ((@file_exists($cachefile))) ? @filemtime($cachefile) : 0;
             if (time() - $cachetime < $timestamp)
             {
@@ -112 +128 @@
             $cachefile = KB_CACHEDIR.'/'.KB_SITE.'/'.md5($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']).'.cache';
             $fp = @fopen($cachefile, 'w');
-            @fwrite($fp, ob_get_contents());
-            @fwrite($fp, '<!-- Generated from cache -->');
+                        //@fwrite($fp, ob_get_contents());
+
+            @fwrite($fp, preg_replace('/profile -->.*<!-- \/profile/','profile -->Cached '.gmdate("d M Y H:i:s").'<!-- /profile',ob_get_contents()));
+            //if(!strpos($_SERVER['REQUEST_URI'], 'feed')) @fwrite($fp, '<!-- Generated from cache -->');
             @fclose($fp);
             ob_end_flush();

dev/common/includes/globals.php

@@ -7 +7 @@
 else
 {
-        $svn_rev = '376';
+        $svn_rev = '383';
 }
 define('SVN_REV', $svn_rev);
@@ -21 +21 @@
 // add new corporations here once you've added the logo to img/corps/
 $corp_npc = array('Guristas', 'Serpentis Corporation', 'Sansha\'s Nation', 'CONCORD',
-        'Mordus Legion', 'Blood Raider', 'Archangels', 'Guardian Angels');
+        'Mordus Legion', 'Blood Raider', 'Archangels', 'Guardian Angels', 'True Power');
 
 function shorten($shorten, $by = 22)

dev/common/index.php

@@ -134 +134 @@
     }
 }
+// Enable page caching if set.
+if(config::get('cache_enabled')) define('KB_CACHE', 1);
+else define('KB_CACHE', 0);
 
 // all admin files are now in the admin directory and preload the menu
@@ -193 +196 @@
     $page = 'home';
 }
-
+// Serve feeds to feed fetchers.
+if(strpos($_SERVER['HTTP_USER_AGENT'], 'EDK Feedfetcher') !== false) $page = 'feed';
 cache::check($page);
 if ($settingsPage)