MARCO: addMenuVertical ahora funciona con cualquier tipo de menu. Falta verificar...

[mecon/meconlib.git] / pear_lib_tmp / HTML / Image.php

diff --git a/pear_lib_tmp/HTML/Image.php b/pear_lib_tmp/HTML/Image.php
index 5c9df5b2f3fd827fe980c1db9482673a1e43a383..1be3923f0cf163704e62e6515c9424002c3e65b5 100644 (file)
--- a/pear_lib_tmp/HTML/Image.php
+++ b/pear_lib_tmp/HTML/Image.php
@@ -32,13 +32,6 @@ require_once 'HTML/Common.php';
  * @access public
  */
 class HTML_Image extends HTML_Common {
-    /**
-     * List of valid HTML attributes for an Image.
-     *
-     * @var    array $validAttrs
-     * @access protected
-     */
-    var $_validAttrs = array('src', 'alt', 'longdesc', 'width', 'height', 'usemap', 'ismap', 'align', 'border', 'hspace', 'vspace', 'id', 'class', 'style', 'title', 'lang', 'dir', 'onclick', 'ondblclick', 'onmousedown', 'onmouseup', 'onmouseover', 'onmousemove', 'onmouseout', 'onkeypress', 'onkeydown', 'onkeyup');
 
     // ~X2C
 
@@ -55,8 +48,12 @@ class HTML_Image extends HTML_Common {
      */
     function HTML_Image($src = '', $alt = '', $attrs = array())// ~X2C
     {
-        $attrs['src'] = $src;
-        $attrs['alt'] = $alt;
+        if (is_array($attrs)) {
+            $attrs['src'] = $src;
+            $attrs['alt'] = $alt;
+        } else {
+            $attrs .= " src=$src alt=$alt";
+        }
         parent::HTML_Common($attrs);
     }
     // -X2C
@@ -71,7 +68,8 @@ class HTML_Image extends HTML_Common {
     function toHtml()// ~X2C
     {
         $attrs = '';
-        foreach ($this->getAttributes() as $key => $val) {
+        $attributes = $this->getAttributes() + array('border' => 0, 'align' => 'middle');
+        foreach ($attributes as $key => $val) {
             $attrs .= ' ' . $key . '="' . htmlentities($val) . '"';
         }
         return "<IMG$attrs/>";
@@ -102,7 +100,7 @@ class HTML_Image extends HTML_Common {
      */
     function setSrc($src)// ~X2C
     {
-        $this->updateAttributes('src' => $src);
+        $this->updateAttributes(array('src' => $src));
     }
     // -X2C
 
@@ -130,7 +128,7 @@ class HTML_Image extends HTML_Common {
      */
     function setAlt($alt)// ~X2C
     {
-        $this->updateAttributes('alt' => $alt);
+        $this->updateAttributes(array('alt' => $alt));
     }
     // -X2C