extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 22:01:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed caching of etemplates:

Browse Source 
- never read timestamp of last import from cache
- check timestamps only once per session and app
This commit is contained in:
Ralf Becker 2010-07-21 13:50:29 +00:00
parent 3dfa4e5fe6
commit f597385a9c
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etemplate/inc/class.boetemplate.inc.php
View File

@ -845,7 +845,7 @@ class boetemplate extends soetemplate
egw_cache::unsetInstance('etemplate',$this->cache_name()); egw_cache::unsetInstance('etemplate',$this->cache_name());
} }
static private $import_tested = array(); static private $import_tested;
/** /**
* Test if new template-import necessary for app and does the import * Test if new template-import necessary for app and does the import
@ -861,15 +861,20 @@ class boetemplate extends soetemplate
if (is_array($app)) $app = $app['name']; if (is_array($app)) $app = $app['name'];
list($app) = explode('.',$app); list($app) = explode('.',$app);
if (is_null(self::$import_tested))
{
self::$import_tested =& egw_cache::getSession('etemplate','import_tested');
if (is_null(self::$import_tested)) self::$import_tested = array();
}
if (!$app || self::$import_tested[$app]) if (!$app || self::$import_tested[$app])
{ {
return ''; // ensure test is done only once per call and app return ''; // ensure test is done only once per session and app
} }
self::$import_tested[$app] = True; // need to be done before new ... self::$import_tested[$app] = True; // need to be done before new ...
$path = EGW_SERVER_ROOT."/$app/setup/etemplates.inc.php"; $path = EGW_SERVER_ROOT."/$app/setup/etemplates.inc.php";
if ($time = @filemtime($path)) if (($time = @filemtime($path)))
{ {
$templ = new boetemplate(array('name' => '.'.$app,'lang' => '##')); $templ = new boetemplate(array('name' => '.'.$app,'lang' => '##'));
if ($templ->lang != '##' || $templ->modified < $time) // need to import if ($templ->lang != '##' || $templ->modified < $time) // need to import
@ -933,12 +938,17 @@ class boetemplate extends soetemplate
$msg = self::test_import($name); $msg = self::test_import($name);
//if ($msg) echo "<p>".__METHOD__."($name,$template,$lang,$group,$version) self::test_import($name) returning $msg</p>\n"; //if ($msg) echo "<p>".__METHOD__."($name,$template,$lang,$group,$version) self::test_import($name) returning $msg</p>\n";
$data = egw_cache::getInstance('etemplate',$cname=self::cache_name($name,$template,$lang));
if (is_array($name)) if (is_array($name))
{ {
$version = $name['version']; $version = $name['version'];
$lang = $name['lang'];
$template = $name['template'];
$name = $name['name']; $name = $name['name'];
} }
// templates starting with . (as the import timestamp) never use the cache
if ($name[0] == '.') return false;
$data = egw_cache::getInstance('etemplate',$cname=self::cache_name($name,$template,$lang));
//echo "<p>".__METHOD__.'('.array2string($name).",$template,$lang,$group,$version) egw_cache::getInstance('etemplate','$cname')=".array2string(array('name'=>$data['name'],'version'=>$data['version'],'modified'=>$data['modified']))."</p>\n"; //echo "<p>".__METHOD__.'('.array2string($name).",$template,$lang,$group,$version) egw_cache::getInstance('etemplate','$cname')=".array2string(array('name'=>$data['name'],'version'=>$data['version'],'modified'=>$data['modified']))."</p>\n";
if (!is_null($data) && (empty($version) || $data['version'] == $version)) if (!is_null($data) && (empty($version) || $data['version'] == $version))