Common subdirectories: securesite/digest_md5 and securesite_new/digest_md5 diff -up securesite/securesite.inc securesite_new/securesite.inc --- securesite/securesite.inc 2009-03-09 14:48:28.000000000 +0000 +++ securesite_new/securesite.inc 2009-06-16 16:00:53.782073600 +0100 @@ -357,12 +357,30 @@ function _securesite_dialog($type) { } } if (isset($content)) { - print theme('securesite_page', $content); + _securesite_rended_http_form(TRUE); + print theme('securesite_page', $content); module_invoke_all('exit'); exit(); } } +/* + * Helper function to let us know if we have rended a html form, if so + * knock out the drupal templates so only securesite-page.tpl.php is loaded + * + * This prevents issues if page-front.tpl.php is set which takes priority + * over the securesite template + */ +function _securesite_rended_http_form($renderd=FALSE){ + static $state = FALSE; + + if($renderd){ + $state=TRUE; + } + + return $state; +} + /** * Opera and Internet Explorer save credentials indefinitely and will keep * attempting to use them even when they have failed multiple times. We add a diff -up securesite/securesite.module securesite_new/securesite.module --- securesite/securesite.module 2009-03-09 14:48:26.000000000 +0000 +++ securesite_new/securesite.module 2009-06-16 16:01:12.213073600 +0100 @@ -259,6 +259,18 @@ function securesite_theme() { ); } +/* + * Implementation of hook_preprocess_page() + * + * Prevents page-front.tpl.php from rendering and use + * securesite-page.tpl.php instead! + */ + function securesite_preprocess_page(&$vars){ + if(_securesite_rended_http_form()){ + unset($vars['template_files']); + } + } + function securesite_theme_registry_alter(&$theme_registry) { $theme_registry['securesite_page']['preprocess functions'] = $theme_registry['page']['preprocess functions']; } Common subdirectories: securesite/theme and securesite_new/theme Common subdirectories: securesite/translations and securesite_new/translations