Update for new location of global template utilities. Note that templates/util_global.php is already included by the Template class so is ALWAYS available for ALL template files.

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.

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');

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. */

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>
+</div>

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>
+</html>

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.

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 */

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>
+</div>

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>
+</div>

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>
+</div>

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.

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);

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>
+</div>

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>
+</div>