Changeset 165 for dev/common

Timestamp:

01/03/07 09:06:54 (15 years ago)

Author:

exi

Message:

Added options to show loss and totalpoints in pilot details.
Tidied up class.box.php.
class.kill.php now checks better for item location ids.
Added victimalliancename to the killlisttable.
The signature generator now paints error messages if he doesnt like stuff.

Location:

dev/common

Files:

• admin.php (modified) (2 diffs)
• class.box.php (modified) (4 diffs)
• class.kill.php (modified) (3 diffs)
• class.killlisttable.php (modified) (1 diff)
• pilot_detail.php (modified) (2 diffs)

dev/common/admin.php

@@ -33 +33 @@
     // new function checkCheckbox, checks $_POST[arg] and inserts 0 if != 'on'
     $config->checkCheckbox('kill_points');
+    $config->checkCheckbox('loss_points');
+    $config->checkCheckbox('total_points');
     $config->checkCheckbox('ship_values');
     $config->checkCheckbox('least_active');
@@ -130 +132 @@
 }
 $html .= "></td></tr>";
+$html .= "<tr><td width=120><b>Display losspoints:</b></td><td><input type=checkbox name=loss_points id=loss_points";
+if ($config->getConfig('loss_points'))
+{
+    $html .= " checked=\"checked\"";
+}
+$html .= "></td></tr>";
+$html .= "<tr><td width=120><b>Display totalpoints:</b></td><td><input type=checkbox name=total_points id=total_points";
+if ($config->getConfig('total_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";

dev/common/class.box.php

@@ -5 +5 @@
 class Box
 {
-    function Box($title = "")
+    function Box($title = '')
     {
         $this->title_ = $title;
-                $this->box_array = array();
+        $this->box_array = array();
     }
 
-    function setIcon($icon)                                     //its called setIcon... and it sets the Icon.
+    //its called setIcon... and it sets the Icon.//its called setIcon... and it sets the Icon.
+    function setIcon($icon)
     {
         $this->icon_ = $icon;
     }
 
-        function addOption($type,$name,$url="") //add something to the array that we send to smarty later... types can be caption, img, link, points. Only link needs all 3 attribues
-        {
-        $this->box_array[]=array('type' => $type, 'name' => $name, 'url' => $url);
-        }
+    //add something to the array that we send to smarty later... types can be caption, img, link, points. Only link needs all 3 attribues
+    function addOption($type, $name, $url = '')
+    {
+        $this->box_array[] = array('type' => $type, 'name' => $name, 'url' => $url);
+    }
 
-        function generate()
+    function generate()
     {
-        //print_r($this->box_array);
-         global $config, $smarty;
-        $smarty->assign('count',count($this->box_array));
-        if($this->icon_){ $smarty->assign('icon',IMG_URL . "/" . $this->icon_); }
-        $smarty->assign('title',$this->title_ );
-        $smarty->assign('items',$this->box_array);
-        return $smarty->fetch(get_tpl('box'));
+        global $config, $smarty;
+
+        $smarty->assign('count', count($this->box_array));
+        if($this->icon_)
+        {
+            $smarty->assign('icon', IMG_URL."/".$this->icon_);
+        }
+        $smarty->assign('title', $this->title_ );
+        $smarty->assign('items', $this->box_array);
+
+        return $smarty->fetch(get_tpl('box'));
     }
 }
@@ -37 +43 @@
     function AwardBox($list, $title, $comment, $entity, $award)
     {
-
         $this->toplist_ = $list;
         $this->title_ = $title;
@@ -47 +52 @@
     function generate()
     {
-                global $config, $smarty;
+        global $config, $smarty;
+
         $rows = array();
         $max = 0;
@@ -54 +60 @@
         {
             $row = $this->toplist_->getRow();
-            if ($row) array_push($rows, $row);
-            if ($row['cnt'] > $max) $max = $row['cnt'];
+            if ($row)
+            {
+                array_push($rows, $row);
+            }
+            if ($row['cnt'] > $max)
+            {
+                $max = $row['cnt'];
+            }
         }
 
-        if (!$rows[0]['plt_id']) return;
+        if (!$rows[0]['plt_id'])
+        {
+            return;
+        }
+
         $pilot = new Pilot($rows[0]['plt_id']);
-                $smarty->assign('title',$this->title_);
-                $smarty->assign('pilot_portrait',$pilot->getPortraitURL(64));
-                $smarty->assign('award_img',IMG_URL . "/awards/" . $this->award_ . ".gif");
-                $smarty->assign('url',"?a=pilot_detail&plt_id=" . $rows[0]['plt_id'] );
-                $smarty->assign('name',$pilot->getName() );
+        $smarty->assign('title', $this->title_);
+        $smarty->assign('pilot_portrait', $pilot->getPortraitURL(64));
+        $smarty->assign('award_img', IMG_URL."/awards/".$this->award_.".gif");
+        $smarty->assign('url', "?a=pilot_detail&plt_id=".$rows[0]['plt_id'] );
+        $smarty->assign('name', $pilot->getName() );
+
         $bar = new BarGraph($rows[0]['cnt'], $max, 60);
-                $smarty->assign('bar',$bar->generate());
-                $smarty->assign('cnt', $rows[0]['cnt']);
+        $smarty->assign('bar', $bar->generate());
+        $smarty->assign('cnt', $rows[0]['cnt']);
 
         for ($i = 2; $i < 11; $i++)
         {
-            if (!$rows[$i - 1]['plt_id']) break;
+            if (!$rows[$i - 1]['plt_id'])
+            {
+                break;
+            }
             $pilot = new Pilot($rows[$i - 1]['plt_id']);
-                        $bar = new BarGraph($rows[$i - 1]['cnt'], $max, 60);
-                        $top[$i] = array('url'=> "?a=pilot_detail&plt_id=" . $rows[$i - 1]['plt_id'], 'name'=>$pilot->getName(),'bar'=>$bar->generate(),'cnt'=>$rows[$i - 1]['cnt']);
+            $bar = new BarGraph($rows[$i - 1]['cnt'], $max, 60);
+            $top[$i] = array('url'=> "?a=pilot_detail&plt_id=".$rows[$i - 1]['plt_id'], 'name'=>$pilot->getName(), 'bar'=>$bar->generate(), 'cnt'=>$rows[$i - 1]['cnt']);
         }
-                $smarty->assign('top',$top);
-                $smarty->assign('comment',$this->comment_);
-                return $smarty->fetch(get_tpl('award_box'));
+
+        $smarty->assign('top', $top);
+        $smarty->assign('comment', $this->comment_);
+        return $smarty->fetch(get_tpl('award_box'));
     }
-
 }
 ?>

dev/common/class.kill.php

@@ -372 +372 @@
                     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 )
+                    and ( itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1))
                     group by itd_itm_id, itd_itl_id
                     order by itd.itd_itl_id, itm.itm_type";
@@ -685 +685 @@
         {
             $item = $dest->getItem();
-            if (!$item->getID() || !$dest->getQuantity() || $dest->getLocationID() === false)
+            $loc_id = $dest->getLocationID();
+            if (!$item->getID() || !$dest->getQuantity() || !is_numeric($loc_id))
             {
                 continue;
@@ -692 +693 @@
             $sql = "insert into kb3_items_destroyed
                         values ( ".$this->getID().", ".$item->getID().", ".$dest->getQuantity().", "
-                    .$dest->getLocationID()." )";
+                    .$loc_id." )";
             $qry->execute($sql);
         }

dev/common/class.killlisttable.php

@@ -73 +73 @@
             $kll['victim'] = $kill->getVictimName();
             $kll['victimcorp'] = $kill->getVictimCorpName();
+            $kll['victimalliancename'] = $kill->getVictimAllianceName();
             $kll['fb'] = $kill->getFBPilotName();
             $kll['fbcorp'] = $kill->getFBCorpName();

dev/common/pilot_detail.php

@@ -56 +56 @@
 
 $points = $klist->getPoints();
+$lpoints = $llist->getPoints();
 $summary = new KillSummaryTable($klist, $llist);
 $summary->setBreak(6);
@@ -161 +162 @@
 $page->addContext($menubox->generate());
 
-$killboard = $page->killboard_;
-$config = $killboard->getConfig();
 if ($config->getKillPoints())
 {
     $scorebox = new Box("Kill points");
-    $scorebox->addOption("points",$points);
+    $scorebox->addOption("points", $points);
+    $page->addContext($scorebox->generate());
+}
+if ($config->getConfig('loss_points'))
+{
+    $scorebox = new Box("Loss points");
+    $scorebox->addOption("points", $lpoints);
+    $page->addContext($scorebox->generate());
+}
+if ($config->getConfig('total_points'))
+{
+    $scorebox = new Box("Total points");
+    $scorebox->addOption("points", $points-$lpoints);
     $page->addContext($scorebox->generate());
 }
 
 $page->setContent($html);
-
 $page->generate();
 ?>