fixed new logs lists template caching

htdocs/lib2/OcSmarty.class.php

@@ -17,7 +17,7 @@ class OcSmarty extends Smarty
 	var $main_template = 'sys_main';
 	var $bench = null;
 	var $compile_id = null;
-	var $cache_id = null;
+	var $cache_id = null;    // This is a smarty caching ID, not a caches.cache_id.
 	var $title = '';
 	var $menuitem = null;
 	var $nowpsearch = false;
@@ -377,7 +377,12 @@ function is_cached($dummy1=null, $dummy2=null, $dummy3=null)
 	function get_cache_id()
 	{
 		global $opt;
-		return $this->name . '|' . $this->cache_id;
+
+		// $cache_id can be directly supplied from unverified user input (URL params).
+		// Probably this is no safety or stability issue, but to be sure we restrict
+		// the ID to a reasonable set of characters:
+
+		return $this->name . '|' . mb_ereg_replace('/[^A-Za-z0-9_\|\-\.]/', '', $this->cache_id);
 	}
 
 	function get_compile_id()

htdocs/newlogs.php

@@ -44,16 +44,17 @@
 	}
 	elseif (@$newlogs_rest)
 	{
-		// latest logs for all countries but Germany
+		// latest logs for all countries but the site's main country
 		$tpl->name = 'newlogsrest';
 		$tpl->menuitem = MNU_START_NEWLOGS;
 		$country = $login->getUserCountry();
 		$exclude_country = $opt['page']['main_country'];
 		$include_country = '%';
-		// As nearly all logs are from Germany, retrieving non-German logs is
+		// As most logs are from the main country, retrieving the other logs is
 		// expensive -> longer cache lifetime.
 		$tpl->caching = true;
 		$tpl->cache_lifetime = 900;
+		$tpl->cache_id = $exclude_country;
 		$logcount = 250;
 		$paging = false;  // paging would have poor performance for all logs
 		$orderByDate = '';
@@ -75,6 +76,7 @@
 		}
 		$tpl->caching = true;
 		$tpl->cache_lifetime = 300;
+		$tpl->cache_id = $country;
 		$logcount = 250;
 		$paging = false;  // paging would have poor performance for all logs
 		$orderByDate = '';