Always add $base_uri to templates

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12053 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/include/init.php b/include/init.php
index 054f3a7b6b0696af562d3fca37692fcf2822b92f..811205ff26ca84994bd41da846bd72682216c540 100644 (file)
--- a/include/init.php
+++ b/include/init.php
@@ -573,6 +573,7 @@ if (empty($oTemplate)) {
 
 // We want some variables to always be available to the template
 $oTemplate->assign('javascript_on', checkForJavascript());
 
 // We want some variables to always be available to the template
 $oTemplate->assign('javascript_on', checkForJavascript());

+$oTemplate->assign('base_uri', sqm_baseuri());

 $always_include = array('sTemplateID', 'icon_theme_path');
 foreach ($always_include as $var) {
     $oTemplate->assign($var, (isset($$var) ? $$var : NULL));
 $always_include = array('sTemplateID', 'icon_theme_path');
 foreach ($always_include as $var) {
     $oTemplate->assign($var, (isset($$var) ? $$var : NULL));

diff --git a/src/right_main.php b/src/right_main.php
index bd6fbab4da19fc9f382f21d6d5c1715dd29d56a7..ae8a188892ef569cd90563c97569ec857b21a3ff 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -309,6 +309,7 @@ if ($aMailbox['EXISTS'] > 0) {
     $oTemplate->assign('page_selector_max', $page_selector_max);
     $oTemplate->assign('compact_paginator', $compact_paginator);
     $oTemplate->assign('javascript_on', checkForJavascript());
     $oTemplate->assign('page_selector_max', $page_selector_max);
     $oTemplate->assign('compact_paginator', $compact_paginator);
     $oTemplate->assign('javascript_on', checkForJavascript());

+    $oTemplate->assign('base_uri', sqm_baseuri());

     $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false);
     $oTemplate->assign('icon_theme_path', $icon_theme_path);
     $oTemplate->assign('aOrder', array_keys($aColumns));
     $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false);
     $oTemplate->assign('icon_theme_path', $icon_theme_path);
     $oTemplate->assign('aOrder', array_keys($aColumns));

diff --git a/src/search.php b/src/search.php
index d17a13d91c42cdf084770493d30181ed71ace78b..d536298745893afca2bc8735283f810516e1347a 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -1607,6 +1607,7 @@ if ($submit == $search_button_text) {
                         $oTemplate->assign('page_selector_max', $page_selector_max);
                         $oTemplate->assign('compact_paginator', $compact_paginator);
                         $oTemplate->assign('javascript_on', checkForJavascript());
                         $oTemplate->assign('page_selector_max', $page_selector_max);
                         $oTemplate->assign('compact_paginator', $compact_paginator);
                         $oTemplate->assign('javascript_on', checkForJavascript());

+                        $oTemplate->assign('base_uri', sqm_baseuri());

                         $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false);
                         $oTemplate->assign('icon_theme_path', $icon_theme_path);
                         $oTemplate->assign('use_icons', (isset($use_icons)) ? $use_icons : false);
                         $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false);
                         $oTemplate->assign('icon_theme_path', $icon_theme_path);
                         $oTemplate->assign('use_icons', (isset($use_icons)) ? $use_icons : false);

diff --git a/src/signout.php b/src/signout.php
index 30180a097f08b57542a7ae9d66a2c6797fbe38b2..3675686eafbb63a575d8bbf1c9db21eeeedfc099 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -58,6 +58,7 @@ if ( !isset($oTemplate) || !is_object($oTemplate) ) {
 
     // We want some variables to always be available to the template
     $oTemplate->assign('javascript_on', checkForJavascript());
 
     // We want some variables to always be available to the template
     $oTemplate->assign('javascript_on', checkForJavascript());

+    $oTemplate->assign('base_uri', sqm_baseuri());

     $always_include = array('sTemplateID', 'icon_theme_path');
     foreach ($always_include as $var) {
         $oTemplate->assign($var, (isset($$var) ? $$var : NULL));
     $always_include = array('sTemplateID', 'icon_theme_path');
     foreach ($always_include as $var) {
         $oTemplate->assign($var, (isset($$var) ? $$var : NULL));