Some improvements, caching of email templates prepared

diff --git a/confirm.php b/confirm.php
index a7c797de4773ade6d7872506de4bf6d8ee9986db..bd8622996fa006c8d78e2231766803d17a2f6ea1 100644 (file)
--- 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&what=confirm';
 
 // Is the hash there?
 if (isGetRequestParameterSet('hash')) {
-       // We have an refid here. So we simply add it
-       $URL = 'modules.php?module=index&what=confirm&hash=' . getRequestParameter('hash');
+       // We have a hash here. So we simply add it
+       $URL .= '&hash=' . getRequestParameter('hash');
 } // END - if
 
 // Load the URL

diff --git a/inc/functions.php b/inc/functions.php
index 7838ec88620947b87d2cc7c6bb17e64386358bf7..f9a51c0cb6e0006883b0a6450a1e28d0fe1bf620 100644 (file)
--- 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 e00b017d4ca45f009860ed846b5c9b34da18af17..f31519e5ab8fdca68a57946019537ca6057e0b71 100644 (file)
--- 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>