Changeset 158 for dev

Timestamp:

12/18/06 00:20:27 (16 years ago)

Author:

exi

Message:

Fix for ticket:34, wrong campaign duration calculation.
Contracts now end at 23:59:59 on the entered day, edit existing contracts for this change to take into account.
Converted the 3 different thumbnail creations into one thumbnail class, please leave a note on problems.
Added 40 more item classes to the autoupgrade code.
Changed http class to supress errors.
Fixed parser to properly check the victim against granted posting permissions.

Location:

dev

Files:

• common/admin.php (modified) (1 diff)
• common/alliance_thumb.php (deleted)
• common/autoupgrade.php (modified) (2 diffs)
• common/class.alliance.php (modified) (1 diff)
• common/class.contract.php (modified) (4 diffs)
• common/class.corp.php (modified) (6 diffs)
• common/class.http.php (modified) (1 diff)
• common/class.killlist.php (modified) (1 diff)
• common/class.killsummarytable.php (modified) (1 diff)
• common/class.parser.php (modified) (3 diffs)
• common/class.pilot.php (modified) (6 diffs)
• common/class.thumb.php (added)
• common/corpportrait.php (deleted)
• common/index.php (modified) (1 diff)
• common/portrait.php (deleted)
• common/thumb.php (added)
• templates/standings.tpl (modified) (1 diff)

dev/common/admin.php

@@ -23 +23 @@
 check_tblstrct5();
 chk_kb3_items();
+check_tblstrct6();
 
 if ($_POST['submit'])

dev/common/autoupgrade.php

@@ -198 +198 @@
 {
     $qry = new DBQuery();
-    $query = 'select count(*) from kb3_item_types where itt_id = 771';
+    $query = 'select count(*) from kb3_item_types where itt_id = 787';
     $result = mysql_query($query);
     $result = mysql_fetch_array($result);
@@ -205 +205 @@
         return;
     }
-    $qry->execute("INSERT IGNORE INTO kb3_item_types VALUES (737,'Gas Cloud Harvester',1)");
-    $qry->execute("INSERT IGNORE INTO kb3_item_types VALUES (762,'Inertia Stabilizer',3)");
-    $qry->execute("INSERT IGNORE INTO kb3_item_types VALUES (763,'Nanofiber Internal Structure',3)");
-    $qry->execute("INSERT IGNORE INTO kb3_item_types VALUES (764,'Overdrive Injector System',3)");
-    $qry->execute("INSERT IGNORE INTO kb3_item_types VALUES (765,'Expanded Cargohold',3)");
-    $qry->execute("INSERT IGNORE INTO kb3_item_types VALUES (766,'Power Diagnostic System',3)");
-    $qry->execute("INSERT IGNORE INTO kb3_item_types VALUES (767,'Capacitor Power Relay',3)");
-    $qry->execute("INSERT IGNORE INTO kb3_item_types VALUES (768,'Capacitor Flux Coil',3)");
-    $qry->execute("INSERT IGNORE INTO kb3_item_types VALUES (769,'Reactor Control Unit',3)");
-    $qry->execute("INSERT IGNORE INTO kb3_item_types VALUES (770,'Shield Flux Coil',3)");
-    $qry->execute("INSERT IGNORE INTO kb3_item_types VALUES (771,'Missile Launcher Heavy Assault',1)");
+    $queries = "
+        INSERT IGNORE INTO `kb3_item_types` VALUES (737, 'Gas Cloud Harvester',1);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (762, 'Inertia Stabilizer',3);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (763, 'Nanofiber Internal Structure',3);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (764, 'Overdrive Injector System',3);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (765, 'Expanded Cargohold',3);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (766, 'Power Diagnostic System',3);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (767, 'Capacitor Power Relay',3);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (768, 'Capacitor Flux Coil',3);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (769, 'Reactor Control Unit',3);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (770, 'Shield Flux Coil',3);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (771, 'Missile Launcher Heavy Assault',1);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (738, 'Cyber Armor', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (740, 'Cyber Electronics', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (741, 'Cyber Engineering', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (742, 'Cyber Gunnery', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (743, 'Cyber Industry', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (744, 'Cyber Leadership', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (745, 'Cyber Learning', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (746, 'Cyber Missile', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (747, 'Cyber Navigation', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (748, 'Cyber Science', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (749, 'Cyber Shields', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (772, 'Assault Missile', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (773, 'Rig Armor', 5);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (774, 'Rig Shield', 5);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (775, 'Rig Energy Weapon', 5);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (776, 'Rig Hybrid Weapon', 5);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (777, 'Rig Projectile Weapon', 5);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (778, 'Rig Drones', 5);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (779, 'Rig Launcher', 5);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (780, 'Rig Electronics', 5);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (781, 'Rig Energy Grid', 5);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (782, 'Rig Astronautic', 5);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (783, 'Cyber X Specials', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (785, 'Script', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (786, 'Rig Electronics Superiority', 5);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (722, 'Advanced Hybrid Ammo Blueprint', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (723, 'Tractor Beam Blueprint', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (724, 'Implant Blueprints', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (725, 'Advanced Projectile Ammo Blueprint', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (726, 'Advanced Frequency Crystal Blueprint', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (727, 'Mining Crystal Blueprint', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (728, 'Decryptors - Amarr', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (729, 'Decryptors - Minmatar', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (730, 'Decryptors - Gallente', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (731, 'Decryptors - Caldari', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (732, 'Decryptors - Sleepers', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (733, 'Decryptors - Yan Jung', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (734, 'Decryptors - Takmahl', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (735, 'Decryptors - Talocan', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (754, 'Salvaged Materials', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (784, 'Large Collidable Ship', 0);
+        INSERT IGNORE INTO `kb3_item_types` VALUES (787, 'Rig Blueprint', 0);
+        ";
+    $query = explode("\n", $queries);
+    foreach ($query as $querystring)
+    {
+        if ($string = trim(str_replace(');', ')', $querystring)))
+        {
+            $qry->execute($string);
+        }
+    }
+}
+function check_tblstrct6()
+{
+    $qry = new DBQuery();
+    $query = 'select all_img from kb3_alliances limit 1';
+    $result = mysql_query($query);
+    if (!$result)
+    {
+        return;
+    }
+    $query = 'ALTER TABLE `kb3_alliances` DROP `all_img`';
+    $qry->execute($query);
 }
 ?>

dev/common/class.alliance.php

@@ -44 +44 @@
         if ($qry->recordCount() == 0)
         {
-            $qry->execute("insert into kb3_alliances values (null,'".slashfix($name)."')");
+            $qry->execute("insert into kb3_alliances (all_id,all_name) values (null,'".slashfix($name)."')");
             $this->id_ = $qry->getInsertID();
         }

dev/common/class.contract.php

@@ -123 +123 @@
     function getRunTime()
     {
-        if ($this->getEndDate() != "")
-            $datet = getdate(strtotime($this->getEndDate()));
-        else
-            $datet = getdate(strtotime(date("Y-m-d")));
-
-        $datef = getdate(strtotime($this->getStartDate()));
-        return $datet['yday'] - $datef['yday'];
+        if (!$datet = $this->getEndDate())
+        {
+            $datet = 'now';
+        }
+
+        $diff = strtotime($datet) - strtotime($this->getStartDate());
+        return floor($diff/86400);
     }
 
@@ -215 +215 @@
         if ($type == "campaign") $campaign = 1;
         else $campaign = 0;
-        if ($enddate != "") $enddate = "'".$enddate."'";
+        if ($enddate != "") $enddate = "'".$enddate." 23:59:59'";
         else $enddate = "null";
 
@@ -222 +222 @@
             $sql = "insert into kb3_contracts values ( null, '".$name."',
                                                    '".KB_SITE."', ".$campaign.",
-                                                   '".$startdate."',
+                                                   '".$startdate." 00:00:00',
                                                    ".$enddate." )";
             $qry->execute($sql) or die($qry->getErrorMsg());
@@ -230 +230 @@
         {
             $sql = "update kb3_contracts set ctr_name = '".$name."',
-                                         ctr_started = '".$startdate."',
+                                         ctr_started = '".$startdate." 00:00:00',
                                          ctr_ended = ".$enddate."
                                      where ctr_id = ".$this->ctr_id_;

dev/common/class.corp.php

@@ -22 +22 @@
     function getPortraitURL($size = 64)
     {
-        return "?a=corpportrait&id=".$this->id_."&size=".$size;
+        return '?a=thumb&type=corp&id='.$this->id_.'&size='.$size;
     }
 
@@ -45 +45 @@
     {
         $qry = new DBQuery();
-        $qry->execute("select *
-                        from kb3_corps
-                       where crp_name = '" . slashfix($name) . "'");
-
+        $qry->execute("select * from kb3_corps
+                       where crp_name = '".slashfix($name)."'");
         $row = $qry->getRow();
         if ($row['crp_id']) $this->id_ = $row['crp_id'];
@@ -57 +55 @@
         if (!$this->qry_->executed_)
         {
-            $this->sql_ = "select *
-                         from kb3_corps
-                        where crp_id = " . $this->id_;
+            $this->sql_ = "select * from kb3_corps
+                                   where crp_id = ".$this->id_;
             $this->qry_->execute($this->sql_);
             $this->row_ = $this->qry_->getRow();
@@ -68 +65 @@
     {
         $qry = new DBQuery();
-        $qry->execute("select *
-                        from kb3_corps
-                       where crp_name = '" . slashfix($name) . "'");
+        $qry->execute("select * from kb3_corps
+                               where crp_name = '".slashfix($name)."'");
 
         if ($qry->recordCount() == 0)
         {
-            $qry->execute("insert into kb3_corps values ( null,
-                                                       '" . slashfix($name) . "',
-                                                       " . $alliance->getID() . ",
-                                                       0,
-                                                       date_format( '"
-                 . $timestamp . "',
-                                                         '%Y.%m.%d %H:%i:%s')
-                                                      )");
+            $qry->execute("insert into kb3_corps values ( null,'".slashfix($name)."',"
+                           .$alliance->getID().",0,date_format('".$timestamp."','%Y.%m.%d %H:%i:%s'))");
             $this->id_ = $qry->getInsertID();
         }
@@ -90 +80 @@
             if ($this->isUpdatable($timestamp) && $row['crp_all_id'] != $alliance->getID())
             {
-                $qry->execute("update kb3_corps
-                             set crp_all_id = " . $alliance->getID() . ",
-                                 crp_updated = date_format( '" . $timestamp . "',
-                                                            '%Y.%m.%d %H:%i:%s')
-                           where crp_id = " . $this->id_);
+                $qry->execute('update kb3_corps
+                                   set crp_all_id = '.$alliance->getID().",
+                                           crp_updated = date_format( '".$timestamp."','%Y.%m.%d %H:%i:%s')
+                                           where crp_id = ".$this->id_);
             }
         }
@@ -104 +93 @@
     {
         $qry = new DBQuery();
-        $qry->execute("select crp_id
-                        from kb3_corps
-                       where crp_id = " . $this->id_ . "
-                         and ( crp_updated < date_format( '" . $timestamp . "',
-                                                          '%Y.%m.%d %H:%i' )
-                               or crp_updated is null )");
-
+        $qry->execute("select crp_id from kb3_corps
+                               where crp_id = ".$this->id_."
+                               and ( crp_updated < date_format( '".$timestamp."', '%Y.%m.%d %H:%i' )
+                                   or crp_updated is null )");
         return $qry->recordCount() == 1;
     }

dev/common/class.http.php

@@ -51 +51 @@
         }
 
-        $this->fp = fsockopen($this->url["host"], 80, $errno, $errstr, 10);
+        $this->fp = @fsockopen($this->url["host"], 80, $errno, $errstr, 10);
         if (!$this->fp)
         {
-            echo "Error occured with fsockopen: $errstr ($errno)<br>\n";
+            //echo "Error occured with fsockopen: $errstr ($errno)<br>\n";
             return false;
         }

dev/common/class.killlist.php

@@ -1 +1 @@
 <?php
 require_once('class.kill.php');
-require_once('class.profiler.php');
 require_once('class.pagesplitter.php');
 

dev/common/class.killsummarytable.php

@@ -84 +84 @@
         }
     }
-
 
     // do it faster, baby!

dev/common/class.parser.php

@@ -304 +304 @@
                             if ($typ == 'a')
                             {
-                                if ($ialliance->getID() == $id)
+                                if ($ialliance->getID() == $id || $kill->getVictimAllianceID() == $id)
                                 {
                                     $authorized = true;
@@ -312 +312 @@
                             elseif ($typ == 'c')
                             {
-                                if ($icorp->getID() == $id)
+                                if ($icorp->getID() == $id || $kill->getVictimCorpID() == $id)
                                 {
                                     $authorized = true;
@@ -320 +320 @@
                             elseif ($typ == 'p')
                             {
-                                if ($ipilot->getID() == $id)
+                                if ($ipilot->getID() == $id || $kill->getVictimID() == $id)
                                 {
                                     $authorized = true;

dev/common/class.pilot.php

@@ -36 +36 @@
     {
         $this->execQuery();
-        return "?a=portrait&id=" . $this->row_['plt_externalid'] . "&size=" . $size;
+        return '?a=thumb&id='.$this->row_['plt_externalid'].'&size='.$size;
     }
 
@@ -43 +43 @@
         if (!$this->qry_->executed_)
         {
-            $this->sql_ = "select *
-                         from kb3_pilots plt, kb3_corps crp, kb3_alliances ali
-                        where crp.crp_id = plt.plt_crp_id
-                          and ali.all_id = crp.crp_all_id
-                          and plt.plt_id = " . $this->id_;
+            $this->sql_ = 'select * from kb3_pilots plt, kb3_corps crp, kb3_alliances ali
+                               where crp.crp_id = plt.plt_crp_id
+                               and ali.all_id = crp.crp_all_id
+                                   and plt.plt_id = '.$this->id_;
             $this->qry_->execute($this->sql_) or die($this->qry_->getErrorMsg());
             $this->row_ = $this->qry_->getRow();
@@ -74 +73 @@
         $qry->execute("select *
                         from kb3_pilots
-                       where plt_name = '" . slashfix($name) . "'");
+                       where plt_name = '".slashfix($name)."'");
 
         if ($qry->recordCount() == 0)
         {
             $qry->execute("insert into kb3_pilots values ( null,
-                                                        '" . slashfix($name) . "',
-                                                        " . $corp->getID() . ",
+                                                        '".slashfix($name)."',
+                                                        ".$corp->getID().",
                                                         0, 0, 0,
-                                                        date_format( '" . $timestamp . "', '%Y.%m.%d %H:%i:%s'))");
+                                                        date_format( '".$timestamp."', '%Y.%m.%d %H:%i:%s'))");
             $this->id_ = $qry->getInsertID();
         }
@@ -92 +91 @@
             {
                 $qry->execute("update kb3_pilots
-                             set plt_crp_id = " . $corp->getID() . ",
-                                 plt_updated = date_format( '" . $timestamp . "', '%Y.%m.%d %H:%i:%s') where plt_id = " . $this->id_);
+                             set plt_crp_id = ".$corp->getID().",
+                                 plt_updated = date_format( '".$timestamp."', '%Y.%m.%d %H:%i:%s') where plt_id = ".$this->id_);
             }
         }
@@ -105 +104 @@
         $qry->execute("select plt_id
                         from kb3_pilots
-                       where plt_id = " . $this->id_ . "
-                         and ( plt_updated < date_format( '" . $timestamp . "', '%Y.%m.%d %H:%i')
+                       where plt_id = ".$this->id_."
+                         and ( plt_updated < date_format( '".$timestamp."', '%Y.%m.%d %H:%i')
                                or plt_updated is null )");
 
@@ -115 +114 @@
     {
         $qry = new DBQuery();
-        $qry->execute("update kb3_pilots set plt_externalid = " . $id . "
-                       where plt_id = " . $this->id_) or die($qry->getErrorMsg());
+        $qry->execute("update kb3_pilots set plt_externalid = ".$id."
+                       where plt_id = ".$this->id_) or die($qry->getErrorMsg());
     }
 }
-
 ?>

dev/common/index.php

@@ -3 +3 @@
 require_once('class.killboard.php');
 require_once('smarty/Smarty.class.php');
-require_once('config.php');
 
 $page = str_replace('.', '', $_GET['a']);

dev/templates/standings.tpl

@@ -6 +6 @@
   <tr class="kb-table-row-even">
 {if $standings[opt].name=='Alliances'}
-    <td width="32" height="34" valign="top" align="right" style="background-image: url(?a=alliance_thumb&size=32&id={$standings[opt].list[idx].pid});"><img src="img/sta_{$standings[opt].list[idx].icon}.png"/></td>
-    <td><b><a href="?a=alliance_detail&all_id={$standings[opt].list[idx].id}">{$standings[opt].list[idx].text}</a></b>{$standings[opt].list[idx].descr}</td>
+    <td width="32" height="34" valign="top" align="right" style="background-image: url(?a=thumb&amp;type=alliance&amp;size=32&amp;id={$standings[opt].list[idx].pid});"><img src="img/sta_{$standings[opt].list[idx].icon}.png"/></td>
+    <td><b><a href="?a=alliance_detail&amp;all_id={$standings[opt].list[idx].id}">{$standings[opt].list[idx].text}</a></b>{$standings[opt].list[idx].descr}</td>
 {else}
-    <td width="32" height="34" valign="top" align="right" style="background-image: url(?a=corpportrait&size=32&id={$standings[opt].list[idx].id});"><img src="img/sta_{$standings[opt].list[idx].icon}.png"/></td>
-    <td><b><a href="?a=corp_detail&crp_id={$standings[opt].list[idx].id}">{$standings[opt].list[idx].text}</a></b>{$standings[opt].list[idx].descr}</td>
+    <td width="32" height="34" valign="top" align="right" style="background-image: url(?a=thumb&amp;type=corp&amp;size=32&amp;id={$standings[opt].list[idx].id});"><img src="img/sta_{$standings[opt].list[idx].icon}.png"/></td>
+    <td><b><a href="?a=corp_detail&amp;crp_id={$standings[opt].list[idx].id}">{$standings[opt].list[idx].text}</a></b>{$standings[opt].list[idx].descr}</td>
 {/if}
     <td align="right">{$standings[opt].list[idx].value}</td>