[Phpgroupware-cvs] filemanager/inc/html.inc.php, 1.12.2.2.2.5

[nomail]

Update of /filemanager/inc
Modified Files:
        Branch: Version-0_9_16-branch
          html.inc.php

date: 2004/05/28 07:23:27;  author: powerstat;  state: Exp;  lines: +78 -12

Log Message:
patch #3101
also added some {}
=====================================================================
Index: filemanager/inc/html.inc.php
diff -u filemanager/inc/html.inc.php:1.12.2.2.2.4 
filemanager/inc/html.inc.php:1.12.2.2.2.5
--- filemanager/inc/html.inc.php:1.12.2.2.2.4   Thu Jan  8 22:29:30 2004
+++ filemanager/inc/html.inc.php        Fri May 28 07:23:27 2004
@@ -332,8 +332,9 @@
        $rstring .= html_text_bold ($text, $return);
        $rstring .= html_nbsp (3, $return);
        if ($size != NULL && $size >= 0)
+       {
                $rstring .= borkb ($size, 1, $return);
-
+       }
        $rstring = html_encode ($rstring, 1);
 
        if ($return)
@@ -372,12 +373,17 @@
 function html_font_set ($size = NULL, $color = NULL, $family = NULL, $return = 
0)
 {
        if ($size != NULL && $size)
+       {
                $size = "size=\"$size\"";
+       }
        if ($color != NULL && $color)
+       {
                $color = "color=\"$color\"";
+       }
        if ($family != NULL && $family)
+       {
                $family = "family=\"$family\"";
-
+       }
        $rstring = "<font $size $color $family>";
        return (eor ($rstring, $return));
 }
@@ -391,8 +397,9 @@
 function html_text_error ($errorwas = NULL, $break = 1, $return = 0)
 {
        if ($break)
+       {
                $rstring .= html_break (1, NULL, 1);
-
+       }
        $rstring .= html_font_set (NULL, HTML_TEXT_ERROR_COLOR, NULL, 1);
        $rstring .= html_text_bold (html_text_italic ($errorwas, 1), 1);
        $rstring .= html_font_end (1);
@@ -408,16 +415,21 @@
        $rstring .= html_page_body_end ($return);
        $rstring .= html_page_end ($return);
        if (!$return)
+       {
                html_page_close ();
+       }
        else
+       {
                return ($rstring);
+       }
 }
 
 function html_link ($href = NULL, $text = NULL, $return = 0, $encode = 1, 
$linkonly = 0, $target = NULL)
 {
        if ($encode)
+       {
                $href = string_encode ($href, 1);
-
+       }
        ###
        # This decodes / back to normal
        ###
@@ -472,16 +484,25 @@
 function html_table_begin ($width = NULL, $border = NULL, $cellspacing = NULL, 
$cellpadding = NULL, $rules = NULL, $string = '', $return = 0)
 {
        if ($width != NULL && $width)
+       {
                $width = "width=\"$width\"";
+       }
        if (is_int ($border) && $border >= 0)
+       {
                $border = "border=\"$border\"";
+       }
        if (is_int ($cellspacing) && $cellspacing >= 0)
+       {
                $cellspacing = "cellspacing=\"$cellspacing\"";
-       if (is_int ($cellpadding) && $cellpadding >= 0) 
+       }
+       if (is_int ($cellpadding) && $cellpadding >= 0)
+       {
                $cellpadding = "cellpadding=\"$cellpadding\"";
+       }
        if ($rules != NULL && $rules)
+       {
                $rules = "rules=$rules";
-
+       }
        $rstring = "<table $width $border $cellspacing $cellpadding $rules 
$string>";
        return (eor ($rstring, $return));
 }
@@ -489,8 +510,9 @@
 function html_link_email ($address = NULL, $text = NULL, $return = 0, $encode 
= 1)
 {
        if ($encode)
+       {
                $href = string_encode ($href, 1);
-
+       }
        $rstring = "<a href=mailto:$address>$text</a>";
        return (eor ($rstring, $return));
 }
@@ -501,17 +523,26 @@
        return (eor ($rstring, $return));
 }
 
-function html_table_row_begin ($align = NULL, $halign = NULL, $valign = NULL, 
$bgcolor = NULL, $string = '', $return = 0)
+function html_table_row_begin ($align = NULL, $halign = NULL, $valign = NULL, 
$bgcolor = NULL, $string = '', $return = 0, $css='')
 {
        if ($align != NULL && $align)
+       {
                $align = "align=\"$align\"";
+       }
        if ($halign != NULL && $halign)
+       {
                $halign = "halign=$halign";
+       }
        if ($valign != NULL && $valign)
+       {
                $valign = "valign=\"$valign\"";
+       }
        if ($bgcolor != NULL && $bgcolor)
+       {
                $bgcolor = "bgcolor=\"$bgcolor\"";
-       $rstring = "<tr $align $halign $valign $bgcolor $string>";
+       }
+               
+       $rstring = "<tr $align $halign $valign $bgcolor $string $css>";
        return (eor ($rstring, $return));
 }
 
@@ -521,22 +552,38 @@
        return (eor ($rstring, $return));
 }
 
-function html_table_col_begin ($align = NULL, $halign = NULL, $valign = NULL, 
$rowspan = NULL, $colspan = NULL, $string = '', $return = 0, $width = NULL)
+function html_table_col_begin ($align = NULL, $halign = NULL, $valign = NULL, 
$rowspan = NULL, $colspan = NULL, $string = '', $return = 0, $width = NULL, 
$css = '')
 {
        if ($align != NULL && $align)
+       {
                $align = "align=\"$align\"";
+       }
        if ($halign != NULL && $halign)
+       {
                $halign = "halign=$halign";
+       }
        if ($valign != NULL && $valign)
+       {
                $valign = "valign=\"$valign\"";
+       }
        if (is_int ($rowspan) && $rowspan >= 0)
+       {
                $rowspan = "rowspan=\"$rowspan\"";
+       }
        if (is_int ($colspan) && $colspan >= 0)
+       {
                $colspan = "colspan=\"$colspan\"";
+       }
        if ($width!=NULL && $width)
+       {
                $width = "width=\"$width\"";
+       }
+       if ($css!=NULL && $css)
+       {
+               $css = "class=\"$css\"";
+       }
 
-       $rstring = "<td $align $halign $valign $rowspan $colspan $width 
$string>";
+       $rstring = "<td $align $halign $valign $rowspan $colspan $width $string 
$css>";
        return (eor ($rstring, $return));
 }
 
@@ -551,19 +598,28 @@
        global $phpgw;
 
        if ($lang)
+       {
                $string = translate ($string);
-
+       }
        if ($times == NULL)
+       {
                $times = 1;
+       }
        for ($i = 0; $i != $times; $i++)
        {
                if ($return)
+               {
                        $rstring .= $string;
+               }
                else
+               {
                        echo $string;
+               }
        }
        if ($return)
+       {
                return ($rstring);
+       }
 }
 
 function html_text_header ($size = 1, $string = NULL, $return = 0, $lang = 0)
@@ -582,15 +638,25 @@
 {
        $title = $alt;
        if ($src != NULL && $src)
+       {
                $src = "src=\"$src\"";
+       }
        if ($alt != NULL && $alt)
+       {
                $alt = "alt=\"$alt\"";
+       }
        if ($align != NULL && $align)
+       {
                $align = "align=\"$align\"";
+       }
        if (is_int ($border) && $border >= 0)
+       {
                $border = "border=\"$border\"";
+       }
        if ($title != NULL && $title)
+       {
                $title = "title=\"$title\"";
+       }
        $rstring = "<img $src $title $alt $align $border $string />";
        return (eor ($rstring, $return));
 }