Changeset 91 for dev

Timestamp:

11/25/06 16:31:50 (14 years ago)

Author:

exi

Message:

Made contracts to be able to be targeted on systems.
Added Mapoptions to make you graphics guys scream.
Added adjustable posting permissions for killmail authorization.
Aded killmail exporter, it can export multiple pilots, corporation and alliances at once.

Location:

dev

Files:

• common/admin_audit.php (modified) (2 diffs)
• common/admin_cc.php (modified) (14 diffs)
• common/admin_mapoptions.php (added)
• common/admin_menu.php (modified) (1 diff)
• common/admin_postperm.php (added)
• common/admin_shp_val.php (modified) (1 diff)
• common/class.contract.php (modified) (1 diff)
• common/class.killboard.php (modified) (6 diffs)
• common/class.map.php (modified) (11 diffs)
• common/kill_export.php (added)
• common/mapview.php (modified) (1 diff)
• templates/admin_export.tpl (added)
• templates/admin_mapoptions.tpl (added)
• templates/admin_postperm.tpl (added)

dev/common/admin_audit.php

@@ -1 @@
-<?
-  require_once( "class.page.php" );
-  require_once( "db.php" );
-  require_once( "admin_menu.php" );
+<?php
+require_once("class.page.php");
+require_once("db.php");
+require_once("admin_menu.php");
 
-  $page = new Page( "Administration - Audit log" );
-  $page->setAdmin();
-  
-        $sql = "SELECT log_kll_id, log_ip_address, log_timestamp, kll_timestamp, plt_name
+$page = new Page("Administration - Audit log");
+$page->setAdmin();
+
+$sql = "SELECT log_kll_id, log_ip_address, log_timestamp, kll_timestamp, plt_name
                         FROM kb3_log log, kb3_kills kll, kb3_pilots plt
                         WHERE log.log_kll_id = kll.kll_id
@@ -13 +13 @@
                         ORDER BY log_timestamp DESC limit 250";
 
-  $dbconn = new DBConnection();
+$dbconn = new DBConnection();
 
-  $qry = new DBQuery();
-  $qry->execute( $sql ) or die( $qry->getErrorMsg() );
+$qry = new DBQuery();
+$qry->execute($sql) or die($qry->getErrorMsg());
 
-  $html .= "<table class=sortable id=audit>";
-  $html .= "<tr class=kb-table-header><td align=center width=60>ID</td><td width=150>Killmail date</td><td width=150>Posted</td><td width=120>IP Address</td><td width=150>Final Blow</td></tr>";
-  $odd = false;
-  while ( $row = $qry->getRow() ) {
-    if ( $odd ) {
-      $class = "kb-table-row-even";
-      $odd = false;
-    } else {
-      $class = "kb-table-row-odd";
-      $odd = true;
+$html .= '<table class="kb-table">';
+$html .= "<tr class=kb-table-header><td align=center width=60>ID</td><td width=150>Killmail date</td><td width=150>Posted</td><td width=120>IP Address</td><td width=150>Final Blow</td></tr>";
+$odd = false;
+while ($row = $qry->getRow())
+{
+    if ($odd)
+    {
+        $class = "kb-table-row-even";
+        $odd = false;
     }
-    $html .= "<tr class=".$class." onmouseover=\"this.className='kb-table-row-hover';\" onmouseout=\"this.className='".$class."';\" onClick=\"window.location.href='?a=kill_detail&kll_id=".$row['log_kll_id']."';\">";
-    $html .= "<td align=center><b>".$row['log_kll_id']."</b></td>";
-    $html .= "<td>".$row['kll_timestamp']."</td>";
-    $html .= "<td>".$row['log_timestamp']."</td>";
-    $html .= "<td>".$row['log_ip_address']."</td>";
-    $html .= "<td>".$row['plt_name']."</td>";
+    else
+    {
+        $class = "kb-table-row-odd";
+        $odd = true;
+    }
+    $html .= "<tr class=" . $class . " onmouseover=\"this.className='kb-table-row-hover';\" onmouseout=\"this.className='" . $class . "';\" onClick=\"window.location.href='?a=kill_detail&kll_id=" . $row['log_kll_id'] . "';\">";
+    $html .= "<td align=center><b>" . $row['log_kll_id'] . "</b></td>";
+    $html .= "<td>" . $row['kll_timestamp'] . "</td>";
+    $html .= "<td>" . $row['log_timestamp'] . "</td>";
+    $html .= "<td>" . $row['log_ip_address'] . "</td>";
+    $html .= "<td>" . $row['plt_name'] . "</td>";
     $html .= "</tr>";
-  }
-  $html .= "</table>";
+}
+$html .= "</table>";
 
-  $page->addContext( $menubox->generate() );
-  $page->setContent( $html );
-  $page->generate();
+$page->addContext($menubox->generate());
+$page->setContent($html);
+$page->generate();
 
-        
 ?>

dev/common/admin_cc.php

@@ -32 +32 @@
     {
         $html .= "<tr class=kb-table-row-odd>";
-        $html .= "<td class=kb-table-cell>" . $contract->getName() . "</td>";
-        $html .= "<td class=kb-table-cell>" . substr($contract->getStartDate(), 0, 10) . "</td>";
-        $html .= "<td class=kb-table-cell>" . substr($contract->getEndDate(), 0, 10) . "</td>";
-        $html .= "<td  class=kb-table-cell align=center width=70><a href=\"?a=admin_cc&ctr_id=" . $contract->getID() . "&op=edit&type=" . $type . "\">Edit</a></td><td align=center><a href=\"?a=admin_cc&ctr_id=" . $contract->getID() . "&op=del&type=" . $type . "\">Delete</a></td>";
+        $html .= "<td class=kb-table-cell>".$contract->getName()."</td>";
+        $html .= "<td class=kb-table-cell>".substr($contract->getStartDate(), 0, 10)."</td>";
+        $html .= "<td class=kb-table-cell>".substr($contract->getEndDate(), 0, 10)."</td>";
+        $html .= "<td  class=kb-table-cell align=center width=70><a href=\"?a=admin_cc&ctr_id=".$contract->getID()."&op=edit&type=".$type."\">Edit</a></td><td align=center><a href=\"?a=admin_cc&ctr_id=".$contract->getID()."&op=del&type=".$type."\">Delete</a></td>";
         $html .= "</tr>";
     }
     if ($list->getCount() > 0)
         $html .= "</table><br>";
-    $html .= "[<a href=\"?a=admin_cc&op=add&type=" . $type . "\">Add " . $type . "</a>]";
+    $html .= "[<a href=\"?a=admin_cc&op=add&type=".$type."\">Add ".$type."</a>]";
 }
 // delete
@@ -51 +51 @@
         $contract->remove();
 
-        Header("Location: ?a=admin_cc&op=view&type=" . $_GET['type']);
+        Header("Location: ?a=admin_cc&op=view&type=".$_GET['type']);
     }
     else
     {
-        $page->setTitle("Administration - Delete " . $_GET['type']);
+        $page->setTitle("Administration - Delete ".$_GET['type']);
         $html .= "Confirm deletion:&nbsp;";
-        $html .= "<button onClick=\"window.location.href='?a=admin_cc&ctr_id=" . $_GET['ctr_id'] . "&op=del&type=" . $_GET['type'] . "&confirm=yes'\">Yes</button>&nbsp;&nbsp;&nbsp;";
+        $html .= "<button onClick=\"window.location.href='?a=admin_cc&ctr_id=".$_GET['ctr_id']."&op=del&type=".$_GET['type']."&confirm=yes'\">Yes</button>&nbsp;&nbsp;&nbsp;";
         $html .= "<button onClick=\"window.history.back();\">No</button>";
     }
@@ -71 +71 @@
             $_POST['ctr_started'], $_POST['ctr_ended']);
 
-        Header("Location: ?a=admin_cc&op=view&type=" . $_GET['type']);
+        Header("Location: ?a=admin_cc&op=view&type=".$_GET['type']);
     }
 
@@ -88 +88 @@
                 $reg_id = $id;
                 break;
-        }
-        $contracttarget = new ContractTarget($contract, $crp_id,
-            $all_id, $reg_id);
+            case "del_system":
+                $sys_id = $id;
+                break;
+        }
+        $contracttarget = new ContractTarget($contract, $crp_id, $all_id, $reg_id, $sys_id);
         $contracttarget->remove();
 
-        Header("Location: ?a=admin_cc&ctr_id=" . $_GET['ctr_id'] . "&op=edit&type=" . $_GET['type']);
+        header("Location: ?a=admin_cc&ctr_id=".$_GET['ctr_id']."&op=edit&type=".$_GET['type']);
     }
 
@@ -110 +112 @@
                 $reg_id = $id;
                 break;
-        }
-        $contracttarget = new ContractTarget($contract, $crp_id,
-            $all_id, $reg_id);
+            case 3:
+                $sys_id = $id;
+                break;
+        }
+        $contracttarget = new ContractTarget($contract, $crp_id, $all_id, $reg_id, $sys_id);
         $contracttarget->add();
 
-        Header("Location: ?a=admin_cc&ctr_id=" . $_GET['ctr_id'] . "&op=edit&type=" . $_GET['type']);
+        header("Location: ?a=admin_cc&ctr_id=".$_GET['ctr_id']."&op=edit&type=".$_GET['type']);
     }
     if ($_POST['add_name'])
@@ -129 +133 @@
                     $sql = "select crp.crp_id as id, crp.crp_name as name
                       from kb3_corps crp
-                     where lower( crp.crp_name ) like '%" . strtolower($_POST['add_name']) . "%'";
+                     where lower( crp.crp_name ) like '%".strtolower($_POST['add_name'])."%'";
                     break;
                 case 1:
                     $sql = "select ali.all_id as id, ali.all_name as name
                       from kb3_alliances ali
-                     where lower( ali.all_name ) like '%" . strtolower($_POST['add_name']) . "%'";
+                     where lower( ali.all_name ) like '%".strtolower($_POST['add_name'])."%'";
                     break;
                 case 2:
                     $sql = "select reg_id as id, reg_name as name
                       from kb3_regions
-                     where lower( reg_name ) like '%" . strtolower($_POST['add_name']) . "%'";
+                     where lower( reg_name ) like '%".strtolower($_POST['add_name'])."%'";
+                    break;
+                case 3:
+                    $sql = "select sys_id as id, sys_name as name
+                      from kb3_systems
+                     where lower( sys_name ) like '%".strtolower($_POST['add_name'])."%'";
                     break;
             }
@@ -152 +161 @@
             }
             else
-                $html .= "No matches found for '" . $_POST['add_name'] . "'.";
+                $html .= "No matches found for '".$_POST['add_name']."'.";
 
             while ($row = $qry->getRow())
@@ -160 +169 @@
                 {
                     case 0:
-                        $html .= "<td><a href=\"?a=corp_detail&crp_id=" . $row['id'] . "\">" . $row['name'] . "</a></td><td align=center><button id=submit name=submit onClick=\"window.location.href='?a=admin_cc&ctr_id=" . $_GET['ctr_id'] . "&op=edit&type=" . $_GET['type'] . "&add_type=" . $_POST['add_type'] . "&add_id=" . $row['id'] . "'\">Select</button></td>";
+                        $html .= "<td><a href=\"?a=corp_detail&crp_id=".$row['id']."\">".$row['name']."</a></td><td align=center><button id=submit name=submit onClick=\"window.location.href='?a=admin_cc&ctr_id=".$_GET['ctr_id']."&op=edit&type=".$_GET['type']."&add_type=".$_POST['add_type']."&add_id=".$row['id']."'\">Select</button></td>";
                         break;
                     case 1:
-                        $html .= "<td><a href=\"?a=alliance_detail&all_id=" . $row['id'] . "\">" . $row['name'] . "</a></td><td align=center><button id=submit name=submit onClick=\"window.location.href='?a=admin_cc&ctr_id=" . $_GET['ctr_id'] . "&op=edit&type=" . $_GET['type'] . "&add_type=" . $_POST['add_type'] . "&add_id=" . $row['id'] . "'\">Select</button></td>";
+                        $html .= "<td><a href=\"?a=alliance_detail&all_id=".$row['id']."\">".$row['name']."</a></td><td align=center><button id=submit name=submit onClick=\"window.location.href='?a=admin_cc&ctr_id=".$_GET['ctr_id']."&op=edit&type=".$_GET['type']."&add_type=".$_POST['add_type']."&add_id=".$row['id']."'\">Select</button></td>";
                         break;
                     case 2:
-                        $html .= "<td>" . $row['name'] . "</td><td align=center><button id=submit name=submit onClick=\"window.location.href='?a=admin_cc&ctr_id=" . $_GET['ctr_id'] . "&op=edit&type=" . $_GET['type'] . "&add_type=" . $_POST['add_type'] . "&add_id=" . $row['id'] . "'\">Select</button></td>";
+                        $html .= "<td>".$row['name']."</td><td align=center><button id=submit name=submit onClick=\"window.location.href='?a=admin_cc&ctr_id=".$_GET['ctr_id']."&op=edit&type=".$_GET['type']."&add_type=".$_POST['add_type']."&add_id=".$row['id']."'\">Select</button></td>";
+                        break;
+                    case 3:
+                        $html .= "<td>".$row['name']."</td><td align=center><button id=submit name=submit onClick=\"window.location.href='?a=admin_cc&ctr_id=".$_GET['ctr_id']."&op=edit&type=".$_GET['type']."&add_type=".$_POST['add_type']."&add_id=".$row['id']."'\">Select</button></td>";
                         break;
                 }
@@ -177 +189 @@
     else
     {
-        $page->setTitle("Administration - Edit " . $_GET['type']);
+        $page->setTitle("Administration - Edit ".$_GET['type']);
 
         $contract = new Contract($_GET['ctr_id']);
@@ -183 +195 @@
         $html .= "<div class=block-header2>Details</div>";
 
-        $html .= "<form id=detail_edit name=detail_edit method=post action=?a=admin_cc&ctr_id=" . $_GET['ctr_id'] . "&op=edit&type=" . $_GET['type'] . ">";
+        $html .= "<form id=detail_edit name=detail_edit method=post action=?a=admin_cc&ctr_id=".$_GET['ctr_id']."&op=edit&type=".$_GET['type'].">";
         $html .= "<table class=kb-subtable width=98%>";
 
-        $html .= "<tr><td width=80><b>Name:</b></td><td><input type=text name=ctr_name id=ctr_name size=38 maxlength=38 value=\"" . $contract->getName() . "\"></td></tr>";
-        $html .= "<tr><td width=80><b>Start date:</b></td><td><input type=text name=ctr_started id=ctr_started size=10 maxlength=10 value=\"" . substr($contract->getStartDate(), 0, 10) . "\"> (yyyy-mm-dd)</td></tr>";
-        $html .= "<tr><td width-80><b>End date:</b></td><td><input type=text name=ctr_ended id=ctr_ended size=10 maxlength=10 value=\"" . substr($contract->getEndDate(), 0, 10) . "\"> (yyyy-mm-dd or blank)</td></tr>";
+        $html .= "<tr><td width=80><b>Name:</b></td><td><input type=text name=ctr_name id=ctr_name size=38 maxlength=38 value=\"".$contract->getName()."\"></td></tr>";
+        $html .= "<tr><td width=80><b>Start date:</b></td><td><input type=text name=ctr_started id=ctr_started size=10 maxlength=10 value=\"".substr($contract->getStartDate(), 0, 10)."\"> (yyyy-mm-dd)</td></tr>";
+        $html .= "<tr><td width-80><b>End date:</b></td><td><input type=text name=ctr_ended id=ctr_ended size=10 maxlength=10 value=\"".substr($contract->getEndDate(), 0, 10)."\"> (yyyy-mm-dd or blank)</td></tr>";
         $html .= "<tr><td></td></tr>";
         $html .= "<tr><td></td><td><input type=submit name=detail_submit value=\"Save\"></td></tr>";
@@ -198 +210 @@
 
         $html .= "<table class=kb-table cellspacing=1>";
-        $html .= "<tr class=kb-table-header><td class=kb-table-cell width=160>Target</td><td class=kb-table-cell width=80 align=center>Corporation</td><td class=kb-table-cell width=80 align=center>Alliance</td><td class=kb-table-cell width=80 align=center>Region</td><td class=kb-table-cell width=80 align=center>Action</td><td</tr>";
+        $html .= "<tr class=kb-table-header><td class=kb-table-cell width=160>Target</td><td class=kb-table-cell width=80 align=center>Corporation</td><td class=kb-table-cell width=80 align=center>Alliance</td><td class=kb-table-cell width=80 align=center>Region</td><td class=kb-table-cell width=80 align=center>System</td><td class=kb-table-cell width=80 align=center>Action</td></tr>";
 
         $c = 0;
@@ -220 +232 @@
                 $name = $region->getName();
             }
-
-            $html .= "<tr class=kb-table-row-odd><td class=kb-table-cell><b>" . $name . "</b></td><td class=kb-table-cell align=center>";
+            if ($type == "system")
+            {
+                $system = new SolarSystem($contracttarget->getID());
+                $name = $system->getName();
+            }
+
+            $html .= "<tr class=kb-table-row-odd><td class=kb-table-cell><b>".$name."</b></td><td class=kb-table-cell align=center>";
             if ($type == "corp")
                 $html .= "x";
@@ -230 +247 @@
             if ($type == "region")
                 $html .= "x";
+            $html .= "</td><td class=kb-table-cell align=center>";
+            if ($type == "system")
+                $html .= "x";
             $html .= "</td>";
 
-            $html .= "<td align=center><a href=\"?a=admin_cc&ctr_id=" . $_GET['ctr_id'] . "&op=edit&type=" . $_GET['type'] . "&sop=del_" . $type . "&id=" . $contracttarget->getID() . "\">delete</a></td></tr>";
+            $html .= "<td align=center><a href=\"?a=admin_cc&ctr_id=".$_GET['ctr_id']."&op=edit&type=".$_GET['type']."&sop=del_".$type."&id=".$contracttarget->getID()."\">delete</a></td></tr>";
         }
 
         if ($c < 30)
         {
-            $html .= "<form id=add_target name=add_target method=post action=?a=admin_cc&ctr_id=" . $_GET['ctr_id'] . "&op=edit&type=" . $_GET['type'] . ">";
+            $html .= "<form id=add_target name=add_target method=post action=?a=admin_cc&ctr_id=".$_GET['ctr_id']."&op=edit&type=".$_GET['type'].">";
             $html .= "<tr><td></td></tr>";
-            $html .= "<tr><td><input type=text id=add_name name=add_name size=30 maxlength=30></td><td align=center><input type=radio name=add_type id=add_type value=0 checked></td><td align=center><input type=radio name=add_type id=add_type value=1></td><td align=center><input type=radio name=add_type id=add_type value=2></td><td align=center><input type=submit id=submit name=submit value=Add></td></tr>";
+            $html .= "<tr><td><input type=text id=add_name name=add_name size=30 maxlength=30></td><td align=center><input type=radio name=add_type id=add_type value=0 checked></td><td align=center><input type=radio name=add_type id=add_type value=1></td><td align=center><input type=radio name=add_type id=add_type value=2></td><td align=center><input type=radio name=add_type id=add_type value=3></td><td align=center><input type=submit id=submit name=submit value=Add></td></tr>";
         }
         $html .= "</table>";
@@ -251 +271 @@
     {
         $contract = new Contract();
-        $contract->add($_POST['ctr_name'], $_GET['type'],
-            $_POST['ctr_started'], $_POST['ctr_ended']);
-
-        Header("Location: ?a=admin_cc&ctr_id=" . $contract->getID() . "&op=edit&type=" . $_GET['type']);
-    }
-
-    $page->setTitle("Administration - Add " . $_GET['type']);
+        $contract->add($_POST['ctr_name'], $_GET['type'], $_POST['ctr_started'], $_POST['ctr_ended']);
+
+        header("Location: ?a=admin_cc&ctr_id=".$contract->getID()."&op=edit&type=".$_GET['type']);
+    }
+
+    $page->setTitle("Administration - Add ".$_GET['type']);
 
     $html .= "<div class=block-header2>Details</div>";
 
-    $html .= "<form id=detail_edit name=detail_edit method=post action=?a=admin_cc&ctr_id=" . $_GET['ctr_id'] . "&op=add&type=" . $_GET['type'] . ">";
+    $html .= "<form id=detail_edit name=detail_edit method=post action=?a=admin_cc&ctr_id=".$_GET['ctr_id']."&op=add&type=".$_GET['type'].">";
     $html .= "<table class=kb-table width=98%>";
 
     $html .= "<tr><td width=80><b>Name:</b></td><td><input type=text name=ctr_name id=ctr_name size=40 maxlength=40></td></tr>";
-    $html .= "<tr><td width=80><b>Start date:</b></td><td><input type=text name=ctr_started id=ctr_started size=10 maxlength=10 value=\"" . date("Y-m-d") . "\"> (yyyy-mm-dd)</td></tr>";
+    $html .= "<tr><td width=80><b>Start date:</b></td><td><input type=text name=ctr_started id=ctr_started size=10 maxlength=10 value=\"".date("Y-m-d")."\"> (yyyy-mm-dd)</td></tr>";
     $html .= "<tr><td width-80><b>End date:</b></td><td><input type=text name=ctr_ended id=ctr_ended size=10 maxlength=10> (yyyy-mm-dd or blank)</td></tr>";
     $html .= "<tr><td></td></tr>";

dev/common/admin_menu.php

@@ -8 +8 @@
 $menubox->addOption("Ship Values", "?a=admin_shp_val");
 $menubox->addOption("Synchronization", "?a=admin_sync");
+$menubox->addOption("Map Options", "?a=admin_mapoptions");
+$menubox->addOption("Post Permissions", "?a=admin_postperm");
 $menubox->addOption("Mods", "?a=admin_mods");
+$menubox->addOption("Auditing", "?a=admin_audit");
 $menubox->addOption("Kill Import - files", "?a=kill_import");
 $menubox->addOption("Kill Import - csv", "?a=kill_import_csv");
+$menubox->addOption("Kill Export - files", "?a=kill_export");
 $menubox->addOption("Kill Export - csv", "?a=kill_export_search");
-$menubox->addOption("Auditing", "?a=admin_audit");
 ?>

dev/common/admin_shp_val.php

@@ -175 +175 @@
         {
             $html .= '<form id="search" action="?a=admin_shp_val" method=post>';
-            $html .= '<table class=kb-table width="99%" align=center cellspacing="1">';
+            $html .= '<table class="kb-table" width="99%" align=center cellspacing="1">';
             $html .= '<input type="hidden" name="opt" value="add"/>';
             $html .= '<script language="javascript">

dev/common/class.contract.php

@@ -1 @@
-<?
-  require_once( "db.php" );
-  require_once( "class.killlist.php" );
-  require_once( "class.graph.php" );
-  require_once( "class.pagesplitter.php" );
-
-  class Contract
-  {
-    function Contract( $ctr_id  = 0 )
-    {
-      $this->ctr_id_ = $ctr_id;
-      $this->contracttargets_ = array();
-
-      // overall kill/losslist      
-      $this->klist_ = new KillList();
-      $this->llist_ = new KillList();
-      if ( CORP_ID ) {
-        $this->klist_->addInvolvedCorp( new Corporation( CORP_ID ) );
-        $this->llist_->addVictimCorp( new Corporation( CORP_ID ) );
-      }
-      if ( ALLIANCE_ID ) {
-        $this->klist_->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) );  
-        $this->llist_->addVictimAlliance( new Alliance( ALLIANCE_ID ) );
-      }
-      $this->contractpointer_ = 0;
-      $this->qry_ = null;
-    }
-    
+<?php
+require_once("db.php");
+require_once("class.killlist.php");
+require_once("class.graph.php");
+require_once("class.pagesplitter.php");
+
+class Contract
+{
+    function Contract($ctr_id = 0)
+    {
+        $this->ctr_id_ = $ctr_id;
+        $this->contracttargets_ = array();
+
+        // overall kill/losslist
+        $this->klist_ = new KillList();
+        $this->llist_ = new KillList();
+        if (CORP_ID)
+        {
+            $this->klist_->addInvolvedCorp(new Corporation(CORP_ID));
+            $this->llist_->addVictimCorp(new Corporation(CORP_ID));
+        }
+        if (ALLIANCE_ID)
+        {
+            $this->klist_->addInvolvedAlliance(new Alliance(ALLIANCE_ID));
+            $this->llist_->addVictimAlliance(new Alliance(ALLIANCE_ID));
+        }
+        $this->contractpointer_ = 0;
+        $this->qry_ = null;
+    }
+
     function execQuery()
     {
-      if ( $this->qry_ )
-        return;
-
-      $this->qry_ = new DBQuery();
-      // general
-      $sql = "select * from kb3_contracts ctr
-               where ctr.ctr_id = ".$this->ctr_id_;
-             
-      $this->qry_ = new DBQuery();
-      if ( !$this->qry_->execute( $sql ) )
-        die( $this->qry_->getErrorMsg() );
-        
-      $row = $this->qry_->getRow();
-      $this->ctr_name_ = $row['ctr_name'];
-      $this->ctr_started_ = $row['ctr_started'];
-      $this->ctr_ended_ = $row['ctr_ended'];
-      $this->campaign_ = ( $row['ctr_campaign'] == "1" );
-      
-      // get corps & alliances for contract
-      $sql = "select ctd.ctd_crp_id, ctd.ctd_all_id, ctd.ctd_reg_id
+        if ($this->qry_)
+            return;
+
+        $this->qry_ = new DBQuery();
+        // general
+        $sql = "select * from kb3_contracts ctr
+                where ctr.ctr_id = ".$this->ctr_id_;
+
+        $this->qry_ = new DBQuery();
+        if (!$this->qry_->execute($sql))
+            die($this->qry_->getErrorMsg());
+
+        $row = $this->qry_->getRow();
+        $this->ctr_name_ = $row['ctr_name'];
+        $this->ctr_started_ = $row['ctr_started'];
+        $this->ctr_ended_ = $row['ctr_ended'];
+        $this->campaign_ = ($row['ctr_campaign'] == "1");
+
+        // get corps & alliances for contract
+        $sql = "select ctd.ctd_crp_id, ctd.ctd_all_id, ctd.ctd_reg_id, ctd.ctd_sys_id
                 from kb3_contract_details ctd
-               where ctd.ctd_ctr_id = ".$row['ctr_id']."
-              order by 3, 2, 1";
-      
-      $caqry = new DBQuery();
-      $caqry->execute( $sql ) or die( $caqry->getErrorMsg() );
-                   
-      while ( $carow = $caqry->getRow() ) {
-        $contracttarget = & new ContractTarget( $this, $carow['ctd_crp_id'], $carow['ctd_all_id'], $carow['ctd_reg_id'] );
-        array_push( $this->contracttargets_, $contracttarget );
-        if ( $carow['ctd_crp_id'] ) {
-          $this->klist_->addVictimCorp( new Corporation( $carow['ctd_crp_id'] ) );
-          $this->llist_->addInvolvedCorp( new Corporation( $carow['ctd_crp_id'] ) );
-        } elseif ( $carow['ctd_all_id'] ) {
-          $this->klist_->addVictimAlliance( new Alliance( $carow['ctd_all_id'] ) );
-          $this->llist_->addInvolvedAlliance( new Alliance( $carow['ctd_all_id'] ) );        
-        } elseif ( $carow['ctd_reg_id'] ) {
-          $this->klist_->addRegion( new Region( $carow['ctd_reg_id'] ) );        
-          $this->llist_->addRegion( new Region( $carow['ctd_reg_id'] ) );        
-        }       
-      }
-
-      $this->klist_->setStartDate( $this->getStartDate() );
-      $this->llist_->setStartDate( $this->getStartDate() );
-      if ( $this->getEndDate() != "" ) {
-        $this->klist_->setEndDate( $this->getEndDate() );
-        $this->llist_->setEndDate( $this->getEndDate() );        
-      }
-      
+                where ctd.ctd_ctr_id = ".$row['ctr_id']."
+                    order by 3, 2, 1";
+
+        $caqry = new DBQuery();
+        $caqry->execute($sql) or die($caqry->getErrorMsg());
+
+        while ($carow = $caqry->getRow())
+        {
+            $contracttarget = &new ContractTarget($this, $carow['ctd_crp_id'], $carow['ctd_all_id'], $carow['ctd_reg_id'], $carow['ctd_sys_id']);
+            array_push($this->contracttargets_, $contracttarget);
+            if ($carow['ctd_crp_id'])
+            {
+                $this->klist_->addVictimCorp(new Corporation($carow['ctd_crp_id']));
+                $this->llist_->addInvolvedCorp(new Corporation($carow['ctd_crp_id']));
+            }
+            elseif ($carow['ctd_all_id'])
+            {
+                $this->klist_->addVictimAlliance(new Alliance($carow['ctd_all_id']));
+                $this->llist_->addInvolvedAlliance(new Alliance($carow['ctd_all_id']));
+            }
+            elseif ($carow['ctd_reg_id'])
+            {
+                $this->klist_->addRegion(new Region($carow['ctd_reg_id']));
+                $this->llist_->addRegion(new Region($carow['ctd_reg_id']));
+            }
+            elseif ($carow['ctd_sys_id'])
+            {
+                $this->klist_->addSystem(new SolarSystem($carow['ctd_sys_id']));
+                $this->llist_->addSystem(new SolarSystem($carow['ctd_sys_id']));
+            }
+        }
+
+        $this->klist_->setStartDate($this->getStartDate());
+        $this->llist_->setStartDate($this->getStartDate());
+        if ($this->getEndDate() != "")
+        {
+            $this->klist_->setEndDate($this->getEndDate());
+            $this->llist_->setEndDate($this->getEndDate());
+        }
     }
 
     function getID()
     {
-      return $this->ctr_id_;
-    }
-    
+        return $this->ctr_id_;
+    }
+
     function getName()
     {
-      $this->execQuery();
-      return $this->ctr_name_;
-    }
-    
+        $this->execQuery();
+        return $this->ctr_name_;
+    }
+
     function getStartDate()
     {
-      $this->execQuery();
-      return $this->ctr_started_;
+        $this->execQuery();
+        return $this->ctr_started_;
     }
 
     function getEndDate()
     {
-      $this->execQuery();
-      return $this->ctr_ended_;
+        $this->execQuery();
+        return $this->ctr_ended_;
     }
 
     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 ($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'];
     }
 
     function getCampaign()
     {
-      $this->execQuery();
-      return $this->campaign_;
+        $this->execQuery();
+        return $this->campaign_;
     }
 
     function getCorps()
     {
-      $this->execQuery();
-      return $this->corps_;
-    }
-    
+        $this->execQuery();
+        return $this->corps_;
+    }
+
     function getAlliances()
     {
-      $this->execQuery();
-      return $this->alliances_;
-    }
-    
+        $this->execQuery();
+        return $this->alliances_;
+    }
+
     function getKills()
     {
-      $this->execQuery();
-      return $this->klist_->getCount();
-    }
-    
+        $this->execQuery();
+        return $this->klist_->getCount();
+    }
+
     function getLosses()
     {
-      $this->execQuery();
-      return $this->llist_->getCount();
+        $this->execQuery();
+        return $this->llist_->getCount();
     }
 
     function getKillISK()
     {
-      $this->execQuery();
-      if ( !$this->klist_->getISK() ) $this->klist_->getAllKills();
-      return $this->klist_->getISK();
-    }
-    
+        $this->execQuery();
+        if (!$this->klist_->getISK()) $this->klist_->getAllKills();
+        return $this->klist_->getISK();
+    }
+
     function getLossISK()
     {
-      $this->execQuery();
-      if ( !$this->llist_->getISK() ) $this->llist_->getAllKills();
-      return $this->llist_->getISK();
-    }    
-    
+        $this->execQuery();
+        if (!$this->llist_->getISK()) $this->llist_->getAllKills();
+        return $this->llist_->getISK();
+    }
+
     function getEfficiency()
     {
-      $this->execQuery();
-      if ( $this->klist_->getISK() )
-        $efficiency = round( $this->klist_->getISK() / ( $this->klist_->getISK() + $this->llist_->getISK() ) * 100, 2 );
-      else
-        $efficiency = 0;
-      
-      return $efficiency;
-    }
-    
+        $this->execQuery();
+        if ($this->klist_->getISK())
+            $efficiency = round($this->klist_->getISK() / ($this->klist_->getISK() + $this->llist_->getISK()) * 100, 2);
+        else
+            $efficiency = 0;
+
+        return $efficiency;
+    }
+
     function getKillList()
     {
-      $this->execQuery();
-      return $this->klist_;
+        $this->execQuery();
+        return $this->klist_;
     }
 
     function getLossList()
     {
-      $this->execQuery();
-      return $this->llist_;
+        $this->execQuery();
+        return $this->llist_;
     }
 
     function getContractTarget()
     {
-      if ( $this->contractpointer_ > 30 )
-        return null;
-
-      $target = $this->contracttargets_[$this->contractpointer_];
-      if ( $target )
-        $this->contractpointer_++;
-      return $target;
-    }
-
-    function add( $name, $type, $startdate, $enddate = "" )
-    {
-      $qry = new DBQuery();
-      if ( $type == "campaign" ) $campaign = 1; else $campaign = 0;
-      if ( $enddate != "" ) $enddate = "'".$enddate."'"; else $enddate = "null";
-
-      if ( !$this->ctr_id_ ) {
-        $sql = "insert into kb3_contracts values ( null, '".$name."',
-                                                   '".KB_SITE."', ".
-                                                   $campaign.",
+        if ($this->contractpointer_ > 30)
+            return null;
+
+        $target = $this->contracttargets_[$this->contractpointer_];
+        if ($target)
+            $this->contractpointer_++;
+        return $target;
+    }
+
+    function add($name, $type, $startdate, $enddate = "")
+    {
+        $qry = new DBQuery();
+        if ($type == "campaign") $campaign = 1;
+        else $campaign = 0;
+        if ($enddate != "") $enddate = "'".$enddate."'";
+        else $enddate = "null";
+
+        if (!$this->ctr_id_)
+        {
+            $sql = "insert into kb3_contracts values ( null, '".$name."',
+                                                   '".KB_SITE."', ".$campaign.",
                                                    '".$startdate."',
                                                    ".$enddate." )";
-        $qry->execute( $sql ) or die( $qry->getErrorMsg() );
-        $this->ctr_id_ = $qry->getInsertID();
-      }
-      else {
-        $sql = "update kb3_contracts set ctr_name = '".$name."',
+            $qry->execute($sql) or die($qry->getErrorMsg());
+            $this->ctr_id_ = $qry->getInsertID();
+        }
+        else
+        {
+            $sql = "update kb3_contracts set ctr_name = '".$name."',
                                          ctr_started = '".$startdate."',
                                          ctr_ended = ".$enddate."
                                      where ctr_id = ".$this->ctr_id_;
-        $qry->execute( $sql ) or die( $qry->getErrorMsg() );
-        $this->ctr_id_ = $qry->getInsertID();
-      }
+            $qry->execute($sql) or die($qry->getErrorMsg());
+            $this->ctr_id_ = $qry->getInsertID();
+        }
     }
 
     function remove()
     {
-      $qry = new DBQuery();
-
-      $qry->execute( "delete from kb3_contracts
-                       where ctr_id = ".$this->ctr_id_ );
-
-      $qry->execute( "delete from kb3_contract_details
-                       where ctd_ctr_id = ".$this->ctr_id_ );
+        $qry = new DBQuery();
+
+        $qry->execute("delete from kb3_contracts
+                       where ctr_id = ".$this->ctr_id_);
+
+        $qry->execute("delete from kb3_contract_details
+                       where ctd_ctr_id = ".$this->ctr_id_);
     }
 
     function validate()
     {
-      $qry = new DBQuery();
-
-      $qry->execute( "select * from kb3_contracts
+        $qry = new DBQuery();
+
+        $qry->execute("select * from kb3_contracts
                        where ctr_id = ".$this->ctr_id_."
-                         and ctr_site = '".KB_SITE."'" );
-      return ( $qry->recordCount() > 0 );
-    }
-  }
-  
-  class ContractTarget
-  {
-    function ContractTarget( $contract, $crp_id, $all_id, $reg_id )
-    {
-      $this->contract_ = $contract;
-      $this->crp_id_ = $crp_id;
-      $this->all_id_ = $all_id;
-      $this->reg_id_ = $reg_id;
-
-      $this->klist_ = & new KillList();
-      $this->llist_ = & new KillList();
-      
-      if ( $this->crp_id_ ) {
-        $this->type_ = "corp";
-        $this->klist_->addVictimCorp( new Corporation( $this->crp_id_ ) );
-        $this->llist_->addInvolvedCorp( new Corporation( $this->crp_id_ ) );
-        $this->id_ = $this->crp_id_;
-      } elseif ( $this->all_id_ ) {
-        $this->type_ = "alliance";
-        $this->klist_->addVictimAlliance( new Alliance( $this->all_id_ ) );
-        $this->llist_->addInvolvedAlliance( new Alliance( $this->all_id_ ) );
-        $this->id_ = $this->all_id_;
-      } elseif ( $this->reg_id_ ) {
-        $this->type_ = "region";
-        $this->klist_->addRegion( new Region( $this->reg_id_ ) );
-        $this->llist_->addRegion( new Region( $this->reg_id_ ) );
-        $this->id_ = $this->reg_id_;
-      }
-        
-      if ( CORP_ID ) {
-        $this->klist_->addInvolvedCorp( new Corporation( CORP_ID ) );
-        $this->llist_->addVictimCorp( new Corporation( CORP_ID ) );
-      }
-      if ( ALLIANCE_ID ) {
-        $this->klist_->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) );  
-        $this->llist_->addVictimAlliance( new Alliance( ALLIANCE_ID ) );
-      }
-      
-      $this->klist_->setStartDate( $contract->getStartDate() );
-      $this->llist_->setStartDate( $contract->getStartDate() );
-      if ( $contract->getEndDate() != "" ) {
-        $this->klist_->setEndDate( $contract->getEndDate() );
-        $this->llist_->setEndDate( $contract->getEndDate() );        
-      }
+                         and ctr_site = '".KB_SITE."'");
+        return ($qry->recordCount() > 0);
+    }
+}
+
+class ContractTarget
+{
+    function ContractTarget($contract, $crp_id, $all_id, $reg_id , $sys_id)
+    {
+        $this->contract_ = $contract;
+        $this->crp_id_ = $crp_id;
+        $this->all_id_ = $all_id;
+        $this->reg_id_ = $reg_id;
+        $this->sys_id_ = $sys_id;
+
+        $this->klist_ = &new KillList();
+        $this->llist_ = &new KillList();
+
+        if ($this->crp_id_)
+        {
+            $this->type_ = "corp";
+            $this->klist_->addVictimCorp(new Corporation($this->crp_id_));
+            $this->llist_->addInvolvedCorp(new Corporation($this->crp_id_));
+            $this->id_ = $this->crp_id_;
+        }
+        elseif ($this->all_id_)
+        {
+            $this->type_ = "alliance";
+            $this->klist_->addVictimAlliance(new Alliance($this->all_id_));
+            $this->llist_->addInvolvedAlliance(new Alliance($this->all_id_));
+            $this->id_ = $this->all_id_;
+        }
+        elseif ($this->reg_id_)
+        {
+            $this->type_ = "region";
+            $this->klist_->addRegion(new Region($this->reg_id_));
+            $this->llist_->addRegion(new Region($this->reg_id_));
+            $this->id_ = $this->reg_id_;
+        }
+        elseif ($this->sys_id_)
+        {
+            $this->type_ = "system";
+            $this->klist_->addSystem(new SolarSystem($this->sys_id_));
+            $this->llist_->addSystem(new SolarSystem($this->sys_id_));
+            $this->id_ = $this->sys_id_;
+        }
+        if (CORP_ID)
+        {
+            $this->klist_->addInvolvedCorp(new Corporation(CORP_ID));
+            $this->llist_->addVictimCorp(new Corporation(CORP_ID));
+        }
+        if (ALLIANCE_ID)
+        {
+            $this->klist_->addInvolvedAlliance(new Alliance(ALLIANCE_ID));
+            $this->llist_->addVictimAlliance(new Alliance(ALLIANCE_ID));
+        }
+
+        $this->klist_->setStartDate($contract->getStartDate());
+        $this->llist_->setStartDate($contract->getStartDate());
+        if ($contract->getEndDate() != "")
+        {
+            $this->klist_->setEndDate($contract->getEndDate());
+            $this->llist_->setEndDate($contract->getEndDate());
+        }
     }
 
     function getID()
     {
-      return $this->id_;
-    }
-    
+        return $this->id_;
+    }
+
     function getName()
     {
-      if ( $this->name_ == "" ) {
+        if ($this->name_ == "")
+        {
+            $qry = new DBQuery();
+            switch ($this->type_)
+            {
+                case "corp":
+                    $qry->execute("select crp_name as name from kb3_corps where crp_id = ".$this->crp_id_);
+                    break;
+                case "alliance":
+                    $qry->execute("select all_name as name from kb3_alliances where all_id = ".$this->all_id_);
+                    break;
+                case "region":
+                    $qry->execute("select reg_name as name from kb3_regions where reg_id = ".$this->reg_id_);
+                    break;
+                case "system":
+                    $qry->execute("select sys_name as name from kb3_systems where sys_id = ".$this->sys_id_);
+                    break;
+            }
+            $row = $qry->getRow();
+            $this->name_ = $row['name'];
+        }
+        return $this->name_;
+    }
+
+    function getType()
+    {
+        return $this->type_;
+    }
+
+    function getKillList()
+    {
+        return $this->klist_;
+    }
+
+    function getLossList()
+    {
+        return $this->llist_;
+    }
+
+    function getEfficiency()
+    {
+        if ($this->klist_->getISK())
+            $efficiency = round($this->klist_->getISK() / ($this->klist_->getISK() + $this->llist_->getISK()) * 100, 2);
+        else
+            $efficiency = 0;
+
+        return $efficiency;
+    }
+
+    function getKills()
+    {
+    }
+
+    function getLosses()
+    {
+    }
+
+    function add()
+    {
         $qry = new DBQuery();
-        switch ( $this->type_ ) {
-          case "corp":
-            $qry->execute( "select crp_name as name from kb3_corps where crp_id = ".$this->crp_id_ );
-            break;
-          case "alliance":   
-            $qry->execute( "select all_name as name from kb3_alliances where all_id = ".$this->all_id_ );
-            break;
-          case "region":   
-            $qry->execute( "select reg_name as name from kb3_regions where reg_id = ".$this->reg_id_ );
-            break;
-        }
-        $row = $qry->getRow();
-        $this->name_ = $row['name'];
-      }
-      return $this->name_;
-    }
-    
-    function getType()
-    {
-      return $this->type_;
-    }
-    
-    function getKillList()
-    {
-      return $this->klist_;
-    }
-
-    function getLossList()
-    {
-      return $this->llist_;
-    }
-    
-    function getEfficiency()
-    {
-      if ( $this->klist_->getISK() )
-        $efficiency = round( $this->klist_->getISK() / ( $this->klist_->getISK() + $this->llist_->getISK() ) * 100, 2 );
-      else
-        $efficiency = 0;
-
-      return $efficiency;
-    }
-    
-    function getKills()
-    {
-    }
-    
-    function getLosses()
-    {
-    }
-
-    function add()
-    {
-      $qry = new DBQuery();
-      $sql = "insert into kb3_contract_details
+        $sql = "insert into kb3_contract_details
                      values ( ".$this->contract_->getID().",";
-      switch( $this->type_ ) {
-        case "corp":
-          $sql .= $this->id_.", 0, 0 )";
-          break;
-        case "alliance":
-          $sql .= "0, ".$this->id_.", 0 )";
-          break;
-        case "region":
-          $sql .= "0, 0, ".$this->id_." )";
-          break;
-      }
-      $qry->execute( $sql ) or die( $qry->getErrorMsg() );
+        switch ($this->type_)
+        {
+            case "corp":
+                $sql .= $this->id_.", 0, 0, 0 )";
+                break;
+            case "alliance":
+                $sql .= "0, ".$this->id_.", 0, 0 )";
+                break;
+            case "region":
+                $sql .= "0, 0, ".$this->id_.",0 )";
+                break;
+            case "system":
+                $sql .= "0, 0, 0, ".$this->id_." )";
+                break;
+        }
+        $qry->execute($sql) or die($qry->getErrorMsg());
     }
 
     function remove()
     {
-      $qry = new DBQuery();
-      $sql = "delete from kb3_contract_details
+        $qry = new DBQuery();
+        $sql = "delete from kb3_contract_details
                     where ctd_ctr_id = ".$this->contract_->getID();
-      switch( $this->type_ ) {
-        case "corp":
-          $sql .= " and ctd_crp_id = ".$this->id_;
-          break;
-        case "alliance":
-          $sql .= " and ctd_all_id = ".$this->id_;
-          break;
-        case "region":
-          $sql .= " and ctd_reg_id = ".$this->id_;
-          break;
-      }
-      $qry->execute( $sql ) or die( $qry->getErrorMsg() );
-    }
-  }
-
-  class ContractList
-  {
+        switch ($this->type_)
+        {
+            case "corp":
+                $sql .= " and ctd_crp_id = ".$this->id_;
+                break;
+            case "alliance":
+                $sql .= " and ctd_all_id = ".$this->id_;
+                break;
+            case "region":
+                $sql .= " and ctd_reg_id = ".$this->id_;
+                break;
+            case "system":
+                $sql .= " and ctd_sys_id = ".$this->id_;
+                break;
+        }
+        $qry->execute($sql) or die($qry->getErrorMsg());
+    }
+}
+
+class ContractList
+{
     function ContractList()
     {
-      $this->qry_ = new DBQuery();
-      $this->active_ = "both";
-      $this->contractcounter_ = 1;
-    }
-    
+        $this->qry_ = new DBQuery();
+        $this->active_ = "both";
+        $this->contractcounter_ = 1;
+    }
+
     function execQuery()
     {
-      if ( $this->qry_->executed() )
-        return;
-
-      $sql = "select ctr.ctr_id, ctr.ctr_started, ctr.ctr_ended, ctr.ctr_name
+        if ($this->qry_->executed())
+            return;
+
+        $sql = "select ctr.ctr_id, ctr.ctr_started, ctr.ctr_ended, ctr.ctr_name
                 from kb3_contracts ctr
                where ctr.ctr_site = '".KB_SITE."'";
-      if ( $this->active_ == "yes" )
-        $sql .= " and ( ctr_ended is null or now() <= ctr_ended )";
-      elseif ( $this->active_ == "no" )
-        $sql .= " and ( now() >= ctr_ended )";
-      
-      if ( $this->campaigns_ )
-        $sql .= " and ctr.ctr_campaign = 1";
-      else
-        $sql .= " and ctr.ctr_campaign = 0";
-        
-      $sql .= " order by ctr_ended, ctr_started desc";
-
-      //if ( $this->limit_ )
-      //  $sql .= " limit ".( $this->page_ / $this->limit_ ).", ".$this->limit_;
-
-      $this->qry_ = new DBQuery();
-      $this->qry_->execute( $sql ) or die( $this->qry_->getErrorMsg() );
-    }
-
-    function setActive( $active )
-    {
-      $this->active_ = $active;
-    }
-    
-    function setCampaigns( $campaigns )
-    {
-      $this->campaigns_ = $campaigns;
-    }
-
-    function setLimit( $limit )
-    {
-      $this->limit_ = $limit;
-    }
-
-    function setPage( $page )
-    {
-      $this->page_ = $page;
-      $this->offset_ = ( $page * $this->limit_ ) - $this->limit_;
+        if ($this->active_ == "yes")
+            $sql .= " and ( ctr_ended is null or now() <= ctr_ended )";
+        elseif ($this->active_ == "no")
+            $sql .= " and ( now() >= ctr_ended )";
+
+        if ($this->campaigns_)
+            $sql .= " and ctr.ctr_campaign = 1";
+        else
+            $sql .= " and ctr.ctr_campaign = 0";
+
+        $sql .= " order by ctr_ended, ctr_started desc";
+        // if ( $this->limit_ )
+        // $sql .= " limit ".( $this->page_ / $this->limit_ ).", ".$this->limit_;
+        $this->qry_ = new DBQuery();
+        $this->qry_->execute($sql) or die($this->qry_->getErrorMsg());
+    }
+
+    function setActive($active)
+    {
+        $this->active_ = $active;
+    }
+
+    function setCampaigns($campaigns)
+    {
+        $this->campaigns_ = $campaigns;
+    }
+
+    function setLimit($limit)
+    {
+        $this->limit_ = $limit;
+    }
+
+    function setPage($page)
+    {
+        $this->page_ = $page;
+        $this->offset_ = ($page * $this->limit_) - $this->limit_;
     }
 
     function getContract()
     {
-      //echo "off: ".$this->offset_."<br>";
-      //echo "cnt: ".$this->contractcounter_."<br>";
-      //echo "limit: ".$this->limit_."<br>";
-      $this->execQuery();
-      if ( $this->offset_ && $this->contractcounter_ < $this->offset_ ) {
-        for ( $i = 0; $i < $this->offset_; $i++ ) {
-          $row = $this->qry_->getRow();
-          $this->contractcounter_++;
-        }
-      }
-      if ( $this->limit_ && ( $this->contractcounter_ - $this->offset_ ) > $this->limit_ )
-        return null;
-
-      $row = $this->qry_->getRow();
-      if ( $row ) {
-        $this->contractcounter_++;
-        return new Contract( $row['ctr_id'] );
-      }
-      else
-        return null;
+        // echo "off: ".$this->offset_."<br>";
+        // echo "cnt: ".$this->contractcounter_."<br>";
+        // echo "limit: ".$this->limit_."<br>";
+        $this->execQuery();
+        if ($this->offset_ && $this->contractcounter_ < $this->offset_)
+        {
+            for ($i = 0; $i < $this->offset_; $i++)
+            {
+                $row = $this->qry_->getRow();
+                $this->contractcounter_++;
+            }
+        }
+        if ($this->limit_ && ($this->contractcounter_ - $this->offset_) > $this->limit_)
+            return null;
+
+        $row = $this->qry_->getRow();
+        if ($row)
+        {
+            $this->contractcounter_++;
+            return new Contract($row['ctr_id']);
+        }
+        else
+            return null;
     }
 
     function getCount()
     {
-      $this->execQuery();
-      return $this->qry_->recordCount();
+        $this->execQuery();
+        return $this->qry_->recordCount();
     }
 
     function getActive()
     {
-      return $this->active_;
-    }
-  }
-
-  class ContractListTable
-  {
-    function ContractListTable( $contractlist )
-    {
-      $this->contractlist_ = $contractlist;
-    }
-
-    function paginate( $paginate, $page = 1 )
-    {
-      if ( !$page ) $page = 1;
-      $this->paginate_ = $paginate;
-      $this->contractlist_->setLimit( $paginate );
-      $this->contractlist_->setPage( $page );
-    }
-    
+        return $this->active_;
+    }
+}
+
+class ContractListTable
+{
+    function ContractListTable($contractlist)
+    {
+        $this->contractlist_ = $contractlist;
+    }
+
+    function paginate($paginate, $page = 1)
+    {
+        if (!$page) $page = 1;
+        $this->paginate_ = $paginate;
+        $this->contractlist_->setLimit($paginate);
+        $this->contractlist_->setPage($page);
+    }
+
     function generate()
     {
-      if ( $this->contractlist_->getCount() ) {
-        $rowid = 0;
-        $html .= "<table class=kb-table width=\"98%\" align=center cellspacing=1>";
-        $html .= "<tr class=kb-table-header>";
-        $html .= "<td class=kb-table-cell width=180>Name</td>";
-        $html .= "<td class=kb-table-cell width=80 align=center>Start date</td>";
-        if ( $this->contractlist_->getActive() == "no" )
-          $html .= "<td class=kb-table-cell width=80 align=center>End date</td>";
-        $html .= "<td class=kb-table-cell width=50 align=center>Kills</td>";
-        $html .= "<td class=kb-table-cell width=70 align=center>ISK (M)</td>";
-        $html .= "<td class=kb-table-cell width=50 align=center>Losses</td>";
-        $html .= "<td class=kb-table-cell width=70 align=center>ISK (M)</td>";
-        $html .= "<td class=kb-table-cell width=70 align=center colspan=2>Efficiency</td>";        
-        $html .= "</tr>";
-        
-        $odd = false;
-        $rowclass = "kb-table-row-even";
-        while ( $contract = $this->contractlist_->getContract() ) {
-          if ( $odd ) {
+        if ($this->contractlist_->getCount())
+        {
+            $rowid = 0;
+            $html .= "<table class=kb-table width=\"98%\" align=center cellspacing=1>";
+            $html .= "<tr class=kb-table-header>";
+            $html .= "<td class=kb-table-cell width=180>Name</td>";
+            $html .= "<td class=kb-table-cell width=80 align=center>Start date</td>";
+            if ($this->contractlist_->getActive() == "no")
+                $html .= "<td class=kb-table-cell width=80 align=center>End date</td>";
+            $html .= "<td class=kb-table-cell width=50 align=center>Kills</td>";
+            $html .= "<td class=kb-table-cell width=70 align=center>ISK (M)</td>";
+            $html .= "<td class=kb-table-cell width=50 align=center>Losses</td>";
+            $html .= "<td class=kb-table-cell width=70 align=center>ISK (M)</td>";
+            $html .= "<td class=kb-table-cell width=70 align=center colspan=2>Efficiency</td>";
+            $html .= "</tr>";
+
+            $odd = false;
             $rowclass = "kb-table-row-even";
-            $odd = false;
-          }
-          else {
-            $rowclass = "kb-table-row-odd";
-            $odd = true;
-          }
-          
-          $html .= "<tr class=".$rowclass." onmouseover=\"this.className='kb-table-row-hover';\" onmouseout=\"this.className='".$rowclass."';\" onClick=\"window.location.href='?a=cc_detail&ctr_id=".$contract->getID()."';\">";
-          $html .= "<td class=kb-table-cell><b>".$contract->getName()."</b></td>";
-          $html .= "<td class=kb-table-cell align=center>".substr( $contract->getStartDate(), 0, 10 )."</td>";
-          if ( $this->contractlist_->getActive() == "no" ) {
-            if ( $contract->getEndDate() == "" )
-              $ended = "Active";
-            else
-              $ended = substr( $contract->getEndDate(), 0, 10 );
-            $html .= "<td class=kb-table-cell align=center>".$ended."</td>";
-          }
-          if ( $contract->getKills() == 0 )
-            $kclass = "kl-null";
-          else
-            $kclass = "kl-kill";
-
-          if ( $contract->getLosses() == 0 )
-            $lclass = "kl-null";
-          else
-            $lclass = "kl-loss";
-                      
-          $html .= "<td class=".$kclass." align=center>".$contract->getKills()."</td>";
-          $html .= "<td class=".$kclass." align=center>".$contract->getKillISK()."</td>";
-          $html .= "<td class=".$lclass." align=center>".$contract->getLosses()."</td>";
-          $html .= "<td class=".$lclass." align=center>".$contract->getLossISK()."</td>";          
-          $bar = new BarGraph( $contract->getEfficiency(), 100, 75 );
-          $html .= "<td class=kb-table-cell align=center width=40><b>".$contract->getEfficiency()."%</b></td>";
-          $html .= "<td class=kb-table-cell align=left width=75>".$bar->generate()."</td>";
-          $html .= "</tr>";
-        }
-        $html .= "</table>";
-        $pagesplitter = new PageSplitter( $this->contractlist_->getCount(), 10 );
-        $html .= $pagesplitter->generate();
-      }
-      else $html .= "None.";
-
-      return $html;
-    }
-  }
-
+            while ($contract = $this->contractlist_->getContract())
+            {
+                if ($odd)
+                {
+                    $rowclass = "kb-table-row-even";
+                    $odd = false;
+                }
+                else
+                {
+                    $rowclass = "kb-table-row-odd";
+                    $odd = true;
+                }
+
+                $html .= "<tr class=".$rowclass." onmouseover=\"this.className='kb-table-row-hover';\" onmouseout=\"this.className='".$rowclass."';\" onClick=\"window.location.href='?a=cc_detail&ctr_id=".$contract->getID()."';\">";
+                $html .= "<td class=kb-table-cell><b>".$contract->getName()."</b></td>";
+                $html .= "<td class=kb-table-cell align=center>".substr($contract->getStartDate(), 0, 10)."</td>";
+                if ($this->contractlist_->getActive() == "no")
+                {
+                    if ($contract->getEndDate() == "")
+                        $ended = "Active";
+                    else
+                        $ended = substr($contract->getEndDate(), 0, 10);
+                    $html .= "<td class=kb-table-cell align=center>".$ended."</td>";
+                }
+                if ($contract->getKills() == 0)
+                    $kclass = "kl-null";
+                else
+                    $kclass = "kl-kill";
+
+                if ($contract->getLosses() == 0)
+                    $lclass = "kl-null";
+                else
+                    $lclass = "kl-loss";
+
+                $html .= "<td class=".$kclass." align=center>".$contract->getKills()."</td>";
+                $html .= "<td class=".$kclass." align=center>".$contract->getKillISK()."</td>";
+                $html .= "<td class=".$lclass." align=center>".$contract->getLosses()."</td>";
+                $html .= "<td class=".$lclass." align=center>".$contract->getLossISK()."</td>";
+                $bar = new BarGraph($contract->getEfficiency(), 100, 75);
+                $html .= "<td class=kb-table-cell align=center width=40><b>".$contract->getEfficiency()."%</b></td>";
+                $html .= "<td class=kb-table-cell align=left width=75>".$bar->generate()."</td>";
+                $html .= "</tr>";
+            }
+            $html .= "</table>";
+            $pagesplitter = new PageSplitter($this->contractlist_->getCount(), 10);
+            $html .= $pagesplitter->generate();
+        }
+        else $html .= "None.";
+
+        return $html;
+    }
+}
 ?>

dev/common/class.killboard.php

@@ -30 +30 @@
                  from kb3_contracts
                  where ctr_campaign = 1
-                   and ctr_site = '" . $this->site_ . "'";
+                   and ctr_site = '".$this->site_."'";
         if ($active) $sql .= " and ctr_ended is null";
         $qry->execute($sql) or die ($qry->getErrorMessage());
@@ -42 +42 @@
                  from kb3_contracts
                  where ctr_campaign = 0
-                   and ctr_site = '" . $this->site_ . "'";
+                   and ctr_site = '".$this->site_."'";
         if ($active) $sql .= " and ( ctr_ended is null or now() <= ctr_ended )";
         $qry->execute($sql) or die ($qry->getErrorMessage());
@@ -58 +58 @@
     {
         $this->qry_ = new DBQuery();
-        $this->sql_ = "select * from kb3_config where cfg_site = '" . $site . "'";
+        $this->sql_ = "select * from kb3_config where cfg_site = '".$site."'";
 
         $this->site_ = $site;
@@ -106 +106 @@
             return $this->config[$key];
         }
-        return 0;
+        return false;
     }
 
@@ -113 +113 @@
         $qry = new DBQuery();
         $qry->execute("select cfg_value from kb3_config
-                       where cfg_key = '" . $key . "'
-                         and cfg_site = '" . $this->site_ . "'");
+                       where cfg_key = '".$key."'
+                               and cfg_site = '".$this->site_."'");
         if ($qry->recordCount())
         {
             $sql = "update kb3_config
-                   set cfg_value = '" . $value . "'
-                 where cfg_site = '" . $this->site_ . "'
-                   and cfg_key = '" . $key . "'";
+                    set cfg_value = '".$value."'
+                    where cfg_site = '".$this->site_."'
+                        and cfg_key = '".$key."'";
         }
         else
         {
-            $sql = "insert into kb3_config values ( '" . $this->site_ . "',
-                                                '" . $key . "',
-                                                '" . $value . "' )";
+            $sql = "insert into kb3_config values ( '".$this->site_."',
+                                                '".$key."',
+                                                '".$value."' )";
         }
         $qry->execute($sql) or die($qry->getErrorMsg());
@@ -132 +132 @@
     }
 
+    function delConfig($key)
+    {
+        $qry = new DBQuery();
+        $qry->execute("delete from kb3_config where cfg_key = '".$key."'
+                               and cfg_site = '".$this->site_."'");
+        if (isset($this->config[$key]))
+        {
+            unset($this->config[$key]);
+        }
+    }
+
     function checkCheckbox($name)
     {
-        if ($_POST[$name] == "on")
+        if ($_POST[$name] == 'on')
         {
             $this->setConfig($name, '1');

dev/common/class.map.php

@@ -1 +1 @@
 <?php
-require_once("db.php");
-require_once("globals.php");
+require_once('db.php');
+require_once('globals.php');
 
 class MapView
@@ -13 +13 @@
         $this->offset_ = 10;
         // colors
+        /* unused, must have been some kind of painting by security
         $this->sys_colors_[0] = array(200, 20, 48);
         $this->sys_colors_[1] = array(200, 20, 48);
@@ -24 +25 @@
         $this->sys_colors_[9] = array(99, 241, 255);
         $this->sys_colors_[10] = array(99, 241, 255);
+        */
+
         $this->linecolor_ = array(75, 75, 75);
         $this->captioncolor_ = array(110, 110, 110);
-        // $this->normalcolor_ = array( 140, 90, 140 );
+        $this->bgcolor_ = array(30, 30, 30);
         $this->normalcolor_ = array(81, 103, 146);
-        // $this->normalcolor_ = array( 151, 141, 191 );
         $this->hlcolor_ = array(200, 200, 200);
     }
 
-    function setBackground()
-    {
+    function setbgcolor($r, $g, $b)
+    {
+        $this->bgcolor_ = array($r, $g, $b);
+    }
+
+    function setlinecolor($r, $g, $b)
+    {
+        $this->linecolor_ = array($r, $g, $b);
+    }
+
+    function setcaptcolor($r, $g, $b)
+    {
+        $this->captioncolor_ = array($r, $g, $b);
+    }
+
+    function setnormalcolor($r, $g, $b)
+    {
+        $this->normalcolor_ = array($r, $g, $b);
+    }
+
+    function sethlcolor($r, $g, $b)
+    {
+        $this->hlcolor_ = array($r, $g, $b);
     }
 
@@ -65 +88 @@
         $this->systemid_ = $systemid;
 
-        $sql = "select reg.reg_id, reg.reg_name, con.con_id, con.con_name, sys.sys_name, sys.sys_sec
+        $sql = 'select reg.reg_id, reg.reg_name, con.con_id, con.con_name, sys.sys_name, sys.sys_sec
                 from kb3_regions reg, kb3_constellations con, kb3_systems sys
                where reg.reg_id = con.con_reg_id
                  and con.con_id = sys.sys_con_id
-                 and sys.sys_id = " . $this->systemid_;
+                 and sys.sys_id = '.$this->systemid_;
 
         $qry = new DBQuery();
-        $qry->execute($sql) or die($qry->getErrorMsg());
+        $qry->execute($sql);
         $row = $qry->getRow();
 
@@ -90 +113 @@
     function generate()
     {
-        $sql = "select sys.sys_x, sys.sys_y, sys.sys_z, sys.sys_sec,
-                     sys.sys_id, sys.sys_name, sys.sys_eve_id, sjp.sjp_to, con.con_id,
+        $sql = 'select sys.sys_x, sys.sys_y, sys.sys_z, sys.sys_sec,
+                   sys.sys_id, sys.sys_name, sys.sys_eve_id, sjp.sjp_to, con.con_id,
                        con.con_name, reg.reg_id, reg.reg_name,
-                       reg.reg_x, reg.reg_z
-                  from kb3_systems sys, kb3_system_jumps sjp,
-                       kb3_constellations con, kb3_regions reg
-                 where con.con_id = sys.sys_con_id
+                       reg.reg_x, reg.reg_z
+                   from kb3_systems sys, kb3_system_jumps sjp,
+                       kb3_constellations con, kb3_regions reg
+                   where con.con_id = sys.sys_con_id
                    and reg.reg_id = con.con_reg_id
-                   and sjp.sjp_from = sys.sys_eve_id";
+                   and sjp.sjp_from = sys.sys_eve_id';
 
         $regioncache = "cache/map/" . $this->regionid_ . "_" . $this->imgwidth_ . ".png";
@@ -134 +157 @@
             $white = imagecolorallocate($img, 255, 255, 255);
             $red = imagecolorallocate($img, 255, 0, 0);
-            $bgcolor = imagecolorallocate($img, 30, 30, 30);
+            $bgcolor = imagecolorallocate($img, $this->bgcolor_[0], $this->bgcolor_[1], $this->bgcolor_[2]);
             imagefilledrectangle($img, 0, 0, $this->imgwidth_, $this->imgheight_, $bgcolor);
 
@@ -198 +221 @@
             // exit;
             // exit;
-
             // draw lines
             if ($this->showlines_)
@@ -208 +230 @@
                     $py = $this->offset_ + ($sys[$n][1] - $minz) * $yscale;
 
-                    $line_col = imagecolorallocate($img, $this->linecolor_[0],
-                        $this->linecolor_[1],
-                        $this->linecolor_[2]);
+                    $line_col = imagecolorallocate($img, $this->linecolor_[0], $this->linecolor_[1], $this->linecolor_[2]);
 
                     for ($m = 0; $m <= $sys[$n][3]; $m++)
@@ -289 +309 @@
                     $ed = 5;
                 }
-
                 // bug compat: imagefilledellipse doesnt draw ellipses with 1px size
-                //             on some installations
+                // on some installations
                 if ($ed < 1)
                 {
                     imagesetpixel($img, $px, $py, $color);
+                }
+                elseif ($ed < 3)
+                {
+                    imagesetpixel($img, $px, $py, $color);
+                    imagesetpixel($img, $px+1, $py, $color);
+                    imagesetpixel($img, $px-1, $py, $color);
+                    imagesetpixel($img, $px, $py-1, $color);
+                    imagesetpixel($img, $px, $py+1, $color);
                 }
                 else
@@ -307 +334 @@
         $captioncolor = imagecolorallocate($img, $this->captioncolor_[0], $this->captioncolor_[1], $this->captioncolor_[2]);
         if (strlen($this->title_) > 0)
+        {
             $title = $this->title_ . " " . $caption;
+        }
         else
+        {
             $title = $caption;
+        }
 
         imagestring($img, 1, 2, 2, $title, $captioncolor);
@@ -318 +349 @@
         // "../fonts/04B_03__.TTF",
         // $title );
-        if ($this->mode_ == "map" && !$cached) imagepng($img, $regioncache);
+        if ($this->mode_ == "map" && !$cached)
+        {
+            imagepng($img, $regioncache);
+        }
         header("Content-type: image/png");
         imagepng($img);

dev/common/mapview.php

@@ -2 +2 @@
 require_once("class.map.php");
 
-$view = new MapView($_GET['mode'], $_GET['size']);
-$view->setSystemID($_GET['sys_id']);
+function checkColors($context)
+{
+    global $config, $view;
+
+    $a = array('line', 'bg', 'hl', 'normal', 'capt');
+    foreach ($a as $b)
+    {
+        if ($string = $config->getConfig('map_'.$context.'_cl_'.$b))
+        {
+            $tmp = explode(',', $string);
+            $function = 'set'.$b.'color';
+            eval('$view->'.$function.'($tmp[0], $tmp[1], $tmp[2]);');
+        }
+    }
+}
+
+$view = new MapView(slashfix($_GET['mode']), intval($_GET['size']));
+$view->setSystemID(intval($_GET['sys_id']));
 switch ($_GET['mode'])
 {
     case "map":
         $view->setTitle("Region");
+        $view->showLines($config->getConfig('map_map_showlines'));
+        checkColors('map');
         break;
     case "region":
         $view->setTitle("Constellation");
-        $view->showLines(true);
+        $view->showLines($config->getConfig('map_reg_showlines'));
         $view->setOffset(25);
+        checkColors('reg');
         break;
     case "cons":
-        $view->showLines(true);
-        $view->showSysNames(true);
+        $view->showLines($config->getConfig('map_con_showlines'));
+        $view->showSysNames($config->getConfig('map_con_shownames'));
         $view->setOffset(25);
+        checkColors('con');
         break;
+    default: exit;
 }