Moving template util file

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

diff --git a/templates/util_left_main.php b/functions/template/folder_list_util.php
similarity index 99%
rename from templates/util_left_main.php
rename to functions/template/folder_list_util.php
index 978878528a285f18373f00182559ea36bb70874e..1ce9c09ce21df621879ce857dd2c6112ce503919 100644 (file)
--- a/templates/util_left_main.php
+++ b/functions/template/folder_list_util.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * util_left_main.php
+ * folder_list_util.php
  *
  * Provides some functions for use in left_main.php and templates.  Do not echo
  * output from these functions!

diff --git a/src/left_main.php b/src/left_main.php
index 3c1dd21ea5d6cf90bd4f8ae3873e9be3eb5dcd6e..51b37976ee14effb587f819fccbfb9170a58b30a 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -20,7 +20,7 @@ require('../include/init.php');
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'functions/imap_general.php');
 require_once(SM_PATH . 'functions/date.php');
-require_once(SM_PATH . 'templates/util_left_main.php');
+require_once(SM_PATH . 'functions/template/folder_list_util.php');
 
 /* These constants are used for folder stuff. */
 define('SM_BOX_UNCOLLAPSED', 0);
@@ -141,6 +141,7 @@ if ($date_format != 6) {
     }
     $clk = str_replace(' ',' ',$clk);
 
+//FIXME don't build HTML here - do it in template; after this is fixed BE SURE to remove the FALSE from the assign() call for $clock below!
     $clock = '<small><span style="white-space: nowrap;">'
        . str_replace(' ', '&nbsp;', _("Last Refresh"))
        . ":</span><br /><span style=\"white-space: nowrap;\">$clk</span></small><br />\n";