Changeset 388

Timestamp:

06/22/09 13:38:25 (13 years ago)

Author:

kovell

Message:

Page cache fixes for comments.
refresh no longer reposts comment.
comments display again.
304 sent for refresh of cached pages.
html fixes

Location:

dev

Files:

• common/admin/option_acache.php (modified) (1 diff)
• common/comments.php (modified) (1 diff)
• common/includes/class.cache.php (modified) (6 diffs)
• common/includes/class.comments.php (modified) (3 diffs)
• common/kill_detail.php (modified) (3 diffs)
• mods/apoc_fitting/kill_detail.php (modified) (4 diffs)
• mods/apoc_fitting/kill_detail.tpl (modified) (5 diffs)
• templates/block_comments.tpl (modified) (4 diffs)
• templates/kill_detail.tpl (modified) (4 diffs)

dev/common/admin/option_acache.php

@@ -8 +8 @@
 options::fadd('Caching enabled', 'cache_enabled', 'checkbox');
 options::fadd('Cache directory', 'cache_dir', 'edit:size:40');
-options::fadd('Ignore pages', 'cache_ignore', 'edit:size:60');
-options::fadd('Cache times', 'cache_times', 'edit:size:60');
+options::fadd('Ignore pages (xx,yy)', 'cache_ignore', 'edit:size:60');
+options::fadd('Cache times (xx:1,yy:2)', 'cache_times', 'edit:size:60');
 
 options::cat('Advanced', 'Cache', 'Query Cache');

dev/common/comments.php

@@ -25 +25 @@
             }
             $comments->addComment($name, $comment);
+                        //Remove cached file.
+                        if(KB_CACHE) cache::deleteCache();
+                        //Redirect to avoid refresh reposting comments.
+                        header('Location: '.$_SERVER['REQUEST_URI'],TRUE,303);
+                        die();
         }
     }

dev/common/includes/class.cache.php

@@ -64 +64 @@
             }
                         // 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))
-            {
-                ob_start('ob_gzhandler');
-                @readfile($cachefile);
-                ob_end_flush();
-                exit();
-            }
-            elseif (config::get('is_reinforced'))
-            {
-                global $smarty;
-                $smarty->assign('message', 'Note: This killboard has entered reinforced operation mode.');
-            }
-*/
+            $cachefile = cache::genCacheName();
             $times = explode(',', config::get('cache_times'));
             foreach ($times as $string)
@@ -93 +78 @@
             else
             {
-                $cachetime = 1;
+                $cachetime = 10;
             }
             $cachetime = $cachetime * 60;
@@ -104 +89 @@
                                 $cachetime = $cachetime * 20;
             }
-                        if(file_exists($cachefile))
-                        {
-                                $timestamp = @filemtime($cachefile);
-                                if(time() - $cachetime > $timestamp) unlink($cachefile);
-                        }
+                        if(file_exists($cachefile)) $timestamp = @filemtime($cachefile);
                         else $timestamp = 0;
             //$timestamp = ((@file_exists($cachefile))) ? @filemtime($cachefile) : 0;
             if (time() - $cachetime < $timestamp)
             {
-                ob_start('ob_gzhandler');
+                                $etag=md5($cachefile);
+                                header("Last-Modified: ".gmdate("D, d M Y H:i:s", $timestamp)." GMT");
+// Breaks comment posting.
+//                              header('Expires: ' . gmdate('D, d M Y H:i:s', $timestamp + $cachetime) . ' GMT');
+                                header("Etag: ".md5($etag));
+                                header("Cache-Control:");
+                                header('Pragma:');
+
+                                if (@strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $timestamp ||
+                                        trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag)
+                                {
+                                        header("HTTP/1.1 304 Not Modified");
+                                        exit;
+                                }
+
+                if(!ini_get('zlib.output_compression')) ob_start('ob_gzhandler');
+                                else ob_start();
                 @readfile($cachefile);
                 ob_end_flush();
@@ -120 +117 @@
             ob_start();
         }
+                header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+//              header('Expires: ' . gmdate('D, d M Y H:i:s', time()+60) . ' GMT');
+                header("Etag: ".md5($cachefile));
+                header("Cache-Control:");
+                header('Pragma:');
     }
 
@@ -126 +128 @@
         if (cache::shouldCache())
         {
-            $cachefile = KB_CACHEDIR.'/'.KB_SITE.'/'.md5($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']).'.cache';
+            $cachefile = cache::genCacheName();
             $fp = @fopen($cachefile, 'w');
                         //@fwrite($fp, ob_get_contents());
@@ -136 +138 @@
         }
     }
+
+        function deleteCache()
+        {
+                $cachefile = cache::genCacheName();
+                @unlink($cachefile);
+        }
+
+        function genCacheName()
+        {
+                return KB_CACHEDIR.'/'.KB_SITE.'/'.md5($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].implode($_SESSION)).'.cache';
+        }
 }
 ?>

dev/common/includes/class.comments.php

@@ -11 +11 @@
      */
     function Comments($kll_id) 
-    { 
+    {
         $this->id_ = $kll_id; 
         $this->raw_ = false; 
@@ -26 +26 @@
         $qry = new DBQuery(true); 
         $qry->execute("SELECT *,id FROM kb3_comments WHERE `kll_id` = '".
-            $kll_id."' order by posttime asc"); 
+            $this->id_."' order by posttime asc");
         while ($row = $qry->getRow()) 
         { 
@@ -32 +32 @@
               'comment' => stripslashes($row['comment']), 'id' => $row['id']); 
         } 
-        $smarty->assign_by_ref('comments', $this->comments_); 
+        $smarty->assign_by_ref('comments', $this->comments_);
+                $smarty->assign('norep', time()%3700);
         return $smarty->fetch(get_tpl('block_comments')); 
     } 

dev/common/kill_detail.php

@@ -1 +1 @@
 <?php
 require_once('common/includes/class.kill.php');
+
+$kll_id = intval($_GET['kll_id']);
+$kll_external_id = intval($_GET['kll_external_id']);
+if (!$kll_id && !$kll_external_id)
+{
+    $html = "No kill id specified.";
+    $page->setContent($html);
+    $page->generate($html);
+    exit;
+}
+
+if($kll_id)
+{
+        $kill = new Kill($kll_id);
+}
+else
+{
+        $kill = new Kill($kll_external_id, true);
+        $kll_id = $kill->getID();
+}
+$kill->setDetailedInvolved();
+
+if (!$kill->exists())
+{
+    $html="That kill doesn't exist.";
+    $page->setContent($html);
+    $page->generate($html);
+    exit;
+}
+
+// If a comment is being posted then we don't exit this block.
+if(isset($_POST['comment']) && config::get('comments'))
+{
+    include('common/comments.php');
+}
+
 require_once('common/includes/class.pilot.php');
 require_once('common/includes/class.corp.php');
@@ -66 +102 @@
         $qry->execute("UPDATE kb3_items_".$table." SET itd_itl_id ='".$Val."' WHERE itd_itm_id=".$IID." AND itd_kll_id = ".$KID." AND itd_itl_id = ".$old);
     }
-}
-
-$kll_id = intval($_GET['kll_id']);
-$kll_external_id = intval($_GET['kll_external_id']);
-if (!$kll_id && !$kll_external_id)
-{
-    $html = "No kill id specified.";
-    $page->setContent($html);
-    $page->generate($html);
-    exit;
-}
-
-if($kll_id)
-{
-        $kill = new Kill($kll_id);
-        $kill->setDetailedInvolved();
-}
-else
-{
-        $kill = new Kill($kll_external_id, true);
-        $kill->setDetailedInvolved();
-        $kll_id = $kill->getID();
-}
-
-if (!$kill->exists())
-{
-    $html = "That kill doesn't exist.";
-    $page->setContent($html);
-    $page->generate($html);
-    exit;
 }
 
@@ -549 +555 @@
     else
     {
-        $menubox->addOption("link", "Fix Slots", "?a=kill_detail&amp;kll_id=".$kill->getID()."&view=FixSlot");
+        $menubox->addOption("link", "Fix Slots", "?a=kill_detail&amp;kll_id=".$kill->getID()."&amp;view=FixSlot");
     }
 }

dev/mods/apoc_fitting/kill_detail.php

@@ -1 +1 @@
 <?php
 require_once('common/includes/class.kill.php');
+
+$kll_id = intval($_GET['kll_id']);
+$kll_external_id = intval($_GET['kll_external_id']);
+if (!$kll_id && !$kll_external_id)
+{
+    $html = "No kill id specified.";
+    $page->setContent($html);
+    $page->generate($html);
+    exit;
+}
+
+if($kll_id)
+{
+        $kill = new Kill($kll_id);
+}
+else
+{
+        $kill = new Kill($kll_external_id, true);
+        $kll_id = $kill->getID();
+}
+$kill->setDetailedInvolved();
+
+if (!$kill->exists())
+{
+    $html="That kill doesn't exist.";
+    $page->setContent($html);
+    $page->generate($html);
+    exit;
+}
+
+// If a comment is being posted then we don't exit this block.
+if(isset($_POST['comment']) && config::get('comments'))
+{
+    include('common/comments.php');
+}
+
 require_once('common/includes/class.killsummarytable.php');
 require_once('common/includes/class.pilot.php');
@@ -66 +102 @@
                           . " AND itd_kll_id = " . $KID . " AND itd_itl_id = " . $old);
         }
-    }
-
-$kll_id = intval($_GET['kll_id']);
-$kll_external_id = intval($_GET['kll_external_id']);
-if (!$kll_id && !$kll_external_id)
-{
-    $html = "No kill id specified.";
-    $page->setContent($html);
-    $page->generate($html);
-    exit;
-}
-
-if($kll_id)
-{
-        $kill = new Kill($kll_id);
-        $kill->setDetailedInvolved();
-}
-else
-{
-        $kill = new Kill($kll_external_id, true);
-        $kill->setDetailedInvolved();
-        $kll_id = $kill->getID();
-}
-
-if (!$kill->exists())
-    {
-    $html="That kill doesn't exist.";
-    $page->setContent($html);
-    $page->generate($html);
-    exit;
     }
 
@@ -274 +280 @@
 
 if (config::get('comments'))
-    {
+{
     include('common/comments.php');
     $smarty->assign('comments', $comment);
-    }
+}
 
 // ship, ship details
@@ -852 +858 @@
     if (isset($_GET['view']) && $_GET['view'] == 'FixSlot')
         {
-        $menubox->addOption("link", "Adjust Values", "?a=kill_detail&kll_id=" . $kill->getID() . "");
+        $menubox->addOption("link", "Adjust Values", "?a=kill_detail&amp;kll_id=" . $kill->getID() . "");
         }
     else

dev/mods/apoc_fitting/kill_detail.tpl

@@ -171 +171 @@
 
           <br />
-          <div id="fitting" style="position:relative; height:398px; width:398px;" name="fitting">
+          <div id="fitting" style="position:relative; height:398px; width:398px;" title="fitting">
                 <div id="mask" style="position:absolute; left:0px; top:0px; width:398px; height:398px; z-index:0;">
                         <img border="0" style="position:absolute; height='398' width='398' filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(
@@ -258 +258 @@
         {if $admin and $config->get('item_values') and !$fixSlot}
                     <tr class="kb-table-row-even">
-                      <form method="post" action="">
-                        <td height="34" colspan="3" valign="top">
+                      <td height="34" colspan="4" valign="top" align="right"><form method="post" action=""><table><tr>
+                        <td>
                             <div align="right">
                                 Current single Item Value:
@@ -266 +266 @@
                             </div></td>
                         <td height="34" valign="top"><input type="submit" name="submit" value="UpdateValue" class="comment-button"></td>
-                      </form>
+                      </tr></table></form></td>
                     </tr>
         {/if}
@@ -297 +297 @@
         {if $admin and $config->get('item_values') and !$fixSlot}
                     <tr class="kb-table-row-even">
-                      <form method="post" action="">
-                        <td height="34" colspan="3" valign="top">
+                      <td height="34" colspan="4" valign="top" align="right"><form method="post" action=""><table><tr>
+                        <td>
                             <div align="right">
                                 Current single Item Value:
@@ -305 +305 @@
                             </div></td>
                         <td height="34" valign="top"><input type="submit" name="submit" value="UpdateValue" class="comment-button"></td>
-                      </form>
+                      </tr></table></form></td>
                     </tr>
         {/if}

dev/templates/block_comments.tpl

@@ -1 +1 @@
 <div class="block-header">Comments</div>
-<table class="kb-table" width="360" border="0" cellspacing="1" border="0">
+<table class="kb-table" width="360" border="0" cellspacing="1">
   <tr>
     <td width="100%" align="left" valign="top">
-      <table width="100%" border="0" cellspacing="0" border="0">
+      <table width="100%" border="0" cellspacing="0">
 {cycle reset=true print=false name=ccl values="kb-table-row-even,kb-table-row-odd"}{section name=i loop=$comments}
         <tr class="{cycle name=ccl}">
           <td>
-            <div style="position: relative;"><a href="?a=search&searchtype=pilot&searchphrase={$comments[i].name}">{$comments[i].name}</a>:
+            <div style="position: relative;"><a href="?a=search&amp;searchtype=pilot&amp;searchphrase={$comments[i].name}">{$comments[i].name}</a>:
 {if $comments[i].time}
             <span style="position:absolute; right: 0px;">{$comments[i].time}</span>
@@ -13 +13 @@
             <p>{$comments[i].comment}</p>
 {if $page->isAdmin()}
-<a href="javascript:openWindow('?a=admin_comments_delete&c_id={$comments[i].id}', null, 480, 350, '' );">Delete Comment</a>
+<a href="javascript:openWindow('?a=admin_comments_delete&amp;c_id={$comments[i].id}', null, 480, 350, '' );">Delete Comment</a>
 <span style="position:absolute; right: 0px;"><u>Posters IP:{$comments[i].ip}</u></span>
 {/if} 
-          </td>
+          </div></td>
         </tr>
 {/section}
-        <tr>
-          <td align="center"><form id="postform" name="postform" method="post" action="">
-            <textarea class="comment" name="comment" cols="55" rows="5" wrap="PHYSICAL" style="width: 340px;" onkeyup="limitText(this.form.comment,document.getElementById('countdown'),200);" onkeypress="limitText(this.form.comment,document.getElementById('countdown'),200);"></textarea>
+        <tr><td><form id="postform" name="postform" method="post" action=""><table><tr>
+          <td align="center">
+            <textarea class="comment" name="comment" cols="55" rows="5" wrap="virtual" style="width: 340px;" onkeyup="limitText(this.form.comment,document.getElementById('countdown'),200);" onkeypress="limitText(this.form.comment,document.getElementById('countdown'),200);"></textarea>
           </td>
         </tr>
@@ -27 +27 @@
           <td>
             <br/>
-            <span name="countdown" id="countdown">200</span> Letters left<br/>
+            <span title="countdown" id="countdown">200</span> Letters left<br/>
             <b>Name:</b>
             <input style="position:relative; right:-3px;" class="comment-button" name="name" type="text" size="24" maxlength="24">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -36 +36 @@
 {/if}
             <input class="comment-button" name="submit" type="submit" value="Add Comment">
-            </form>
-          </td>
+            
+          </td></tr></table></form></td>
         </tr>
       </table>

dev/templates/kill_detail.tpl

@@ -94 +94 @@
 
 {if $config->get('fp_show')}
-          <div id="fitting" style="position:relative; height:398px; width:398px; background-image:url({$img_url}/{$themedir}/{$panel_style}.png)" name="fitting">
+          <div id="fitting" style="position:relative; height:398px; width:398px; background-image:url({$img_url}/{$themedir}/{$panel_style}.png)" title="fitting">
                 <div id="high0" style="position:absolute; left:0px; top:0px; width:398px; height:398px; z-index:0;">
                         <img src="{$img_url}/{$themedir}/{$ssc->attrib.hiSlots.value}h.gif" border="0" alt=""></div>
@@ -211 +211 @@
         {if $admin and $config->get('item_values') and !$fixSlot}
                     <tr class="kb-table-row-even">
-                      <form method="post" action="">
-                        <td height="34" colspan="3" valign="top">
+                      <td height="34" colspan="4" valign="top" align="right"><form method="post" action=""><table><tr>
+                        <td>
                             <div align="right">
                                 Current single Item Value:
@@ -219 +219 @@
                             </div></td>
                         <td height="34" valign="top"><input type="submit" name="submit" value="UpdateValue" class="comment-button"></td>
-                      </form>
+                      </tr></table></form></td>
                     </tr>
         {/if}
@@ -250 +250 @@
         {if $admin and $config->get('item_values') and !$fixSlot}
                     <tr class="kb-table-row-even">
-                      <form method="post" action="">
-                        <td height="34" colspan="3" valign="top">
+                      <td height="34" colspan="4" valign="top" align="right"><form method="post" action=""><table><tr>
+                        <td>
                             <div align="right">
                                 Current single Item Value:
                                 <input name="IID" value="{$i.itemID}" type="hidden">
                                 <input name="{$i.itemID}" type="text" class="comment-button" value="{$i.single_unit}" size="6">
-                            </div>
+                            </div></td>
                         <td height="34" valign="top"><input type="submit" name="submit" value="UpdateValue" class="comment-button"></td>
-                      </form>
+                      </tr></table></form></td>
                     </tr>
         {/if}