From e53edbf87fe19a22e1ca1df2867c5195ea91c200 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 4 Jul 2007 05:45:16 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1861
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 classes/widget/WidgetHandler.class.php | 15 ++++++++++++---
 modules/widget/widget.controller.php   |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php
index 368417604..70c333f11 100644
--- a/classes/widget/WidgetHandler.class.php
+++ b/classes/widget/WidgetHandler.class.php
@@ -47,9 +47,18 @@
                 $output = $oWidget->proc($args);
             }
 
-            if($args->style) {
-                $args->style = preg_replace("/height([^;]*);/i","",$args->style);
-                $output = sprintf("<div style=\"%s\">%s</div>", $args->style, $output);
+            if($args->widget_fix_width == 'Y') {
+                $style = "";
+
+                $style .= sprintf("%s:%spx;", "width", trim($args->widget_width));
+                $style .= sprintf("margin:%dpx %dpx %dpx %dpx;", $args->widget_margin_top, $args->widget_margin_right,$args->widget_margin_bottom,$args->widget_margin_left);
+                if($args->widget_position) {
+                    $style .= sprintf("%s:%s;", "float", trim($args->widget_position));
+                    $output = sprintf('<div style="%s">%s</div>',$style, $output);
+                } else {
+                    $style  .= "float:left;";
+                    $output = sprintf('<div class="clear"></div><div style="%s">%s</div>',$style, $output);
+                }
             }
 
             if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index bf50c9d81..2bdbfecf9 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -46,7 +46,7 @@
                 $style .= sprintf("%s:%spx;", "width", trim($vars->widget_width));
                 $style .= sprintf("margin:%dpx %dpx %dpx %dpx;", $vars->widget_margin_top, $vars->widget_margin_right,$vars->widget_margin_bottom,$vars->widget_margin_left);
                 if($vars->widget_position) $style .= sprintf("%s:%s;", "float", trim($vars->widget_position));
-                else $style .= "clear:left;";
+                else $style .= "float:left;";
                 $widget_code = sprintf('<img src="%s" class="zbxe_widget_output" widget="%s" %s style="%s" />', $blank_img_path, $widget, implode(' ',$attribute), $style);
             } else {
                 $widget_code = sprintf('<img width="100" height="100" src="%s" class="zbxe_widget_output" widget="%s" %s />', $blank_img_path, $widget, implode(' ',$attribute));