Changeset 327 for dev

Timestamp:

06/12/08 00:09:35 (14 years ago)

Author:

exi

Message:

Emergency fix for new killmail format

Location:

dev/common/includes

Files:

• class.kill.php (modified) (2 diffs)
• class.parser.php (modified) (2 diffs)

dev/common/includes/class.kill.php

@@ -202 +202 @@
         $mail .= substr(str_replace('-', '.' , $this->getTimeStamp()), 0, 16)."\r\n\r\n";
         $mail .= "Victim: ".$this->getVictimName()."\r\n";
+        $mail .= "Corp: ".$this->getVictimCorpName()."\r\n";
         $mail .= "Alliance: ".$this->getVictimAllianceName()."\r\n";
-        $mail .= "Corp: ".$this->getVictimCorpName()."\r\n";
+        $mail .= "Faction: NONE\r\n";
         $ship = $this->getVictimShip();
         $mail .= "Destroyed: ".$ship->getName()."\r\n";
@@ -239 +240 @@
             {
                 $mail .= "Security: ".$inv->getSecStatus()."\r\n";
+                $mail .= "Corp: ".$corp->getName()."\r\n";
                 $mail .= "Alliance: ".$alliance->getName()."\r\n";
-                $mail .= "Corp: ".$corp->getName()."\r\n";
+                $mail .= "Faction: NONE\r\n";
                 $mail .= "Ship: ".$ship->getName()."\r\n";
                 $mail .= "Weapon: ".$weapon->getName()."\r\n";

dev/common/includes/class.parser.php

@@ -103 +103 @@
             $dmgtaken = trim($matches[1]);
             $this->dmgtaken = $dmgtaken;
+        }
+        $empyrean = false;
+        if (preg_match("/Faction: (.*)/", $header, $matches))
+        {
+            $empyrean = true;
         }
 
@@ -256 +261 @@
             else
             {
-                preg_match("/Alliance: (.*)/", $involved[$i + 2], $matches);
-                $ianame = $matches[1];
-
-                preg_match("/Corp: (.*)/", $involved[$i + 3], $matches);
-                $icname = $matches[1];
-
-                preg_match("/Ship: (.*)/", $involved[$i + 4], $matches);
-                $isname = $matches[1];
-
-                preg_match("/Weapon: (.*)/", $involved[$i + 5], $matches);
-                $iwname = $matches[1];
-                $i += 6;
+                if ($empyrean)
+                {
+                    preg_match("/Corp: (.*)/", $involved[$i + 2], $matches);
+                    $icname = $matches[1];
+
+                    preg_match("/Alliance: (.*)/", $involved[$i + 3], $matches);
+                    $ianame = $matches[1];
+
+                    preg_match("/Ship: (.*)/", $involved[$i + 5], $matches);
+                    $isname = $matches[1];
+
+                    preg_match("/Weapon: (.*)/", $involved[$i + 6], $matches);
+                    $iwname = $matches[1];
+                    $i += 7;
+                }
+                else
+                {
+                    preg_match("/Alliance: (.*)/", $involved[$i + 2], $matches);
+                    $ianame = $matches[1];
+
+                    preg_match("/Corp: (.*)/", $involved[$i + 3], $matches);
+                    $icname = $matches[1];
+
+                    preg_match("/Ship: (.*)/", $involved[$i + 4], $matches);
+                    $isname = $matches[1];
+
+                    preg_match("/Weapon: (.*)/", $involved[$i + 5], $matches);
+                    $iwname = $matches[1];
+                    $i += 6;
+                }
+
                 if ($dmgtaken)
                 {