Changeset 421

Show
Ignore:
Timestamp:
07/13/09 12:52:52 (11 years ago)
Author:
kovell
Message:

Alliance page is named Faction if showing a Faction. Cache options clarified. Page specific cache times re-enabled.

Location:
dev/common
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • dev/common/admin/option_acache.php

    r404 r421  
    88options::fadd('Cache lifetime (min)', 'cache_time', 'edit:size:4'); 
    99options::fadd('Cache directory', 'cache_dir', 'edit:size:40'); 
    10 options::fadd('Ignore pages (xx,yy)', 'cache_ignore', 'edit:size:60'); 
    11 //options::fadd('Cache times (xx:1,yy:2)', 'cache_times', 'edit:size:60'); 
    12 options::fadd('Pages updated every kill', 'cache_update', 'edit:size:60'); 
     10options::fadd('Ignore pages', 'cache_ignore', 'edit:size:60','','','page1,page2 [no spaces]'); 
     11options::fadd('Page specific times', 'cache_times', 'edit:size:60','','','page:time,page2:time [no spaces]'); 
     12options::fadd('Pages updated every kill', 'cache_update', 'edit:size:60','','','* or page1,page2 [no spaces]'); 
    1313 
    1414options::cat('Advanced', 'Cache', 'Query Cache'); 
     
    142142                        $qry->execute("DELETE FROM kb3_sum_corp"); 
    143143                        $qry->execute("DELETE FROM kb3_sum_pilot"); 
     144                        // Clear page and query cache as well since they also contain the 
     145                        // summaries. 
     146                        admin_acache::clearQCache(); 
     147                        admin_acache::removeOld(0, KB_CACHEDIR.'/'.KB_SITE, false); 
    144148                        $_POST['option']['clear_sum'] == 'off'; 
    145149        } 
     
    147151        { 
    148152                        admin_acache::clearQCache(); 
     153                        // Also clear the page cache since it will have cached the results 
     154                        // of the file cache 
     155                        admin_acache::removeOld(0, KB_CACHEDIR.'/'.KB_SITE, false); 
    149156                        $_POST['option']['clear_sql'] == 'off'; 
    150157        } 
  • dev/common/alliance_detail.php

    r399 r421  
    6565 
    6666$alliance = new Alliance($all_id); 
    67 $page = new Page('Alliance details - '.$alliance->getName()); 
     67if($alliance->isFaction()) $page = new Page('Faction details - '.$alliance->getName()); 
     68else $page = new Page('Alliance details - '.$alliance->getName()); 
    6869 
    6970$html .= "<table class=kb-table width=\"100%\" border=\"0\" cellspacing=1><tr class=kb-table-row-even><td rowspan=8 width=128 align=center bgcolor=black>"; 
  • dev/common/includes/class.cache.php

    r399 r421  
    6868 
    6969                        $cachefile = cache::genCacheName(); 
    70                         /* 
     70                         
    7171            $times = explode(',', config::get('cache_times')); 
    7272            foreach ($times as $string) 
     
    8282            else 
    8383            { 
    84                 $cachetime = 10; 
     84                $cachetime = config::get('cache_time'); 
    8585            } 
    86                         */ 
     86                         
    8787                        $cachetime = config::get('cache_time'); 
    8888            $cachetime = $cachetime * 60;