Changeset 274

Timestamp:

12/06/07 16:26:17 (12 years ago)

Author:

exi

Message:

Added new german translation parsing.
Changed upgrade sql so it doesn't kill all rows if something is wrong.

Location:

dev

Files:

• common/includes/class.parser.php (modified) (3 diffs)
• install/install_step41.php (modified) (2 diffs)
• install/install_step42.php (modified) (2 diffs)

dev/common/includes/class.parser.php

@@ -382 +382 @@
         $destroyedpos = strpos($this->killmail_, "Destroyed items:");
 
-        if ($destroyedpos > 0)
+        if ($destroyedpos)
         {
             $endpos = strlen($this->killmail_) - $destroyedpos + 16;
@@ -402 +402 @@
         {
             $startpos = strpos($this->killmail_, "Dropped items:");
-            $endpos = strlen($this->killmail_) - $startpos + 16;
-
-            $dropped = explode("\n", trim(substr($this->killmail_, $startpos + 16, $endpos)));
-            #var_dump($dropped); exit;
-
-            $dropped_items = $this->scanForItems($dropped);
-            foreach ($dropped_items as $item)
-            {
-                $ditem = new DroppedItem($item['item'], $item['quantity'], $item['location']);
-                $kill->addDroppedItem($ditem);
-            }
-        }
-
+            if ($startpos)
+            {
+                $endpos = strlen($this->killmail_) - $startpos + 16;
+
+                $dropped = explode("\n", trim(substr($this->killmail_, $startpos + 16, $endpos)));
+                #var_dump($dropped); exit;
+
+                $dropped_items = $this->scanForItems($dropped);
+                foreach ($dropped_items as $item)
+                {
+                    $ditem = new DroppedItem($item['item'], $item['quantity'], $item['location']);
+                    $kill->addDroppedItem($ditem);
+                }
+            }
+        }
 
         if (!$authorized)
@@ -546 +548 @@
         if ($set == 'german')
         {
-            $search = array('Ziel:','Allianz: NICHTS','Allianz: nichts','Allianz:','Zerst'.chr(246).'rte Gegenst'.chr(228).'nde', 'Zerst'.chr(246).'rt','Sicherheit:','Beteiligte Parteien:','Anz:', 'Corporation:', '(Fracht)');
-            $replace = array('Victim:','Alliance: None','Alliance: None','Alliance:','Destroyed items','Destroyed','Security:','Involved parties:', 'Qty:', 'Corp:', '(Cargo)');
+            $search = array('Ziel:','Allianz: NICHTS','Allianz: nichts','Allianz:',
+                            'Zerst'.chr(246).'rte Gegenst'.chr(228).'nde', 'Zerst'.chr(246).'rt:', 'Sicherheit:',
+                            'Beteiligte Parteien:','Anz:','Corporation:','(Fracht)', 'Schiff:','Waffe:',
+                            'Verursachter Schaden:','Erlittener Schaden:', '(gab den letzten Schuss ab)',
+                            'Hinterlassene Gegenst'.chr(228).'nde:', 'Anz.:');
+            $replace = array('Victim:','Alliance: None','Alliance: None','Alliance:',
+                            'Destroyed items','Destroyed:', 'Security:',
+                            'Involved parties:', 'Qty:', 'Corp:', '(Cargo)', 'Ship:', 'Weapon:',
+                            'Damage Done:', 'Damage Taken:', '(laid the final blow)',
+                            'Dropped items:', 'Qty:');
+
+            if (strpos($this->killmail, chr(246)) === false)
+            {
+                $this->killmail_ = utf8_decode($this->killmail_);
+            }
             $this->killmail_ = str_replace($search, $replace, $this->killmail_);
             return;

dev/install/install_step41.php

@@ -47 +47 @@
 insertConfig('cfg_mainsite', MAIN_SITE);
 
-echo 'Upgrdaded your Config.<br/>';
+echo 'Upgraded your Config and chmodded ../kbconfig.php 440. If there was a warning for chmod please change the permission manually.<br/>';
 
 echo 'The next query checks for abandoned items, save this list for your reference.<br/>';
@@ -57 +57 @@
 where invtypes.typeID is null";
 $result = mysql_query($query);
+echo mysql_error();
 while ($row = mysql_fetch_array($result))
 {

dev/install/install_step42.php

@@ -7 +7 @@
 
 $query = "update kb3_items_destroyed
-            left join kb3_items on itd_itm_id=itm_id
-            left join kb3_invtypes on itm_name=typeName
+            inner join kb3_items on itd_itm_id=itm_id
+            inner join kb3_invtypes on itm_name=typeName
             set itd_itm_id=typeID";
 mysql_query($query);
@@ -14 +14 @@
 
 $query = "update kb3_inv_detail
-            left join kb3_items on ind_wep_id=itm_id
-            left join kb3_invtypes on itm_name=typeName
+            inner join kb3_items on ind_wep_id=itm_id
+            inner join kb3_invtypes on itm_name=typeName
             set ind_wep_id=typeID";
 mysql_query($query);