Changeset 149
- Timestamp:
- 12/12/06 18:10:07 (16 years ago)
- Location:
- dev
- Files:
-
- 10 modified
Legend:
- Unmodified
- Added
- Removed
-
dev/common/admin_shp_val.php
r91 r149 31 31 { 32 32 $search = true; 33 $searchstr = ' where ksb.shp_value is null and shp.shp_class != 1 8and shp.shp_id='.$id;33 $searchstr = ' where ksb.shp_value is null and shp.shp_class != 17 and shp.shp_id='.$id; 34 34 } 35 35 } … … 37 37 { 38 38 $search = true; 39 $searchstr = " where ksb.shp_value is null and shp.shp_class != 1 8and shp.shp_name like '%{$name}%'";39 $searchstr = " where ksb.shp_value is null and shp.shp_class != 17 and shp.shp_name like '%{$name}%'"; 40 40 } 41 41 else -
dev/common/class.comments.php
r134 r149 7 7 { 8 8 $this->id_ = $kll_id; 9 $this->raw_ = false; 9 10 10 11 $this->comments_ = array(); … … 27 28 function addComment($name, $text) 28 29 { 29 $comment = $text; 30 $comment = $this->bbencode($comment); 30 $comment = $this->bbencode($text); 31 31 32 32 $name = slashfix(strip_tags($name)); … … 44 44 } 45 45 46 function postRaw($bool) 47 { 48 $this->raw_ = $bool; 49 } 50 46 51 function bbencode($string) 47 52 { 48 $string = strip_tags(stripslashes($string)); 53 if (!$this->raw_) 54 { 55 $string = strip_tags(stripslashes($string)); 56 } 49 57 $string = str_replace(array('[b]','[/b]','[i]','[/i]','[u]','[/u]'), 50 58 array('<b>','</b>','<i>','</i>','<u>','</u>'), $string); -
dev/common/class.killlist.php
r137 r149 40 40 sys.sys_name, sys.sys_sec, 41 41 fbplt.plt_name as fbplt_name, 42 fbplt.plt_externalid as fbplt_externalid, 42 43 fbcrp.crp_name as fbcrp_name'; 43 44 … … 283 284 $kill->setFBCorpName($row['fbcrp_name']); 284 285 $kill->setKillPoints($row['kll_points']); 286 $kill->plt_ext_ = $row['plt_externalid']; 287 $kill->fbplt_ext_ = $row['fbplt_externalid']; 285 288 return $kill; 286 289 } -
dev/common/class.killlisttable.php
r134 r149 78 78 $kll['systemsecurity'] = $kill->getSolarSystemSecurity(); 79 79 $kll['timestamp'] = $kill->getTimeStamp(); 80 81 if ($kill->fbplt_ext_) 82 { 83 $kll['fbplext'] = $kill->fbplt_ext_; 84 } 85 else 86 { 87 $kll['fbplext'] = null; 88 } 89 if ($kill->plt_ext_) 90 { 91 $kll['plext'] = $kill->plt_ext_; 92 } 93 else 94 { 95 $kll['plext'] = null; 96 } 80 97 if ($config->getConfig('comments_count')) 81 98 { -
dev/common/kills.php
r104 r149 1 <? 2 require_once( "class.page.php");3 require_once( "class.box.php");4 require_once( "class.corp.php");5 require_once( "class.alliance.php");6 require_once( "class.killlist.php");7 require_once( "class.ship.php");8 require_once( "class.killlisttable.php");9 require_once( "class.killsummarytable.php");10 require_once( "class.toplist.php");1 <?php 2 require_once("class.page.php"); 3 require_once("class.box.php"); 4 require_once("class.corp.php"); 5 require_once("class.alliance.php"); 6 require_once("class.killlist.php"); 7 require_once("class.ship.php"); 8 require_once("class.killlisttable.php"); 9 require_once("class.killsummarytable.php"); 10 require_once("class.toplist.php"); 11 11 12 $week = $_GET['w']; 13 $year = $_GET['y']; 14 15 if ( $week == "" ) 16 $week = date( "W" ); 17 18 if ( $year == "" ) 19 $year = date( "Y" ); 20 21 if ( $week == 52 ) { 12 $week = $_GET['w']; 13 $year = $_GET['y']; 14 15 if ($week == "") 16 $week = date("W"); 17 18 if ($year == "") 19 $year = date("Y"); 20 21 if ($week == 52) 22 { 22 23 $nweek = 1; 23 24 $nyear = $year + 1; 24 25 $pyear = $year - 1; 25 } 26 else { 26 } 27 else 28 { 27 29 $nweek = $week + 1; 28 30 $nyear = $year; 29 } 30 if ( $week == 1 ) { 31 } 32 if ($week == 1) 33 { 31 34 $pweek = 52; 32 35 $pyear = $year - 1; 33 } 34 else { 36 } 37 else 38 { 35 39 $pweek = $week - 1; 36 40 $pyear = $year; 37 41 } 38 42 39 $page = new Page( "Kills - Week ".$week);43 $page = new Page("Kills - Week ".$week); 40 44 41 $kslist = new KillList(); 42 $kslist->setWeek( $week ); 43 $kslist->setYear( $year ); 44 if ( CORP_ID ) 45 $kslist->addInvolvedCorp( new Corporation( CORP_ID ) ); 46 if ( ALLIANCE_ID ) 47 $kslist->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) ); 48 49 $llist = new KillList(); 50 $llist->setWeek( $week ); 51 $llist->setYear( $year ); 52 if ( CORP_ID ) 53 $llist->addVictimCorp( new Corporation( CORP_ID ) ); 54 if ( ALLIANCE_ID ) 55 $llist->addVictimAlliance( new Alliance( ALLIANCE_ID ) ); 45 $kslist = new KillList(); 46 $kslist->setWeek($week); 47 $kslist->setYear($year); 48 if (CORP_ID) 49 $kslist->addInvolvedCorp(new Corporation(CORP_ID)); 50 if (ALLIANCE_ID) 51 $kslist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 56 52 57 $summarytable = new KillSummaryTable( $kslist, $llist ); 58 $summarytable->setBreak( 6 ); 59 $html .= $summarytable->generate(); 53 $llist = new KillList(); 54 $llist->setWeek($week); 55 $llist->setYear($year); 56 if (CORP_ID) 57 $llist->addVictimCorp(new Corporation(CORP_ID)); 58 if (ALLIANCE_ID) 59 $llist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 60 60 61 $klist = new KillList(); 62 $klist->setOrdered( true ); 63 $klist->setWeek( $week ); 64 $klist->setYear( $year ); 65 if ( CORP_ID ) 66 $klist->addInvolvedCorp( new Corporation( CORP_ID ) ); 67 if ( ALLIANCE_ID ) 68 $klist->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) ); 69 if ( $_GET['scl_id'] ) 70 $klist->addVictimShipClass( new ShipClass( $_GET['scl_id'] ) ); 71 else 72 $klist->setPodsNoobShips( false ); 61 $summarytable = new KillSummaryTable($kslist, $llist); 62 $summarytable->setBreak(6); 63 $html .= $summarytable->generate(); 73 64 74 $table = new KillListTable( $klist ); 75 $html .= $table->generate(); 65 $klist = new KillList(); 66 $klist->setOrdered(true); 67 $klist->setWeek($week); 68 $klist->setYear($year); 69 if (CORP_ID) 70 $klist->addInvolvedCorp(new Corporation(CORP_ID)); 71 if (ALLIANCE_ID) 72 $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 73 if ($_GET['scl_id']) 74 $klist->addVictimShipClass(new ShipClass($_GET['scl_id'])); 75 else 76 $klist->setPodsNoobShips(false); 76 77 77 $page->setContent( $html ); 78 $table = new KillListTable($klist); 79 $html .= $table->generate(); 80 81 $page->setContent($html); 78 82 $menubox = new box("Menu"); 79 83 $menubox->setIcon("menu-item.gif"); 80 $menubox->addOption("caption", "Navigation" ); 81 $menubox->addOption("link", "Previous week ", "?a=kills&w=".$pweek."&y=".$pyear ); 82 if ( $week != date( "W" ) ) 83 $menubox->addOption( "Next week", "?a=kills&w=".$nweek."&y=".$nyear ); 84 $page->addContext( $menubox->generate() ); 85 86 $tklist = new TopKillsList(); 87 $tklist->setWeek( $week ); 88 $tklist->setYear( $year ); 89 if ( CORP_ID ) 90 $tklist->addInvolvedCorp( new Corporation( CORP_ID ) ); 91 if ( ALLIANCE_ID ) 92 $tklist->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) ); 93 94 $tklist->generate(); 95 $tkbox = new AwardBox( $tklist, "Top killers", "kills in week ".$week, "kills", "eagle" ); 96 $page->addContext( $tkbox->generate() ); 84 $menubox->addOption("caption", "Navigation"); 85 $menubox->addOption("link", "Previous week ", "?a=kills&w=".$pweek."&y=".$pyear); 86 if ($week != date("W")) 87 { 88 $menubox->addOption('link', "Next week", "?a=kills&w=".$nweek."&y=".$nyear); 89 } 90 $page->addContext($menubox->generate()); 97 91 98 $killboard = $page->killboard_; 99 $config = $killboard->getConfig(); 100 if ( $config->getKillPoints() ) { 92 $tklist = new TopKillsList(); 93 $tklist->setWeek($week); 94 $tklist->setYear($year); 95 if (CORP_ID) 96 $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 97 if (ALLIANCE_ID) 98 $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 99 100 $tklist->generate(); 101 $tkbox = new AwardBox($tklist, "Top killers", "kills in week ".$week, "kills", "eagle"); 102 $page->addContext($tkbox->generate()); 103 104 $killboard = $page->killboard_; 105 $config = $killboard->getConfig(); 106 if ($config->getKillPoints()) 107 { 101 108 $tklist = new TopScoreList(); 102 $tklist->setWeek( $week);103 $tklist->setYear( $year);104 if ( CORP_ID)105 $tklist->addInvolvedCorp( new Corporation( CORP_ID ));106 if ( ALLIANCE_ID)107 $tklist->addInvolvedAlliance( new Alliance( ALLIANCE_ID ));108 109 $tklist->setWeek($week); 110 $tklist->setYear($year); 111 if (CORP_ID) 112 $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 113 if (ALLIANCE_ID) 114 $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 115 109 116 $tklist->generate(); 110 $tkbox = new AwardBox( $tklist, "Top scorers", "points in week ".$week, "points", "redcross");111 $page->addContext( $tkbox->generate() );112 117 $tkbox = new AwardBox($tklist, "Top scorers", "points in week ".$week, "points", "redcross"); 118 $page->addContext($tkbox->generate()); 119 } 113 120 114 121 $page->generate(); 115 122 ?> -
dev/common/losses.php
r104 r149 1 <? 2 require_once( "class.page.php");3 require_once( "class.box.php");4 require_once( "class.corp.php");5 require_once( "class.alliance.php");6 require_once( "class.killlist.php");7 require_once( "class.killlisttable.php");8 require_once( "class.killsummarytable.php");9 require_once( "class.toplist.php");1 <?php 2 require_once("class.page.php"); 3 require_once("class.box.php"); 4 require_once("class.corp.php"); 5 require_once("class.alliance.php"); 6 require_once("class.killlist.php"); 7 require_once("class.killlisttable.php"); 8 require_once("class.killsummarytable.php"); 9 require_once("class.toplist.php"); 10 10 11 $week = $_GET['w']; 12 $year = $_GET['y']; 13 14 if ( $week == "" ) 15 $week = date( "W" ); 16 17 if ( $year == "" ) 18 $year = date( "Y" ); 19 20 if ( $week == 52 ) { 11 $week = $_GET['w']; 12 $year = $_GET['y']; 13 14 if ($week == "") 15 $week = date("W"); 16 17 if ($year == "") 18 $year = date("Y"); 19 20 if ($week == 52) 21 { 21 22 $nweek = 1; 22 23 $nyear = $year + 1; 23 } 24 else { 24 } 25 else 26 { 25 27 $nweek = $week + 1; 26 28 $nyear = $year; 27 } 28 if ( $week == "1" ) { 29 } 30 if ($week == "1") 31 { 29 32 $pweek = 52; 30 33 $pyear = $year - 1; 31 } 32 else { 34 } 35 else 36 { 33 37 $pweek = $week - 1; 34 38 $pyear = $year; 35 39 } 36 40 37 $page = new Page( "Losses - Week ".$week);41 $page = new Page("Losses - Week ".$week); 38 42 39 $klist = new KillList(); 40 $klist->setWeek( $week ); 41 $klist->setYear( $year ); 42 if ( CORP_ID ) 43 $klist->addInvolvedCorp( new Corporation( CORP_ID ) ); 44 if ( ALLIANCE_ID ) 45 $klist->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) ); 46 47 $lslist = new KillList(); 48 $lslist->setWeek( $week ); 49 $lslist->setYear( $year ); 50 if ( CORP_ID ) 51 $lslist->addVictimCorp( new Corporation( CORP_ID ) ); 52 if ( ALLIANCE_ID ) 53 $lslist->addVictimAlliance( new Alliance( ALLIANCE_ID ) ); 54 55 $summarytable = new KillSummaryTable( $klist, $lslist ); 56 $summarytable->setBreak( 6 ); 57 $html .= $summarytable->generate(); 43 $klist = new KillList(); 44 $klist->setWeek($week); 45 $klist->setYear($year); 46 if (CORP_ID) 47 $klist->addInvolvedCorp(new Corporation(CORP_ID)); 48 if (ALLIANCE_ID) 49 $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 58 50 59 //$html .= "<table width=\"99%\" align=center><tr><td class=weeknav align=left>"; 60 61 // if ( $week != date( "W" ) ) 62 // $html .= "[<a href=\"?a=losses&w=".$nweek."&y=".$nyear."\"><<</a>]"; 63 64 // $html .= "</td><td class=weeknav align=right>[<a href=\"?a=losses&w=".$pweek."&y=".$pyear."\">>></a>]</td></tr></table>"; 51 $lslist = new KillList(); 52 $lslist->setWeek($week); 53 $lslist->setYear($year); 54 if (CORP_ID) 55 $lslist->addVictimCorp(new Corporation(CORP_ID)); 56 if (ALLIANCE_ID) 57 $lslist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 65 58 66 $llist = new KillList(); 67 $llist->setOrdered( true ); 68 $llist->setWeek( $week ); 69 $llist->setYear( $year ); 70 if ( CORP_ID ) 71 $llist->addVictimCorp( new Corporation( CORP_ID ) ); 72 if ( ALLIANCE_ID ) 73 $llist->addVictimAlliance( new Alliance( ALLIANCE_ID ) ); 74 if ( $_GET['scl_id'] ) 75 $llist->addVictimShipClass( new ShipClass( $_GET['scl_id'] ) ); 76 else 77 $llist->setPodsNoobShips( false ); 78 79 $table = new KillListTable( $llist ); 80 $html .= $table->generate(); 59 $summarytable = new KillSummaryTable($klist, $lslist); 60 $summarytable->setBreak(6); 61 $html .= $summarytable->generate(); 62 // $html .= "<table width=\"99%\" align=center><tr><td class=weeknav align=left>"; 63 // if ( $week != date( "W" ) ) 64 // $html .= "[<a href=\"?a=losses&w=".$nweek."&y=".$nyear."\"><<</a>]"; 65 // $html .= "</td><td class=weeknav align=right>[<a href=\"?a=losses&w=".$pweek."&y=".$pyear."\">>></a>]</td></tr></table>"; 66 $llist = new KillList(); 67 $llist->setOrdered(true); 68 $llist->setWeek($week); 69 $llist->setYear($year); 70 if (CORP_ID) 71 $llist->addVictimCorp(new Corporation(CORP_ID)); 72 if (ALLIANCE_ID) 73 $llist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 74 if ($_GET['scl_id']) 75 $llist->addVictimShipClass(new ShipClass($_GET['scl_id'])); 76 else 77 $llist->setPodsNoobShips(false); 78 79 $table = new KillListTable($llist); 80 $html .= $table->generate(); 81 81 82 82 $menubox = new box("Menu"); 83 83 $menubox->setIcon("menu-item.gif"); 84 $menubox->addOption("caption", "Navigation" ); 85 $menubox->addOption("link", "Previous week", "?a=losses&w=".$pweek."&y=".$pyear ); 86 if ( $week != date( "W" ) ) 87 $menubox->addOption("link", "Next week", "?a=losses&w=".$nweek."&y=".$nyear ); 88 $page->addContext( $menubox->generate() ); 84 $menubox->addOption("caption", "Navigation"); 85 $menubox->addOption("link", "Previous week", "?a=losses&w=".$pweek."&y=".$pyear); 86 if ($week != date("W")) 87 { 88 $menubox->addOption("link", "Next week", "?a=losses&w=".$nweek."&y=".$nyear); 89 } 90 $page->addContext($menubox->generate()); 89 91 90 $tllist = new TopLossesList(); 91 $tllist->setWeek( $week ); 92 $tllist->setYear( $year ); 93 if ( CORP_ID ) 94 $tllist->addVictimCorp( new Corporation( CORP_ID ) ); 95 if ( ALLIANCE_ID ) 96 $tllist->addVictimAlliance( new Alliance( ALLIANCE_ID ) ); 97 98 $tllist->generate(); 99 $tlbox = new AwardBox( $tllist, "Top losers", "losses in week ".$week, "losses", "moon" ); 100 $page->addContext( $tlbox->generate() ); 92 $tllist = new TopLossesList(); 93 $tllist->setWeek($week); 94 $tllist->setYear($year); 95 if (CORP_ID) 96 $tllist->addVictimCorp(new Corporation(CORP_ID)); 97 if (ALLIANCE_ID) 98 $tllist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 101 99 102 $page->setContent( $html ); 103 $page->generate(); 100 $tllist->generate(); 101 $tlbox = new AwardBox($tllist, "Top losers", "losses in week ".$week, "losses", "moon"); 102 $page->addContext($tlbox->generate()); 103 104 $page->setContent($html); 105 $page->generate(); 104 106 ?> -
dev/install/install_step4.php
r133 r149 107 107 if (trim($query)) 108 108 { 109 $query = trim($query); 110 if (substr($query, -1, 1) == ';') 111 { 112 $query = substr($query, 0, -1); 113 } 109 114 $query_count++; 110 115 $id = mysql_query($query); … … 173 178 foreach ($querys as $query) 174 179 { 175 $id = mysql_query($query); 180 $query = trim($query); 181 if ($query) 182 { 183 if (substr($query, -1, 1) == ';') 184 { 185 $query = substr($query, 0, -1); 186 } 187 $id = mysql_query($query); 188 } 176 189 } 177 190 if ($id) -
dev/mods/rss_feed/rss.php
r134 r149 19 19 <title>".KB_TITLE."</title> 20 20 <description>20 Most Recent Kills</description> 21 <link> http://".KB_HOST."</link>21 <link>".KB_HOST."</link> 22 22 <copyright>".KB_TITLE."</copyright>\n"; 23 23 -
dev/templates/kill_detail.tpl
r137 r149 14 14 <tr class={cycle name=ccl}> 15 15 <td class=kb-table-cell width=64><b>Alliance:</b></td> 16 <td class=kb-table-cell><b><a href=" VictimAllianceURL">{$VictimAllianceName}</a></b></td>16 <td class=kb-table-cell><b><a href="{$VictimAllianceURL}">{$VictimAllianceName}</a></b></td> 17 17 </tr> 18 18 </table> -
dev/templates/standings.tpl
r134 r149 7 7 {if $standings[opt].name=='Alliances'} 8 8 <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> 9 <td><b><a href="?a lliance_detail&all_id={$standings[opt].list[idx].id}">{$standings[opt].list[idx].text}</a></b>{$standings[opt].list[idx].descr}</td>9 <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> 10 10 {else} 11 11 <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> 12 <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>12 <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> 13 13 {/if} 14 14 <td align="right">{$standings[opt].list[idx].value}</td>