Changeset 174 for dev

Timestamp:

01/09/07 21:22:39 (14 years ago)

Author:

exi

Message:

Added a prermr killmail preparser to the parser.
Changed item class so it doesnt break the mail when there is no item type for the item in the database.
Fixed 2 alliance logos.
Fixed kill_detail.tpl, the slot icons didnt use the imageurl.

Location:

dev

Files:

• common/class.item.php (modified) (1 diff)
• common/class.kill.php (modified) (2 diffs)
• common/class.parser.php (modified) (5 diffs)
• img/alliances/CenterforDiseaseCreation.png (moved) (moved from dev/img/alliances/CenterforDiseaseControl.png)
• img/alliances/TheArrowProject.png (copied) (copied from dev/img/alliances/TheARROWProject.png)
• templates/kill_detail.tpl (modified) (1 diff)

dev/common/class.item.php

@@ -70 +70 @@
             }
             $this->sql_ = "select *
-                           from kb3_items, kb3_item_types
-                               where itm_id = '".$this->id_."'
-                               and itm_type = itt_id";
+                           from kb3_items
+                           left join kb3_item_types on itm_type = itt_id
+                               where itm_id = '".$this->id_."'";
             $this->qry_->execute($this->sql_);
             $this->row_ = $this->qry_->getRow();

dev/common/class.kill.php

@@ -686 +686 @@
             $item = $dest->getItem();
             $loc_id = $dest->getLocationID();
-            if (!$item->getID() || !$dest->getQuantity() || !is_numeric($loc_id))
-            {
+            if (!is_numeric($item->getID()) || !is_numeric($item->getID()) || !is_numeric($dest->getQuantity()) || !is_numeric($loc_id))
+            {
+                trigger_error('error with destroyed item.', E_USER_WARNING);
+                var_dump($dest);exit;
                 continue;
             }
@@ -730 +732 @@
 class InvolvedParty
 {
-    function InvolvedParty($pilotid, $corpid, $allianceid,
-        $secstatus, $ship, $weapon)
+    function InvolvedParty($pilotid, $corpid, $allianceid, $secstatus, $ship, $weapon)
     {
         $this->pilotid_ = $pilotid;

dev/common/class.parser.php

@@ -16 +16 @@
         {
             $this->preparse('german');
+        }
+        elseif (strpos($this->killmail_, 'System Security Level:'))
+        {
+            // this converts the killmail internally from pre-rmr to kali format
+            $this->preparse('prermr');
         }
 
@@ -202 +207 @@
                 $isname = "Unknown";
                 $iwname = $pmatches[1];
+
                 if (!strlen($icname) && !strlen($iwname))
                 {
@@ -262 +268 @@
             {
                 $this->error('Ship not found.', $isname);
+            }
+
+            if (!trim($iwname))
+            {
+                // set weapon to unknown in case we didn't found one
+                $iwname = 'Unknown';
             }
             $iweapon = new Item();
@@ -353 +365 @@
 
             $i = 0;
-            while ($i < count($destroyed))
-            {
+            $num = count($destroyed);
+            while ($i < $num)
+            {
+                $destroyed[$i] = trim($destroyed[$i]);
                 if ($destroyed[$i] == "")
                 {
@@ -474 +488 @@
             return;
         }
+        if ($set == 'prermr')
+        {
+            $search = array('Corporation:','Destroyed Type:','Solar System:', 'System Security Level:', 'Security Status:', 'Ship Type:', 'Weapon Type:', '(Fitted - Medium slot)', '(Fitted - Low slot)', '(Fitted - High slot)');
+            $replace = array('Corp:','Destroyed:', 'System:', 'Security:', 'Security:', 'Ship:', 'Weapon:', '', '', '');
+            $this->killmail_ = str_replace($search, $replace, $this->killmail_);
+            $position = strpos($this->killmail_, 'Destroyed items:');
+            if ($position !== false)
+            {
+                $destroyed = explode("\n", strstr($this->killmail_, 'Destroyed items:'));
+                $i = 0;
+                $num = count($destroyed);
+                while ($i < $num)
+                {
+                    $destroyed[$i] = trim($destroyed[$i]);
+
+                    $itempos = strpos($destroyed[$i], 'Type: ');
+                    if ($itempos !== false)
+                    {
+                        $destroyed[$i] = substr($destroyed[$i], $itempos+6);
+                        if (isset($destroyed[$i+1]))
+                        {
+                            $quantitypos = strstr($destroyed[$i+1], 'Quantity: ');
+                            if ($quantitypos !== false)
+                            {
+                                $qty = ', Qty: '.substr($destroyed[$i+1], $quantitypos+10);
+                                $pos = strpos($destroyed[$i], '(');
+                                if ($pos !== false)
+                                {
+                                    $destroyed[$i] = trim(substr($destroyed[$i], 0, $pos)).$qty.' '.substr($destroyed[$i], $pos);
+                                }
+                                else
+                                {
+                                    $destroyed[$i] .= $qty;
+                                }
+                                unset($destroyed[$i+1]);
+                                $i++;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        unset($destroyed[$i]);
+                    }
+                    $i++;
+                }
+                $this->killmail_ = substr($this->killmail_, 0, $position).'Destroyed items: '."\n\n\n".join("\n", $destroyed)."\n";
+            }
+        }
     }
 }

dev/templates/kill_detail.tpl

@@ -64 +64 @@
 {if $slot.items}
                 <tr class="kb-table-row-even">
-                    <td class="item-icon" width="32"><img src="img/{$slot.img}" alt="{$slot.text}" border="0"></td>
+                    <td class="item-icon" width="32"><img src="{$img_url}/{$slot.img}" alt="{$slot.text}" border="0"></td>
                     <td colspan="2" class="kb-table-cell"><b>{$slot.text}</b> </td>
     {if $config->getConfig('item_values')}