Changeset 188

Timestamp:

02/17/07 15:24:06 (15 years ago)

Author:

exi

Message:

Changed default td width for options to 160px.
Added the appropiate timeframe to the fast contractlisttable.
Events now can also return a reference to a variable containing additional information.
Killlists now return a non formatted isk-value for losses/kills, please report any errors on other pages.
Added a custom user menu, able to be shownon every page.
Added some code for user logins, please ignore it for now.
Added a small battle statistics frame to the battle overview.
To login as admin now just leave user blank and use the admin password.

Location:

dev

Files:

• common/admin/admin_user.php (added)
• common/cc_detail.php (modified) (7 diffs)
• common/class.box.php (modified) (1 diff)
• common/class.contract.php (modified) (2 diffs)
• common/class.event.php (modified) (1 diff)
• common/class.killlist.php (modified) (3 diffs)
• common/class.killsummarytable.php (modified) (4 diffs)
• common/class.page.php (modified) (3 diffs)
• common/class.session.php (modified) (3 diffs)
• common/class.user.php (added)
• common/index.php (modified) (2 diffs)
• common/kill_related.php (modified) (1 diff)
• common/kills.php (modified) (1 diff)
• common/login.php (modified) (1 diff)
• common/register.php (added)
• templates/admin_options_checkbox.tpl (modified) (1 diff)
• templates/admin_options_custom.tpl (modified) (1 diff)
• templates/admin_options_edit.tpl (modified) (1 diff)
• templates/admin_options_field_foot.tpl (modified) (1 diff)
• templates/admin_options_select.tpl (modified) (1 diff)
• templates/battle_overview_table.tpl (modified) (1 diff)
• templates/contractlisttable.tpl (modified) (1 diff)
• templates/error.tpl (added)
• templates/user_login.tpl (added)
• templates/user_register.tpl (added)

dev/common/cc_detail.php

@@ -19 +19 @@
     $title = "Contract details";
 
-$page = new Page($title . " - " . $contract->getName());
+$page = new Page($title." - ".$contract->getName());
 
 $html .= "<table align=center class=kb-table width=\"100%\" height=\"80\" border=\"0\" cellspacing=1><tr class=kb-table-row-even><td rowspan=5 align=center width=80 height=80>";
 // table class=kb-subtable cellspacing=0><tr class=kb-table-row-even><td width=80 height=80 align=center>";
 if ($contract->getCampaign())
-    $html .= "<img src=\"" . IMG_URL . "/campaign-big.gif\" align=center>";
-else
-    $html .= "<img src=\"" . IMG_URL . "/contract-big.gif\" align=center>";
+    $html .= "<img src=\"".IMG_URL."/campaign-big.gif\" align=center>";
+else
+    $html .= "<img src=\"".IMG_URL."/contract-big.gif\" align=center>";
 
 $html .= "</td>";
@@ -35 +35 @@
 else
     $ended = substr($contract->getEndDate(), 0, 10);
-$html .= "<td class=kb-table-cell><b>Start date:</b></td><td class=kb-table-cell width=120><b>" . substr($contract->getStartDate(), 0, 10) . "</b></td><td class=kb-table-cell><b>End date:</b></td><td class=kb-table-cell width=120><b>" . $ended . "</b></td></tr>";
-$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Kills:</b></td><td class=kl-kill>" . $contract->getKills() . "</td><td class=kb-table-cell><b>Losses:</b></td><td class=kl-loss>" . $contract->getLosses() . "</td></tr>";
-$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Damage done (ISK):</b></td><td class=kl-kill>" . $contract->getKillISK() . "M</td><td class=kb-table-cell><b>Damage received (ISK):</b></td><td class=kl-loss>" . $contract->getLossISK() . "M</td></tr>";
-$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Runtime:</b></td><td class=kb-table-cell><b>" . $contract->getRunTime() . " days</b></td><td class=kb-table-cell><b>Efficiency:</b></td><td class=kb-table-cell><b>" . $contract->getEfficiency() . "%</b></td></tr>";
+$html .= "<td class=kb-table-cell><b>Start date:</b></td><td class=kb-table-cell width=120><b>".substr($contract->getStartDate(), 0, 10)."</b></td><td class=kb-table-cell><b>End date:</b></td><td class=kb-table-cell width=120><b>".$ended."</b></td></tr>";
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Kills:</b></td><td class=kl-kill>".$contract->getKills()."</td><td class=kb-table-cell><b>Losses:</b></td><td class=kl-loss>".$contract->getLosses()."</td></tr>";
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Damage done (ISK):</b></td><td class=kl-kill>".round($contract->getKillISK()/1000000, 2)."M</td><td class=kb-table-cell><b>Damage received (ISK):</b></td><td class=kl-loss>".round($contract->getLossISK()/1000000, 2)."M</td></tr>";
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Runtime:</b></td><td class=kb-table-cell><b>".$contract->getRunTime()." days</b></td><td class=kb-table-cell><b>Efficiency:</b></td><td class=kb-table-cell><b>".$contract->getEfficiency()."%</b></td></tr>";
 $html .= "</table>";
 // $html .= "</td></tr></table>";
@@ -63 +63 @@
             $summary->setView('combined');
 
-            $html .= "<br><div class=kb-contract-target-header>Target " . $target->getType() . " - ";
+            $html .= "<br><div class=kb-contract-target-header>Target ".$target->getType()." - ";
             switch ($target->getType()) {
                 case "corp":
-                    $html .= "<a class=kb-contract href=\"?a=" . $target->getType() . "_detail&crp_id=" . $target->getID() . "\">" . $target->getName() . "</a>";
+                    $html .= "<a class=kb-contract href=\"?a=".$target->getType()."_detail&crp_id=".$target->getID()."\">".$target->getName()."</a>";
                     break;
                 case "alliance":
-                    $html .= "<a class=kb-contract href=\"?a=" . $target->getType() . "_detail&all_id=" . $target->getID() . "\">" . $target->getName() . "</a>";
+                    $html .= "<a class=kb-contract href=\"?a=".$target->getType()."_detail&all_id=".$target->getID()."\">".$target->getName()."</a>";
                     break;
                 case "system":
-                    $html .= "<a class=kb-contract href=\"?a=" .$target->getType() . "_detail&sys_id=" . $target->getID() . "\">" . $target->getName() . "</a>";
+                    $html .= "<a class=kb-contract href=\"?a=" .$target->getType()."_detail&sys_id=".$target->getID()."\">".$target->getName()."</a>";
                     break;
                 case "region":
@@ -90 +90 @@
             $bar = new BarGraph($efficiency, 100, 120);
             $html .= "<table class=kb-table cellspacing=1 border=\"0\" width=\"100%\"><tr class=kb-table-row-even>";
-            $html .= "<td class=kb-table-cell width=108><b>Totals:</b></td><td class=kl-kill-bg width=60 align=center>" . $summary->getTotalKills() . "</td><td class=kl-kill-bg width=60 align=center>" . $summary->getTotalKillISK() . "M</td>";
-            $html .= "<td class=kl-loss-bg width=64 align=center>" . $summary->getTotalLosses() . "</td><td class=kl-loss-bg width=60 align=center>" . $summary->getTotalLossISK() . "M</td></tr></table>";
+            $html .= "<td class=kb-table-cell width=108><b>Totals:</b></td><td class=kl-kill-bg width=60 align=center>".$summary->getTotalKills()."</td><td class=kl-kill-bg width=60 align=center>".round($summary->getTotalKillISK()/1000000, 2)."M</td>";
+            $html .= "<td class=kl-loss-bg width=64 align=center>".$summary->getTotalLosses()."</td><td class=kl-loss-bg width=60 align=center>".round($summary->getTotalLossISK()/1000000, 2)."M</td></tr></table>";
 
             $html .= "</td><td align=left>";
 
             $html .= "<table class=kb-table cellspacing=1 border=\"0\"><tr class=kb-table-row-even>";
-            $html .= "<td class=kb-table-cell width=108><b>Efficiency:</b></td><td class=kb-table-cell align=center colspan=2 width=120><b>" . $efficiency . "%</b></td>";
-            $html .= "<td class=kb-table-cell colspan=2 width=120>" . $bar->generate() . "</td></tr>";
+            $html .= "<td class=kb-table-cell width=108><b>Efficiency:</b></td><td class=kb-table-cell align=center colspan=2 width=120><b>".$efficiency."%</b></td>";
+            $html .= "<td class=kb-table-cell colspan=2 width=120>".$bar->generate()."</td></tr>";
             $html .= "</tr></table>";
 
@@ -201 +201 @@
 $menubox->setIcon("menu-item.gif");
 $menubox->addOption("caption","Overview");
-$menubox->addOption("link","Target overview", "?a=cc_detail&ctr_id=" . $_GET['ctr_id']);
+$menubox->addOption("link","Target overview", "?a=cc_detail&ctr_id=".$_GET['ctr_id']);
 $menubox->addOption("caption","Kills & losses");
-$menubox->addOption("link","Recent activity", "?a=cc_detail&ctr_id=" . $_GET['ctr_id'] . "&view=recent_activity");
-$menubox->addOption("link","All kills", "?a=cc_detail&ctr_id=" . $_GET['ctr_id'] . "&view=kills");
-$menubox->addOption("link","All losses", "?a=cc_detail&ctr_id=" . $_GET['ctr_id'] . "&view=losses");
+$menubox->addOption("link","Recent activity", "?a=cc_detail&ctr_id=".$_GET['ctr_id']."&view=recent_activity");
+$menubox->addOption("link","All kills", "?a=cc_detail&ctr_id=".$_GET['ctr_id']."&view=kills");
+$menubox->addOption("link","All losses", "?a=cc_detail&ctr_id=".$_GET['ctr_id']."&view=losses");
 
 $page->addContext($menubox->generate());
@@ -221 +221 @@
 else
     $campaign = "contract";
-$tkbox = new AwardBox($tklist, "Top killers", "kills in this " . $campaign, "kills", "eagle");
+$tkbox = new AwardBox($tklist, "Top killers", "kills in this ".$campaign, "kills", "eagle");
 
 $page->addContext($tkbox->generate());
@@ -237 +237 @@
 
     $tklist->generate();
-    $tkbox = new AwardBox($tklist, "Top scorers", "points in this " . $campaign, "points", "redcross");
+    $tkbox = new AwardBox($tklist, "Top scorers", "points in this ".$campaign, "points", "redcross");
     $page->addContext($tkbox->generate());
 }

dev/common/class.box.php

@@ -26 +26 @@
     function generate()
     {
-        global $config, $smarty;
+        global $smarty;
 
         $smarty->assign('count', count($this->box_array));

dev/common/class.contract.php

@@ -596 +596 @@
                 $sql .= " and kll.kll_all_id in ( ".join(',', $contract->klist_->vic_all_)." )";
 
+            if ($contract->klist_->timeframe_)
+            {
+                $sql .= $contract->klist_->timeframe_;
+            }
+
             $result = $qry->execute($sql);
             $kdata = $qry->getRow($result);
@@ -645 +650 @@
             if ($contract->llist_->vic_all_)
                 $sql .= " and kll.kll_all_id in ( ".join(',', $contract->llist_->vic_all_)." )";
+
+            if ($contract->llist_->timeframe_)
+            {
+                $sql .= $contract->llist_->timeframe_;
+            }
 
             $result = $qry->execute($sql);

dev/common/class.event.php

@@ -48 +48 @@
                     else
                     {
-                        call_user_func($cb, null);
+                        call_user_func($cb, $object);
                     }
                 }

dev/common/class.killlist.php

@@ -147 +147 @@
                 $this->sql_ .= " and kll.kll_system_id = ".$rrow['kll_system_id']."
                            and kll.kll_timestamp <=
-                               date_add( '".$rrow['kll_timestamp']."', INTERVAL '15:0' MINUTE_SECOND )
+                               date_add( '".$rrow['kll_timestamp']."', INTERVAL '60:0' MINUTE_SECOND )
                            and kll.kll_timestamp >=
-                               date_sub( '".$rrow['kll_timestamp']."', INTERVAL '15:0' MINUTE_SECOND )";
+                               date_sub( '".$rrow['kll_timestamp']."', INTERVAL '60:0' MINUTE_SECOND )";
             }
             // timeframe
@@ -266 +266 @@
             }
 
-            $this->killisk_ += $row['scl_value'] / 1000000;
+            $this->killisk_ += $row['scl_value'];
             $this->killpoints_ += $row['kll_points'];
 
@@ -281 +281 @@
             $kill->setVictimShipExternalID($row['shp_externalid']);
             $kill->setVictimShipClassName($row['scl_class']);
-            $kill->setVictimShipValue(round($row['scl_value'] / 1000000, 2));
+            $kill->setVictimShipValue($row['scl_value']);
             $kill->setVictimID($row['kll_victim_id']);
             $kill->setFBPilotName($row['fbplt_name']);

dev/common/class.killsummarytable.php

@@ -293 +293 @@
             }
 
-            $html .= "<tr class=" . $class . ">";
+            $html .= "<tr class=".$class.">";
 
             $qrystring = preg_replace("/&scl_id=([0-9]?[0-9])/", "", $_SERVER['QUERY_STRING']);
@@ -303 +303 @@
             $html .= "<td class=kb-table-cell><b>";
 
-            if ($this->filter_) $html .= "<a class=kb-shipclass" . $highlight . " href=\"?" . $qrystring . "&scl_id=" . $v['id'] . "\">";
+            if ($this->filter_) $html .= "<a class=kb-shipclass".$highlight." href=\"?".$qrystring."&scl_id=".$v['id']."\">";
 
             $html .= $k;
@@ -311 +311 @@
             $html .= "</b></td>";
 
-            $html .= "<td class=" . $kclass . " align=center>" . $v['kills'] . "</td>";
+            $html .= "<td class=".$kclass." align=center>".$v['kills']."</td>";
             if ($this->verbose_)
-                $html .= "<td class=" . $kclass . " align=center>" . $v['kills_isk'] . "</td>";
-            $html .= "<td class=" . $lclass . " align=center>" . $v['losses'] . "</td>";
+                $html .= "<td class=".$kclass." align=center>".round($v['kills_isk']/1000000, 2)."</td>";
+            $html .= "<td class=".$lclass." align=center>".$v['losses']."</td>";
             if ($this->verbose_)
-                $html .= "<td class=" . $lclass . " align=center>" . $v['losses_isk'] . "</td>";
+                $html .= "<td class=".$lclass." align=center>".round($v['losses_isk']/1000000, 2)."</td>";
 
             $html .= "</tr>";
@@ -337 +337 @@
             $html .= "<table align=center><tr><td align=center valign=top class=weeknav>";
             $qrystring = preg_replace("/&scl_id=([0-9]?[0-9])/", "", $_SERVER['QUERY_STRING']);
-            $html .= "[<a href=\"?" . $qrystring . "\">clear filter</a>]</td></tr></table>";
+            $html .= "[<a href=\"?".$qrystring."\">clear filter</a>]</td></tr></table>";
         }
 

dev/common/class.page.php

@@ -40 +40 @@
     }
 
+    function error($message)
+    {
+        global $smarty;
+
+        $smarty->assign('error', $message);
+        $this->setContent($smarty->fetch(get_tpl('error')));
+        $this->generate();
+    }
+
     function generate()
     {
-        global $config, $smarty;
+        global $smarty;
 
         $smarty->assign('kb_title', KB_TITLE.' Killboard - '.$this->title_);
@@ -129 +138 @@
         $smarty->assign('profile', KB_PROFILE);
         $smarty->assign('content_html', $this->contenthtml_);
+        if (config::get('user_showmenu'))
+        {
+            $this->contexthtml_ = user::menu().$this->contexthtml_;
+        }
         $smarty->assign('context_html', $this->contexthtml_);
         $smarty->display(get_tpl('index'));
@@ -183 +196 @@
         $this->cachetime_ = $cachetime;
     }
-
-    function error($errormsg)
-    {
-        echo $errormsg;
-        exit;
-    }
 }
 

dev/common/class.session.php

@@ -1 +1 @@
 <?php
-require_once('db.php');
 
 class Session
@@ -9 +8 @@
         {
             session_start();
+            if (isset($_SESSION['user']))
+            {
+                user::loggedin(true);
+            }
         }
     }
@@ -22 +25 @@
     }
 
-    function create($super)
+    function create($admin = false)
     {
         session_start();
-        $_SESSION['admin'] = 1;
-        $_SESSION['admin_super'] = $super;
+        $_SESSION['admin'] = $admin;
     }
 

dev/common/index.php

@@ -2 +2 @@
 // many ppl had issues with pear and relative paths
 require_once('common/db.php');
+require_once('smarty/Smarty.class.php');
 require_once('class.killboard.php');
-require_once('smarty/Smarty.class.php');
 require_once('class.event.php');
 require_once('class.roles.php');
+require_once('class.user.php');
 
-// smarty doesnt like it (i either)
+// smarty doesnt like it
 @set_magic_quotes_runtime(0);
 
@@ -68 +69 @@
 foreach ($mods_active as $mod)
 {
-    // load all modules which need initialization
+    // load all active modules which need initialization
     if (file_exists('mods/'.$mod.'/init.php'))
     {

dev/common/kill_related.php

@@ -367 +367 @@
 $html .= $smarty->fetch(get_tpl('battle_overview'));
 
-$html .= "<div class=kb-kills-header>Related kills</div>";
+$html .= '<div class="kb-kills-header">Battle Statistics</div>';
+$html .= "<table class=kb-table width=\"100%\" border=\"0\" cellspacing=1><tr class=kb-table-row-even>";
+
+$kill_summary = new KillSummaryTable($klist, $llist);
+$summary_html = $kill_summary->generate();
+
+$html .= "<td class=kb-table-cell width=180><b>Kills:</b></td><td class=kl-kill>".$kill_summary->getTotalKills()."</td></tr>";
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Losses:</b></td><td class=kl-loss>".$kill_summary->getTotalLosses()."</td></tr>";
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Damage done (ISK):</b></td><td class=kl-kill>".round($kill_summary->getTotalKillISK()/1000000, 2)."M</td></tr>";
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Damage received (ISK):</b></td><td class=kl-loss>".round($kill_summary->getTotalLossISK()/1000000, 2)."M</td></tr>";
+if ($kill_summary->getTotalKillISK())
+{
+    $efficiency = round($kill_summary->getTotalKillISK() / ($kill_summary->getTotalKillISK() + $kill_summary->getTotalLossISK()) * 100, 2);
+}
+else
+{
+    $efficiency = 0;
+}
+
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Efficiency:</b></td><td class=kb-table-cell><b>" . $efficiency . "%</b></td></tr>";
+
+$html .= "</table>";
+$html .= "<br/>";
+
+
+$html .= "<div class=\"kb-kills-header\">Related kills</div>";
 
 $ktable = new KillListTable($klist);
 $html .= $ktable->generate();
 
-$html .= "<div class=kb-losses-header>Related losses</div>";
+$html .= "<div class=\"kb-losses-header\">Related losses</div>";
 
 $ltable = new KillListTable($llist);

dev/common/kills.php

@@ -102 +102 @@
 $page->addContext($tkbox->generate());
 
-$killboard = $page->killboard_;
-$config = $killboard->getConfig();
-if ($config->getKillPoints())
+if (config::get('kill_points'))
 {
     $tklist = new TopScoreList();

dev/common/login.php

@@ -1 +1 @@
 <?php
-require_once("db.php");
-require_once("class.page.php");
+require_once('class.page.php');
+require_once('class.user.php');
 
-$page = new Page("Login");
+$page = new Page('Login');
 
-if (trim($_POST['password']))
+if (trim($_POST['usrpass']))
 {
-    if ($_POST['password'] == ADMIN_PASSWORD || $_POST['password'] == SUPERADMIN_PASSWORD)
+    if ($_POST['usrlogin'] == '' && $_POST['usrpass'] == ADMIN_PASSWORD)
     {
-        if ($_POST['password'] == SUPERADMIN_PASSWORD)
+        $page->session_->create(1);
+
+        header('Location: ?a=admin');
+    }
+    else
+    {
+        $result = user::login($_POST['usrlogin'], $_POST['usrpass']);
+        if ($result)
         {
-            $redir = "admin";
-            $super = 1;
+            header('Location: ?a=home');
         }
         else
         {
-            $redir = "admin";
-            $super = 0;
+            $smarty->assign('error', 'Login error, please check your username and password.');
         }
-
-        $page->session_->create($super);
-
-        header("Location: ?a=" . $redir);
     }
-    else
-        $html .= "Invalid password.<br><br>";
 }
 
-$html .= "<form name=login id=login method=post action=?a=login>";
-$html .= "Admin password: <input name=password id=password type=password>&nbsp;<input type=\"submit\" name=submit id=submit name=Go value=Go>";
-$html .= "</form>";
-
-$page->setContent($html);
+$page->setContent($smarty->fetch(get_tpl('user_login')));
 $page->generate();
 ?>

dev/templates/admin_options_checkbox.tpl

@@ -1 +1 @@
 {strip}
-<tr><td width="120"><b>{$opt.descr}:</b></td><td>
+<tr><td width="160"><b>{$opt.descr}:</b></td><td>
 <input type="checkbox" id="option[{$opt.name}]" name="option[{$opt.name}]"
 {if $config->getConfig($opt.name)} checked="checked"{/if}>

dev/templates/admin_options_custom.tpl

@@ -1 +1 @@
 {strip}
-<tr><td width="120"><b>{$opt.descr}:</b></td><td>
+<tr><td width="160"><b>{$opt.descr}:</b></td><td>
 {$opt.html}
 </td></tr>

dev/templates/admin_options_edit.tpl

@@ -1 +1 @@
 {strip}
-<tr><td width="120"><b>{$opt.descr}:</b></td><td>
+<tr><td width="160"><b>{$opt.descr}:</b></td><td>
 <input type="edit" id="option[{$opt.name}]" name="option[{$opt.name}]"
 value="{$config->getConfig($opt.name)}" size="{$options.size}" maxlength="{$options.maxlength}">

dev/templates/admin_options_field_foot.tpl

@@ -1 +1 @@
 <div class="block-header2">Save changes</div>
 <table class="kb-subtable">
-<tr><td width="120"></td><td><input type="submit" name="submit" value="Save"></td></tr>
+<tr><td width="160"></td><td><input type="submit" name="submit" value="Save"></td></tr>
 </table>
 </form>

dev/templates/admin_options_select.tpl

@@ -1 +1 @@
 {strip}
-<tr><td width="120"><b>{$opt.descr}:</b></td><td>
+<tr><td width="160"><b>{$opt.descr}:</b></td><td>
 <select id="option[{$opt.name}]" name="option[{$opt.name}]">
 {foreach from=$options key=key item=i}

dev/templates/battle_overview_table.tpl

@@ -1 +1 @@
 <table class="kb-table" width="95%" align="center">
     <tr class="kb-table-header">
-      <td class="kb-table-header" colspan="2" align="center">Ship/Pilot</td>
+      <td class="kb-table-header" colspan="2" align="center">Pilot/Ship</td>
       <td class="kb-table-header" align="center" style="min-width: 45%; width: 45%; max-width: 45%;">Corp/Alliance</td>
     </tr>

dev/templates/contractlisttable.tpl

@@ -25 +25 @@
 {/if}
   <td class="kl-kill" align="center">{$i.kills}</td>
-  <td class="kl-kill" align="center">{$i.killisk/1000000}</td>
+  <td class="kl-kill" align="center">{$i.killisk/1000000|string_format:"%.2f"}</td>
   <td class="kl-loss" align="center">{$i.losses}</td>
-  <td class="kl-loss" align="center">{$i.lossisk/1000000}</td>
+  <td class="kl-loss" align="center">{$i.lossisk/1000000|string_format:"%.2f"}</td>
   <td class="kb-table-cell" align="center" width="40"><b>{$i.efficiency}</b></td>
   <td class="kb-table-cell" align="left" width="75">{$i.bar}</td>