X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=class%2Fhtml.class;fp=class%2Fhtml.class;h=86ef82dea02586c1d963c961b56b2aec3e8cc996;hp=b2a5f75757cba5fcd23478f4c4cf3bc48d737447;hb=c6bed7235cd387150b2baed2131cc0111c67a731;hpb=84d46e4ee219902f7c95b0cc2342623ea9f31866

diff --git a/class/html.class b/class/html.class
index b2a5f757..86ef82de 100644
--- a/class/html.class
+++ b/class/html.class
@@ -131,43 +131,38 @@ class html {
        echo ' '.$js;
     }
     if ($tag) echo '>';
-    if ($text) {
-       if ($style && !$usecss) { /* if use css then fallback to stylesheet for layout */
-          foreach ($style as $k => $v) {
-            echo '<'.$k.'>';
-	  }
-	  echo $text;
-          foreach ($style as $k => $v) { /* if value of key value = true close the tag */
-	    if ($v) {
-               echo '</'.$k.'>';
-	    }   
-	  }
-       } else {
-         echo $text;
+
+    $openstyles = '';
+    $closestyles = '';
+    if ($style && !$usecss) {
+       foreach ($style as $k => $v) {
+          $openstyles .= '<'.$k.'>';
        }
+       foreach ($style as $k => $v) {
+          /* if value of key value = true close the tag */
+	  if ($v) {
+             $closestyles .= '</'.$k.'>';
+          }   
+       }
+    }
+    echo $openstyles;
+
+    if ($text) {
+       echo $text;
     }
+
     $cnt = count($this->html_el);
     if ($cnt) {
-       if ($style && !$usecss) {
-          foreach ($style as $k => $v) {
-            echo '<'.$k.'>';
-	  }
-       }
        echo "\n";
        for($i = 0;$i<$cnt;$i++) {
           $el = $this->html_el[$i];
 	  $el->echoHtml($usecss,$indentmore);
        }
-       if ($style && !$usecss) {       
-          foreach ($style as $k => $v) { /* if value of key value = true close the tag */
-	    if ($v) {
-               echo '</'.$k.'>';
-	    }   
-	  }
-       }
+       echo $indent;
     }
+    echo $closestyles;
     if ($tag) {
-       echo $indent . '</'.$tag.'>'."\n";
+       echo '</'.$tag.'>'."\n";
     } else {
        echo "\n";
     }