Changeset 233 for dev

Show
Ignore:
Timestamp:
09/06/07 10:07:07 (15 years ago)
Author:
ralle030583
Message:

- changed summarytable format to 5 rows each cause of cap. industrial
- bugfix in autoupgrade of navigation table (Kills were linked to Home :-/)
- added chk_cap_industrial to autoupgrade
- added Capital Industrial to sql install files

Location:
dev
Files:
21 modified

Legend:

Unmodified
Added
Removed

  • dev/common/admin/option_db.php

    r231 r233  
    1212        // todo: write functions to take care of this 
    1313        // based on a database description file 
     14        check_cap_industrial(); 
    1415        check_pilots(); 
    1516        check_invdetail(); 

  • dev/common/alliance_detail.php

    r213 r233  
    2323$kill_summary = new KillSummaryTable(); 
    2424$kill_summary->addInvolvedAlliance($alliance); 
    25 $kill_summary->setBreak(6); 
     25$kill_summary->setBreak(5); 
    2626$summary_html = $kill_summary->generate(); 
    2727 

  • dev/common/cc_detail.php

    r213 r233  
    4040$llist = $contract->getLossList(); 
    4141$killsummary = new KillSummaryTable($klist, $llist); 
    42 $killsummary->setBreak(6); 
     42$killsummary->setBreak(5); 
    4343if ($_GET['view'] == "") 
    4444    $killsummary->setFilter(false); 

  • dev/common/corp_detail.php

    r213 r233  
    1818$kill_summary = new KillSummaryTable(); 
    1919$kill_summary->addInvolvedCorp($corp); 
    20 $kill_summary->setBreak(6); 
     20$kill_summary->setBreak(5); 
    2121$summary_html = $kill_summary->generate(); 
    2222 

  • dev/common/home.php

    r213 r233  
    3232 
    3333$summarytable = new KillSummaryTable($kslist, $llist); 
    34 $summarytable->setBreak(6); 
     34$summarytable->setBreak(5); 
    3535$html .= $summarytable->generate(); 
    3636 

  • dev/common/igb_home.php

    r213 r233  
    3232 
    3333$summarytable = new KillSummaryTable($kslist, $llist); 
    34 $summarytable->setBreak(6); 
     34$summarytable->setBreak(5); 
    3535 
    3636if ($week == 1) 

  • dev/common/includes/autoupgrade.php

    r221 r233  
    1919        PRIMARY KEY ( `ID` ) 
    2020        ) TYPE = MYISAM'; 
     21    $qry->execute($query); 
     22} 
     23 
     24function check_cap_industrial() 
     25{ 
     26    $qry = new DBQuery(); 
     27    $query = 'select count(*) as cnt from kb3_ship_classes where scl_class="Cap. Industrial";'; 
     28    $result = $qry->execute($query); 
     29        if ($result['cnt'] == 1) 
     30    { 
     31        return; 
     32    } 
     33    $query =    "INSERT IGNORE INTO kb3_ship_classes(scl_id,scl_class,scl_value,scl_points) 
     34                                        values ('','Cap. Industrial','1850000000','5000'); 
     35                                INSERT IGNORE INTO kb3_ships(shp_id,shp_name,shp_class,shp_externalid,shp_rce_id,shp_baseprice,shp_techlevel) 
     36                                        values ('','Rorqual','','28352','0','1850000000','1'); 
     37                                UPDATE kb3_ships set kb3_ships.shp_class=(select scl_id from kb3_ship_classes where scl_class='Cap. Industrial') where kb3_ships.shp_name='Rorqual'; 
     38                                INSERT IGNORE INTO kb3_ships_values(shp_id,shp_value) 
     39                                        values ((select kb3_ships.shp_id from kb3_ships where kb3_ships.shp_name='Rorqual'),'1850000000');"; 
    2140    $qry->execute($query); 
    2241} 
    … …  
    4665                                                        INSERT IGNORE INTO `kb3_navigation` (`nav_type`,`intern`,`descr` ,`url` ,`target`,`posnr` ,`page`,`KBSITE`) VALUES ('top',1,'Campaings','?a=campaigns','_self',2,'ALL_PAGES','".KB_SITE."'); 
    4766                                                        INSERT IGNORE INTO `kb3_navigation` (`nav_type`,`intern`,`descr` ,`url` ,`target`,`posnr` ,`page`,`KBSITE`) VALUES ('top',1,'Contracts','?a=contracts','_self',3,'ALL_PAGES','".KB_SITE."'); 
    48                                                         INSERT IGNORE INTO `kb3_navigation` (`nav_type`,`intern`,`descr` ,`url` ,`target`,`posnr` ,`page`,`KBSITE`) VALUES ('top',1,'Kills','?a=home','_self',4,'ALL_PAGES','".KB_SITE."'); 
     67                                                        INSERT IGNORE INTO `kb3_navigation` (`nav_type`,`intern`,`descr` ,`url` ,`target`,`posnr` ,`page`,`KBSITE`) VALUES ('top',1,'Kills','?a=kills','_self',4,'ALL_PAGES','".KB_SITE."'); 
    4968                                                        INSERT IGNORE INTO `kb3_navigation` (`nav_type`,`intern`,`descr` ,`url` ,`target`,`posnr` ,`page`,`KBSITE`) VALUES ('top',1,'Losses','?a=losses','_self',5,'ALL_PAGES','".KB_SITE."'); 
    5069                                                        INSERT IGNORE INTO `kb3_navigation` (`nav_type`,`intern`,`descr` ,`url` ,`target`,`posnr` ,`page`,`KBSITE`) VALUES ('top',1,'Post Mail','?a=post','_self',6,'ALL_PAGES','".KB_SITE."'); 

  • dev/common/includes/globals.php

    r232 r233  
    11<?php 
    22// current subversion revision 
    3 preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 232 $', $match); 
     3preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 233 $', $match); 
    44define('SVN_REV', $match[1]); 
    55 

  • dev/common/kill_related.php

    r229 r233  
    9595 
    9696$summarytable = new KillSummaryTable($kslist, $lslist); 
    97 $summarytable->setBreak(6); 
     97$summarytable->setBreak(5); 
    9898$html .= $summarytable->generate(); 
    9999 

  • dev/common/kills.php

    r206 r233  
    5858 
    5959$summarytable = new KillSummaryTable($kslist, $llist); 
    60 $summarytable->setBreak(6); 
     60$summarytable->setBreak(5); 
    6161$html .= $summarytable->generate(); 
    6262 

  • dev/common/losses.php

    r215 r233  
    6060 
    6161$summarytable = new KillSummaryTable($klist, $lslist); 
    62 $summarytable->setBreak(6); 
     62$summarytable->setBreak(5); 
    6363$html .= $summarytable->generate(); 
    6464// $html .= "<table width=\"99%\" align=center><tr><td class=weeknav align=left>"; 

  • dev/common/pilot_detail.php

    r206 r233  
    5656$lpoints = $llist->getPoints(); 
    5757$summary = new KillSummaryTable($klist, $llist); 
    58 $summary->setBreak(6); 
     58$summary->setBreak(5); 
    5959if ($_GET['view'] == "ships_weapons") 
    6060{ 

  • dev/common/system_detail.php

    r206 r233  
    3737 
    3838$summarytable = new KillSummaryTable($kslist, $lslist); 
    39 $summarytable->setBreak(6); 
     39$summarytable->setBreak(5); 
    4040$html .= $summarytable->generate(); 
    4141 

  • dev/install/sql/sql_tbldata_opt_ships_values.sql

    r160 r233  
    189189INSERT IGNORE INTO `kb3_ships_values` VALUES ('215','60000000000'); 
    190190INSERT IGNORE INTO `kb3_ships_values` VALUES ('213','80000000000'); 
     191INSERT IGNORE INTO `kb3_ships_values` VALUES ('431','1850000000'); 

  • dev/install/sql/sql_tbldata_ship_classes.sql

    r98 r233  
    2727INSERT IGNORE INTO `kb3_ship_classes` VALUES ('27','Carrier','1000000000','3000'); 
    2828INSERT IGNORE INTO `kb3_ship_classes` VALUES ('28','Mothership','25000000000','6000'); 
     29INSERT IGNORE INTO `kb3_ship_classes` VALUES ('29','Cap. Industrial','1850000000','5000'); 

  • dev/install/sql/sql_tbldata_ships.sql

    r138 r233  
    364364INSERT IGNORE INTO `kb3_ships` VALUES ('429','Maelstrom','1','24694','4','145000000','1'); 
    365365INSERT IGNORE INTO `kb3_ships` VALUES ('430','Rokh','1','24688','2','165000000','1'); 
     366INSERT IGNORE INTO `kb3_ships` VALUES ('431','Rorqual','29','28352','0','1850000000','1'); 

  • dev/mods/example_mod/home.php

    r213 r233  
    3434 
    3535$summarytable = new KillSummaryTable($kslist, $llist); 
    36 $summarytable->setBreak(6); 
     36$summarytable->setBreak(5); 
    3737//$html .= $summarytable->generate(); 
    3838 

  • dev/mods/forum_post/cc_detail.php

    r227 r233  
    5252$llist = $contract->getLossList(); 
    5353$killsummary = new KillSummaryTable($klist, $llist); 
    54 $killsummary->setBreak(6); 
     54$killsummary->setBreak(5); 
    5555if ($_GET['view'] == "") 
    5656    $killsummary->setFilter(false); 

  • dev/mods/forum_post/forum_post.php

    r227 r233  
    1515$llist = $contract->getLossList(); 
    1616$killsummary = new KillSummaryTable($klist, $llist); 
    17 $killsummary->setBreak(6); 
     17$killsummary->setBreak(5); 
    1818        if ($_GET['view'] == ""){ 
    1919                $killsummary->setFilter(false); 
    … …  
    105105 
    106106$killsummary = new KillSummaryTable($kslist, $lslist); 
    107 $killsummary->setBreak(6); 
     107$killsummary->setBreak(5); 
    108108$name = $system->getName()." ".substr($firstts,0, 16)." ". substr($lastts,-8,5); 
    109109} 

  • dev/mods/forum_post/kill_related.php

    r207 r233  
    9595 
    9696$summarytable = new KillSummaryTable($kslist, $lslist); 
    97 $summarytable->setBreak(6); 
     97$summarytable->setBreak(5); 
    9898$html .= $summarytable->generate(); 
    9999 

  • dev/mods/known_members/corp_detail.php

    r213 r233  
    6767{ 
    6868    $summarytable = new KillSummaryTable($klist, $llist); 
    69     $summarytable->setBreak(6); 
     69    $summarytable->setBreak(5); 
    7070 
    7171    $html .= $summarytable->generate();