Changeset 134

Timestamp:

12/06/06 03:11:17 (14 years ago)

Author:

exi

Message:

Added standings-management.
Changed installer step 3 to only use POST data now.
Character portraits should now look a bit better.
Changed all smarty template requests to use a wrapper function.
Modified standard page for IGB.
Added php compat file to reduce minimal needed version to 4.0.9.

Location:

dev

Files:

• cache (modified) (1 prop)
• common/admin.php (modified) (2 diffs)
• common/admin_mapoptions.php (modified) (1 diff)
• common/admin_menu.php (modified) (1 diff)
• common/admin_postperm.php (modified) (1 diff)
• common/admin_standings.php (added)
• common/alliance_thumb.php (added)
• common/class.box.php (modified) (5 diffs)
• common/class.comments.php (modified) (1 diff)
• common/class.item.php (modified) (4 diffs)
• common/class.killlisttable.php (modified) (1 diff)
• common/class.page.php (modified) (3 diffs)
• common/corpportrait.php (modified) (1 diff)
• common/db.php (modified) (1 diff)
• common/globals.php (modified) (1 diff)
• common/igb.php (modified) (1 diff)
• common/index.php (modified) (1 diff)
• common/kill_detail.php (modified) (1 diff)
• common/kill_export.php (modified) (1 diff)
• common/php_compat.php (added)
• common/portrait.php (modified) (1 diff)
• common/standings.php (added)
• img/corps/0.jpg (added)
• img/sta_alliance.png (added)
• img/sta_bad.png (added)
• img/sta_corp.png (added)
• img/sta_gang.png (added)
• img/sta_good.png (added)
• img/sta_high.png (added)
• img/sta_horrible.png (added)
• img/sta_war.png (added)
• install/export/export_GRIEFWATCH.php (modified) (1 diff)
• install/install_step3.php (modified) (1 diff)
• mods/rss_feed (added)
• mods/rss_feed/class.rss.php (added)
• mods/rss_feed/rss.gif (added)
• mods/rss_feed/rss.php (added)
• sql (deleted)
• templates/admin_postperm.tpl (modified) (2 diffs)
• templates/admin_standings.tpl (added)
• templates/igb_index.tpl (modified) (2 diffs)
• templates/standings.tpl (added)

dev/common/admin.php

@@ -32 +32 @@
     $config->checkCheckbox('least_active');
     $config->checkCheckbox('adapt_items');
+    $config->checkCheckbox('show_standing');
 
     if ($config->checkCheckbox('comments'))
@@ -141 +142 @@
 }
 $html .= "></td></tr>";
+$html .= "<tr><td width=120><b>Display Standings:</b></td><td><input type=checkbox name=show_standing id=show_standing";
+if ($config->getConfig('show_standing'))
+{
+    $html .= " checked=\"checked\"";
+}
+$html .= "></td></tr>";
 
 $html .= "<tr><td width=120><b>Enable Lost Item Values</b></td><td><input type=checkbox name=item_values id=item_values";

dev/common/admin_mapoptions.php

@@ -92 +92 @@
 $smarty->assign_by_ref('config', $config);
 $smarty->assign_by_ref('options', $options);
-$html = $smarty->fetch('admin_mapoptions.tpl');
+$html = $smarty->fetch(get_tpl('admin_mapoptions'));
 
 $page->addContext($menubox->generate());

dev/common/admin_menu.php

@@ -7 +7 @@
 $menubox->addOption("link","Contracts", "?a=admin_cc&op=view&type=contract");
 $menubox->addOption("link","Campaigns", "?a=admin_cc&op=view&type=campaign");
+$menubox->addOption("link","Standings", "?a=admin_standings");
 $menubox->addOption("link","Ship Values", "?a=admin_shp_val");
 $menubox->addOption("link","Synchronization", "?a=admin_sync");

dev/common/admin_postperm.php

@@ -175 +175 @@
     $smarty->assign_by_ref('permissions', $perm);
 }
-$html = $smarty->fetch('admin_postperm.tpl');
+$html = $smarty->fetch(get_tpl('admin_postperm'));
 
 $page->addContext($menubox->generate());

dev/common/class.box.php

@@ -1 @@
-<?php 
+<?php
 require_once("class.graph.php");
 require_once("globals.php");
@@ -10 +10 @@
                 $this->box_array = array();
     }
-        
+
     function setIcon($icon)                                     //its called setIcon... and it sets the Icon.
     {
         $this->icon_ = $icon;
     }
-        
-        function addOption($type,$name,$url="") //add something to the array that we send to smarty later... types can be caption, img, link, points. Only link needs all 3 attribues 
+
+        function addOption($type,$name,$url="") //add something to the array that we send to smarty later... types can be caption, img, link, points. Only link needs all 3 attribues
         {
         $this->box_array[]=array('type' => $type, 'name' => $name, 'url' => $url);
@@ -29 +29 @@
         $smarty->assign('title',$this->title_ );
         $smarty->assign('items',$this->box_array);
-        return $smarty->fetch('box.tpl');
+        return $smarty->fetch(get_tpl('box'));
     }
 }
@@ -72 +72 @@
         {
             if (!$rows[$i - 1]['plt_id']) break;
-            $pilot = new Pilot($rows[$i - 1]['plt_id']); 
+            $pilot = new Pilot($rows[$i - 1]['plt_id']);
                         $bar = new BarGraph($rows[$i - 1]['cnt'], $max, 60);
                         $top[$i] = array('url'=> "?a=pilot_detail&plt_id=" . $rows[$i - 1]['plt_id'], 'name'=>$pilot->getName(),'bar'=>$bar->generate(),'cnt'=>$rows[$i - 1]['cnt']);
@@ -78 +78 @@
                 $smarty->assign('top',$top);
                 $smarty->assign('comment',$this->comment_);
-                return $smarty->fetch('award_box.tpl');
+                return $smarty->fetch(get_tpl('award_box'));
     }
-        
+
 }
 ?>

dev/common/class.comments.php

@@ -22 +22 @@
 
         $smarty->assign_by_ref('comments', $this->comments_);
-        return $smarty->fetch('block_comments.tpl');
+        return $smarty->fetch(get_tpl('block_comments'));
     }
 

dev/common/class.item.php

@@ -18 +18 @@
     {
         $this->execQuery();
-//        if (!$this->row_['itm_name'])
-//        {
-//            return $this->id_;
-//        }
         return $this->row_['itm_name'];
     }
-
-
 
     function getIcon($size = 32)
@@ -47 +41 @@
         }
 
-        if (substr($this->getName(), strlen($this->getName()) - 2, 2) == "II" || $this->row_['techlevel'])
+        if (substr($this->getName(), strlen($this->getName()) - 2, 2) == "II" || $this->row_['techlevel'] == 2)
         {
             $icon .= IMG_URL.'/items/32_32/t2.gif';
@@ -58 +52 @@
         $smarty->assign('img', $img);
         $smarty->assign('icon', $icon);
-        return $smarty->fetch('icon.tpl');
+        return $smarty->fetch(get_tpl('icon'));
     }
 
@@ -71 +65 @@
         if (!$this->qry_->executed_)
         {
+            if (!$this->id_)
+            {
+                return false;
+            }
             $this->sql_ = "select *
                            from kb3_items, kb3_item_types

dev/common/class.killlisttable.php

@@ -90 +90 @@
 
         $smarty->assign_by_ref('killlist', $kl);
-        return $smarty->fetch('killlisttable.tpl');
+        return $smarty->fetch(get_tpl('killlisttable'));
     }
 }

dev/common/class.page.php

@@ -81 +81 @@
             {
                 $menu->add('campaigns', 'Campaigns');
+            }
+            $w = 10;
+            if ($campaigns)
+            {
+                $w--;
+            }
+            if ($contracts)
+            {
+                $w--;
+            }
+            if ($config->getConfig('show_standing'))
+            {
+                $w--;
+                $menu->add('standings', 'Standings');
             }
             $menu->add('kills', 'Kills');
@@ -100 +114 @@
             $menu->add('about', 'About');
 
-            $w = '10%';
-            if ($contracts || $campaigns)
-            {
-                $w = '9%';
-            }
-            if ($contracts && $campaigns)
-            {
-                $w = '8%';
-            }
-
-            $smarty->assign('menu_w', $w);
+            $smarty->assign('menu_w', $w.'%');
             $smarty->assign('menu', $menu->get());
         }
@@ -122 +126 @@
         $smarty->assign('content_html', $this->contenthtml_);
         $smarty->assign('context_html', $this->contexthtml_);
-        if ($this->igb_)
-        {
-            $smarty->display('igb_index.tpl');
-        }
-        else
-        {
-            $smarty->display('index.tpl');
-        }
+        $smarty->display(get_tpl('index'));
     }
 

dev/common/corpportrait.php

@@ -25 +25 @@
         $oldy = imagesy($img);
         imagecopyresampled($newimg, $img, 0, 0, 0, 0, $size, $size, $oldx, $oldy);
-        imagejpeg($newimg, $portrait);
+        imagejpeg($newimg, $portrait, 95);
         header("Content-Type: image/jpeg");
         readfile($portrait);

dev/common/db.php

@@ -2 +2 @@
 require_once('config.php');
 require_once('globals.php');
+require_once('php_compat.php');
 
 class DBConnection

dev/common/globals.php

@@ -39 +39 @@
     return number_format(round($s, 1), 1);
 }
+
+function get_tpl($name)
+{
+    if (IS_IGB)
+    {
+        if (file_exists('./templates/igb_'.$name.'.tpl'))
+        {
+            return 'igb_'.$name.'.tpl';
+        }
+    }
+    return $name.'.tpl';
+}
 ?>

dev/common/igb.php

@@ -1 @@
-<?
-  require_once( "class.page.php" );
+<?php
+require_once("class.page.php");
 
-  $kb = new Killboard( KB_SITE );
+$page = new Page("Killboard IGB Menu");
+$html = "<a href=\"?a=post_igb\">Post killmail</a> | <a href=\"?a=portrait_grab\">Update portrait</a>";
 
-  $html = "<html><head><title>".KB_TITLE." Killboard"."</title></head></html><body>";
-
-  $html .= "<a href=\"?a=post_igb\">Post killmail</a> | <a href=\"?a=portrait_grab\">Update portrait</a>";
-
-  $html .= "</body></html>";
-
-  echo $html;
+$page->setContent($html);
+$page->generate();
 ?>

dev/common/index.php

@@ -11 +11 @@
     $page = 'home';
 }
-if (substr($_SERVER['HTTP_USER_AGENT'], 0, 15) == 'EVE-minibrowser' && $page != 'igb' && $page != 'post_igb' && $page != 'portrait_grab' && $page != 'bills')
+if (substr($_SERVER['HTTP_USER_AGENT'], 0, 15) == 'EVE-minibrowser')
 {
-    $page = 'igb';
+    define('IS_IGB', true);
+    if (!isset($_GET['a']))
+    {
+        $page = 'igb';
+    }
+}
+else
+{
+    define('IS_IGB', false);
 }
 

dev/common/kill_detail.php

@@ -226 +226 @@
 $page->addContext($mapbox->generate());
 
-$html = $smarty->fetch('kill_detail.tpl');
+$html = $smarty->fetch(get_tpl('kill_detail'));
 $page->setContent($html);
 $page->generate();

dev/common/kill_export.php

@@ -254 +254 @@
 
     $smarty->assign_by_ref('permissions', $perm);
-    $html = $smarty->fetch('admin_export.tpl');
+    $html = $smarty->fetch(get_tpl('admin_export'));
 }
 

dev/common/portrait.php

@@ -63 +63 @@
     $newimg = imagecreatetruecolor($size, $size);
     imagecopyresampled($newimg, $img, 0, 0, 0, 0, $size, $size, 128, 128);
-    imagejpeg($newimg, $portrait);
+    imagejpeg($newimg, $portrait, 95);
     header("Content-Type: image/jpeg");
     readfile($portrait);

dev/install/export/export_GRIEFWATCH.php

@@ -5 +5 @@
 exit('please edit file before running');
 
-for ($i = 0; $i>=$num_kills; $i--)
+for ($i = 0; $i<=$num_kills; $i++)
 {
     $kill = $i;

dev/install/install_step3.php

@@ -4 +4 @@
 {
     $_SESSION['sql'] = array();
-    $_SESSION['sql']['host'] = $_REQUEST['host'];
-    $_SESSION['sql']['user'] = $_REQUEST['user'];
-    $_SESSION['sql']['pass'] = $_REQUEST['dbpass'];
-    $_SESSION['sql']['db'] = $_REQUEST['db'];
+    $_SESSION['sql']['host'] = $_POST['host'];
+    $_SESSION['sql']['user'] = $_POST['user'];
+    $_SESSION['sql']['pass'] = $_POST['dbpass'];
+    $_SESSION['sql']['db'] = $_POST['db'];
 }
 

dev/templates/admin_postperm.tpl

@@ -3 +3 @@
 <form id="search" action="?a=admin_postperm" method="post">
 <table class="kb-subtable">
-<tr><td>Type:</td><td>Text: (3 letters minimum)</td></tr>
-<tr><td><select id="searchtype" name="searchtype"><option value="pilot">Pilot</option>
-<option value="corp">Corporation</option>
-<option value="alliance">Alliance</option>
-</select></td><td><input id="searchphrase" name="searchphrase" type="text" size="30"/></td>
-<td><input type="submit" name="submit" value="Search"/></td></tr></table></form>
+  <tr><td>Type:</td><td>Text: (3 letters minimum)</td></tr>
+  <tr><td><select id="searchtype" name="searchtype"><option value="pilot">Pilot</option>
+    <option value="corp">Corporation</option>
+    <option value="alliance">Alliance</option>
+    </select></td><td><input id="searchphrase" name="searchphrase" type="text" size="30"/></td>
+    <td><input type="submit" name="submit" value="Search"/></td>
+  </tr>
+</table>
+</form>
 {if $search}
 <table class="kb-table" width="450" cellspacing="1">
-<tr class="kb-table-header"><td>Search results</td></tr>
+  <tr class="kb-table-header"><td>Search results</td></tr>
 {section name=res loop=$results}
-<tr class="kb-table-row-even"><td><a href="{$results[res].link}">{$results[res].descr}</a></td></tr>
+  <tr class="kb-table-row-even"><td><a href="{$results[res].link}">{$results[res].descr}</a></td></tr>
 {sectionelse}
-<tr class="kb-table-row-even"><td>No results.</td></tr>
+  <tr class="kb-table-row-even"><td>No results.</td></tr>
 {/section}
 </table>
@@ -27 +30 @@
 <table class="kb-table">
 {section name=opt loop=$permissions}
-    <tr class="kb-table-header"><td colspan="2">{$permissions[opt].name}</td></tr>
+  <tr class="kb-table-header"><td colspan="2">{$permissions[opt].name}</td></tr>
 {section name=idx loop=$permissions[opt].list}
-    <tr><td width="200"><b>{$permissions[opt].list[idx].text}</b></td><td><a href="{$permissions[opt].list[idx].link}">Delete</a></td></tr>
+  <tr><td width="200"><b>{$permissions[opt].list[idx].text}</b></td><td><a href="{$permissions[opt].list[idx].link}">Delete</a></td></tr>
 {/section}
 {sectionelse}
-<tr><td>None.</td></tr>
+  <tr><td>None.</td></tr>
 {/section}
 </table>

dev/templates/igb_index.tpl

@@ -1 +1 @@
 <html>
 <head>
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
 <title>{$kb_title}</title>
-<link rel="stylesheet" type="text/css" href="{$style_url}/common.css">
-<link rel="stylesheet" type="text/css" href="{$style_url}/{$style}/style.css">
 </head>
-<body bgcolor="#222222" {$on_load} style="height: 100%">
-<table class="main-table" height="100%" align="center" bgcolor="#111111" border="0" cellspacing="1" style="height: 100%">
-<tr style="height: 100%">
-<td valign="top" height="100%" style="height: 100%">
-<div id="page-title">{$page_title}</div>
-<table cellpadding=0 cellspacing=0 width="100%" border="0">
-<tr><td valign="top"><div id="content">
+<body bgcolor="#222222">
+<table heigth="100%" width="100%" bgcolor="#111111" border="0" cellspacing="1">
+<tr>
+<td valign="top">
+<div>{$page_title}</div>
+<hr>
 {$content_html}
-</div></td>
 {if $context_html}
 <td valign="top" align="right">
@@ -20 +15 @@
 </td>
 {/if}
-</tr></table>
-{if $profile}
-<table class="kb-subtable" width="99%" border="0">
-<tr><td height="100%" align="right" valign="bottom">{$profile_time}s</td></tr>
-</table>
-{else}
-<!-- {$profile_time}s -->
-{/if}
-<div class="counter"></div>
+<hr>
 </td></tr></table>
 </body>