Changeset 149

Timestamp:

12/12/06 18:10:07 (14 years ago)

Author:

exi

Message:

Changed custom ship values to also display unknown types.
Changed comment class to allow html code insertion.
Added pullout of externalids on killlists.
Fixed next week link.
Small change to the sql-inserter to remove the ';'.
Fixed the double http-link on rss feeds.
Fixed VictimAllianceURL on kill_details.
Fixed wrong links on standings page.

Location:

dev

Files:

• common/admin_shp_val.php (modified) (2 diffs)
• common/class.comments.php (modified) (3 diffs)
• common/class.killlist.php (modified) (2 diffs)
• common/class.killlisttable.php (modified) (1 diff)
• common/kills.php (modified) (1 diff)
• common/losses.php (modified) (1 diff)
• install/install_step4.php (modified) (2 diffs)
• mods/rss_feed/rss.php (modified) (1 diff)
• templates/kill_detail.tpl (modified) (1 diff)
• templates/standings.tpl (modified) (1 diff)

dev/common/admin_shp_val.php

@@ -31 +31 @@
         {
             $search = true;
-            $searchstr = ' where ksb.shp_value is null and shp.shp_class != 18 and shp.shp_id='.$id;
+            $searchstr = ' where ksb.shp_value is null and shp.shp_class != 17 and shp.shp_id='.$id;
         }
     }
@@ -37 +37 @@
     {
         $search = true;
-        $searchstr = " where ksb.shp_value is null and shp.shp_class != 18 and shp.shp_name like '%{$name}%'";
+        $searchstr = " where ksb.shp_value is null and shp.shp_class != 17 and shp.shp_name like '%{$name}%'";
     }
     else

dev/common/class.comments.php

@@ -7 +7 @@
     {
         $this->id_ = $kll_id;
+        $this->raw_ = false;
 
         $this->comments_ = array();
@@ -27 +28 @@
     function addComment($name, $text)
     {
-        $comment = $text;
-        $comment = $this->bbencode($comment);
+        $comment = $this->bbencode($text);
 
         $name = slashfix(strip_tags($name));
@@ -44 +44 @@
     }
 
+    function postRaw($bool)
+    {
+        $this->raw_ = $bool;
+    }
+
     function bbencode($string)
     {
-        $string = strip_tags(stripslashes($string));
+        if (!$this->raw_)
+        {
+            $string = strip_tags(stripslashes($string));
+        }
         $string = str_replace(array('[b]','[/b]','[i]','[/i]','[u]','[/u]'),
                               array('<b>','</b>','<i>','</i>','<u>','</u>'), $string);

dev/common/class.killlist.php

@@ -40 +40 @@
                                 sys.sys_name, sys.sys_sec,
                                 fbplt.plt_name as fbplt_name,
+                                fbplt.plt_externalid as fbplt_externalid,
                                 fbcrp.crp_name as fbcrp_name';
 
@@ -283 +284 @@
             $kill->setFBCorpName($row['fbcrp_name']);
             $kill->setKillPoints($row['kll_points']);
+            $kill->plt_ext_ = $row['plt_externalid'];
+            $kill->fbplt_ext_ = $row['fbplt_externalid'];
             return $kill;
         }

dev/common/class.killlisttable.php

@@ -78 +78 @@
             $kll['systemsecurity'] = $kill->getSolarSystemSecurity();
             $kll['timestamp'] = $kill->getTimeStamp();
+
+            if ($kill->fbplt_ext_)
+            {
+                $kll['fbplext'] = $kill->fbplt_ext_;
+            }
+            else
+            {
+                $kll['fbplext'] = null;
+            }
+            if ($kill->plt_ext_)
+            {
+                $kll['plext'] = $kill->plt_ext_;
+            }
+            else
+            {
+                $kll['plext'] = null;
+            }
             if ($config->getConfig('comments_count'))
             {

dev/common/kills.php

@@ -1 @@
-<?
-  require_once( "class.page.php" );
-  require_once( "class.box.php" );
-  require_once( "class.corp.php" );
-  require_once( "class.alliance.php" );
-  require_once( "class.killlist.php" );
-  require_once( "class.ship.php" );
-  require_once( "class.killlisttable.php" );
-  require_once( "class.killsummarytable.php" );
-  require_once( "class.toplist.php" );
+<?php
+require_once("class.page.php");
+require_once("class.box.php");
+require_once("class.corp.php");
+require_once("class.alliance.php");
+require_once("class.killlist.php");
+require_once("class.ship.php");
+require_once("class.killlisttable.php");
+require_once("class.killsummarytable.php");
+require_once("class.toplist.php");
 
-  $week = $_GET['w'];
-  $year = $_GET['y'];
-  
-  if ( $week == "" )
-    $week = date( "W" );
-  
-  if ( $year == "" )
-    $year = date( "Y" );
-    
-  if ( $week == 52 ) {
+$week = $_GET['w'];
+$year = $_GET['y'];
+
+if ($week == "")
+    $week = date("W");
+
+if ($year == "")
+    $year = date("Y");
+
+if ($week == 52)
+{
     $nweek = 1;
     $nyear = $year + 1;
     $pyear = $year - 1;
-  }
-  else {
+}
+else
+{
     $nweek = $week + 1;
     $nyear = $year;
-  }
-  if ( $week == 1 ) {
+}
+if ($week == 1)
+{
     $pweek = 52;
     $pyear = $year - 1;
-  }
-  else {
+}
+else
+{
     $pweek = $week - 1;
     $pyear = $year;
-  }
+}
 
-  $page = new Page( "Kills - Week ".$week );
+$page = new Page("Kills - Week ".$week);
 
-  $kslist = new KillList();
-  $kslist->setWeek( $week );
-  $kslist->setYear( $year );
-  if ( CORP_ID )
-    $kslist->addInvolvedCorp( new Corporation( CORP_ID ) );
-  if ( ALLIANCE_ID )
-    $kslist->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) );
-                                                                                
-  $llist = new KillList();
-  $llist->setWeek( $week );
-  $llist->setYear( $year );
-  if ( CORP_ID )
-    $llist->addVictimCorp( new Corporation( CORP_ID ) );
-  if ( ALLIANCE_ID )
-    $llist->addVictimAlliance( new Alliance( ALLIANCE_ID ) );
+$kslist = new KillList();
+$kslist->setWeek($week);
+$kslist->setYear($year);
+if (CORP_ID)
+    $kslist->addInvolvedCorp(new Corporation(CORP_ID));
+if (ALLIANCE_ID)
+    $kslist->addInvolvedAlliance(new Alliance(ALLIANCE_ID));
 
-  $summarytable = new KillSummaryTable( $kslist, $llist );
-  $summarytable->setBreak( 6 );
-  $html .= $summarytable->generate();
+$llist = new KillList();
+$llist->setWeek($week);
+$llist->setYear($year);
+if (CORP_ID)
+    $llist->addVictimCorp(new Corporation(CORP_ID));
+if (ALLIANCE_ID)
+    $llist->addVictimAlliance(new Alliance(ALLIANCE_ID));
 
-  $klist = new KillList();
-  $klist->setOrdered( true );
-  $klist->setWeek( $week );
-  $klist->setYear( $year );
-  if ( CORP_ID )
-    $klist->addInvolvedCorp( new Corporation( CORP_ID ) );
-  if ( ALLIANCE_ID )
-    $klist->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) );
-  if ( $_GET['scl_id'] )
-    $klist->addVictimShipClass( new ShipClass( $_GET['scl_id'] ) );
-  else
-    $klist->setPodsNoobShips( false );
+$summarytable = new KillSummaryTable($kslist, $llist);
+$summarytable->setBreak(6);
+$html .= $summarytable->generate();
 
-  $table = new KillListTable( $klist );
-  $html .= $table->generate();
+$klist = new KillList();
+$klist->setOrdered(true);
+$klist->setWeek($week);
+$klist->setYear($year);
+if (CORP_ID)
+    $klist->addInvolvedCorp(new Corporation(CORP_ID));
+if (ALLIANCE_ID)
+    $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID));
+if ($_GET['scl_id'])
+    $klist->addVictimShipClass(new ShipClass($_GET['scl_id']));
+else
+    $klist->setPodsNoobShips(false);
 
-  $page->setContent( $html );
+$table = new KillListTable($klist);
+$html .= $table->generate();
+
+$page->setContent($html);
 $menubox = new box("Menu");
 $menubox->setIcon("menu-item.gif");
-  $menubox->addOption("caption", "Navigation" );
-  $menubox->addOption("link", "Previous week ", "?a=kills&w=".$pweek."&y=".$pyear );
-  if ( $week != date( "W" ) )
-    $menubox->addOption( "Next week", "?a=kills&w=".$nweek."&y=".$nyear );
-  $page->addContext( $menubox->generate() );
-  
-  $tklist = new TopKillsList();
-  $tklist->setWeek( $week );
-  $tklist->setYear( $year );
-  if ( CORP_ID )
-    $tklist->addInvolvedCorp( new Corporation( CORP_ID ) );
-  if ( ALLIANCE_ID )
-    $tklist->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) );
-    
-  $tklist->generate();
-  $tkbox = new AwardBox( $tklist, "Top killers", "kills in week ".$week, "kills", "eagle" );
-  $page->addContext( $tkbox->generate() );  
+$menubox->addOption("caption", "Navigation");
+$menubox->addOption("link", "Previous week ", "?a=kills&w=".$pweek."&y=".$pyear);
+if ($week != date("W"))
+{
+    $menubox->addOption('link', "Next week", "?a=kills&w=".$nweek."&y=".$nyear);
+}
+$page->addContext($menubox->generate());
 
-  $killboard = $page->killboard_;
-  $config = $killboard->getConfig();
-  if ( $config->getKillPoints() ) {
+$tklist = new TopKillsList();
+$tklist->setWeek($week);
+$tklist->setYear($year);
+if (CORP_ID)
+    $tklist->addInvolvedCorp(new Corporation(CORP_ID));
+if (ALLIANCE_ID)
+    $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID));
+
+$tklist->generate();
+$tkbox = new AwardBox($tklist, "Top killers", "kills in week ".$week, "kills", "eagle");
+$page->addContext($tkbox->generate());
+
+$killboard = $page->killboard_;
+$config = $killboard->getConfig();
+if ($config->getKillPoints())
+{
     $tklist = new TopScoreList();
-    $tklist->setWeek( $week );
-    $tklist->setYear( $year );
-    if ( CORP_ID )
-      $tklist->addInvolvedCorp( new Corporation( CORP_ID ) );
-    if ( ALLIANCE_ID )
-      $tklist->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) );
-    
+    $tklist->setWeek($week);
+    $tklist->setYear($year);
+    if (CORP_ID)
+        $tklist->addInvolvedCorp(new Corporation(CORP_ID));
+    if (ALLIANCE_ID)
+        $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID));
+
     $tklist->generate();
-    $tkbox = new AwardBox( $tklist, "Top scorers", "points in week ".$week, "points", "redcross" );
-    $page->addContext( $tkbox->generate() );  
-  }
+    $tkbox = new AwardBox($tklist, "Top scorers", "points in week ".$week, "points", "redcross");
+    $page->addContext($tkbox->generate());
+}
 
-  $page->generate();
+$page->generate();
 ?>

dev/common/losses.php

@@ -1 @@
-<?
-  require_once( "class.page.php" );
-  require_once( "class.box.php" );
-  require_once( "class.corp.php" );
-  require_once( "class.alliance.php" );
-  require_once( "class.killlist.php" );
-  require_once( "class.killlisttable.php" );
-  require_once( "class.killsummarytable.php" );
-  require_once( "class.toplist.php" );
+<?php
+require_once("class.page.php");
+require_once("class.box.php");
+require_once("class.corp.php");
+require_once("class.alliance.php");
+require_once("class.killlist.php");
+require_once("class.killlisttable.php");
+require_once("class.killsummarytable.php");
+require_once("class.toplist.php");
 
-  $week = $_GET['w'];
-  $year = $_GET['y'];
-  
-  if ( $week == "" )
-    $week = date( "W" );
-  
-  if ( $year == "" )
-    $year = date( "Y" );
-    
-  if ( $week == 52 ) {
+$week = $_GET['w'];
+$year = $_GET['y'];
+
+if ($week == "")
+    $week = date("W");
+
+if ($year == "")
+    $year = date("Y");
+
+if ($week == 52)
+{
     $nweek = 1;
     $nyear = $year + 1;
-  }
-  else {
+}
+else
+{
     $nweek = $week + 1;
     $nyear = $year;
-  }
-  if ( $week == "1" ) {
+}
+if ($week == "1")
+{
     $pweek = 52;
     $pyear = $year - 1;
-  }
-  else {
+}
+else
+{
     $pweek = $week - 1;
     $pyear = $year;
-  }
+}
 
-  $page = new Page( "Losses - Week ".$week );
+$page = new Page("Losses - Week ".$week);
 
-  $klist = new KillList();
-  $klist->setWeek( $week );
-  $klist->setYear( $year );
-  if ( CORP_ID )
-    $klist->addInvolvedCorp( new Corporation( CORP_ID ) );
-  if ( ALLIANCE_ID )
-    $klist->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) );
-                                                                                
-  $lslist = new KillList();
-  $lslist->setWeek( $week );
-  $lslist->setYear( $year );
-  if ( CORP_ID )
-    $lslist->addVictimCorp( new Corporation( CORP_ID ) );
-  if ( ALLIANCE_ID )
-    $lslist->addVictimAlliance( new Alliance( ALLIANCE_ID ) );
-                                                                                
-  $summarytable = new KillSummaryTable( $klist, $lslist );
-  $summarytable->setBreak( 6 );
-  $html .= $summarytable->generate();
+$klist = new KillList();
+$klist->setWeek($week);
+$klist->setYear($year);
+if (CORP_ID)
+    $klist->addInvolvedCorp(new Corporation(CORP_ID));
+if (ALLIANCE_ID)
+    $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID));
 
-  //$html .= "<table width=\"99%\" align=center><tr><td class=weeknav align=left>";
-  
- // if ( $week != date( "W" ) )
- //   $html .= "[<a href=\"?a=losses&w=".$nweek."&y=".$nyear."\"><<</a>]";
-    
-//  $html .= "</td><td class=weeknav align=right>[<a href=\"?a=losses&w=".$pweek."&y=".$pyear."\">>></a>]</td></tr></table>";
+$lslist = new KillList();
+$lslist->setWeek($week);
+$lslist->setYear($year);
+if (CORP_ID)
+    $lslist->addVictimCorp(new Corporation(CORP_ID));
+if (ALLIANCE_ID)
+    $lslist->addVictimAlliance(new Alliance(ALLIANCE_ID));
 
-  $llist = new KillList();
-  $llist->setOrdered( true );
-  $llist->setWeek( $week );
-  $llist->setYear( $year );
-  if ( CORP_ID )
-    $llist->addVictimCorp( new Corporation( CORP_ID ) );
-  if ( ALLIANCE_ID )
-    $llist->addVictimAlliance( new Alliance( ALLIANCE_ID ) );
-  if ( $_GET['scl_id'] )
-    $llist->addVictimShipClass( new ShipClass( $_GET['scl_id'] ) );
-  else
-    $llist->setPodsNoobShips( false );
-                                                                                
-  $table = new KillListTable( $llist );
-  $html .= $table->generate();
+$summarytable = new KillSummaryTable($klist, $lslist);
+$summarytable->setBreak(6);
+$html .= $summarytable->generate();
+// $html .= "<table width=\"99%\" align=center><tr><td class=weeknav align=left>";
+// if ( $week != date( "W" ) )
+// $html .= "[<a href=\"?a=losses&w=".$nweek."&y=".$nyear."\"><<</a>]";
+// $html .= "</td><td class=weeknav align=right>[<a href=\"?a=losses&w=".$pweek."&y=".$pyear."\">>></a>]</td></tr></table>";
+$llist = new KillList();
+$llist->setOrdered(true);
+$llist->setWeek($week);
+$llist->setYear($year);
+if (CORP_ID)
+    $llist->addVictimCorp(new Corporation(CORP_ID));
+if (ALLIANCE_ID)
+    $llist->addVictimAlliance(new Alliance(ALLIANCE_ID));
+if ($_GET['scl_id'])
+    $llist->addVictimShipClass(new ShipClass($_GET['scl_id']));
+else
+    $llist->setPodsNoobShips(false);
+
+$table = new KillListTable($llist);
+$html .= $table->generate();
 
 $menubox = new box("Menu");
 $menubox->setIcon("menu-item.gif");
-  $menubox->addOption("caption", "Navigation" );
-  $menubox->addOption("link", "Previous week", "?a=losses&w=".$pweek."&y=".$pyear );
-  if ( $week != date( "W" ) )
-    $menubox->addOption("link", "Next week", "?a=losses&w=".$nweek."&y=".$nyear );
-  $page->addContext( $menubox->generate() );
+$menubox->addOption("caption", "Navigation");
+$menubox->addOption("link", "Previous week", "?a=losses&w=".$pweek."&y=".$pyear);
+if ($week != date("W"))
+{
+    $menubox->addOption("link", "Next week", "?a=losses&w=".$nweek."&y=".$nyear);
+}
+$page->addContext($menubox->generate());
 
-  $tllist = new TopLossesList();
-  $tllist->setWeek( $week );
-  $tllist->setYear( $year );
-  if ( CORP_ID )
-    $tllist->addVictimCorp( new Corporation( CORP_ID ) );
-  if ( ALLIANCE_ID )
-    $tllist->addVictimAlliance( new Alliance( ALLIANCE_ID ) );
-    
-  $tllist->generate();
-  $tlbox = new AwardBox( $tllist, "Top losers", "losses in week ".$week, "losses", "moon" );
-  $page->addContext( $tlbox->generate() );  
+$tllist = new TopLossesList();
+$tllist->setWeek($week);
+$tllist->setYear($year);
+if (CORP_ID)
+    $tllist->addVictimCorp(new Corporation(CORP_ID));
+if (ALLIANCE_ID)
+    $tllist->addVictimAlliance(new Alliance(ALLIANCE_ID));
 
-  $page->setContent( $html );
-  $page->generate();
+$tllist->generate();
+$tlbox = new AwardBox($tllist, "Top losers", "losses in week ".$week, "losses", "moon");
+$page->addContext($tlbox->generate());
+
+$page->setContent($html);
+$page->generate();
 ?>

dev/install/install_step4.php

@@ -107 +107 @@
                     if (trim($query))
                     {
+                        $query = trim($query);
+                        if (substr($query, -1, 1) == ';')
+                        {
+                            $query = substr($query, 0, -1);
+                        }
                         $query_count++;
                         $id = mysql_query($query);
@@ -173 +178 @@
                 foreach ($querys as $query)
                 {
-                    $id = mysql_query($query);
+                    $query = trim($query);
+                    if ($query)
+                    {
+                        if (substr($query, -1, 1) == ';')
+                        {
+                            $query = substr($query, 0, -1);
+                        }
+                        $id = mysql_query($query);
+                    }
                 }
                 if ($id)

dev/mods/rss_feed/rss.php

@@ -19 +19 @@
 <title>".KB_TITLE."</title>
 <description>20 Most Recent Kills</description>
-<link>http://".KB_HOST."</link>
+<link>".KB_HOST."</link>
 <copyright>".KB_TITLE."</copyright>\n";
 

dev/templates/kill_detail.tpl

@@ -14 +14 @@
                 <tr class={cycle name=ccl}>
                     <td class=kb-table-cell width=64><b>Alliance:</b></td>
-                    <td class=kb-table-cell><b><a href="VictimAllianceURL">{$VictimAllianceName}</a></b></td>
+                    <td class=kb-table-cell><b><a href="{$VictimAllianceURL}">{$VictimAllianceName}</a></b></td>
                 </tr>
             </table>

dev/templates/standings.tpl

@@ -7 +7 @@
 {if $standings[opt].name=='Alliances'}
     <td width="32" height="34" valign="top" align="right" style="background-image: url(?a=alliance_thumb&size=32&id={$standings[opt].list[idx].pid});"><img src="img/sta_{$standings[opt].list[idx].icon}.png"/></td>
-    <td><b><a href="?alliance_detail&all_id={$standings[opt].list[idx].id}">{$standings[opt].list[idx].text}</a></b>{$standings[opt].list[idx].descr}</td>
+    <td><b><a href="?a=alliance_detail&all_id={$standings[opt].list[idx].id}">{$standings[opt].list[idx].text}</a></b>{$standings[opt].list[idx].descr}</td>
 {else}
     <td width="32" height="34" valign="top" align="right" style="background-image: url(?a=corpportrait&size=32&id={$standings[opt].list[idx].id});"><img src="img/sta_{$standings[opt].list[idx].icon}.png"/></td>
-    <td><b><a href="?corp_detail&all_id={$standings[opt].list[idx].id}">{$standings[opt].list[idx].text}</a></b>{$standings[opt].list[idx].descr}</td>
+    <td><b><a href="?a=corp_detail&all_id={$standings[opt].list[idx].id}">{$standings[opt].list[idx].text}</a></b>{$standings[opt].list[idx].descr}</td>
 {/if}
     <td align="right">{$standings[opt].list[idx].value}</td>