Remove span tags from core

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

diff --git a/functions/html.php b/functions/html.php
index 3172bc5044d4c7fd855e0def212b323d61fea25e..ecdafd2eac790a65d1ca20ed9d76ec8689358a0e 100644 (file)
--- a/functions/html.php
+++ b/functions/html.php
@@ -112,8 +112,36 @@ function create_image($src, $alt='', $width='', $height='',
 }
 
 
+/**
+ * Generates a span tag
+ *
+ * @param string $value   The contents that belong inside the span
+ * @param string $class   The CSS class name (OPTIONAL; default
+ *                        not used)
+ * @param string $id      The ID name (OPTIONAL; default not used)
+ *
+ * @return string The desired span tag.
+ *
+ * @since 1.5.2
+ *
+ */
+function create_span($value, $class='', $id='') {
+
+    global $oTemplate;
+
+    $oTemplate->assign('value', $value);
+    $oTemplate->assign('class', $class);
+    $oTemplate->assign('id', $id);
+
+    return $oTemplate->fetch('span.tpl');
+
+}
+
+
 /**
  * Generates html tags
+//FIXME: this should not be used anywhere in the core, or we should
+//       convert this to use templates.  We sould not be assuming HTML output.
  *
  * @param string $tag Tag to output
  * @param string $val Value between tags

diff --git a/functions/template/message_list_util.php b/functions/template/message_list_util.php
index cdd8825b5bda5f58dff9d07705371770a98c3bdf..8ffa17a4b8fd977fd00bb9f7331278ed47e12198 100644 (file)
--- a/functions/template/message_list_util.php
+++ b/functions/template/message_list_util.php
@@ -174,16 +174,15 @@ function getPriorityIcon ($priority, $icon_theme_path) {
     switch ($priority) {
         case 1:
         case 2:
-            $icon = getIcon($icon_theme_path, 'prio_high.png', '<span class="high_priority">!</span>');
+            $icon = getIcon($icon_theme_path, 'prio_high.png', create_span('!', 'high_priority'));
             break;
         case 5:
-            $icon = getIcon($icon_theme_path, 'prio_low.png', '<span class="low_priority">&#8595;</span>');
+            $icon = getIcon($icon_theme_path, 'prio_low.png', create_span('&#8595;', 'low_priority'));
             break;
         default:
             $icon = getIcon($icon_theme_path, 'transparent.png', '', '', 5);
             break;
     }
- echo "prio = $priority<br>icon = $icon<br>";   
 
     return $icon;
 }

diff --git a/templates/default/span.tpl b/templates/default/span.tpl
new file mode 100644 (file)
index 0000000..2bbda59
--- /dev/null
+++ b/templates/default/span.tpl
@@ -0,0 +1,26 @@
+<?php
+
+/**
+  * span.tpl
+  *
+  * Template for constructing a span tag.
+  *
+  * The following variables are available in this template:
+  *      + $value   - The contents that belong inside the span
+  *      + $class   - CSS class name (optional; may not be present)
+  *      + $id      - ID name (optional; may not be present)
+  *
+  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+  * @version $Id$
+  * @package squirrelmail
+  * @subpackage templates
+  */
+
+
+// retrieve the template vars
+//
+extract($t);
+
+
+?><span<?php if (!empty($class)) echo ' class="' . $class . '"'; ?><?php if (!empty($id)) echo ' id="' . $id . '"'; ?>><?php echo $value; ?></span>