From f4d28601c0ea91db9a9ab7365be4faccfd4147f0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 28 Jun 2010 05:23:38 +0000
Subject: [PATCH] Some improvements, caching of email templates prepared

---
 confirm.php                                    | 8 ++++----
 inc/functions.php                              | 9 +++++++--
 templates/de/html/admin/admin_user_details.tpl | 2 ++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/confirm.php b/confirm.php
index a7c797de47..bd8622996f 100644
--- a/confirm.php
+++ b/confirm.php
@@ -50,13 +50,13 @@ require('inc/config-global.php');
 // Set content type for e.g. search engines
 setContentType('text/html');
 
-// No hash provided by default
-$URL = 'modules.php?module=index';
+// No hash provided then we redirect to the right page
+$URL = 'modules.php?module=index&amp;what=confirm';
 
 // Is the hash there?
 if (isGetRequestParameterSet('hash')) {
-	// We have an refid here. So we simply add it
-	$URL = 'modules.php?module=index&amp;what=confirm&amp;hash=' . getRequestParameter('hash');
+	// We have a hash here. So we simply add it
+	$URL .= '&amp;hash=' . getRequestParameter('hash');
 } // END - if
 
 // Load the URL
diff --git a/inc/functions.php b/inc/functions.php
index 7838ec8862..f9a51c0cb6 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -3876,11 +3876,16 @@ function generateMetaDescriptionCode () {
 }
 
 // Generates an FQFN for template cache from the given template name
-function generateCacheFqfn ($template) {
+function generateCacheFqfn ($template, $mode = 'html') {
 	// Is this cached?
 	if (!isset($GLOBALS['template_cache_fqfn'][$template])) {
 		// Generate the FQFN
-		$GLOBALS['template_cache_fqfn'][$template] = sprintf("%s_compiled/html/%s.tpl.cache", getConfig('CACHE_PATH'), $template);
+		$GLOBALS['template_cache_fqfn'][$template] = sprintf(
+			"%s_compiled/%s/%s.tpl.cache",
+			getConfig('CACHE_PATH'),
+			$mode,
+			$template
+		);
 	} // END - if
 
 	// Return it
diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl
index e00b017d4c..f31519e5ab 100644
--- a/templates/de/html/admin/admin_user_details.tpl
+++ b/templates/de/html/admin/admin_user_details.tpl
@@ -1,3 +1,4 @@
+<div align="center">
 <table border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed">
 	<tr>
 		<td colspan="4" class="admin_title" align="center" style="height: 30px">
@@ -191,3 +192,4 @@
 		</td>
 	</tr>
 </table>
+</div>
-- 
2.39.5