A few output elements are used often, so just retrieve them once and make them global...

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

diff --git a/functions/mime.php b/functions/mime.php
index bf9701eeb6d353204d51a7fc2405c13eb767ccd8..f2e111c8a284af45e957deb0f574c311b12ee5db 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -354,9 +354,7 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma
            $show_html_default, $sort, $has_unsafe_images, $passed_ent_id,
            $use_iframe, $iframe_height, $download_and_unsafe_link,
            $download_href, $unsafe_image_toggle_href, $unsafe_image_toggle_text,
-           $oTemplate;
-
-    $nbsp = $oTemplate->fetch('non_breaking_space.tpl');
+           $oTemplate, $nbsp;
 
     // workaround for not updated config.php
     if (! isset($use_iframe)) $use_iframe = false;

diff --git a/functions/template/paginator_util.php b/functions/template/paginator_util.php
index c43b845b9483c98d3545479c8749588ec253e54b..cf892075dda6d44316f6854ca6166ac6920d9351 100644 (file)
--- a/functions/template/paginator_util.php
+++ b/functions/template/paginator_util.php
@@ -48,7 +48,8 @@ function get_paginator_link($box, $start_msg, $text) {
  */
 function get_compact_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll, $javascript_on, $page_selector) {
 
-    global $oTemplate;
+    /* This will be used as a space. */
+    global $oTemplate, $nbsp;
 
     // keeps count of how many times
     // the paginator is used, avoids
@@ -68,8 +69,6 @@ function get_compact_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll,
     $box = urlencode($box);
 
     /* Create simple strings that will be creating the paginator. */
-    /* This will be used as a space. */
-    $spc = $oTemplate->fetch('non_breaking_space.tpl');
     /* This will be used as a seperator. */
     $sep = '|';
 
@@ -131,7 +130,7 @@ function get_compact_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll,
             for ($p = 0; $p < $tot_pgs; $p++) {
                 $options[(($p*$iLimit)+1) . '_' . $box] = ($p+1) . "/$tot_pgs";
             }
-            $result .= $spc . addSelect('startMessage_' . $display_iterations, 
+            $result .= $nbsp . addSelect('startMessage_' . $display_iterations, 
                                         $options, 
                                         ((($cur_pg-1)*$iLimit)+1), 
                                         TRUE, 
@@ -152,8 +151,8 @@ function get_compact_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll,
         }
     }
 
-    $result .= ($pg_str  != '' ? '['.$pg_str.']' .  $spc : '');
-    $result .= ($all_str != '' ? $spc . '['.$all_str.']' . $spc . $spc : '');
+    $result .= ($pg_str  != '' ? '['.$pg_str.']' .  $nbsp : '');
+    $result .= ($all_str != '' ? $nbsp . '['.$all_str.']' . $nbsp . $nbsp : '');
 
     /* If the resulting string is blank, return a non-breaking space. */
     if ($result == '') {
@@ -181,7 +180,8 @@ function get_compact_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll,
  */
 function get_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll,$page_selector, $page_selector_max) {
 
-    global $oTemplate;
+    /* This will be used as a space. */
+    global $oTemplate, $nbsp;
     sqgetGlobalVar('PHP_SELF',$php_self,SQ_SERVER);
 
     /* Initialize paginator string chunks. */
@@ -193,8 +193,6 @@ function get_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll,$page_sel
     $box = urlencode($box);
 
     /* Create simple strings that will be creating the paginator. */
-    /* This will be used as a space. */
-    $spc = $oTemplate->fetch('non_breaking_space.tpl');
     /* This will be used as a seperator. */
     $sep = '|';
 
@@ -295,42 +293,42 @@ function get_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll,$page_sel
 
             /* Start with the first quarter. */
             if (($q1_pgs == 0) && ($cur_pg > 1)) {
-                $pg_str .= "...$spc";
+                $pg_str .= "...$nbsp";
             } else {
                 for ($pg = 1; $pg <= $q1_pgs; ++$pg) {
                     $start = (($pg-1) * $iLimit) + 1;
-                    $pg_str .= get_paginator_link($box, $start, $pg) . $spc;
+                    $pg_str .= get_paginator_link($box, $start, $pg) . $nbsp;
                 }
                 if ($cur_pg - $q2_pgs - $q1_pgs > 1) {
-                    $pg_str .= "...$spc";
+                    $pg_str .= "...$nbsp";
                 }
             }
 
             /* Continue with the second quarter. */
             for ($pg = $cur_pg - $q2_pgs; $pg < $cur_pg; ++$pg) {
                 $start = (($pg-1) * $iLimit) + 1;
-                $pg_str .= get_paginator_link($box, $start, $pg) . $spc;
+                $pg_str .= get_paginator_link($box, $start, $pg) . $nbsp;
             }
 
             /* Now print the current page. */
-            $pg_str .= $cur_pg . $spc;
+            $pg_str .= $cur_pg . $nbsp;
 
             /* Next comes the third quarter. */
             for ($pg = $cur_pg + 1; $pg <= $cur_pg + $q3_pgs; ++$pg) {
                 $start = (($pg-1) * $iLimit) + 1;
-                $pg_str .= get_paginator_link($box, $start, $pg) . $spc;
+                $pg_str .= get_paginator_link($box, $start, $pg) . $nbsp;
             }
 
             /* And last, print the forth quarter page links. */
             if (($q4_pgs == 0) && ($cur_pg < $tot_pgs)) {
-                $pg_str .= "...$spc";
+                $pg_str .= "...$nbsp";
             } else {
                 if (($tot_pgs - $q4_pgs) > ($cur_pg + $q3_pgs)) {
-                    $pg_str .= "...$spc";
+                    $pg_str .= "...$nbsp";
                 }
                 for ($pg = $tot_pgs - $q4_pgs + 1; $pg <= $tot_pgs; ++$pg) {
                     $start = (($pg-1) * $iLimit) + 1;
-                    $pg_str .= get_paginator_link($box, $start,$pg) . $spc;
+                    $pg_str .= get_paginator_link($box, $start,$pg) . $nbsp;
                 }
             }
 
@@ -352,17 +350,17 @@ function get_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll,$page_sel
         $all_str = create_hyperlink("$php_self?showall=1&amp;startMessage=1&amp;mailbox=$box", _("Show All"));
 
         $result .= '[';
-        $result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : '');
+        $result .= ($prv_str != '' ? $prv_str . $nbsp . $sep . $nbsp : '');
         $result .= ($nxt_str != '' ? $nxt_str : '');
-        $result .= ']' . $spc ;
+        $result .= ']' . $nbsp ;
     }
 
-    $result .= ($pg_str  != '' ? $spc . '['.$spc.$pg_str.']' .  $spc : '');
-    $result .= ($all_str != '' ? $spc . '['.$all_str.']' . $spc . $spc : '');
+    $result .= ($pg_str  != '' ? $nbsp . '['.$nbsp.$pg_str.']' .  $nbsp : '');
+    $result .= ($all_str != '' ? $nbsp . '['.$all_str.']' . $nbsp . $nbsp : '');
 
     /* If the resulting string is blank, return a non-breaking space. */
     if ($result == '') {
-        $result = $oTemplate->fetch('non_breaking_space.tpl');
+        $result = $nbsp;
     }
     /* Return our final magical compact paginator string. */
     return ($result);

diff --git a/include/init.php b/include/init.php
index c6bb2d2341f5575ff6d17be0b3cc8d5660ca99e1..d12b71d83dcaef6c42858ab46af8b79a5e63b73c 100644 (file)
--- a/include/init.php
+++ b/include/init.php
@@ -667,6 +667,7 @@ if (empty($oTemplate)) {
 }
 
 // We want some variables to always be available to the template
+//
 $oTemplate->assign('javascript_on', 
     (sqGetGlobalVar('user_is_logged_in', $user_is_logged_in, SQ_SESSION)
      ?  checkForJavascript() : 0));
@@ -676,6 +677,11 @@ foreach ($always_include as $var) {
     $oTemplate->assign($var, (isset($$var) ? $$var : NULL));
 }
 
+// A few output elements are used often, so just get them once here
+//
+$nbsp = $oTemplate->fetch('non_breaking_space.tpl');
+$br = $oTemplate->fetch('line_break.tpl');
+
 /**
  * Initialize our custom error handler object
  */

diff --git a/include/options/folder.php b/include/options/folder.php
index c2f7639ed13ce7b2afc83ace572e41ec9fcba758..811a0adf335785634d475872cae24afbba1c3e12 100644 (file)
--- a/include/options/folder.php
+++ b/include/options/folder.php
@@ -33,7 +33,7 @@ define('SMOPT_GRP_FOLDERSELECT', 2);
  * @return array all option information
  */
 function load_optpage_data_folder() {
-    global $username, $imapServerAddress, $imapPort, $oTemplate,
+    global $username, $imapServerAddress, $imapPort, $oTemplate, $nbsp,
            $folder_prefix, $default_folder_prefix, $show_prefix_option;
 
     /* Get some imap data we need later. */
@@ -227,7 +227,6 @@ function load_optpage_data_folder() {
     $optgrps[SMOPT_GRP_FOLDERSELECT] = _("Folder Selection Options");
     $optvals[SMOPT_GRP_FOLDERSELECT] = array();
 
-    $nbsp = $oTemplate->fetch('non_breaking_space.tpl');
     $delim = sqimap_get_delimiter($imapConnection);
     $optvals[SMOPT_GRP_FOLDERSELECT][] = array(
         'name'    => 'mailbox_select_style',

diff --git a/plugins/bug_report/setup.php b/plugins/bug_report/setup.php
index 4c520f74f16f1dc71f40070488c4875b50e9e000..291707e3f61d589487c24c514ce521d7cb5b5cca 100644 (file)
--- a/plugins/bug_report/setup.php
+++ b/plugins/bug_report/setup.php
@@ -35,8 +35,7 @@ function bug_report_button() {
         return;
     }
 
-    global $oTemplate;
-    $nbsp = $oTemplate->fetch('non_breaking_space.tpl');
+    global $oTemplate, $nbsp;
     $output = makeInternalLink('plugins/bug_report/bug_report.php', _("Bug"), '')
             . $nbsp . $nbsp;
     return array('menuline' => $output);

diff --git a/plugins/calendar/functions.php b/plugins/calendar/functions.php
index 16d83720c5cd39dc41268c0608a8bb7ff958d8fe..bda182c55705a1d6c703434c55a39771a2ea45bf 100644 (file)
--- a/plugins/calendar/functions.php
+++ b/plugins/calendar/functions.php
@@ -18,8 +18,7 @@
   */
 function calendar_do() {
 
-    global $oTemplate;
-    $nbsp = $oTemplate->fetch('non_breaking_space.tpl');
+    global $oTemplate, $nbsp;
     $output = makeInternalLink('plugins/calendar/calendar.php',_("Calendar"),'right')
             . $nbsp . $nbsp;
     return array('menuline' => $output);

diff --git a/plugins/demo/functions.php b/plugins/demo/functions.php
index 04bacc282e805d5625e9abf213620e2a99ffa9f2..d0a5558e87fc2463d768728ca325756a9c3eb5da 100644 (file)
--- a/plugins/demo/functions.php
+++ b/plugins/demo/functions.php
@@ -20,10 +20,9 @@
   */
 function demo_page_header_template_do()
 {
-   global $oTemplate;
+   global $oTemplate, $nbsp;
 
    sq_change_text_domain('demo');
-   $nbsp = $oTemplate->fetch('non_breaking_space.tpl');
    $output = makeInternalLink('plugins/demo/demo.php', _("Demo"), '')
            . $nbsp . $nbsp;
    sq_change_text_domain('squirrelmail');

diff --git a/plugins/mail_fetch/functions.php b/plugins/mail_fetch/functions.php
index 565e867b127abe869a600e05efacaaa1ccb65483..6d48541c722c8662adb786dd33da3166b3e67791 100644 (file)
--- a/plugins/mail_fetch/functions.php
+++ b/plugins/mail_fetch/functions.php
@@ -32,8 +32,7 @@ global $mail_fetch_allow_unsubscribed;
   */
 function mail_fetch_link_do() {
 
-    global $oTemplate;
-    $nbsp = $oTemplate->fetch('non_breaking_space.tpl');
+    global $oTemplate, $nbsp;
     $output = makeInternalLink('plugins/mail_fetch/fetch.php', _("Fetch"), '')
             . $nbsp . $nbsp;
     return array('menuline' => $output);

diff --git a/plugins/squirrelspell/sqspell_functions.php b/plugins/squirrelspell/sqspell_functions.php
index 4fbd42e1a6b7ca189a2dd107427a9f6ed325f92c..66adcc59fb16e232c605908e1a5981d0833cb47b 100644 (file)
--- a/plugins/squirrelspell/sqspell_functions.php
+++ b/plugins/squirrelspell/sqspell_functions.php
@@ -63,8 +63,7 @@ function squirrelspell_setup_function() {
    */
   if (checkForJavascript()) {
 
-    global $oTemplate, $base_uri;
-    $nbsp = $oTemplate->fetch('non_breaking_space.tpl');
+    global $oTemplate, $base_uri, $nbsp;
 
     $output = addButton(_("Check Spelling"), 
                         'check_spelling', 

diff --git a/plugins/test/functions.php b/plugins/test/functions.php
index 543a941d2531b082c35ff3b1232f9db3c1c16945..303f5f95b741776146ef5d5c92ae35a4df24f468 100644 (file)
--- a/plugins/test/functions.php
+++ b/plugins/test/functions.php
@@ -17,8 +17,7 @@
   */
 function test_menuline_do() {
 
-    global $oTemplate;
-    $nbsp = $oTemplate->fetch('non_breaking_space.tpl');
+    global $oTemplate, $nbsp;
     $output = makeInternalLink('plugins/test/test.php', 'Test', 'right')
             . $nbsp . $nbsp;
     return array('menuline' => $output);

diff --git a/templates/default/line_break.tpl b/templates/default/line_break.tpl
new file mode 100644 (file)
index 0000000..89196d9
--- /dev/null
+++ b/templates/default/line_break.tpl
@@ -0,0 +1,19 @@
+<?php
+
+/**
+  * line_break.tpl
+  *
+  * Template for constructing a line break.
+  *
+  * The following variables are available in this template:
+  *      (none)
+  *
+  * @copyright &copy; 1999-2008 The SquirrelMail Project Team
+  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+  * @version $Id: line_break.tpl 12046 2007-01-02 21:03:07Z pdontthink $
+  * @package squirrelmail
+  * @subpackage templates
+  */
+
+
+?><br />