X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fhtml.php;h=217ecfe022aba86e83bd01ef54f822a6fb8d27e6;hb=9a09a81dc665789aa03072d834f4febbff10cd46;hp=747d68ede2c347859388d01c56cbd45242efb329;hpb=91e0dccca7b2452d8b450791cae3aa4125e8889e;p=squirrelmail.git

diff --git a/functions/html.php b/functions/html.php
index 747d68ed..217ecfe0 100644
--- a/functions/html.php
+++ b/functions/html.php
@@ -3,19 +3,19 @@
 /**
  * html.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * The idea is to inlcude here some functions to make easier
  * the right to left implementation by "functionize" some
  * html outputs.
  *
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
+ * @since 1.3.0
  */
 
 /**
- * Generate html tags
+ * Generates html tags
  *
  * @param string $tag Tag to output
  * @param string $val Value between tags
@@ -23,6 +23,7 @@
  * @param string $bgcolor Back color in hexadecimal
  * @param string $xtra Extra options
  * @return string HTML ready for output
+ * @since 1.3.0
  */
 function html_tag( $tag,                // Tag to output
                        $val = '',           // Value between tags
@@ -30,152 +31,130 @@ function html_tag( $tag,                // Tag to output
                        $bgcolor = '',       // Back color
                        $xtra = '' ) {       // Extra options
 
-        GLOBAL $languages, $squirrelmail_language;
-
-        $align = strtolower( $align );
-        $bgc = '';
-        $tag = strtolower( $tag );
+    GLOBAL $languages, $squirrelmail_language;
 
-        if ( isset( $languages[$squirrelmail_language]['DIR']) ) {
-            $dir = $languages[$squirrelmail_language]['DIR'];
-        } else {
-            $dir = 'ltr';
-        }
+    $align = strtolower( $align );
+    $bgc = '';
+    $tag = strtolower( $tag );
 
-        if ( $dir == 'ltr' ) {
-            $rgt = 'right';
-            $lft = 'left';
-        } else {
-            $rgt = 'left';
-            $lft = 'right';
-        }
+    if ( isset( $languages[$squirrelmail_language]['DIR']) ) {
+        $dir = $languages[$squirrelmail_language]['DIR'];
+    } else {
+        $dir = 'ltr';
+    }
 
-        if ( $bgcolor <> '' ) {
-            $bgc = " bgcolor=\"$bgcolor\"";
-        }
+    if ( $dir == 'ltr' ) {
+        $rgt = 'right';
+        $lft = 'left';
+    } else {
+        $rgt = 'left';
+        $lft = 'right';
+    }
 
-        switch ( $align ) {
-            case '':
-                $alg = '';
-                break;
-            case 'right':
-                $alg = " align=\"$rgt\"";
-                break;
-            case 'left':
-                $alg = " align=\"$lft\"";
-                break;
-            default:
-                $alg = " align=\"$align\"";
-                break;
-        }
+    if ( $bgcolor <> '' ) {
+        $bgc = " bgcolor=\"$bgcolor\"";
+    }
 
-        $ret = "<$tag";
+    switch ( $align ) {
+    case '':
+        $alg = '';
+        break;
+    case 'right':
+        $alg = " align=\"$rgt\"";
+        break;
+    case 'left':
+        $alg = " align=\"$lft\"";
+        break;
+    default:
+        $alg = " align=\"$align\"";
+        break;
+    }
 
-        if ( $dir <> 'ltr' ) {
-            $ret .= " dir=\"$dir\"";
-        }
-        $ret .= $bgc . $alg;
+    $ret = "<$tag";
 
-        if ( $xtra <> '' ) {
-            $ret .= " $xtra";
-        }
+    if ( $dir <> 'ltr' ) {
+        $ret .= " dir=\"$dir\"";
+    }
+    $ret .= $bgc . $alg;
 
-        if ( $val <> '' ) {
-            $ret .= ">$val</$tag>";
-        } else {
-            $ret .= '>';
-        }
+    if ( $xtra <> '' ) {
+        $ret .= " $xtra";
+    }
 
-        return( $ret );
+    if ( $val <> '' ) {
+        $ret .= ">$val</$tag>\n";
+    } else {
+        $ret .= '>'. "\n";
     }
 
-    /* handy function to set url vars */
-    /* especially usefull when $url = $PHP_SELF */
-    function set_url_var($url, $var, $val=0, $link=true) {
-        $k = '';
-        $pat_a = array (
-                       '/.+(\\&'.$var.')=(.*)\\&/AU',   /* in the middle */
-                       '/.+\\?('.$var.')=(.*\\&).+/AU', /* at front, more follow */
-                       '/.+(\\?'.$var.')=(.*)$/AU',     /* at front and only var */
-                       '/.+(\\&'.$var.')=(.*)$/AU'      /* at the end */
-                     );
-        preg_replace('/&amp;/','&',$url);
-        switch (true) {
-            case (preg_match($pat_a[0],$url,$regs)):
-                $k = $regs[1];
-                $v = $regs[2];
-                break;
-            case (preg_match($pat_a[1],$url,$regs)):
-                $k = $regs[1];
-                $v = $regs[2];
-                break;
-            case (preg_match($pat_a[2],$url,$regs)):
-                $k = $regs[1];
-                $v = $regs[2];
-                break;
-            case (preg_match($pat_a[3],$url,$regs)):
-                $k = $regs[1];
-                $v = $regs[2];
-                break;
-            default:
-                if ($val) {
-                    if (strpos($url,'?')) {
-                        $url .= "&$var=$val";
-                    } else {
-                        $url .= "?$var=$val";
-                    }
-                }
-                break;
-        }
+    return( $ret );
+}
 
-        if ($k) {
-            if ($val) {
-                $rpl = "$k=$val";
-                if ($link) {
-                    $rpl = preg_replace('/&/','&amp;',$rpl);
-                }
+/**
+ * handy function to set url vars
+ *
+ * especially useful when $url = $PHP_SELF
+ * @param string $url url that must be modified
+ * @param string $var variable name
+ * @param string $val variable value
+ * @param boolean $link controls sanitizing of ampersand in urls (since 1.3.2)
+ * @return string $url modified url
+ * @since 1.3.0
+ */
+function set_url_var($url, $var, $val=0, $link=true) {
+    $k = '';
+    $pat_a = array (
+                    '/.+(\\&'.$var.')=(.*)\\&/AU',   /* in the middle */
+                    '/.+\\?('.$var.')=(.*\\&).+/AU', /* at front, more follow */
+                    '/.+(\\?'.$var.')=(.*)$/AU',     /* at front and only var */
+                    '/.+(\\&'.$var.')=(.*)$/AU'      /* at the end */
+                    );
+    $url = preg_replace('/&amp;/','&',$url);
+
+    // FIXME: why switch is used instead of if () or one preg_match()
+    switch (true) {
+    case (preg_match($pat_a[0],$url,$regs)):
+        $k = $regs[1];
+        $v = $regs[2];
+        break;
+    case (preg_match($pat_a[1],$url,$regs)):
+        $k = $regs[1];
+        $v = $regs[2];
+        break;
+    case (preg_match($pat_a[2],$url,$regs)):
+        $k = $regs[1];
+        $v = $regs[2];
+        break;
+    case (preg_match($pat_a[3],$url,$regs)):
+        $k = $regs[1];
+        $v = $regs[2];
+        break;
+    default:
+        if ($val) {
+            if (strpos($url,'?')) {
+                $url .= "&$var=$val";
             } else {
-                $rpl = '';
+                $url .= "?$var=$val";
             }
-            $pat = "/$k=$v/";
-            $url = preg_replace($pat,$rpl,$url);
         }
-        return $url;
+        break;
     }
 
-    /* Temporary test function to proces template vars with formatting.
-     * I use it for viewing the message_header (view_header.php) with
-     * a sort of template.
-     */
-    function echo_template_var($var, $format_ar = array() ) {
-        $frm_last = count($format_ar) -1;
-
-        if (isset($format_ar[0])) echo $format_ar[0];
-            $i = 1;
-
-        switch (true) {
-            case (is_string($var)):
-                echo $var;
-                break;
-            case (is_array($var)):
-                $frm_a = array_slice($format_ar,1,$frm_last-1);
-                foreach ($var as $a_el) {
-                    if (is_array($a_el)) {
-                        echo_template_var($a_el,$frm_a);
-                    } else {
-                        echo $a_el;
-                        if (isset($format_ar[$i])) {
-                            echo $format_ar[$i];
-                        }
-                        $i++;
-                    }
-                }
-                break;
-            default:
-                break;
+    if ($k) {
+        if ($val) {
+            $rpl = "$k=$val";
+            if ($link) {
+                $rpl = preg_replace('/&/','&amp;',$rpl);
+            }
+        } else {
+            $rpl = '';
         }
-        if (isset($format_ar[$frm_last]) && $frm_last>$i ) {
-            echo $format_ar[$frm_last];
+        if( substr($v,-1)=='&' ) {
+            $rpl .= '&';
         }
+        $pat = "/$k=$v/";
+        $url = preg_replace($pat,$rpl,$url);
     }
-?>
\ No newline at end of file
+    $url = preg_replace('/&/','&amp;',$url);
+    return $url;
+}