Changeset 16

Timestamp:

10/18/06 23:45:48 (14 years ago)

Author:

exi

Message:

Added comments: with/without password, delete through admin

Location:

dev

Files:

• common/admin.php (modified) (3 diffs)
• common/autoupgrade.php (added)
• common/class.kill.php (modified) (3 diffs)
• common/class.killboard.php (modified) (1 diff)
• common/comments.php (added)
• common/comments_delete.php (added)
• common/generic.js (modified) (2 diffs)
• common/kill_detail.php (modified) (2 diffs)
• common/search.php (modified) (1 diff)
• style/blue/style.css (modified) (1 diff)
• style/default/style.css (modified) (2 diffs)

dev/common/admin.php

@@ -15 +15 @@
     $config->setStyleBanner($_POST['style_banner']);
     $config->setStyleName($_POST['style_name']);
-    if ($_POST['kill_points'] == "on") $killpoints = 1;
-    else $killpoints = 0;
-    if ($_POST['least_active'] == "on") $leastactive = 1;
-    else $leastactive = 0;
+    if ($_POST['kill_points'] == "on")
+    {
+        $killpoints = 1;
+    }
+    else
+    {
+        $killpoints = 0;
+    }
+    if ($_POST['least_active'] == "on")
+    {
+        $leastactive = 1;
+    }
+    else
+    {
+        $leastactive = 0;
+    }
     $config->setKillPoints($killpoints);
     $config->setLeastActive($leastactive);
+    if ($_POST['comments'] == "on")
+    {
+        require_once('autoupgrade.php');
+        check_commenttable();
+        $config->setConfig('comments', '1');
+    }
+    else
+    {
+        $config->setConfig('comments', '0');
+    }
+    if ($_POST['comments_pw'] == "on")
+    {
+        $config->setConfig('comments_pw', '1');
+    }
+    else
+    {
+        $config->setConfig('comments_pw', '0');
+    }
     $config->setPostPassword($_POST['post_password']);
     $config->setPostMailto($_POST['post_mailto']);
@@ -64 +94 @@
             if (is_dir($dir . $file))
             {
-                if ($file == "." || $file == "..")
+                if ($file == "." || $file == ".." || $file == ".svn")
                     continue;
                 $html .= "<option value=\"" . $file . "\"";
@@ -81 +111 @@
 $html .= "<table class=kb-subtable>";
 $html .= "<tr><td width=120><b>Display killpoints:</b></td><td><input type=checkbox name=kill_points id=kill_points";
-if ($config->getKillPoints())
+if ($config->getConfig('kill_points'))
+    $html .= " checked=\"checked\"";
+$html .= "></td></tr>";
+$html .= "<tr><td width=120><b>Enable Comments:</b></td><td><input type=checkbox name=comments id=comments";
+if ($config->getConfig('comments'))
+    $html .= " checked=\"checked\"";
+$html .= "></td></tr>";
+$html .= "<tr><td width=120><b>Require password for Comments:</b></td><td><input type=checkbox name=comments_pw id=comments_pw";
+if ($config->getConfig('comments_pw'))
     $html .= " checked=\"checked\"";
 $html .= "></td></tr>";

dev/common/class.kill.php

@@ -1 @@
-<?
-  require_once( "db.php" );
-  require_once( "class.item.php" );
-  require_once( "class.corp.php" );
-  require_once( "class.alliance.php" );
-  require_once( "class.ship.php" );
-  require_once( "class.system.php" );
-  require_once( "class.pilot.php" );
-  require_once( "class.killlist.php" );  
-
-  class Kill {
-
-    function Kill( $id = 0 )
-    {
-      $this->id_ = $id;
-      $this->involvedparties_ = array();
-      $this->destroyeditems_ = array();
+<?php
+require_once("db.php");
+require_once("class.item.php");
+require_once("class.corp.php");
+require_once("class.alliance.php");
+require_once("class.ship.php");
+require_once("class.system.php");
+require_once("class.pilot.php");
+require_once("class.killlist.php");
+
+class Kill
+{
+    function Kill($id = 0)
+    {
+        $this->id_ = $id;
+        $this->involvedparties_ = array();
+        $this->destroyeditems_ = array();
     }
 
     function getID()
     {
-      return $this->id_;
+        return $this->id_;
     }
 
     function getTimeStamp()
     {
-      $this->execQuery();
-      return $this->timestamp_;
+        $this->execQuery();
+        return $this->timestamp_;
     }
 
     function getVictimName()
     {
-      $this->execQuery();
-      return $this->victimname_;
+        $this->execQuery();
+        return $this->victimname_;
     }
 
     function getVictimID()
     {
-      $this->execQuery();
-      return $this->victimid_;
-    }
-
-    function getVictimPortrait( $size = 32 )
-    {
-      $this->execQuery();
-      $plt = new Pilot( $this->victimid_ );
-      return $plt->getPortraitURL( $size );
+        $this->execQuery();
+        return $this->victimid_;
+    }
+
+    function getVictimPortrait($size = 32)
+    {
+        $this->execQuery();
+        $plt = new Pilot($this->victimid_);
+        return $plt->getPortraitURL($size);
     }
 
     function getVictimCorpID()
     {
-      $this->execQuery();
-      return $this->victimcorpid_;
+        $this->execQuery();
+        return $this->victimcorpid_;
     }
 
     function getVictimCorpName()
     {
-      $this->execQuery();
-      return $this->victimcorpname_;
+        $this->execQuery();
+        return $this->victimcorpname_;
     }
 
     function getVictimAllianceName()
     {
-      $this->execQuery();
-      return $this->victimalliancename_;
+        $this->execQuery();
+        return $this->victimalliancename_;
     }
 
     function getVictimShip()
     {
-      $this->execQuery();
-      return $this->victimship_;
+        $this->execQuery();
+        return $this->victimship_;
     }
 
     function getSystem()
     {
-      $this->execQuery();
-      return $this->solarsystem_;
+        $this->execQuery();
+        return $this->solarsystem_;
     }
 
     function getFBPilotID()
     {
-      $this->execQuery();
-      if ( !$this->fbpilotid_ ) return "null";
-      else return $this->fbpilotid_;
-    }
-    
+        $this->execQuery();
+        if (!$this->fbpilotid_) return "null";
+        else return $this->fbpilotid_;
+    }
+
     function getFBPilotName()
     {
-      $this->execQuery();
-      return $this->fbpilotname_;
+        $this->execQuery();
+        return $this->fbpilotname_;
     }
 
     function getFBCorpID()
     {
-      $this->execQuery();
-      if ( !$this->fbcorpid_ ) return "null";
-      else return $this->fbcorpid_;
+        $this->execQuery();
+        if (!$this->fbcorpid_) return "null";
+        else return $this->fbcorpid_;
     }
 
     function getFBCorpName()
     {
-      $this->execQuery();
-      return $this->fbcorpname_;
+        $this->execQuery();
+        return $this->fbcorpname_;
     }
 
     function getFBAllianceID()
     {
-      $this->execQuery();
-      if ( !$this->fballianceid_ ) return "null";
-      else return $this->fballianceid_;
+        $this->execQuery();
+        if (!$this->fballianceid_) return "null";
+        else return $this->fballianceid_;
     }
 
     function getFBAllianceName()
     {
-      $this->execQuery();
-      return $this->fballiancename_;
-    }
-    
+        $this->execQuery();
+        return $this->fballiancename_;
+    }
+
     function getKillPoints()
     {
-      $this->execQuery();
-      return $this->killpoints_;
+        $this->execQuery();
+        return $this->killpoints_;
     }
 
     function getSolarSystemName()
     {
-      return $this->solarsystemname_;
+        return $this->solarsystemname_;
     }
 
     function getSolarSystemSecurity()
     {
-      return $this->solarsystemsecurity_;
+        return $this->solarsystemsecurity_;
     }
 
     function getVictimShipName()
     {
-      return $this->victimshipname_;
+        return $this->victimshipname_;
     }
 
     function getVictimShipExternalID()
     {
-      return $this->victimshipexternalid_;
+        return $this->victimshipexternalid_;
     }
 
     function getVictimShipClassName()
     {
-      return $this->victimshipclassname_;
+        return $this->victimshipclassname_;
     }
 
     function getVictimShipValue()
     {
-      return $this->victimshipvalue_;
-    }
-
-    function getVictimShipImage( $size )
-    {
-      return IMG_URL."/ships/".$size."_".$size."/"
-             .$this->victimshipexternalid_.".png";
+        return $this->victimshipvalue_;
+    }
+
+    function getVictimShipImage($size)
+    {
+        return IMG_URL . "/ships/" . $size . "_" . $size . "/"
+         . $this->victimshipexternalid_ . ".png";
     }
 
     function getVictimShipValueIndicator()
     {
-      $value = $this->getVictimShipValue();
-                                                                                
-      if ( $value >= 0 && $value <= 1 )
-        $color = "gray";
-      elseif ( $value > 1 && $value <= 15 )
-        $color = "blue";
-      elseif ( $value > 15 && $value <= 25 )
-        $color = "green";
-      elseif ( $value > 25 && $value <= 40 )
-        $color = "yellow";
-      elseif ( $value > 40 && $value <= 80 )
-        $color = "red";
-      elseif ( $value > 80 && $value <= 250 )
-        $color = "orange";
-      elseif ( $value > 250 && $value <= 5000 )
-        $color = "purple";
-                                                                                
-      return IMG_URL."/ships/ship-".$color.".gif";
+        $value = $this->getVictimShipValue();
+
+        if ($value >= 0 && $value <= 1)
+            $color = "gray";
+        elseif ($value > 1 && $value <= 15)
+            $color = "blue";
+        elseif ($value > 15 && $value <= 25)
+            $color = "green";
+        elseif ($value > 25 && $value <= 40)
+            $color = "yellow";
+        elseif ($value > 40 && $value <= 80)
+            $color = "red";
+        elseif ($value > 80 && $value <= 250)
+            $color = "orange";
+        elseif ($value > 250 && $value <= 5000)
+            $color = "purple";
+
+        return IMG_URL . "/ships/ship-" . $color . ".gif";
     }
 
     function getRawMail()
     {
-      $this->execQuery();
-
-      $mail .= substr( str_replace( '-', '.' , $this->getTimeStamp() ), 0, 16 )."\r\n\r\n";
-      $mail .= "Victim: ".$this->getVictimName()."\r\n";
-      $mail .= "Alliance: ".$this->getVictimAllianceName()."\r\n";
-      $mail .= "Corp: ".$this->getVictimCorpName()."\r\n";
-      $ship = $this->getVictimShip();
-      $mail .= "Destroyed: ".$ship->getName()."\r\n";
-      $system = $this->getSystem();
-      $mail .= "System: ".$system->getName()."\r\n";
-      $mail .= "Security: ".$system->getSecurity( true )."\r\n\r\n";
-      $mail .= "Involved parties:\r\n\r\n";
- 
-      foreach ( $this->involvedparties_ as $inv ) {
-        $pilot = new Pilot( $inv->getPilotID() );
-        $corp = new Corporation( $inv->getCorpID() );
-        $alliance = new Alliance( $inv->getAllianceID() );
-
-        $weapon = $inv->getWeapon();
-        $ship = $inv->getShip();
-        if ( $pilot->getName() == $weapon->getName() )
-          $name = $pilot->getName()." / ".$corp->getName();
-        else
-          $name = $pilot->getName();
-
-        $mail .= "Name: ".$name;
-        if ( $pilot->getID() == $this->getFBPilotID() )
-        $mail .= " (laid the final blow)";
-        $mail .= "\r\n";
-                                                                                
-        if ( $pilot->getName() != $weapon->getName() ) {
-          $mail .= "Security: ".$inv->getSecStatus()."\r\n";
-          $mail .= "Alliance: ".$alliance->getName()."\r\n";
-          $mail .= "Corp: ".$corp->getName()."\r\n";
-          $mail .= "Ship: ".$ship->getName()."\r\n";
-          $mail .= "Weapon: ".$weapon->getName()."\r\n";
-        }
-        $mail .= "\r\n";
-      }
-
-      if ( count( $this->destroyeditems_ ) > 0 ) {
-        $mail .= "\r\nDestroyed items:\r\n\r\n";
-
-        foreach( $this->destroyeditems_ as $destroyed ) {
-          $item = $destroyed->getItem();
-          $mail .= $item->getName();
-          if ( $destroyed->getQuantity() > 1 )
-            $mail .= ", Qty: ".$destroyed->getQuantity();
-          if ( $destroyed->getLocationID() == 4 ) // cargo
-            $mail .= " (Cargo)";
-          if ( $destroyed->getLocationID() == 6 ) // drone
-            $mail .= " (Drone Bay)";
-          $mail .= "\r\n";
+        $this->execQuery();
+
+        $mail .= substr(str_replace('-', '.' , $this->getTimeStamp()), 0, 16) . "\r\n\r\n";
+        $mail .= "Victim: " . $this->getVictimName() . "\r\n";
+        $mail .= "Alliance: " . $this->getVictimAllianceName() . "\r\n";
+        $mail .= "Corp: " . $this->getVictimCorpName() . "\r\n";
+        $ship = $this->getVictimShip();
+        $mail .= "Destroyed: " . $ship->getName() . "\r\n";
+        $system = $this->getSystem();
+        $mail .= "System: " . $system->getName() . "\r\n";
+        $mail .= "Security: " . $system->getSecurity(true) . "\r\n\r\n";
+        $mail .= "Involved parties:\r\n\r\n";
+
+        foreach ($this->involvedparties_ as $inv)
+        {
+            $pilot = new Pilot($inv->getPilotID());
+            $corp = new Corporation($inv->getCorpID());
+            $alliance = new Alliance($inv->getAllianceID());
+
+            $weapon = $inv->getWeapon();
+            $ship = $inv->getShip();
+            if ($pilot->getName() == $weapon->getName())
+                $name = $pilot->getName() . " / " . $corp->getName();
+            else
+                $name = $pilot->getName();
+
+            $mail .= "Name: " . $name;
+            if ($pilot->getID() == $this->getFBPilotID())
+                $mail .= " (laid the final blow)";
+            $mail .= "\r\n";
+
+            if ($pilot->getName() != $weapon->getName())
+            {
+                $mail .= "Security: " . $inv->getSecStatus() . "\r\n";
+                $mail .= "Alliance: " . $alliance->getName() . "\r\n";
+                $mail .= "Corp: " . $corp->getName() . "\r\n";
+                $mail .= "Ship: " . $ship->getName() . "\r\n";
+                $mail .= "Weapon: " . $weapon->getName() . "\r\n";
+            }
+            $mail .= "\r\n";
         }
-      }
-
-      return $mail;
+
+        if (count($this->destroyeditems_) > 0)
+        {
+            $mail .= "\r\nDestroyed items:\r\n\r\n";
+
+            foreach($this->destroyeditems_ as $destroyed)
+            {
+                $item = $destroyed->getItem();
+                $mail .= $item->getName();
+                if ($destroyed->getQuantity() > 1)
+                    $mail .= ", Qty: " . $destroyed->getQuantity();
+                if ($destroyed->getLocationID() == 4) // cargo
+                    $mail .= " (Cargo)";
+                if ($destroyed->getLocationID() == 6) // drone
+                    $mail .= " (Drone Bay)";
+                $mail .= "\r\n";
+            }
+        }
+
+        return $mail;
     }
 
     function getDupe()
     {
-      $this->execQuery();
-      $dupe = 0;
-      $qry = new DBQuery();
-      if ( !$this->getFBPilotID() || !$this->victimid_ )
-        return 0;
-      $qry->execute( "select kll_id
+        $this->execQuery();
+        $dupe = 0;
+        $qry = new DBQuery();
+        if (!$this->getFBPilotID() || !$this->victimid_)
+            return 0;
+        $qry->execute("select kll_id
                         from kb3_kills
-                       where kll_timestamp <= 
-                             date_add( '".$this->timestamp_."', INTERVAL '15:0' MINUTE_SECOND )
-                         and kll_timestamp >= 
-                             date_sub( '".$this->timestamp_."', INTERVAL '15:0' MINUTE_SECOND )
-                         and kll_victim_id = ".$this->victimid_."
-                         and kll_ship_id = ".$this->victimship_->getID()." 
-                         and kll_system_id = ".$this->solarsystem_->getID()."
-                         and kll_fb_plt_id = ".$this->getFBPilotID()."
-                         and kll_id != ".$this->id_ );
-
-      $row = $qry->getRow();
-      if ( $row )
-        return $row['kll_id'];
-      else
-        return 0;
+                       where kll_timestamp <=
+                             date_add( '" . $this->timestamp_ . "', INTERVAL '15:0' MINUTE_SECOND )
+                         and kll_timestamp >=
+                             date_sub( '" . $this->timestamp_ . "', INTERVAL '15:0' MINUTE_SECOND )
+                         and kll_victim_id = " . $this->victimid_ . "
+                         and kll_ship_id = " . $this->victimship_->getID() . "
+                         and kll_system_id = " . $this->solarsystem_->getID() . "
+                         and kll_fb_plt_id = " . $this->getFBPilotID() . "
+                         and kll_id != " . $this->id_);
+
+        $row = $qry->getRow();
+        if ($row)
+            return $row['kll_id'];
+        else
+            return 0;
     }
 
     function execQuery()
     {
-      if ( !$this->timestamp_ ) {
-        $qry = new DBQuery();
-      
-        $this->qry_ = new DBQuery();
-        $this->sql_ = "select kll.kll_id, kll.kll_timestamp, plt.plt_name,
+        if (!$this->timestamp_)
+        {
+            $qry = new DBQuery();
+
+            $this->qry_ = new DBQuery();
+            $this->sql_ = "select kll.kll_id, kll.kll_timestamp, plt.plt_name,
                               crp.crp_name, ali.all_name, kll.kll_ship_id,
                               kll.kll_system_id, kll.kll_ship_id,
@@ -288 +293 @@
                               kb3_alliances ali, kb3_alliances fbali, kb3_corps fbcrp,
                               kb3_pilots fbplt
-                        where kll.kll_id = ".$this->id_."
+                        where kll.kll_id = " . $this->id_ . "
                           and plt.plt_id = kll.kll_victim_id
                           and crp.crp_id = kll.kll_crp_id
@@ -295 +300 @@
                           and fbcrp.crp_id = kll.kll_fb_crp_id
                           and fbplt.plt_id = kll.kll_fb_plt_id";
-      
-      
-        $this->qry_->execute( $this->sql_ );
-        $row = $this->qry_->getRow();
-        $this->setTimeStamp( $row['kll_timestamp'] );
-        $this->setSolarSystem( new SolarSystem( $row['kll_system_id'] ) );
-        $this->setVictimID( $row['kll_victim_id'] );
-        $this->setVictimName( $row['plt_name'] );
-        $this->setVictimCorpID( $row['kll_crp_id'] );
-        $this->setVictimCorpName( $row['crp_name'] );
-        $this->setVictimAllianceName( $row['all_name'] );
-        $this->setVictimShip( new Ship( $row['kll_ship_id'] ) );
-        $this->setFBPilotID( $row['fbplt_id'] );
-        $this->setFBPilotName( $row['fbplt_name'] );
-        $this->setFBCorpID( $row['fbcrp_id'] );
-        $this->setFBCorpName( $row['fbcrp_name'] );
-        $this->setFBAllianceID( $row['fbali_id'] );        
-        $this->setFBAllianceName( $row['fbali_name'] );        
-        $this->setKillPoints( $row['kll_points'] );        
-
-        if ( !$row )
-          $this->valid_ = false;
-        else
-          $this->valid_ = true;
-          
-        // involved
-        $sql = "select ind_plt_id, ind_crp_id, ind_all_id, ind_sec_status,
+
+            $this->qry_->execute($this->sql_);
+            $row = $this->qry_->getRow();
+            $this->setTimeStamp($row['kll_timestamp']);
+            $this->setSolarSystem(new SolarSystem($row['kll_system_id']));
+            $this->setVictimID($row['kll_victim_id']);
+            $this->setVictimName($row['plt_name']);
+            $this->setVictimCorpID($row['kll_crp_id']);
+            $this->setVictimCorpName($row['crp_name']);
+            $this->setVictimAllianceName($row['all_name']);
+            $this->setVictimShip(new Ship($row['kll_ship_id']));
+            $this->setFBPilotID($row['fbplt_id']);
+            $this->setFBPilotName($row['fbplt_name']);
+            $this->setFBCorpID($row['fbcrp_id']);
+            $this->setFBCorpName($row['fbcrp_name']);
+            $this->setFBAllianceID($row['fbali_id']);
+            $this->setFBAllianceName($row['fbali_name']);
+            $this->setKillPoints($row['kll_points']);
+
+            if (!$row)
+                $this->valid_ = false;
+            else
+                $this->valid_ = true;
+            // involved
+            $sql = "select ind_plt_id, ind_crp_id, ind_all_id, ind_sec_status,
                        ind_shp_id, ind_wep_id
                   from kb3_inv_detail
-                 where ind_kll_id = ".$this->getID()."
+                 where ind_kll_id = " . $this->getID() . "
                 order by ind_order";
-        
-        $qry->execute( $sql ) or die( $qry->getErrorMsg() );
-        while ( $row = $qry->getRow() ) {
-          $involved = new InvolvedParty( $row['ind_plt_id'],
-                                         $row['ind_crp_id'],
-                                         $row['ind_all_id'],
-                                         $row['ind_sec_status'],
-                                         new Ship( $row['ind_shp_id'] ),
-                                         new Item( $row['ind_wep_id'] ) );
-          array_push( $this->involvedparties_, $involved );
-        }
-
-        // destroyed items
-        $sql = "select sum( itd.itd_quantity ) as itd_quantity, itd_itm_id,
+
+            $qry->execute($sql) or die($qry->getErrorMsg());
+            while ($row = $qry->getRow())
+            {
+                $involved = new InvolvedParty($row['ind_plt_id'],
+                    $row['ind_crp_id'],
+                    $row['ind_all_id'],
+                    $row['ind_sec_status'],
+                    new Ship($row['ind_shp_id']),
+                    new Item($row['ind_wep_id']));
+                array_push($this->involvedparties_, $involved);
+            }
+            // destroyed items
+            $sql = "select sum( itd.itd_quantity ) as itd_quantity, itd_itm_id,
                        itd_itl_id, itl_location
                   from kb3_items_destroyed itd, kb3_items itm,
                        kb3_item_locations itl
-                 where itd.itd_kll_id = ".$this->getID()."
+                 where itd.itd_kll_id = " . $this->getID() . "
                    and itd.itd_itm_id = itm.itm_id
                    and ( itd.itd_itl_id = itl.itl_id or itd.itd_itl_id = 0 )
                 group by itd_itm_id, itd_itl_id
                 order by itd.itd_itl_id, itm.itm_type";
-        
-        $qry->execute( $sql ) or die( $qry->getErrorMsg() );
-        while ( $row = $qry->getRow() ) {
-          $destroyed = new DestroyedItem( new Item( $row['itd_itm_id'] ),
-                                          $row['itd_quantity'],
-                                          $row['itl_location'] );
-          array_push( $this->destroyeditems_, $destroyed );
-        }
-      }
+
+            $qry->execute($sql) or die($qry->getErrorMsg());
+            while ($row = $qry->getRow())
+            {
+                $destroyed = new DestroyedItem(new Item($row['itd_itm_id']),
+                    $row['itd_quantity'],
+                    $row['itl_location']);
+                array_push($this->destroyeditems_, $destroyed);
+            }
+        }
     }
 
     function exists()
     {
-      $this->execQuery();
-      return $this->valid_;
+        $this->execQuery();
+        return $this->valid_;
     }
 
     function relatedKillCount()
     {
-      $kslist = new KillList();
-      $kslist->setRelated( $this->id_ );
-      if ( CORP_ID )
-        $kslist->addInvolvedCorp( new Corporation( CORP_ID ) );
-      if ( ALLIANCE_ID )
-        $kslist->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) );
-       
-      return $kslist->getCount();
-    }
-    
+        $kslist = new KillList();
+        $kslist->setRelated($this->id_);
+        if (CORP_ID)
+            $kslist->addInvolvedCorp(new Corporation(CORP_ID));
+        if (ALLIANCE_ID)
+            $kslist->addInvolvedAlliance(new Alliance(ALLIANCE_ID));
+
+        return $kslist->getCount();
+    }
+
     function relatedLossCount()
     {
-      $lslist = new KillList();
-      $lslist->setRelated( $this->id_ );
-      if ( CORP_ID )
-        $lslist->addVictimCorp( new Corporation( CORP_ID ) );
-      if ( ALLIANCE_ID )
-      $lslist->addVictimAlliance( new Alliance( ALLIANCE_ID ) );
-      
-      return $lslist->getCount();
-    }
-
-    function setID( $id )
-    {
-      $this->id_ = $id;
-    }
-
-    function setTimeStamp( $timestamp )
-    {
-      $this->timestamp_ = $timestamp;
-    }
-
-    function setSolarSystem( $solarsystem )
-    {
-      $this->solarsystem_ = $solarsystem;
-    }
-    
-    function setSolarSystemName( $solarsystemname )
-    {
-      $this->solarsystemname_ = $solarsystemname;
-    }
-    
-    function setSolarSystemSecurity( $solarsystemsecurity )
-    {
-      $this->solarsystemsecurity_ = $solarsystemsecurity;
-    }
-
-    function setVictim( $victim )
-    {
-      $this->victim_ = $victim;
-    }
-
-    function setVictimID( $victimid )
-    {
-      $this->victimid_ = $victimid;
-    }
-
-    function setVictimName( $victimname )
-    {
-      $this->victimname_ = $victimname;
-    }
-
-    function setVictimCorpID( $victimcorpid )
-    {
-      $this->victimcorpid_ = $victimcorpid;
-    }
-
-    function setVictimCorpName( $victimcorpname )
-    {
-      $this->victimcorpname_ = $victimcorpname;
-    }
-
-    function setVictimAllianceID( $victimallianceid )
-    {
-      $this->victimallianceid_ = $victimallianceid;
-    }
-
-    function setVictimAllianceName( $victimalliancename )
-    {
-      $this->victimalliancename_ = $victimalliancename;
-    }
-
-    function setVictimShip( $victimship )
-    {
-      $this->victimship_ = $victimship;
-    }
-
-    function setVictimShipName( $victimshipname )
-    {
-      $this->victimshipname_ = $victimshipname;
-    }
-
-    function setVictimShipExternalID( $victimshipexternalid )
-    {
-      $this->victimshipexternalid_ = $victimshipexternalid;
-    }
-
-    function setVictimShipClassName( $victimshipclassname )
-    {
-      $this->victimshipclassname_ = $victimshipclassname;
-    }
-
-    function setVictimShipValue( $victimshipvalue )
-    {
-      $this->victimshipvalue_ = $victimshipvalue;
-    }
-
-    function setFBPilotID( $fbpilotid )
-    {
-      $this->fbpilotid_ = $fbpilotid;
-    }
-    
-    function setFBPilotName( $fbpilotname )
-    {
-      $this->fbpilotname_ = $fbpilotname;
-    }
-
-    function setFBCorpID( $fbcorpid )
-    {
-      $this->fbcorpid_ = $fbcorpid;
-    }
-
-    function setFBCorpName( $fbcorpname )
-    {
-      $this->fbcorpname_ = $fbcorpname;
-    }
-    
-    function setFBAllianceID( $fballianceid )
-    {
-      $this->fballianceid_ = $fballianceid;
-    }
-
-    function setFBAllianceName( $fballiancename )
-    {
-      $this->fballiancename_ = $fballiancename;
-    }
-    function setKillPoints( $killpoints )
-    {
-      $this->killpoints_ = $killpoints;
-    }
-    
+        $lslist = new KillList();
+        $lslist->setRelated($this->id_);
+        if (CORP_ID)
+            $lslist->addVictimCorp(new Corporation(CORP_ID));
+        if (ALLIANCE_ID)
+            $lslist->addVictimAlliance(new Alliance(ALLIANCE_ID));
+
+        return $lslist->getCount();
+    }
+
+    function setID($id)
+    {
+        $this->id_ = $id;
+    }
+
+    function setTimeStamp($timestamp)
+    {
+        $this->timestamp_ = $timestamp;
+    }
+
+    function setSolarSystem($solarsystem)
+    {
+        $this->solarsystem_ = $solarsystem;
+    }
+
+    function setSolarSystemName($solarsystemname)
+    {
+        $this->solarsystemname_ = $solarsystemname;
+    }
+
+    function setSolarSystemSecurity($solarsystemsecurity)
+    {
+        $this->solarsystemsecurity_ = $solarsystemsecurity;
+    }
+
+    function setVictim($victim)
+    {
+        $this->victim_ = $victim;
+    }
+
+    function setVictimID($victimid)
+    {
+        $this->victimid_ = $victimid;
+    }
+
+    function setVictimName($victimname)
+    {
+        $this->victimname_ = $victimname;
+    }
+
+    function setVictimCorpID($victimcorpid)
+    {
+        $this->victimcorpid_ = $victimcorpid;
+    }
+
+    function setVictimCorpName($victimcorpname)
+    {
+        $this->victimcorpname_ = $victimcorpname;
+    }
+
+    function setVictimAllianceID($victimallianceid)
+    {
+        $this->victimallianceid_ = $victimallianceid;
+    }
+
+    function setVictimAllianceName($victimalliancename)
+    {
+        $this->victimalliancename_ = $victimalliancename;
+    }
+
+    function setVictimShip($victimship)
+    {
+        $this->victimship_ = $victimship;
+    }
+
+    function setVictimShipName($victimshipname)
+    {
+        $this->victimshipname_ = $victimshipname;
+    }
+
+    function setVictimShipExternalID($victimshipexternalid)
+    {
+        $this->victimshipexternalid_ = $victimshipexternalid;
+    }
+
+    function setVictimShipClassName($victimshipclassname)
+    {
+        $this->victimshipclassname_ = $victimshipclassname;
+    }
+
+    function setVictimShipValue($victimshipvalue)
+    {
+        $this->victimshipvalue_ = $victimshipvalue;
+    }
+
+    function setFBPilotID($fbpilotid)
+    {
+        $this->fbpilotid_ = $fbpilotid;
+    }
+
+    function setFBPilotName($fbpilotname)
+    {
+        $this->fbpilotname_ = $fbpilotname;
+    }
+
+    function setFBCorpID($fbcorpid)
+    {
+        $this->fbcorpid_ = $fbcorpid;
+    }
+
+    function setFBCorpName($fbcorpname)
+    {
+        $this->fbcorpname_ = $fbcorpname;
+    }
+
+    function setFBAllianceID($fballianceid)
+    {
+        $this->fballianceid_ = $fballianceid;
+    }
+
+    function setFBAllianceName($fballiancename)
+    {
+        $this->fballiancename_ = $fballiancename;
+    }
+    function setKillPoints($killpoints)
+    {
+        $this->killpoints_ = $killpoints;
+    }
+
     function calculateKillPoints()
     {
-      $ship = $this->getVictimShip();
-      $shipclass= $ship->getClass();
-      $vicpoints = $shipclass->getPoints();
-      $maxpoints = round( $vicpoints * 1.2 );
-      foreach ( $this->involvedparties_ as $inv ) {
-        $ship = $inv->getShip();
-        $invpoints += $shipclass->getPoints();
-      }
-      
-      $gankfactor = $vicpoints / ( $vicpoints + $invpoints );
-      $points = ceil( $vicpoints * ( $gankfactor / 0.6 ) );
-
-      if ( $points > $maxpoints ) $points = $maxpoints;
-      
-      $points = round( $points, 0 );
-      //echo "invpoints:".$invpoints."<br>";
-      //echo "vicpoints:".$vicpoints."<br>";
-      //echo "gankfactor:".$gankfactor."<br>";
-      //echo "points:".$points;
-      //exit;
-      
-      return $points;
+        $ship = $this->getVictimShip();
+        $shipclass = $ship->getClass();
+        $vicpoints = $shipclass->getPoints();
+        $maxpoints = round($vicpoints * 1.2);
+
+        foreach ($this->involvedparties_ as $inv)
+        {
+            $shipinv = $inv->getShip();
+            $shipclassinv = $shipinv->getClass();
+            $invpoints += $shipclassinv->getPoints();
+        }
+
+        $gankfactor = $vicpoints / ($vicpoints + $invpoints);
+        $points = ceil($vicpoints * ($gankfactor / 0.75));
+
+        if ($points > $maxpoints) $points = $maxpoints;
+
+        $points = round($points, 0);
+        return $points;
     }
 
     function add()
     {
-      //if ( $this->timestamp_ == "" || !$this->victimid_ || !$this->victimship_->getID() || !$this->solarsystem_->getID() ||
-     //      !$this->victimallianceid_ || !$this->victimcorpid_ || !$this->getFBAllianceID() || !$this->getFBCorpID() ||
-    //       !$this->getFBPilotID() )
-    //    return 0;
-        
-      $qry = new DBQuery();
-      $qry->execute( "select kll_id
+        // if ( $this->timestamp_ == "" || !$this->victimid_ || !$this->victimship_->getID() || !$this->solarsystem_->getID() ||
+        // !$this->victimallianceid_ || !$this->victimcorpid_ || !$this->getFBAllianceID() || !$this->getFBCorpID() ||
+        // !$this->getFBPilotID() )
+        // return 0;
+        $qry = new DBQuery();
+        $qry->execute("select kll_id
                         from kb3_kills
-                       where kll_timestamp <= 
-                             date_add( '".$this->timestamp_."', INTERVAL '15:0' MINUTE_SECOND )
-                         and kll_timestamp >= 
-                             date_sub( '".$this->timestamp_."', INTERVAL '15:0' MINUTE_SECOND )
-                         and kll_victim_id = ".$this->victimid_."
-                         and kll_ship_id = ".$this->victimship_->getID()." 
-                         and kll_system_id = ".$this->solarsystem_->getID()."
-                         and kll_fb_plt_id = ".$this->getFBPilotID() ) or die( $qry->getErrorMsg() );
-
-      if ( $qry->recordCount() == 0 ) {
-        $sql = "insert into kb3_kills
+                       where kll_timestamp <=
+                             date_add( '" . $this->timestamp_ . "', INTERVAL '15:0' MINUTE_SECOND )
+                         and kll_timestamp >=
+                             date_sub( '" . $this->timestamp_ . "', INTERVAL '15:0' MINUTE_SECOND )
+                         and kll_victim_id = " . $this->victimid_ . "
+                         and kll_ship_id = " . $this->victimship_->getID() . "
+                         and kll_system_id = " . $this->solarsystem_->getID() . "
+                         and kll_fb_plt_id = " . $this->getFBPilotID()) or die($qry->getErrorMsg());
+
+        if ($qry->recordCount() == 0)
+        {
+            $sql = "insert into kb3_kills
                 values ( null,
-                         date_format('".$this->timestamp_."', '%Y.%m.%d %H:%i:%s'),
-                         ".$this->victimid_.", ".$this->victimallianceid_.", 
-                         ".$this->victimcorpid_.", ".$this->victimship_->getID().", 
-                         ".$this->solarsystem_->getID().", ".$this->getFBAllianceID().", 
-                         ".$this->getFBCorpID().", ".$this->getFBPilotID().", ".$this->calculateKillPoints()." )";
-        $qry->execute( $sql ) or die( $qry->getErrorMsg() );
-        $this->id_ = $qry->getInsertID();
-        
-        // involved
-        $order = 0;
-        $invall = array();
-        $invcrp = array();
-        $invplt = array();
-        foreach ( $this->involvedparties_ as $inv ) {
-          $ship = $inv->getShip();
-          $weapon = $inv->getWeapon();
-          if ( !$inv->getPilotID() || $inv->getSecStatus() == "" || !$inv->getAllianceID() || !$inv->getCorpID() ||
-               !$ship->getID() || !$weapon->getID() ) {
-            $this->remove();
-            return 0;
-          }
-            
-          $sql = "insert into kb3_inv_detail
-                  values ( ".$this->getID().", ".$inv->getPilotID().", '".$inv->getSecStatus()."', "
-                            .$inv->getAllianceID().", ".$inv->getCorpID().", ".$ship->getID().", "
-                            .$weapon->getID().", ".$order++." )";
-          $qry->execute( $sql ) or die( $qry->getErrorMsg() );
-
-          if ( !in_array( $inv->getAllianceID(), $invall ) && $inv->getAllianceID() != 14 ) {
-            array_push( $invall, $inv->getAllianceID() );
-            $qry->execute( "insert into kb3_inv_all values ( ".$this->getID().", ".$inv->getAllianceID()." )" ) or die( $qry->getErrorMsg() );
-          }
-          if ( !in_array( $inv->getCorpID(), $invcrp ) ) {
-            array_push( $invcrp, $inv->getCorpID() );
-            $qry->execute( "insert into kb3_inv_crp values ( ".$this->getID().", ".$inv->getCorpID()." )" ) or die( $qry->getErrorMsg() );
-          }
-          if ( !in_array( $inv->getPilotID(), $invplt ) ) {
-            array_push( $invplt, $inv->getPilotID() );
-            $qry->execute( "insert into kb3_inv_plt values ( ".$this->getID().", ".$inv->getPilotID()." )" ) or die( $qry->getErrorMsg() );
-          }
-        }
-        
-        // destroyed
-        foreach ( $this->destroyeditems_ as $dest ) {
-          $item = $dest->getItem();
-          if ( !$item->getID() || !$dest->getQuantity() || !$dest->getLocationID() )
-            continue;
-
-          $sql = "insert into kb3_items_destroyed
-                  values ( ".$this->getID().", ".$item->getID().", ".$dest->getQuantity().", "
-                            .$dest->getLocationID()." )";
-          $qry->execute( $sql ) or die( $qry->getErrorMsg() );
-        }                
-      }
-      else {
-        $row = $qry->getRow();
-        $this->dupeid_ = $row['kll_id'];
-        $this->id_ = -1;
-      }
-      return $this->id_;
+                         date_format('" . $this->timestamp_ . "', '%Y.%m.%d %H:%i:%s'),
+                         " . $this->victimid_ . ", " . $this->victimallianceid_ . ",
+                         " . $this->victimcorpid_ . ", " . $this->victimship_->getID() . ",
+                         " . $this->solarsystem_->getID() . ", " . $this->getFBAllianceID() . ",
+                         " . $this->getFBCorpID() . ", " . $this->getFBPilotID() . ", " . $this->calculateKillPoints() . " )";
+            $qry->execute($sql) or die($qry->getErrorMsg());
+            $this->id_ = $qry->getInsertID();
+            // involved
+            $order = 0;
+            $invall = array();
+            $invcrp = array();
+            $invplt = array();
+            foreach ($this->involvedparties_ as $inv)
+            {
+                $ship = $inv->getShip();
+                $weapon = $inv->getWeapon();
+                if (!$inv->getPilotID() || $inv->getSecStatus() == "" || !$inv->getAllianceID() || !$inv->getCorpID() || !$ship->getID() || !$weapon->getID())
+                {
+                    $this->remove();
+                    return 0;
+                }
+
+                $sql = "insert into kb3_inv_detail
+                  values ( " . $this->getID() . ", " . $inv->getPilotID() . ", '" . $inv->getSecStatus() . "', "
+                 . $inv->getAllianceID() . ", " . $inv->getCorpID() . ", " . $ship->getID() . ", "
+                 . $weapon->getID() . ", " . $order++ . " )";
+                $qry->execute($sql) or die($qry->getErrorMsg());
+
+                if (!in_array($inv->getAllianceID(), $invall) && $inv->getAllianceID() != 14)
+                {
+                    array_push($invall, $inv->getAllianceID());
+                    $qry->execute("insert into kb3_inv_all values ( " . $this->getID() . ", " . $inv->getAllianceID() . " )") or die($qry->getErrorMsg());
+                }
+                if (!in_array($inv->getCorpID(), $invcrp))
+                {
+                    array_push($invcrp, $inv->getCorpID());
+                    $qry->execute("insert into kb3_inv_crp values ( " . $this->getID() . ", " . $inv->getCorpID() . " )") or die($qry->getErrorMsg());
+                }
+                if (!in_array($inv->getPilotID(), $invplt))
+                {
+                    array_push($invplt, $inv->getPilotID());
+                    $qry->execute("insert into kb3_inv_plt values ( " . $this->getID() . ", " . $inv->getPilotID() . " )") or die($qry->getErrorMsg());
+                }
+            }
+            // destroyed
+            foreach ($this->destroyeditems_ as $dest)
+            {
+                $item = $dest->getItem();
+                if (!$item->getID() || !$dest->getQuantity() || !$dest->getLocationID())
+                    continue;
+
+                $sql = "insert into kb3_items_destroyed
+                  values ( " . $this->getID() . ", " . $item->getID() . ", " . $dest->getQuantity() . ", "
+                 . $dest->getLocationID() . " )";
+                $qry->execute($sql) or die($qry->getErrorMsg());
+            }
+        }
+        else
+        {
+            $row = $qry->getRow();
+            $this->dupeid_ = $row['kll_id'];
+            $this->id_ = -1;
+        }
+        return $this->id_;
     }
 
     function remove()
     {
-      if ( !$this->id_ )
-        return;
-
-      $qry = new DBQuery();
-      $qry->execute( "delete from kb3_kills
-                       where kll_id = ".$this->id_ );
-      $qry->execute( "delete from kb3_inv_detail
-                       where ind_kll_id = ".$this->id_ );
-      $qry->execute( "delete from kb3_inv_all
-                       where ina_kll_id = ".$this->id_ );
-      $qry->execute( "delete from kb3_inv_crp
-                       where inc_kll_id = ".$this->id_ );
-      $qry->execute( "delete from kb3_inv_plt
-                       where inp_kll_id = ".$this->id_ );
-      $qry->execute( "delete from kb3_items_destroyed
-                       where itd_kll_id = ".$this->id_ );
-    }
-
-    function addInvolvedParty( $involved )
-    {
-      array_push( $this->involvedparties_, $involved );
-    }
-
-    function addDestroyedItem( $destroyed )
-    {
-      array_push( $this->destroyeditems_, $destroyed );
-    }
-  }
-
-  class InvolvedParty
-  {
-    function InvolvedParty( $pilotid, $corpid, $allianceid,
-                            $secstatus, $ship, $weapon )
-    {
-      $this->pilotid_ = $pilotid;
-      $this->corpid_ = $corpid;
-      $this->allianceid_ = $allianceid;
-      $this->secstatus_ = $secstatus;
-      $this->ship_ = $ship;
-      $this->weapon_ = $weapon;
+        if (!$this->id_)
+            return;
+
+        $qry = new DBQuery();
+        $qry->execute("delete from kb3_kills
+                       where kll_id = " . $this->id_);
+        $qry->execute("delete from kb3_inv_detail
+                       where ind_kll_id = " . $this->id_);
+        $qry->execute("delete from kb3_inv_all
+                       where ina_kll_id = " . $this->id_);
+        $qry->execute("delete from kb3_inv_crp
+                       where inc_kll_id = " . $this->id_);
+        $qry->execute("delete from kb3_inv_plt
+                       where inp_kll_id = " . $this->id_);
+        $qry->execute("delete from kb3_items_destroyed
+                       where itd_kll_id = " . $this->id_);
+    }
+
+    function addInvolvedParty($involved)
+    {
+        array_push($this->involvedparties_, $involved);
+    }
+
+    function addDestroyedItem($destroyed)
+    {
+        array_push($this->destroyeditems_, $destroyed);
+    }
+}
+
+class InvolvedParty
+{
+    function InvolvedParty($pilotid, $corpid, $allianceid,
+        $secstatus, $ship, $weapon)
+    {
+        $this->pilotid_ = $pilotid;
+        $this->corpid_ = $corpid;
+        $this->allianceid_ = $allianceid;
+        $this->secstatus_ = $secstatus;
+        $this->ship_ = $ship;
+        $this->weapon_ = $weapon;
     }
 
     function getPilotID()
     {
-      return $this->pilotid_;
+        return $this->pilotid_;
     }
 
     function getCorpID()
     {
-      return $this->corpid_;
+        return $this->corpid_;
     }
 
     function getAllianceID()
     {
-      return $this->allianceid_;
+        return $this->allianceid_;
     }
 
     function getSecStatus()
     {
-      return $this->secstatus_;
+        return $this->secstatus_;
     }
 
     function getShip()
     {
-      return $this->ship_;
+        return $this->ship_;
     }
 
     function getWeapon()
     {
-      return $this->weapon_;
-    }
-  }
-
-  class DestroyedItem
-  {
-    function DestroyedItem( $item, $quantity, $location )
-    {
-      $this->item_ = $item;
-      $this->quantity_ = $quantity;
-      $this->location_ = $location;
-    }
-    
+        return $this->weapon_;
+    }
+}
+
+class DestroyedItem
+{
+    function DestroyedItem($item, $quantity, $location)
+    {
+        $this->item_ = $item;
+        $this->quantity_ = $quantity;
+        $this->location_ = $location;
+    }
+
     function getItem()
     {
-      return $this->item_;
+        return $this->item_;
     }
 
     function getQuantity()
     {
-      if ( $this->quantity_ == "" ) $this->quantity = 1;
-      return $this->quantity_;
+        if ($this->quantity_ == "") $this->quantity = 1;
+        return $this->quantity_;
     }
 
     function getLocationID()
     {
-      $id = 0;
-      if ( strlen( $this->location_ ) < 2 ) {
-        $id = $this->item_->getSlot();
-      }
-      else {
-        $qry = new DBQuery();
-        $qry->execute( "select itl_id from kb3_item_locations where itl_location = '".$this->location_."'" ) or die( $qry->getErrorMsg() );
-        $row = $qry->getRow();
-        $id = $row['itl_id'];
-      }
-     
-      return $id;
-    }    
-  }
+        $id = 0;
+        if (strlen($this->location_) < 2)
+        {
+            $id = $this->item_->getSlot();
+        }
+        else
+        {
+            $qry = new DBQuery();
+            $qry->execute("select itl_id from kb3_item_locations where itl_location = '" . $this->location_ . "'") or die($qry->getErrorMsg());
+            $row = $qry->getRow();
+            $id = $row['itl_id'];
+        }
+
+        return $id;
+    }
+}
+
 ?>

dev/common/class.killboard.php

@@ -102 +102 @@
     {
         $this->execQuery();
-        return $this->config[$key];
+        if (isset($this->config[$key]))
+        {
+            return $this->config[$key];
+        }
+        return 0;
     }
 

dev/common/generic.js

@@ -3 +3 @@
   var w = screen.width;
   var h = screen.height;
-  
+
   var x = ( w / 2 ) - ( width / 2 );
   var y = ( h / 2 ) - ( height  / 2 );
-  
+
   window.open( url, target, 'width=' + width + ',height=' + height + ',' + flags );
 }
@@ -16 +16 @@
   curtab.style.display = 'block';
 }
+
+function limitText(limitField, limitCount, limitNum)
+{
+        if (limitField.value.length > limitNum)
+    {
+                limitField.value = limitField.value.substring(0, limitNum);
+        }
+    else
+    {
+                limitCount.value = limitNum - limitField.value.length;
+        }
+}

dev/common/kill_detail.php

@@ -85 +85 @@
 }
 $html .= "</table>";
+
+$config = $page->killboard_->getConfig();
+if ($config->getConfig('comments'))
+{
+    include('comments.php');
+}
 
 $html .= "</td><td width=50>&nbsp;</td>";
@@ -187 +193 @@
 $page->addContext($menubox->generate());
 
-$config = $page->killboard_->getConfig();
 if ($config->getKillPoints())
 {

dev/common/search.php

@@ -1 @@
-<?
-  require_once( "class.page.php" );
-  require_once( "db.php" );
-  require_once( "globals.php" );
+<?php
+require_once("db.php");
+require_once("class.page.php");
+require_once("globals.php");
 
-  $page = new Page( "Search" );
+$page = new Page("Search");
 
-  $html .= "<form id=search action=\"?a=search\" method=post>";
-  $html .= "<table class=kb-subtable><tr>";
-  $html .= "<td>Type:</td><td>Text: (3 letters minimum)</td>";
-  $html .= "</tr><tr>";
-  $html .= "<td><select id=searchtype name=searchtype><option value=pilot>Pilot</option><option value=corp>Corporation</option><option value=alliance>Alliance</option></select></td>";
-  $html .= "<td><input id=searchphrase name=searchphrase type=text size=30/></td>";
-  $html .= "<td><input type=submit name=submit value=Search></td>";
-  $html .= "</tr></table>"; 
-  $html .= "</form>";
-  
-  if ( $_POST['searchphrase'] != "" && strlen( $_POST['searchphrase'] ) >= 3 ) {
-    switch ( $_POST['searchtype'] ) {
-      case "pilot":
-        $sql = "select plt.plt_id, plt.plt_name, crp.crp_name
+$html .= "<form id=search action=\"?a=search\" method=post>";
+$html .= "<table class=kb-subtable><tr>";
+$html .= "<td>Type:</td><td>Text: (3 letters minimum)</td>";
+$html .= "</tr><tr>";
+$html .= "<td><select id=searchtype name=searchtype><option value=pilot>Pilot</option><option value=corp>Corporation</option><option value=alliance>Alliance</option></select></td>";
+$html .= "<td><input id=searchphrase name=searchphrase type=text size=30/></td>";
+$html .= "<td><input type=submit name=submit value=Search></td>";
+$html .= "</tr></table>";
+$html .= "</form>";
+
+if ($_REQUEST['searchphrase'] != "" && strlen($_REQUEST['searchphrase']) >= 3)
+{
+    switch ($_REQUEST['searchtype'])
+    {
+        case "pilot":
+            $sql = "select plt.plt_id, plt.plt_name, crp.crp_name
                   from kb3_pilots plt, kb3_corps crp
-                 where lower( plt.plt_name ) like lower( '%".slashfix( $_POST['searchphrase'] )."%' )
+                 where lower( plt.plt_name ) like lower( '%" . slashfix($_REQUEST['searchphrase']) . "%' )
                    and plt.plt_crp_id = crp.crp_id
                  order by plt.plt_name";
-        $header = "<td>Pilot</td><td>Corporation</td>";
-        break;
-      case "corp":
-        $sql = "select crp.crp_id, crp.crp_name, ali.all_name
+            $header = "<td>Pilot</td><td>Corporation</td>";
+            break;
+        case "corp":
+            $sql = "select crp.crp_id, crp.crp_name, ali.all_name
                   from kb3_corps crp, kb3_alliances ali
-                 where lower( crp.crp_name ) like lower( '%".slashfix( $_POST['searchphrase'] )."%' )
+                 where lower( crp.crp_name ) like lower( '%" . slashfix($_REQUEST['searchphrase']) . "%' )
                    and crp.crp_all_id = ali.all_id
                  order by crp.crp_name";
-        $header = "<td>Corporation</td><td>Alliance</td>";
-        break;
-      case "alliance":
-        $sql = "select ali.all_id, ali.all_name
+            $header = "<td>Corporation</td><td>Alliance</td>";
+            break;
+        case "alliance":
+            $sql = "select ali.all_id, ali.all_name
                   from kb3_alliances ali
-                 where lower( ali.all_name ) like lower( '%".slashfix( $_POST['searchphrase'] )."%' )
+                 where lower( ali.all_name ) like lower( '%" . slashfix($_REQUEST['searchphrase']) . "%' )
                  order by ali.all_name";
-        $header = "<td>Alliance</td><td></td>";
-        break;
+            $header = "<td>Alliance</td><td></td>";
+            break;
     }
-    
+
     $qry = new DBQuery();
-    if ( !$qry->execute( $sql ) )
-      die ( $qry->getErrorMsg() );
+    if (!$qry->execute($sql))
+    {
+        die ($qry->getErrorMsg());
+    }
 
     $html .= "<div class=block-header>Search results</div>";
-    
-    if ( $qry->recordCount() > 0 ) {
-      $html .= "<table class=kb-table width=450 cellspacing=1>";
-      $html .= "<tr class=kb-table-header>".$header."</tr>";
+
+    if ($qry->recordCount() > 0)
+    {
+        $html .= "<table class=kb-table width=450 cellspacing=1>";
+        $html .= "<tr class=kb-table-header>".$header."</tr>";
     }
     else
-      $html .= "No results.";
-      
-    while ( $row = $qry->getRow() )
     {
-      $html .= "<tr class=kb-table-row-even>";
-      switch ( $_POST['searchtype'] ) {
-        case "pilot":
-          $html .= "<td><a href=\"?a=pilot_detail&plt_id=".$row['plt_id']."\">".$row['plt_name']."</a></td><td>".$row['crp_name']."</td>";
-          break;
-        case "corp":
-          $html .= "<td><a href=\"?a=corp_detail&crp_id=".$row['crp_id']."\">".$row['crp_name']."</a></td><td>".$row['all_name']."</td>";
-          break;
-        case "alliance":
-          $html .= "<td><a href=\"?a=alliance_detail&all_id=".$row['all_id']."\">".$row['all_name']."</a></td><td></td>";
-          break;
-      }
-      $html .= "</tr>";
+        $html .= "No results.";
     }
-    if ( $qry->recordCount() > 0 )
-      $html .= "</table>";
-  } 
-  
-  $page->setContent( $html );
-  $page->generate();
+
+    while ($row = $qry->getRow())
+    {
+        $html .= "<tr class=kb-table-row-even>";
+        switch ($_REQUEST['searchtype'])
+        {
+            case "pilot":
+                $html .= "<td><a href=\"?a=pilot_detail&plt_id=" . $row['plt_id'] . "\">" . $row['plt_name'] . "</a></td><td>" . $row['crp_name'] . "</td>";
+                break;
+            case "corp":
+                $html .= "<td><a href=\"?a=corp_detail&crp_id=" . $row['crp_id'] . "\">" . $row['crp_name'] . "</a></td><td>" . $row['all_name'] . "</td>";
+                break;
+            case "alliance":
+                $html .= "<td><a href=\"?a=alliance_detail&all_id=" . $row['all_id'] . "\">" . $row['all_name'] . "</a></td><td></td>";
+                break;
+        }
+        $html .= "</tr>";
+    }
+    if ($qry->recordCount() > 0)
+    {
+        $html .= "</table>";
+    }
+}
+
+$page->setContent($html);
+$page->generate();
 ?>

dev/style/blue/style.css

@@ -493 +493 @@
         text-decoration: none;
 }
+.comment {
+        background-color: #292929;
+        border: 1px solid;
+        border-color: #292929;
+        margin-top: 5px;
+        padding-top: 8px;
+        padding-left: 8px;
+        color: #cccccc;
+        font-size: 12px;
+        font-family: Arial, Helvetica, sans-serif;
+        -moz-border-radius-topleft: 10px;
+        -moz-border-radius-topright: 10px;
+        -moz-border-radius-bottomleft: 10px;
+        -moz-border-radius-bottomright: 10px;
+        }
+
+.comment:focus {
+        border-color: #FFFFFF;
+}
+.comment-button {
+        background-color: #292929;
+        border: 1px solid;
+        border-color: #292929;
+        color: #cccccc;
+        font-size: 12px;
+        margin-top: 5px;
+        padding-left: 8px;
+        font-family: Arial, Helvetica, sans-serif;
+        -moz-border-radius-topleft: 10px;
+        -moz-border-radius-topright: 10px;
+        -moz-border-radius-bottomleft: 10px;
+        -moz-border-radius-bottomright: 10px;
+        }
+.comment-button:focus {
+        border-color: #FFFFFF;
+}
+#comments-wrap {
+        border-top:#333333 thin solid;
+        width:350px;
+        margin-top:15px;
+        float:left;
+        clear:left;
+        color: #cccccc;
+        font-size: 12px;
+        }
+.comment-text {
+        padding:5px;
+        border-bottom-width:thin;
+        border-bottom-style:solid;
+        border-bottom-color: #333333;
+        overflow: hidden;
+        }
+#countdown {
+        border:0px;
+        background-color:#000000;
+        color: #cccccc;
+        font-size: 12px;
+        font-family: Arial, Helvetica, sans-serif;
+        }

dev/style/default/style.css

@@ -229 +229 @@
 img.avatar
 {
-  border: 1px solid #333333 #333333 #444444 #444444;
+  border: 1px solid #333333;
 }
 
@@ -493 +493 @@
         text-decoration: none;
 }
+.comment {
+        background-color: #292929;
+        border: 1px solid;
+        border-color: #292929;
+        margin-top: 5px;
+        padding-top: 8px;
+        padding-left: 8px;
+        color: #cccccc;
+        font-size: 12px;
+        font-family: Arial, Helvetica, sans-serif;
+        -moz-border-radius-topleft: 10px;
+        -moz-border-radius-topright: 10px;
+        -moz-border-radius-bottomleft: 10px;
+        -moz-border-radius-bottomright: 10px;
+        }
+
+.comment:focus {
+        border-color: #FFFFFF;
+}
+.comment-button {
+        background-color: #292929;
+        border: 1px solid;
+        border-color: #292929;
+        color: #cccccc;
+        font-size: 12px;
+        margin-top: 5px;
+        padding-left: 8px;
+        font-family: Arial, Helvetica, sans-serif;
+        -moz-border-radius-topleft: 10px;
+        -moz-border-radius-topright: 10px;
+        -moz-border-radius-bottomleft: 10px;
+        -moz-border-radius-bottomright: 10px;
+        }
+.comment-button:focus {
+        border-color: #FFFFFF;
+}
+#comments-wrap {
+        border-top:#333333 thin solid;
+        width:350px;
+        margin-top:15px;
+        float:left;
+        clear:left;
+        color: #cccccc;
+        font-size: 12px;
+        }
+.comment-text {
+        padding:5px;
+        border-bottom-width:thin;
+        border-bottom-style:solid;
+        border-bottom-color: #333333;
+        overflow: hidden;
+        }
+#countdown {
+        border:0px;
+        background-color:#000000;
+        color: #cccccc;
+        font-size: 12px;
+        font-family: Arial, Helvetica, sans-serif;
+        }