Changeset 250

Timestamp:

11/23/07 19:11:12 (13 years ago)

Author:

exi

Message:

Important fix in the sql cache code.
The classified function now obeys the gmtime-setting.
Added a callback for assembling the html header, use the event 'page_assembleheader' to access Page::addHeader($line);.
Moved victim damage in the kill details.
The raw mail function should now return the new data format.

Location:

branch/rev3

Files:

• common/includes/class.db.php (modified) (2 diffs)
• common/includes/class.db_cache.php (modified) (2 diffs)
• common/includes/class.kill.php (modified) (5 diffs)
• common/includes/class.page.php (modified) (3 diffs)
• mods/rss_feed/init.php (added)
• templates/index.tpl (modified) (1 diff)
• templates/kill_detail.tpl (modified) (4 diffs)

branch/rev3/common/includes/class.db.php

@@ -34 +34 @@
     var $object;
 
+    // php5 style object overloading
+    // we internally load up the wanted object and reroute all
+    // object actions to it
     function __construct()
     {
@@ -72 +75 @@
     }
 
+    // php4 style object overloading
+    // we just hijack $this but we need to use a helper
+    // function for this because php5 fatals if it sees
+    // $this = ... in the src
     function DBQuery()
     {

branch/rev3/common/includes/class.db_cache.php

@@ -22 +22 @@
         // only cache selects
         // we don't use select ... into so there is no problem
+        $this->_sql = str_replace(array("\r\n", "\n"), ' ', $this->_sql);
         if (strtolower(substr($this->_sql, 0, 6)) != 'select' && strtolower(substr($this->_sql, 0, 4)) != 'show')
         {
@@ -61 +62 @@
             $parse = str_replace(',', ' join ', $parse);
         }
+
+        $parse = 'join '.$parse;
         if (strpos($parse, 'join'))
         {

branch/rev3/common/includes/class.kill.php

@@ -208 +208 @@
         $system = $this->getSystem();
         $mail .= "System: ".$system->getName()."\r\n";
-        $mail .= "Security: ".$system->getSecurity(true)."\r\n\r\n";
+        $mail .= "Security: ".$system->getSecurity(true)."\r\n";
+        $mail .= "Damage Taken: ".$this->VictimDamageTaken."\r\n\r\n";
         $mail .= "Involved parties:\r\n\r\n";
 
@@ -242 +243 @@
                 $mail .= "Ship: ".$ship->getName()."\r\n";
                 $mail .= "Weapon: ".$weapon->getName()."\r\n";
+                $mail .= "Damage Done: ".$inv->dmgdone_."\r\n";
+            }
+            else
+            {
+                $mail .= "Damage Done: ".$inv->dmgdone_."\r\n";
             }
             $mail .= "\r\n";
@@ -275 +281 @@
                     $mail .= " (Cargo)";
                 if ($destroyed->getLocationID() == 6) // drone
+                    $mail .= " (Drone Bay)";
+                $mail .= "\r\n";
+            }
+        }
+
+        if (count($this->droppeditems_) > 0)
+        {
+            $mail .= "\r\nDropped items:\r\n\r\n";
+
+            foreach($this->droppeditems_ as $dropped)
+            {
+                $item = $dropped->getItem();
+                $mail .= $item->getName();
+                if ($dropped->getQuantity() > 1)
+                {
+                    // if the option is enabled and the item is fitted then split it up
+                    // this is aworkaround for the lazy parser of griefwatch
+                    if (config::get('kill_splitfit') && $dropped->getQuantity() < 9 && ($dropped->getLocationID() == 1
+                        || $dropped->getLocationID() == 2 || $dropped->getLocationID() == 3))
+                    {
+                        for ($i = $dropped->getQuantity(); $i > 1; $i--)
+                        {
+                            $mail .= "\r\n".$item->getName();
+                        }
+
+                    }
+                    else
+                    {
+                        $mail .= ", Qty: ".$dropped->getQuantity();
+                    }
+                }
+                if ($dropped->getLocationID() == 4) // cargo
+                    $mail .= " (Cargo)";
+                if ($dropped->getLocationID() == 6) // drone
                     $mail .= " (Drone Bay)";
                 $mail .= "\r\n";
@@ -454 +494 @@
 
             $offset = config::get('kill_classified')*3600;
-            if (strtotime($this->timestamp_) > time()-$offset)
+            if (config::get('date_gmtime'))
+            {
+                $time = time()-date('Z');
+            }
+            else
+            {
+                $time = time();
+            }
+            if (strtotime($this->timestamp_) > $time-$offset)
             {
                 return true;
@@ -467 +515 @@
         {
             $offset = config::get('kill_classified')*3600;
-            if (strtotime($this->timestamp_) > time()-$offset)
-            {
-                return ($offset-time()+strtotime($this->timestamp_));
+            if (config::get('date_gmtime'))
+            {
+                $time = time()-date('Z');
+            }
+            else
+            {
+                $time = time();
+            }
+            if (strtotime($this->timestamp_) > $time-$offset)
+            {
+                return ($offset-$time+strtotime($this->timestamp_));
             }
         }

branch/rev3/common/includes/class.page.php

@@ -13 +13 @@
         $this->title_ = $title;
         $this->admin_ = false;
+        $this->headlines = array();
 
         $this->igb_ = IS_IGB;
@@ -47 +48 @@
     }
 
+    function addHeader($line)
+    {
+        $this->headlines[] = $line;
+    }
+
     function generate()
     {
@@ -61 +67 @@
             $smarty->assign('on_load', ' onload="'.$this->onload_.'"');
         }
+
+        event::call('page_assembleheader', $this);
         // header
+        $smarty->assign('page_headerlines', join("\n", $this->headlines));
 
         if (!$this->igb_)

branch/rev3/templates/index.tpl

@@ -6 +6 @@
 <link rel="stylesheet" type="text/css" href="{$style_url}/common.css">
 <link rel="stylesheet" type="text/css" href="{$style_url}/{$style}/style.css">
-{if $rss_feed}
-<link rel="alternate" type="application/rss+xml" title="RSS feed for watched kills" href="?a=rss" />
-{/if}
+{$page_headerlines}
 <script language=javascript src="{$style_url}/generic.js"></script>
 <!--[if lt IE 7]>

branch/rev3/templates/kill_detail.tpl

@@ -4 +4 @@
         <td width=360 align=left valign=top><table class=kb-table width=360 cellpadding=0 cellspacing=1 border=0>
                 <tr class= {cycle name=ccl}>
-                    <td rowspan=4 width="64"><img src="{$VictimPortrait}" border="0" width="64" heigth="64"></td>
+                    <td rowspan=3 width="64"><img src="{$VictimPortrait}" border="0" width="64" heigth="64"></td>
                     <td class=kb-table-cell width=64><b>Victim:</b></td>
                     <td class=kb-table-cell><b><a href="{$VictimURL}">{$VictimName}</a></b></td>
@@ -15 +15 @@
                     <td class=kb-table-cell width=64><b>Alliance:</b></td>
                     <td class=kb-table-cell><b><a href="{$VictimAllianceURL}">{$VictimAllianceName}</a></b></td>
-                </tr>
-                <tr class={cycle name=ccl}>
-                    <td class=kb-table-cell width=64><b>Damage taken:</b></td>
-                    <td class=kb-table-cell><b>{$VictimDamageTaken}</b></td>
                 </tr>
             </table>
@@ -42 +38 @@
                 </tr>
                 <tr class={cycle name=ccl}>
-                    <td colspan=2 class=kb-table-cell style="padding-top: 1px; padding-bottom: 1px;">Damage done:</td><td class=kb-table-cell style="padding-top: 1px; padding-bottom: 1px;">{$i.damageDone}</td>
+                    <td colspan=2 class=kb-table-cell style="padding-top: 1px; padding-bottom: 1px;">Damage done:</td><td class=kb-table-cell style="padding-top: 1px; padding-bottom: 1px;">{$i.damageDone|number_format}</td>
                 </tr>
 {/foreach}
@@ -131 +127 @@
 {if $item_values}
                 <tr class={cycle name=ccl}>
+                    <td align="right" colspan="3"><b>Damage taken:</b></td>
+                    <td align="right">{$VictimDamageTaken|number_format}</td>
+                </tr>
+                <tr class={cycle name=ccl}>
                     <td colspan="3"><div align="right"><strong>Total Module Loss:</strong></div></td>
                     <td align="right">{$ItemValue}</td>
                 </tr>
-                <tr class={cycle name=ccl}>
-                    <td colspan="3"><div align="right"><strong>Total Module Drop:</strong></div></td>
-                    <td align="right">{$DropValue}</td>
+                <tr class={cycle name=ccl} style="background-color: green;">
+                    <td style="border: 1px solid green;" colspan="3"><div align="right"><strong>Total Module Drop:</strong></div></td>
+                    <td style="border: 1px solid green;" align="right">{$DropValue}</td>
                 </tr>
                 <tr class={cycle name=ccl}>