Changeset 396

Timestamp:

06/28/09 13:02:26 (11 years ago)

Author:

kovell

Message:

Fixes: HTML, killlists with multiple involved, thumbnail creation delays, mods using short php tags corrected (Tribalize) . Autoupgrade adds missing indexes on upgraded boards. page cache updating algorithm improved, feed log information cleaned up (Oleg)

Location:

dev

Files:

• common/admin/admin_navmanager.php (modified) (1 diff)
• common/admin/feed_fetcher.php (modified) (1 diff)
• common/admin/option_acache.php (modified) (1 diff)
• common/campaigns.php (modified) (1 diff)
• common/includes/autoupgrade.php (modified) (4 diffs)
• common/includes/class.cache.php (modified) (4 diffs)
• common/includes/class.kill.php (modified) (2 diffs)
• common/includes/class.killlist.php (modified) (5 diffs)
• common/includes/class.pilot.php (modified) (2 diffs)
• common/includes/class.thumb.php (modified) (1 diff)
• common/includes/globals.php (modified) (1 diff)
• common/thumb.php (modified) (1 diff)
• mods/apiuser/checkphpbb.php (modified) (1 diff)
• mods/apiuser/phpbbaccess.php (modified) (1 diff)
• mods/example_mod/settings.php (modified) (1 diff)
• mods/forum_post/forum_post.php (modified) (1 diff)
• mods/forum_post/settings.php (modified) (1 diff)
• templates/award_box.tpl (modified) (1 diff)
• templates/icon24.tpl (modified) (1 diff)
• templates/icon32.tpl (modified) (1 diff)
• templates/icon48.tpl (modified) (1 diff)
• templates/summarytable.tpl (modified) (2 diffs)

dev/common/admin/admin_navmanager.php

@@ -271 +271 @@
     }elseif (ALLIANCE_ID)
     {
-        $statlink = '?a=alliance_detail&';
+        $statlink = '?a=alliance_detail';
     }
     $qry = new DBQuery();

dev/common/admin/feed_fetcher.php

@@ -170 +170 @@
                                 {
                                         $qry = new DBQuery();
+                                        if(strpos($uurl, '?')) $logurl = substr(substr($uurl,7,strpos($uurl, '?') - 7), 0, 20);
+                                        else $logurl = substr($uurl,7,20);
                                         $qry->execute( "insert into kb3_log (log_kll_id, log_site, log_ip_address, log_timestamp) values( ".
-                                                $killid.", '".KB_SITE."','".substr($uurl,7,20)."',now() )" );
+                                                $killid.", '".KB_SITE."','".$logurl."',now() )" );
                                         $html .= "Killmail successfully posted <a href=\"?a=kill_detail&kll_id=".$killid."\">here</a>.<br>";
 

dev/common/admin/option_acache.php

@@ -7 +7 @@
 options::cat('Advanced', 'Cache', 'Cache Control');
 options::fadd('Caching enabled', 'cache_enabled', 'checkbox');
+options::fadd('Cache lifetime (min)', 'cache_time', 'edit:size:4');
 options::fadd('Cache directory', 'cache_dir', 'edit:size:40');
 options::fadd('Ignore pages (xx,yy)', 'cache_ignore', 'edit:size:60');
-options::fadd('Cache times (xx:1,yy:2)', 'cache_times', 'edit:size:60');
+//options::fadd('Cache times (xx:1,yy:2)', 'cache_times', 'edit:size:60');
+options::fadd('Pages updated every kill', 'cache_update', 'edit:size:60');
 
 options::cat('Advanced', 'Cache', 'Query Cache');

dev/common/campaigns.php

@@ -29 +29 @@
 $menubox->setIcon('menu-item.gif');
 $menubox->addOption('link', 'Active campaigns', '?a=campaigns');
-$menubox->addOption('link', 'Past campaigns', '?a=campaigns&view=past');
+$menubox->addOption('link', 'Past campaigns', '?a=campaigns&view=past');
 
 $page->addContext($menubox->generate());

dev/common/includes/autoupgrade.php

@@ -12 +12 @@
 define(CURRENT_DB_UPDATE,config::get("DBUpdate"));
 //Update version of this autoupgrade.php
-define(LASTEST_DB_UPDATE,"007");
+define(LASTEST_DB_UPDATE,"008");
 
 function updateDB(){
@@ -25 +25 @@
 
                 update007();
+                update008();
         }
 }
@@ -280 +281 @@
                 $qry->execute("SHOW COLUMNS FROM kb3_pilots LIKE 'plt_losspoints'");
                 if($qry->recordCount()) $qry->execute("ALTER TABLE kb3_pilots DROP plt_losspoints");
+
+                // Add corp and alliance index to kb3_inv_detail
                 $qry->execute("SHOW INDEX FROM kb3_inv_detail");
 
-                // Add corp and alliance index to kb3_inv_detail
                 $indexcexists = false;
                 $indexaexists = false;
@@ -336 +338 @@
         }
 }
+// Add unique name indices to alliance, corp and pilot
+// Check kb3_inv_detail has correct indices
+function update008()
+{
+        //Checking if this Update already done
+        if (CURRENT_DB_UPDATE < "008" )
+        {
+                if(!config::get('008updatestatus')) config::set('008updatestatus',0);
+                $qry = new DBQuery(true);
+
+                if(config::get('008updatestatus') <1)
+                {
+                        // Add pilot, corp and alliance index to kb3_inv_detail
+                        // Incomplete in update007
+                        $qry->execute("SHOW INDEXES FROM kb3_inv_detail");
+                        $indexcexists = false;
+                        $indexaexists = false;
+                        $indexpexists = false;
+                        $indexkexists = false;
+                        while($testresult = $qry->getRow())
+                        {
+                                if($testresult['Column_name'] == 'ind_kll_id' && $testresult['Seq_in_index'] == 1)
+                                        $indexkexists = true;
+                                if($testresult['Column_name'] == 'ind_crp_id' && $testresult['Seq_in_index'] == 1)
+                                        $indexcexists = true;
+                                if($testresult['Column_name'] == 'ind_all_id' && $testresult['Seq_in_index'] == 1)
+                                        $indexaexists = true;
+                                if($testresult['Column_name'] == 'ind_plt_id' && $testresult['Seq_in_index'] == 1)
+                                        $indexpexists = true;
+                        }
+                        //
+                        if(!indexkexists)
+                                $qry->execute("ALTER TABLE `kb3_inv_detail` ADD INDEX ( `ind_kll_id`, `ind_order` ) ");
+                        if(!indexcexists)
+                                $qry->execute("ALTER TABLE `kb3_inv_detail` ADD INDEX ( `ind_crp_id` ) ");
+                        if(!indexaexists)
+                                $qry->execute("ALTER TABLE `kb3_inv_detail` ADD INDEX ( `ind_all_id` ) ");
+                        if(!indexpexists)
+                                $qry->execute("ALTER TABLE `kb3_inv_detail` ADD INDEX ( `ind_plt_id` ) ");
+                        config::set('008updatestatus', 1);
+                }
+
+                $qry->execute("SHOW INDEXES FROM kb3_corps");
+                $indexaexists = false;
+                while($testresult = $qry->getRow())
+                {
+                        if($testresult['Column_name'] == 'crp_name' && $testresult['Non_unique'] == 0)
+                                $indexcexists = true;
+                }
+                if(!$indexcexists)
+                {
+                        $sqlcrp = 'select a.crp_id as newid, b.crp_id as oldid from kb3_corps a, kb3_corps b where a.crp_name = b.crp_name and a.crp_id < b.crp_id';
+
+                        if(config::get('008updatestatus') <2)
+                        {
+                                $qry->execute('update kb3_inv_detail join ('.$sqlcrp.') c on c.oldid = ind_crp_id set ind_crp_id = c.newid');
+                                config::set('008updatestatus', 2);
+                        }
+                        if(config::get('008updatestatus') <3)
+                        {
+                                $qry->execute('update kb3_pilots join ('.$sqlcrp.') c on (c.oldid = plt_crp_id) set plt_crp_id = c.newid');
+                                config::set('008updatestatus', 3);
+                        }
+                        if(config::get('008updatestatus') <4)
+                        {
+                                $qry->execute('update kb3_kills join ('.$sqlcrp.') c on (c.oldid = kll_crp_id) set kll_crp_id = c.newid');
+                                config::set('008updatestatus', 4);
+                        }
+
+                        if(config::get('008updatestatus') <6)
+                        {
+                                $qry->execute('delete b from kb3_corps a, kb3_corps b where a.crp_name = b.crp_name and a.crp_id < b.crp_id');
+                                config::set('008updatestatus', 6);
+                        }
+                        if(config::get('008updatestatus') <7)
+                        {
+                                $qry->execute("SHOW INDEXES FROM kb3_corps");
+                                $indexcexists = false;
+                                while($testresult = $qry->getRow())
+                                {
+                                        if($testresult['Column_name'] == 'crp_name' && $testresult['Seq_in_index'] == 1)
+                                        {
+                                                $indexcname = $testresult['Key_name'];
+                                                $indexcexists = true;
+                                        }
+                                        // Don't replace a custom multi-column index.
+                                        elseif($testresult['Key_name'] == $indexcname && $testresult['Seq_in_index'] == 2)
+                                                $indexcexists = false;
+                                }
+                                if(!$indexcexists) $qry->execute("ALTER TABLE `kb3_corps` DROP INDEX `".$indexcname."`");
+                                $qry->execute("ALTER TABLE `kb3_corps` ADD UNIQUE INDEX ( `crp_name` ) ");
+                                config::set('008updatestatus', 7);
+                        }
+                }
+                // Make kb3_alliances.all_name unique without losing kills
+                $qry->execute("SHOW INDEXES FROM kb3_alliances");
+                $indexaexists = false;
+                while($testresult = $qry->getRow())
+                {
+                        if($testresult['Column_name'] == 'all_name' && $testresult['Non_unique'] == 0)
+                                $indexaexists = true;
+                }
+                if(!$indexaexists)
+                {
+                        $sqlall = 'select a.all_id as newid, b.all_id as oldid from kb3_alliances a, kb3_alliances b where a.all_name = b.all_name and a.all_id < b.all_id';
+                        if(config::get('008updatestatus') <8)
+                        {
+                                $qry->execute('update kb3_inv_detail join ('.$sqlall.') c on c.oldid = ind_all_id set ind_all_id = c.newid');
+                                config::set('008updatestatus', 8);
+                        }
+                        if(config::get('008updatestatus') <9)
+                        {
+                                $qry->execute('update kb3_corps join ('.$sqlall.') c on (c.oldid = crp_all_id) set crp_all_id = c.newid');
+                                config::set('008updatestatus', 9);
+                        }
+                        if(config::get('008updatestatus') <10)
+                        {
+                                $qry->execute('update kb3_kills join ('.$sqlall.') c on (c.oldid = kll_all_id) set kll_all_id = c.newid');
+                                config::set('008updatestatus', 10);
+                        }
+
+                        if(config::get('008updatestatus') <12)
+                        {
+                                $qry->execute('delete b from kb3_alliances a, kb3_alliances b where a.all_name = b.all_name and a.all_id < b.all_id');
+                                config::set('008updatestatus', 12);
+                        }
+                        if(config::get('008updatestatus') <13)
+                        {
+                                $qry->execute("SHOW INDEXES FROM kb3_alliances");
+                                $indexaexists = false;
+                                while($testresult = $qry->getRow())
+                                {
+                                        if($testresult['Column_name'] == 'all_name' && $testresult['Seq_in_index'] == 1)
+                                        {
+                                                $indexaname = $testresult['Key_name'];
+                                                $indexaexists = true;
+                                        }
+                                        // Don't replace a custom multi-column index.
+                                        elseif($testresult['Key_name'] == $indexaname && $testresult['Seq_in_index'] == 2)
+                                                $indexaexists = false;
+                                }
+                                if($indexaexists) $qry->execute("ALTER TABLE `kb3_alliances` DROP INDEX `".$indexaname."`");
+                                $qry->execute("ALTER TABLE `kb3_alliances` ADD UNIQUE INDEX ( `all_name` ) ");
+                                config::set('008updatestatus', 13);
+                        }
+                }
+
+                // Make kb3_pilots.plt_name unique without losing kills
+                $qry->execute("SHOW INDEXES FROM kb3_pilots");
+                $indexaexists = false;
+                while($testresult = $qry->getRow())
+                {
+                        if($testresult['Column_name'] == 'plt_name' && $testresult['Non_unique'] == 0)
+                                $indexaexists = true;
+                }
+                if(!$indexaexists)
+                {
+                        $sqlplt = 'select a.plt_id as newid, b.plt_id as oldid from kb3_pilots a, kb3_pilots b where a.plt_name = b.plt_name and a.plt_id < b.plt_id';
+                        if(config::get('008updatestatus') <14)
+                        {
+                                $qry->execute('update kb3_inv_detail join ('.$sqlplt.') c on c.oldid = ind_plt_id set ind_plt_id = c.newid');
+                                config::set('008updatestatus', 14);
+                        }
+                        if(config::get('008updatestatus') <15)
+                        {
+                                $qry->execute('update kb3_kills join ('.$sqlplt.') c on (c.oldid = kll_victim_id) set kll_victim_id = c.newid');
+                                config::set('008updatestatus', 15);
+                        }
+                        if(config::get('008updatestatus') <16)
+                        {
+                                $qry->execute('update kb3_kills join ('.$sqlplt.') c on (c.oldid = kll_fb_plt_id) set kll_fb_plt_id = c.newid');
+                                config::set('008updatestatus', 16);
+                        }
+                        if(config::get('008updatestatus') <17)
+                        {
+                                $qry->execute('delete b from kb3_pilots a, kb3_pilots b where a.plt_name = b.plt_name and a.plt_id < b.plt_id');
+                                config::set('008updatestatus', 17);
+                        }
+                        if(config::get('008updatestatus') <18)
+                        {
+                                $qry->execute("SHOW INDEXES FROM kb3_pilots");
+                                $indexpexists = false;
+                                while($testresult = $qry->getRow())
+                                {
+                                        if($testresult['Column_name'] == 'plt_name' && $testresult['Seq_in_index'] == 1)
+                                        {
+                                                $indexpname = $testresult['Key_name'];
+                                                $indexpexists = true;
+                                        }
+                                        // Don't replace a custom multi-column index.
+                                        elseif($testresult['Key_name'] == $indexpname && $testresult['Seq_in_index'] == 2)
+                                                $indexpexists = false;
+                                }
+                                if($indexpexists)  $qry->execute("ALTER TABLE `kb3_pilots` DROP INDEX `".$indexpname."`");
+                                $qry->execute("ALTER TABLE `kb3_pilots` ADD UNIQUE INDEX ( `plt_name` ) ");
+                                config::set('008updatestatus', 18);
+                        }
+                }
+                config::del("008updatestatus");
+                config::set('cache_update', '*');
+                config::set('cache_time', '10');
+                config::set("DBUpdate", "008");
+        }
+}
 
 function update_slot_of_group($id,$oldSlot = 0 ,$newSlot){

dev/common/includes/class.cache.php

@@ -66 +66 @@
                 mkdir(KB_CACHEDIR.'/'.KB_SITE);
             }
-                        // Include session info in the hash to support session-based security.
-            $cachefile = cache::genCacheName();
+
+                        $cachefile = cache::genCacheName();
+                        /*
             $times = explode(',', config::get('cache_times'));
             foreach ($times as $string)
@@ -83 +84 @@
                 $cachetime = 10;
             }
+                        */
+                        $cachetime = config::get('cache_time');
             $cachetime = $cachetime * 60;
 
@@ -94 +97 @@
                         if(file_exists($cachefile)) $timestamp = @filemtime($cachefile);
                         else $timestamp = 0;
-            //$timestamp = ((@file_exists($cachefile))) ? @filemtime($cachefile) : 0;
+                        
+                        if(config::get('cache_update') == '*')
+                                if(file_exists(KB_CACHEDIR.'/'.KB_SITE.'/killadded.mk'))
+                                        if($timestamp < @filemtime(KB_CACHEDIR.'/'.KB_SITE.'/killadded.mk'))
+                                                $timestamp = 0;
+                        else
+                        {
+                                $cacheupdate = explode(',', config::get('cache_update'));
+                                if (($page != '' && in_array($page, $cacheupdate)))
+                                        if(file_exists(KB_CACHEDIR.'/'.KB_SITE.'/killadded.mk'))
+                                                if($timestamp < @filemtime(KB_CACHEDIR.'/'.KB_SITE.'/killadded.mk'))
+                                                        $timestamp = 0;
+                        }
             if (time() - $cachetime < $timestamp)
             {
@@ -158 +173 @@
                 touch(genCacheName());
         }
+        //! Notify the cache that a kill has been added.
+        function notifyKillAdded()
+        {
+                touch(KB_CACHEDIR.'/'.KB_SITE.'/killadded.mk');
+        }
 }
 ?>

dev/common/includes/class.kill.php

@@ -6 +6 @@
 require_once('common/includes/class.system.php');
 require_once('common/includes/class.pilot.php');
-require_once('common/includes/class.killlist.php');
+//require_once('common/includes/class.killlist.php');
 require_once('common/includes/class.itemlist.php');
+require_once('common/includes/class.cache.php');
 
 class Kill
@@ -1101 +1102 @@
                 // call the event that we added this mail
                 event::call('killmail_added', $this);
+                cache::notifyKillAdded();
                 return $this->id_;
         }

dev/common/includes/class.killlist.php

@@ -139 +139 @@
             if( $datefilter == "" && ( $this->inv_plt_ || $this->inv_crp_ || $this->inv_all_))
             {
-                if($this->inv_plt_) $this->sql_ .= "INNER JOIN kb3_inv_detail ind ".
+                                $this->sql_ .= " INNER JOIN ";
+                                if($this->inv_plt_ && !($this->inv_crp_ || $this->inv_all_))
+                                {
+                                        $this->sql_ .= " kb3_inv_detail ind ".
                   "ON (kll.kll_id = ind.ind_kll_id AND ind.ind_plt_id IN (".
                   implode(',', $this->inv_plt_)." ) ) ";
-                if($this->inv_crp_) $this->sql_ .= "INNER JOIN (SELECT DISTINCT ind_kll_id FROM kb3_inv_detail WHERE ind_crp_id IN (".
-                  implode(',', $this->inv_crp_)." ) ) ind ".
-                  "ON (kll.kll_id = ind.ind_kll_id) ";
-                if($this->inv_all_) $this->sql_ .= "INNER JOIN (SELECT DISTINCT ind_kll_id FROM kb3_inv_detail WHERE ind_all_id IN (".
-                  implode(',', $this->inv_all_)." ) ) ind ".
-                                  "ON (kll.kll_id = ind.ind_kll_id)";
+                                }
+                                else
+                                {
+                                        $unionop = " ( ";
+                                        if($this->inv_plt_)
+                                        {
+                                                $indsqlp .= $unionop." SELECT DISTINCT ind_kll_id ".
+                                                        "FROM kb3_inv_detail ".
+                                                        "WHERE ind_plt_id IN (".implode(',', $this->inv_plt_)." ) ";
+                                                $unionop = " UNION ";
+                                        }
+                                        if($this->inv_crp_)
+                                        {
+                                                $this->sql_ .= $unionop." SELECT DISTINCT ind_kll_id ".
+                                                        "FROM kb3_inv_detail WHERE ind_crp_id IN (".
+                                                        implode(',', $this->inv_crp_)." ) ";
+                                                $unionop = " UNION ";
+                                        }
+                                        if($this->inv_all_) $this->sql_ .= $unionop." SELECT DISTINCT ind_kll_id FROM kb3_inv_detail WHERE ind_all_id IN (".
+                                          implode(',', $this->inv_all_).") ";
+                                        $this->sql_ .= ") ind ON (kll.kll_id = ind.ind_kll_id) ";
+                                }
             }
             // The first argument after WHERE affects sql optimisation so check
@@ -175 +194 @@
             if($this->vic_plt_ || $this->vic_crp_ || $this->vic_all_)
             {
-                    if ($this->mixedvictims_)
-                    {
-                        $this->sql_ .= $sqlwhereop." ( ";
-                        $sqlwhereop = "";
-                    }
-
-                    if ($this->vic_plt_)
-                        {$this->sql_ .= " ".$sqlwhereop." kll.kll_victim_id in ( ".implode(',', $this->vic_plt_)." )"; $sqlwhereop = " OR ";}
-                    if ($this->vic_crp_)
-                        {$this->sql_ .= " ".$sqlwhereop." kll.kll_crp_id in ( ".implode(',', $this->vic_crp_)." )"; $sqlwhereop = " OR ";}
-                    if ($this->vic_all_)
-                        {$this->sql_ .= " ".$sqlwhereop." kll.kll_all_id in ( ".implode(',', $this->vic_all_)." )"; $sqlwhereop = " OR ";}
-                    $sqlwhereop = ' AND ';
-                    if ($this->mixedvictims_)
-                        $this->sql_ .= " ) ";
+                                $this->sql_ .= $sqlwhereop." ( ";
+                                $sqlwhereop = "";
+
+                                if ($this->vic_plt_)
+                                        {$this->sql_ .= " ".$sqlwhereop." kll.kll_victim_id in ( ".implode(',', $this->vic_plt_)." )"; $sqlwhereop = " OR ";}
+                                if ($this->vic_crp_)
+                                        {$this->sql_ .= " ".$sqlwhereop." kll.kll_crp_id in ( ".implode(',', $this->vic_crp_)." )"; $sqlwhereop = " OR ";}
+                                if ($this->vic_all_)
+                                        {$this->sql_ .= " ".$sqlwhereop." kll.kll_all_id in ( ".implode(',', $this->vic_all_)." )"; $sqlwhereop = " OR ";}
+                                        
+                                $sqlwhereop = ' AND ';
+                                $this->sql_ .= " ) ";
             }
 
@@ -239 +255 @@
             if($this->inv_plt_ || $this->inv_crp_ || $this->inv_all_)
             {
+                                if($this->inv_all_ && $this->inv_crp_)
+                                {
+                                        $this->sql_ .= $sqlwhereop." ( ";
+                                        $sqlwhereop = '';
+                                }
+                                // No need to check the involved pilot since they can't shoot themself and get a killmail.
                 if ($this->inv_all_)
                 {
@@ -249 +271 @@
                     $sqlwhereop = ' AND ';
                 }
-                if( $datefilter != "" || $this->vic_plt_ || $this->vic_crp_ || $this->vic_all_)
+                                if($this->inv_all_ && $this->inv_crp_) $this->sql_ .= ") ";
+                if( $datefilter != "")
                 {
                     $this->sql_ .= $sqlwhereop." EXISTS (SELECT 1 FROM kb3_inv_detail exind ".
@@ -264 +287 @@
                 }
             }
-            // This will scan the entire table if LIMIT or a date filter are not used.
+            // This may scan the entire table if LIMIT or a date filter are not used.
+                        // Some queries combining groups will be slow on mysql versions < 5 without index merge.
             if($this->comb_plt_ || $this->comb_crp_ || $this->comb_all_)
             {
                 $this->sql_ .= $sqlwhereop." ( ";
-                $sqlwhereop = "";
+                $sqlwhereop = " OR ";
+                                $sqlexistop = "EXISTS ( SELECT 1 FROM kb3_inv_detail cind WHERE kll.kll_id = cind.ind_kll_id AND (";
                 if($this->comb_plt_)
                 {
-                        $this->sql_ .= " EXISTS (SELECT 1 FROM kb3_inv_detail cind
-                               WHERE cind.ind_plt_id in ( ".implode(',', $this->comb_plt_)." ) and kll.kll_id = cind.ind_kll_id  LIMIT 1) OR ";
-                        $this->sql_ .= "kll.kll_victim_id in ( ".implode(',', $this->comb_plt_)." ) ";
+                        $this->sql_ .= $sqlexistop." cind.ind_plt_id in ( ".implode(',', $this->comb_plt_)." )";
+                        $sqlexistop = " OR ";
+                }
+                if($this->comb_crp_)
+                {
+                        $this->sql_ .= $sqlexistop." cind.ind_crp_id in ( ".implode(',', $this->comb_crp_)." )";
+                        $sqlexistop = " OR ";
+                }
+                if($this->comb_all_)
+                {
+                        $this->sql_ .= $sqlexistop." cind.ind_all_id in ( ".implode(',', $this->comb_all_)." )";
+                }
+                                $this->sql_ .= " ) )";
+                if($this->comb_plt_)
+                {
+                        $this->sql_ .= $sqlwhereop."kll.kll_victim_id in ( ".implode(',', $this->comb_plt_)." ) ";
                         $sqlwhereop = " OR ";
                 }
                 if($this->comb_crp_)
                 {
-                        $this->sql_ .= $sqlwhereop." EXISTS (SELECT 1 FROM kb3_inv_detail cind
-                               WHERE  cind.ind_crp_id in ( ".implode(',', $this->comb_crp_)." ) and kll.kll_id = cind.ind_kll_id LIMIT 1) OR ";
-                        $this->sql_ .= "kll.kll_crp_id in ( ".implode(',', $this->comb_crp_)." ) ";
+                        $this->sql_ .= $sqlwhereop."kll.kll_crp_id in ( ".implode(',', $this->comb_crp_)." ) ";
                         $sqlwhereop = " OR ";
                 }
                 if($this->comb_all_)
                 {
-                        $this->sql_ .= $sqlwhereop." EXISTS (SELECT 1 FROM kb3_inv_detail cind
-                               WHERE  cind.ind_all_id in ( ".implode(',', $this->comb_all_)." ) and kll.kll_id = cind.ind_kll_id LIMIT 1) OR ";
-                        $this->sql_ .= "kll.kll_all_id in ( ".implode(',', $this->comb_all_)." ) ";
+                        $this->sql_ .= $sqlwhereop."kll.kll_all_id in ( ".implode(',', $this->comb_all_)." ) ";
                 }
                 $this->sql_ .= " )";

dev/common/includes/class.pilot.php

@@ -60 +60 @@
         if (!$this->externalid_)
         {
-                require_once("class.api.php");
-                $api = new Api();
-                $id = $api->getCharId($this->getName());
-                if ($id > 0)
-                        $this->setCharacterID($id);
-                return '?a=thumb&id='.$id.'&size='.$size;
-                        
+                return '?a=thumb&id='.$this->id_.'&size='.$size.'&int=1';
         }
         else
@@ -72 +66 @@
                         if( file_exists('cache/portraits/'.$this->externalid_.'_'.$size.'.jpg'))
                                 return 'cache/portraits/'.$this->externalid_.'_'.$size.'.jpg';
-                        else return '?a=thumb&id='.$this->externalid_.'&size='.$size;
+                        else return '?a=thumb&id='.$this->externalid_.'&size='.$size;
         }
     }   

dev/common/includes/class.thumb.php

@@ -210 +210 @@
     }
 }
+
+class thumbInt extends thumb
+{
+        function thumbInt($int_id, $size)
+        {
+                require_once('common/includes/class.pilot.php');
+                $pilot = new Pilot($int_id);
+                $this->_id = $pilot->getExternalID();
+        $this->_size = $size;
+        $this->_type = 'pilot';
+        $this->_encoding = 'jpeg';
+
+        $this->validate();
+        }
+}
 ?>

dev/common/includes/globals.php

@@ -7 +7 @@
 else
 {
-        $svn_rev = '394';
+        $svn_rev = '396';
 }
 define('SVN_REV', $svn_rev);

dev/common/thumb.php

@@ -2 +2 @@
 require_once('common/includes/class.thumb.php');
 
-$thumb = new thumb($_GET['id'], $_GET['size'], $_GET['type']);
+if(isset($_GET['int'])) $thumb = new thumbInt(intval($_GET['id']), intval($_GET['size']));
+else $thumb = new thumb(intval($_GET['id']), intval($_GET['size']), slashfix($_GET['type']));
 $thumb->display();
 ?>

dev/mods/apiuser/checkphpbb.php

@@ -1 @@
-<?
+<?php
 print $_SESSION['phpOK'].'@';
 ?>

dev/mods/apiuser/phpbbaccess.php

@@ -1 @@
-<?
+<?php
 //debut Mod PHPBB
 // Gestion de la page 

dev/mods/example_mod/settings.php

@@ -1 @@
-<?
+<?php
 require_once( "common/admin/admin_menu.php" );
 

dev/mods/forum_post/forum_post.php

@@ -1 @@
-popup| <?       
+popup| <?php    
 require_once('common/includes/class.killlist.php');
 require_once('common/includes/class.killlisttable.php');

dev/mods/forum_post/settings.php

@@ -1 @@
-<?
+<?php
 require_once( "common/admin/admin_menu.php" );
 require_once("common/includes/class.ship.php");

dev/templates/award_box.tpl

@@ -1 @@
-<!-- award_box.tpl -->
-<p>
+<!-- award_box.tpl -->&nbsp;
 <table class=kb-table width=150 cellspacing="1">
         <tr>

dev/templates/icon24.tpl

@@ -1 @@
-<div class="item-icon" style="position:absolute; border: none; height:24px; width:24px; text-align:left;">
+<span class="item-icon" style="position:absolute; border: none; height:24px; width:24px; text-align:left;">
 <img border="0" style="position:absolute; left:-4px; top:-4px; height:32; width:32; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(
      src='{$icon}', sizingMethod='image');" src="{$icon}" alt="">
 <img border="0" style="position:absolute; height:24px; width:24px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(
      src='{$img}', sizingMethod='image');" src='{$img}' title="{$name}" alt="{$name}">
-</div>
+</span>

dev/templates/icon32.tpl

@@ -1 @@
-<div class="item-icon" style="position:absolute; border: none; height:32px; width:32px; text-align:left;">
+<span class="item-icon" style="position:absolute; border: none; height:32px; width:32px; text-align:left;">
 <img border="0" style="position:absolute; height:32px; width:32px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(
      src='{$img}', sizingMethod='image');" src='{$img}' alt="">
 <img border="0" style="position:absolute; height:32px;  width:32px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(
      src='{$icon}', sizingMethod='image');" src='{$icon}' title="{$name}" alt="{$name}">
-</div>
+</span>

dev/templates/icon48.tpl

@@ -1 @@
-<div class="item-icon" style="position:absolute; border: none; height:48px; width:48px; text-align:left;">
+<span class="item-icon" style="position:absolute; border: none; height:48px; width:48px; text-align:left;">
 <img border="0" style="position:absolute; height:48px; width:48px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(
      src='{$img}', sizingMethod='image');" src='{$img}' alt="">
 <img border="0" style="position:absolute; height:48px;  width:48px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(
      src='{$icon}', sizingMethod='image');" src='{$icon}' title="{$name}" alt="{$name}">
-</div>
+</span>

dev/templates/summarytable.tpl

@@ -1 @@
-<!-- summarytable.php --><table class=kb-subtable width="100%" border="0" cellspacing=0>
+<!-- summarytable.tpl --><table class=kb-subtable width="100%" border="0" cellspacing=0>
         <tr>
                 <td valign=top width="{$width}%">
@@ -66 +66 @@
 {/if}
 {if $clearfilter}<table align=center><tr><td align=center valign=top class=weeknav>[<a href="{$clearfilter}">clear filter</a>]</td></tr></table>{/if}
-<!-- /summarytable.php -->
+<!-- /summarytable.tpl -->