Update for new location of global template utilities. Note that templates/util_globa...

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

diff --git a/class/template/Template.class.php b/class/template/Template.class.php
index 4853ea881df2aea5d9ade57d89391b32a39667ec..c5b6198f6aee23b18a6f428938d3d4d23bcaa9f9 100644 (file)
--- a/class/template/Template.class.php
+++ b/class/template/Template.class.php
@@ -18,7 +18,7 @@
   */
 
 /** load template functions */
-require(SM_PATH . 'functions/template.php');
+require(SM_PATH . 'functions/template/general_util.php');
 
 /**
   * The SquirrelMail Template class.

diff --git a/src/addressbook.php b/src/addressbook.php
index 90a9b3b27f5e55a4a7d36c4f0fc505dac2223de1..24a5bcfca4aba06e8218d51f7fb98e5200d310f6 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -21,7 +21,7 @@ include('../include/init.php');
 /* address book functions */
 require_once(SM_PATH . 'functions/addressbook.php');
 include_once(SM_PATH . 'templates/util_addressbook.php');
-include_once(SM_PATH . 'templates/util_global.php');
+include_once(SM_PATH . 'functions/template/general_util.php');
 
 /* form functions */
 require_once(SM_PATH . 'functions/forms.php');

diff --git a/src/left_main.php b/src/left_main.php
index d7feb633f1bada011c795eb1a8614b73f567e6b7..99cbcff2caa7a9bdadf1d37b5ec065cf385d6eb8 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_global.php');
+require_once(SM_PATH . 'functions/template/general_util.php');
 require_once(SM_PATH . 'templates/util_left_main.php');
 
 /* These constants are used for folder stuff. */

diff --git a/templates/default/compose_attachments.tpl b/templates/default/compose_attachments.tpl
index ced5e89b621570df73cf65fbf707dc35fcada5ee..dd66910acdbc6f1bcfb1a783f83000830920e0cf 100644 (file)
--- a/templates/default/compose_attachments.tpl
+++ b/templates/default/compose_attachments.tpl
@@ -13,9 +13,6 @@
  * @subpackage templates
  */
 
-/** add required includes **/
-include_once(SM_PATH . 'templates/util_global.php');
-
 /** extract template variables **/
 extract($t);
 
@@ -67,4 +64,4 @@ extract($t);
     }
  ?>
 </table>
-</div>
\ No newline at end of file
+</div>

diff --git a/templates/default/footer.tpl b/templates/default/footer.tpl
index 23a0bc21a0cb3d00dae77e56d421ce30fee527e8..c4645e444ecf0c733a5cfb8c6b7ba6d96a7bdf8b 100644 (file)
--- a/templates/default/footer.tpl
+++ b/templates/default/footer.tpl
@@ -12,9 +12,6 @@
  * @subpackage templates
  */
 
-/** add required includes */
-include_once(SM_PATH . 'templates/util_global.php');
-
 /* retrieve the template vars */
 extract($t);
 
@@ -22,4 +19,4 @@ displayErrors();
 ?>
 <!-- end of generated html -->
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/templates/default/left_main.tpl b/templates/default/left_main.tpl
index 902473eaea8cb1511f563a6e2f6b55baad13dc92..92e6c555784f4c59f88a80321b52b656622cf389 100644 (file)
--- a/templates/default/left_main.tpl
+++ b/templates/default/left_main.tpl
@@ -69,8 +69,6 @@
  * @author Steve Brown
  */
 
-/** include required files */
-include_once(SM_PATH . 'templates/util_global.php');
 
 /*
  * Recursively parse the mailbox structure to build the navigation tree.

diff --git a/templates/default/message_list.tpl b/templates/default/message_list.tpl
index 734265fa036f47838b6ea8a3c7bb3519e2b8993a..67bffe51f669f80a0461809af91844330e6a423b 100644 (file)
--- a/templates/default/message_list.tpl
+++ b/templates/default/message_list.tpl
@@ -13,7 +13,6 @@
  */
 
 /** add required includes */
-include_once(SM_PATH . 'templates/util_global.php');
 include_once(SM_PATH . 'templates/util_message_list.php');
 
 /* retrieve the template vars */

diff --git a/templates/default/printer_friendly_bottom.tpl b/templates/default/printer_friendly_bottom.tpl
index 0ba6c7c8b6fc5acd56b0a8ff9daddfa95822428a..1506f8365ea0ff2637686f86c0614b9156204b3b 100644 (file)
--- a/templates/default/printer_friendly_bottom.tpl
+++ b/templates/default/printer_friendly_bottom.tpl
@@ -37,8 +37,6 @@
  * @subpackage templates
  */
 
-/** add required includes **/
-include_once(SM_PATH . 'templates/util_global.php');
 
 /** extract template variables **/
 extract($t);
@@ -110,4 +108,4 @@ if (count($attachments) > 0) {
     }
 }
 ?>
-</div>
\ No newline at end of file
+</div>

diff --git a/templates/default/read_attachments.tpl b/templates/default/read_attachments.tpl
index f41f78616242608c753b6a54568049e249ee7f73..9bd648cc423b6e925d922a4b1751461b13f7710e 100644 (file)
--- a/templates/default/read_attachments.tpl
+++ b/templates/default/read_attachments.tpl
@@ -30,8 +30,6 @@
  * @subpackage templates
  */
 
-/** add required includes **/
-include_once(SM_PATH . 'templates/util_global.php');
 
 /** extract template variables **/
 extract($t);
@@ -99,4 +97,4 @@ if (count($attachments)==0) {
   </td>
  </tr>
 </table>
-</div>
\ No newline at end of file
+</div>

diff --git a/templates/default/search_list.tpl b/templates/default/search_list.tpl
index 4ae0c014d7a3a5851bc75f3c9f2f61dea0495cbb..1eca419e801fdc4cab220359e8177ff1f64b5a21 100644 (file)
--- a/templates/default/search_list.tpl
+++ b/templates/default/search_list.tpl
@@ -28,8 +28,6 @@
  * @subpackage templates
  */
 
-/** add required includes **/
-require_once(SM_PATH . 'templates/util_global.php');
 
 /** extract template variables **/
 extract($t);
@@ -103,4 +101,4 @@ extract($t);
     }
  ?>
 </table>
-</div>
\ No newline at end of file
+</div>

diff --git a/templates/default_advanced/left_main.tpl b/templates/default_advanced/left_main.tpl
index 37904af6ed573512c832af9e01629026be2964b2..c8bad7aba28b3455425ae4d0fa5a529ba9a3e4f8 100644 (file)
--- a/templates/default_advanced/left_main.tpl
+++ b/templates/default_advanced/left_main.tpl
@@ -75,8 +75,6 @@
  * @author Steve Brown
  */
 
-/** include required files */
-include_once(SM_PATH . 'templates/util_global.php');
 
 /*
  * Recursively parse the mailbox structure to build the navigation tree.

diff --git a/templates/default_advanced/login.tpl b/templates/default_advanced/login.tpl
index d4c85a57907d2d3618f81575d67cd99edf2c5d74..6159239acc49355b37bef961c21bca1e28528dc1 100644 (file)
--- a/templates/default_advanced/login.tpl
+++ b/templates/default_advanced/login.tpl
@@ -25,8 +25,6 @@
  * @subpackage templates
  */
 
-// add includes
-include_once(SM_PATH . 'templates/util_global.php');
 
 /* retrieve the template vars */
 extract($t);

diff --git a/templates/default_advanced/options_highlight_list.tpl b/templates/default_advanced/options_highlight_list.tpl
index 0fc7d12c9ef65cde38f3d6c58b7a789543a3e0d9..e91535f344d25df3c539e9bfcfd65b6739f14381 100644 (file)
--- a/templates/default_advanced/options_highlight_list.tpl
+++ b/templates/default_advanced/options_highlight_list.tpl
@@ -24,8 +24,6 @@
  * @subpackage templates
  */
 
-/** add required includes **/
-require(SM_PATH . 'templates/util_global.php');
 
 /** extract template variables **/
 extract($t);
@@ -107,4 +105,4 @@ extract($t);
   </td>
  </tr>
 </table>
-</div>
\ No newline at end of file
+</div>

diff --git a/templates/default_advanced/options_order.tpl b/templates/default_advanced/options_order.tpl
index ede9357e0d56212acfb2c8ae99674e37b5ba9bcf..6a5e7689ec26cdb44f9e11d6ecbbc4d11583959f 100644 (file)
--- a/templates/default_advanced/options_order.tpl
+++ b/templates/default_advanced/options_order.tpl
@@ -25,8 +25,6 @@
  * @subpackage templates
  */
 
-/** add required includes **/
-include(SM_PATH . 'templates/util_global.php');
 
 /** extract template variables **/
 extract($t);
@@ -92,4 +90,4 @@ extract($t);
   </td>
  </tr>
 </table>
-</div>
\ No newline at end of file
+</div>