Changeset 59

Timestamp:

11/07/06 04:44:47 (16 years ago)

Author:

exi

Message:

Changed the custom shipsvalue table to show more information
Added admin option for the mailhost for post-ccs ( http://trac.eve-dev.net/ticket/9)

Location:

dev/common

Files:

• about.php (modified) (3 diffs)
• admin.php (modified) (2 diffs)
• post.php (modified) (5 diffs)
• post_igb.php (modified) (2 diffs)

dev/common/about.php

@@ -53 +53 @@
 $qry->execute($sql);
 $html .= "<table class=kb-table cellspacing=1>";
-$html .= "<tr class=kb-table-header><td width=110>Ship class</td><td>Value in ISK</td><td align=center>Indicator</td></tr>";
+$html .= "<tr class=kb-table-header><td width=160>Ship class</td><td>Value in ISK</td><td>Points</td><td align=center>Indicator</td></tr>";
 while ($row = $qry->getRow())
 {
     $shipclass = new ShipClass($row['scl_id']);
-    $html .= "<tr class=kb-table-row-odd><td>" . $shipclass->getName() . "</td><td align=\"right\">".number_format($shipclass->getValue()*1000000,0,',','.')."</td><td align=center><img class=ship src=\"" . $shipclass->getValueIndicator() . "\" border=\"0\"></td></tr>";
+    $html .= "<tr class=kb-table-row-odd><td>".$shipclass->getName()."</td><td align=\"right\">".number_format($shipclass->getValue()*1000000,0,',','.')."</td><td align=\"right\">".number_format($shipclass->getPoints(),0,',','.')."</td><td align=center><img class=ship src=\"" . $shipclass->getValueIndicator() . "\" border=\"0\"></td></tr>";
 }
 $html .= "</table>";
+
+function getVictimShipValueIndicator($value)
+{
+    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 <= 7000)
+        $color = "purple";
+
+    return IMG_URL . "/ships/ship-" . $color . ".gif";
+}
 
 if ($config->getConfig('ship_values'))
 {
     $sql = 'select kbs.shp_id as id, shp.shp_name, kbs.shp_value,
-                 shp.shp_techlevel
+                 shp.shp_techlevel, scl.scl_class, scl.scl_points
                  from kb3_ships_values kbs
                  inner join kb3_ships shp on (kbs.shp_id = shp.shp_id)
+                 inner join kb3_ship_classes scl on (shp.shp_class = scl.scl_id)
                  order by shp.shp_name asc';
     $html .= "<br/>Custom shipvalues which override the value from shipclasses:<br><br>";
@@ -72 +93 @@
     $qry->execute($sql);
     $html .= "<table class=kb-table cellspacing=1>";
-    $html .= "<tr class=kb-table-header><td width=110>Ship Name</td><td>Value in ISK</td></tr>";
+    $html .= "<tr class=kb-table-header><td width=160>Ship Name</td><td>Ship Class</td><td>Points</td><td align=\"right\">Value in ISK</td></tr>";
     while ($row = $qry->getRow())
     {
@@ -79 +100 @@
             $row['shp_name'] = '<img src="'.IMG_URL.'/ships/32_32/t2.gif">'.$row['shp_name'];
         }
-        $html .= "<tr class=kb-table-row-odd><td>".$row['shp_name']."</td><td align=\"right\">".number_format($row['shp_value'],0,',','.')."</td></tr>";
+        $html .= "<tr class=kb-table-row-odd><td>".$row['shp_name']."&nbsp;</td><td>".$row['scl_class']."&nbsp;</td><td align=\"right\">".number_format($row['scl_points'],0,',','.')."</td><td align=\"right\">&nbsp;".number_format($row['shp_value'],0,',','.')."&nbsp;<img src=\"".getVictimShipValueIndicator($row['shp_value']/1000000)."\"></td></tr>";
     }
     $html .= "</table>";

dev/common/admin.php

@@ -30 +30 @@
     $config->setPostPassword($_POST['post_password']);
     $config->setPostMailto($_POST['post_mailto']);
+    $config->setConfig('mail_host', $_POST['post_mailhost']);
 
     if ($_POST['filter_apply'] == "on")
@@ -150 +151 @@
 $html .= "<tr><td width=120><b>Post password:</b></td><td><input type=text name=post_password id=post_password size=20 maxlength=20 value=\"" . $config->getPostPassword() . "\"></td></tr>";
 $html .= "<tr><td width=120><b>Killmail CC:</b></td><td><input type=text name=post_mailto id=post_mailto size=20 maxlength=80 value=\"" . $config->getPostMailto() . "\"> (e-mail address)</td></tr>";
+$html .= "<tr><td width=120><b>Mailhost:</b></td><td><input type=text name=post_mailhost id=post_mailhost size=20 maxlength=80 value=\"".$config->getConfig('mail_host')."\"></td></tr>";
 $html .= "<tr><td width=120><b>Disallow any killmails before:</b></td><td>" . dateSelector($config->getConfig('filter_apply'), $config->getConfig('filter_date')) . "</td></tr>";
 $html .= "</table>";

dev/common/post.php

@@ -9 +9 @@
 $kb = new Killboard(KB_SITE);
 
-$config = $kb->getConfig();
 if (isset($_POST['killmail']))
 {
@@ -15 +14 @@
     {
         $parser = new Parser($_POST['killmail']);
-        
-                //Filtering
-        if($config->getConfig("filter_apply") == "1"){
-                $filterdate = $config->getConfig("filter_date");
-                $year = substr($_POST['killmail'],0,4);
-                $month = substr($_POST['killmail'],5,2);
-                $day = substr($_POST['killmail'],8,2);          
-                $killstamp = mktime(0,0,0,$month,$day,$year);
-                if($killstamp < $filterdate){
-                        $killid = -3;
-                }else{
-                        $killid = $parser->parse(true);
-                }
-        }else{
-                $killid = $parser->parse(true);
-        }      
+
+        // Filtering
+        if ($config->getConfig("filter_apply"))
+        {
+            $filterdate = $config->getConfig("filter_date");
+            $year = substr($_POST['killmail'], 0, 4);
+            $month = substr($_POST['killmail'], 5, 2);
+            $day = substr($_POST['killmail'], 8, 2);
+            $killstamp = mktime(0, 0, 0, $month, $day, $year);
+            if ($killstamp < $filterdate)
+            {
+                $killid = -3;
+            }
+            else
+            {
+                $killid = $parser->parse(true);
+            }
+        }
+        else
+        {
+            $killid = $parser->parse(true);
+        }
 
         if ($killid == 0 || $killid == -1 || $killid == -2 || $killid == -3)
         {
             if ($killid == 0)
+            {
                 $html = "Killmail is malformed.";
-            if ($killid == -1)
+            }
+            elseif ($killid == -1)
             {
-                $html = "That killmail has already been posted <a href=\"?a=kill_detail&kll_id=" . $parser->dupeid_ . "\">here</a>.";
+                $html = "That killmail has already been posted <a href=\"?a=kill_detail&kll_id=".$parser->dupeid_."\">here</a>.";
             }
-            if ($killid == -2)
+            elseif ($killid == -2)
+            {
                 $html = "You are not authorized to post this killmail.";
-                
-            if ($killid == -3){
-                $filterdate = date("j F Y",$config->getConfig("filter_date"));
+            }
+            elseif ($killid == -3)
+            {
+                $filterdate = date("j F Y", $config->getConfig("filter_date"));
                 $html = "You are not allowed to post killmails older than $filterdate.";
-             }
+            }
         }
         else
@@ -55 +64 @@
                 $kill = new Kill($killid);
 
-                $mailer->From = "mailer@eve-killboard.net";
-                $mailer->FromName = "eve-killboard.net";
+                $mailer->From = "mailer@".$config->getConfig('mail_host');
+                $mailer->FromName = $config->getConfig('mail_host');
                 $mailer->Subject = "Killmail #" . $killid;
                 $mailer->Host = "localhost";
@@ -62 +71 @@
                 $mailer->Helo = "localhost";
                 $mailer->Mailer = "smtp";
-                $mailer->AddReplyTo("no_reply@eve-killboard.net", "No-Reply");
-                $mailer->Sender = "mailer@eve-killboard.net";
+                $mailer->AddReplyTo("no_reply@".$config->getConfig('mail_host'), "No-Reply");
+                $mailer->Sender = "mailer@".$config->getConfig('mail_host');
                 $mailer->Body = $kill->getRawMail();
                 $mailer->AddAddress($config->getPostMailto());
@@ -71 +80 @@
             $qry = new DBQuery();
             $qry->execute("insert into kb3_log
-                               values( " . $killid . ", '" . KB_SITE . "',
-                                       '" . $_SERVER['REMOTE_ADDR'] . "',
-                                       now() )");
+                               values(".$killid.",'".KB_SITE."','".$_SERVER['REMOTE_ADDR']."', now())");
 
-            header("Location: ?a=kill_detail&kll_id=" . $killid);
+            header("Location: ?a=kill_detail&kll_id=".$killid);
             exit;
         }

dev/common/post_igb.php

@@ -1 @@
-<?
-  require_once( "class.page.php" );
-  require_once( "class.killboard.php" );
-  require_once( "class.parser.php" );
-  require_once( "class.phpmailer.php" );
-  require_once( "class.kill.php" );
+<?php
+require_once("class.page.php");
+require_once("class.killboard.php");
+require_once("class.parser.php");
+require_once("class.phpmailer.php");
+require_once("class.kill.php");
 
-  $kb = new Killboard( KB_SITE );
+$kb = new Killboard(KB_SITE);
 
-  $html = "<html><head><title>".KB_TITLE." Killboard - Post Mail"."</title></head></html><body>";
+$html = "<html><head><title>" . KB_TITLE . " Killboard - Post Mail" . "</title></head></html><body>";
 
-  $config = $kb->getConfig();
+if (isset($_POST['killmail']))
+{
+    if ($_POST['password'] == $config->getPostPassword())
+    {
+        $parser = new Parser($_POST['killmail']);
 
-  if ( isset( $_POST['killmail'] ) ) {
+        $killid = $parser->parse(true);
 
-    if ( $_POST['password'] == $config->getPostPassword() ) {
-      $parser = new Parser( $_POST['killmail'] );
+        if ($killid == 0 || $killid == -1 || $killid == -2 || $killid == -3)
+        {
+            if ($killid == 0)
+            {
+                $html = "Killmail is malformed.";
+            }
+            elseif ($killid == -1)
+            {
+                $html = "That killmail has already been posted.";
+            }
+            elseif ($killid == -2)
+            {
+                $html = "You are not authorized to post this killmail.";
+            }
+            elseif ($killid == -3)
+            {
+                $filterdate = date("j F Y", $config->getConfig("filter_date"));
+                $html = "You are not allowed to post killmails older than $filterdate.";
+            }
 
-      $killid = $parser->parse( true );
+            $html .= "<br><br><a href=\"?a=post_igb\">Try again</a>";
+        }
+        else
+        {
+            if ($config->getPostMailTo() != "")
+            {
+                $mailer = new PHPMailer();
+                $kill = new Kill($killid);
 
-      if ( $killid == 0 || $killid == -1 || $killid == -2 || $killid == -3) {
-        if ( $killid == 0 )
-          $html = "Killmail is malformed.";
-        if ( $killid == -1 )
-          $html = "That killmail has already been posted.";
-        if ( $killid == -2 )
-          $html = "You are not authorized to post this killmail.";
-           
-        if ($killid == -3) {
-        $filterdate = date("j F Y",$config->getConfig("filter_date"));
-          $html = "You are not allowed to post killmails older than $filterdate.";
-        }
+                $mailer->From = "mailer@".$config->getConfig('mail_host');
+                $mailer->FromName = $config->getConfig('mail_host');
+                $mailer->Subject = "Killmail #" . $killid;
+                $mailer->Host = "localhost";
+                $mailer->Port = 25;
+                $mailer->Helo = "localhost";
+                $mailer->Mailer = "smtp";
+                $mailer->AddReplyTo("no_reply@".$config->getConfig('mail_host'), "No-Reply");
+                $mailer->Sender = "mailer@".$config->getConfig('mail_host');
+                $mailer->Body = $kill->getRawMail();
+                $mailer->AddAddress($config->getPostMailto());
+                $mailer->Send();
+            }
 
+            $qry = new DBQuery();
+            $qry->execute("insert into kb3_log
+                               values( " . $killid . ", '" . KB_SITE . "',
+                                       '" . $_SERVER['REMOTE_ADDR'] . "',
+                                       now() )");
+
+            $html .= "Killmail posted successfully.<br><br>";
+            $html .= "<a href=\"?a=post_igb\">Post another killmail</a>";
+        }
+    }
+    else
+    {
+        $html .= "Invalid password.";
         $html .= "<br><br><a href=\"?a=post_igb\">Try again</a>";
-      }
-      else {
-        if ( $config->getPostMailTo() != "" ) {
-          $mailer = new PHPMailer();
-          $kill = new Kill( $killid );
-
-          $mailer->From = "mailer@eve-killboard.net";
-          $mailer->FromName = "eve-killboard.net";
-          $mailer->Subject = "Killmail #".$killid;
-          $mailer->Host = "localhost";
-          $mailer->Port = 25;
-          $mailer->Helo = "localhost";
-          $mailer->Mailer = "smtp";
-          $mailer->AddReplyTo( "no_reply@eve-killboard.net", "No-Reply" );
-          $mailer->Sender = "mailer@eve-killboard.net";
-          $mailer->Body = $kill->getRawMail();
-          $mailer->AddAddress( $config->getPostMailto() );
-          $mailer->Send();
-        }
-
-        $qry = new DBQuery();
-        $qry->execute( "insert into kb3_log
-                               values( ".$killid.", '".KB_SITE."',
-                                       '".$_SERVER['REMOTE_ADDR']."',
-                                       now() )" );
-
-        $html .= "Killmail posted successfully.<br><br>";
-        $html .= "<a href=\"?a=post_igb\">Post another killmail</a>";
-      }
     }
-    else {
-      $html .= "Invalid password.";
-      $html .= "<br><br><a href=\"?a=post_igb\">Try again</a>";
-    }
-  }
-  else {
+}
+else
+{
     $html .= "Paste the killmail from your EVEMail inbox into the box below. Make sure you post the <b>ENTIRE</b> mail.<br>Posting fake or otherwise edited mails is not allowed. All posts are logged.";
     $html .= "<br><br>Remember to post your losses as well.<br><br>";
@@ -77 +87 @@
     $html .= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input id=submit name=\"submit\" type=\"submit\" value=\"Process !\">";
     $html .= "</form>";
+}
 
-  }
+$html .= "</body></html>";
 
-  $html .= "</body></html>";
-
-  echo $html;
+echo $html;
 ?>