Templates for reading a message

[squirrelmail.git] / templates / util_global.php

diff --git a/templates/util_global.php b/templates/util_global.php
index 87c3984f54f0b8a2ffc2d6afc60b37ca36fa141a..9ef9e040eca869e7ed834c8bf55df816f4a80446 100644 (file)
--- a/templates/util_global.php
+++ b/templates/util_global.php
@@ -61,15 +61,20 @@ function getIcon($icon_theme_path, $icon_name, $text_icon, $alt_text='', $w=NULL
  * @since 1.5.2
  */
 function getIconPath ($icon_theme_path, $icon_name) {
+    global $default_icon_theme;
+
     if (is_null($icon_theme_path))
         return NULL;
     
     // Desired icon exists in the current theme?
     if (is_file($icon_theme_path . $icon_name)) {
         return $icon_theme_path . $icon_name;
-
+        
+    // Icon not found, check for the admin-specified default
+    } elseif (!is_null($default_icon_theme) && is_file($default_icon_theme . $icon_name)) {
+        return $default_icon_theme . $icon_name;
+        
     // Icon not found, return the SQM default icon
-    // TODO: allow admins to change the default icon theme in conf.pl
     } elseif (is_file(SM_PATH . 'images/themes/default/'.$icon_name)) {
         return SM_PATH . 'images/themes/default/'.$icon_name;
     } 
@@ -86,5 +91,19 @@ function getIconPath ($icon_theme_path, $icon_name) {
 function displayErrors () {
     global $oErrorHandler;
     
-    $oErrorHandler->displayErrors();
+    if ($oErrorHandler) {
+        $oErrorHandler->displayErrors();
+    }
+}
+
+/**
+ * Make the internal show_readable_size() function available to templates.
+ * 
+ * @param int size to be converted to human-readable
+ * @return string human-readable form
+ * @since 1.5.2
+ **/
+function humanReadableSize ($size) {
+    return show_readable_size($size);
 }
+