X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fhtml.php;h=dfc55978819ade95086abd0f6d9332ea78ba5071;hb=2f617223e0e2742d2d9377aadedd3737b3256430;hp=ec7f90e37a186f7db2a9ce50ae3c902d36bc91ff;hpb=0177059f88bf54485b0d713ccad09b864dbf5240;p=squirrelmail.git diff --git a/functions/html.php b/functions/html.php index ec7f90e3..dfc55978 100644 --- a/functions/html.php +++ b/functions/html.php @@ -7,7 +7,7 @@ * the right to left implementation by "functionize" some * html outputs. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright 1999-2011 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail @@ -201,10 +201,43 @@ function create_span($value, $class='', $id='', $aAttribs=array()) { } +/** + * Generates an opening body tag + * + * @param string $onload Body onload JavaScript handler code + * (OPTIONAL; default not used) + * @param string $class The CSS class name (OPTIONAL; default + * not used) + * @param array $aAttribs Any extra attributes: this must be an + * associative array, where keys will be + * added as the attribute name, and values + * (which are optional - should be null if + * none should be used) will be placed in + * double quotes (pending template implementation) + * as the attribute value (OPTIONAL; default empty). + * + * @return string The desired body tag. + * + * @since 1.5.2 + * + */ +function create_body($onload='', $class='', $aAttribs=array()) { + + global $oTemplate; + + $oTemplate->assign('onload', $onload); + $oTemplate->assign('class', $class); + + $oTemplate->assign('aAttribs', $aAttribs); + + return $oTemplate->fetch('body.tpl'); + +} + + /** * Generates html tags -//FIXME: this should not be used anywhere in the core, or we should -// convert this to use templates. We sould not be assuming HTML output. +//FIXME: This should not be used anywhere in the core, or we should convert this to use templates. We should not be assuming HTML output. * * @param string $tag Tag to output * @param string $val Value between tags @@ -281,71 +314,98 @@ function html_tag( $tag, // Tag to output /** - * handy function to set url vars + * This function is used to add, modify or delete more than + * one GET variable at a time in a URL. This simply takes + * an array of variables (key/value pairs) and passes them + * one at a time to {@link set_url_var}. + * + * Note that the value for any one of the variables may be + * an array, and it will be handled properly. + * + * As with set_url_var, any of the variable values may be + * set to NULL to remove it from the URI. + * + * Also, to ensure compatibility with older versions, use + * $val='0' to set $var to 0. + * + * @param string $uri URI that must be modified + * @param array $values List of GET variable names and their values + * @param boolean $sanitize Controls sanitizing of ampersand in URIs + * + * @return string The modified URI + * + * @since 1.5.2 + * + */ +function set_uri_vars($uri, $values, $sanitize=TRUE) { + foreach ($values as $key => $value) + if (is_array($value)) { + $i = 0; + foreach ($value as $val) + $uri = set_url_var($uri, $key . '[' . $i++ . ']', $val, $sanitize); + } + else + $uri = set_url_var($uri, $key, $value, $sanitize); + return $uri; +} + + +/** + * This function is used to add, modify or delete GET variables in a URL. + * It is especially useful when $url = $PHP_SELF + * + * Set $val to NULL to remove $var from $url. + * To ensure compatibility with older versions, use $val='0' to set $var to 0. * - * especially useful when $url = $PHP_SELF * @param string $url url that must be modified - * @param string $var variable name + * @param string $var GET 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 */ - ); +function set_url_var($url, $var, $val=null, $link=true) { $url = str_replace('&','&',$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 { - $url .= "?$var=$val"; - } + if (strpos($url, '?') === false) { + $url .= '?'; + } + + list($uri, $params) = explode('?', $url, 2); + + $newpar = array(); + $params = explode('&', $params); + + foreach ($params as $p) { + if (trim($p)) { + $p = explode('=', $p); + $newpar[$p[0]] = (isset($p[1]) ? $p[1] : ''); } - break; } - if ($k) { - if ($val) { - $rpl = "$k=$val"; - } else { - $rpl = ''; - } - if( substr($v,-1)=='&' ) { - $rpl .= '&'; - } - $pat = "/$k=$v/"; - $url = preg_replace($pat,$rpl,$url); + if (is_null($val)) { + unset($newpar[$var]); + } else { + $newpar[$var] = $val; } + + if (!count($newpar)) { + return $uri; + } + + $url = $uri . '?'; + foreach ($newpar as $name => $value) { + $url .= "$name=$value&"; + } + + $url = substr($url, 0, -1); if ($link) { $url = str_replace('&','&',$url); } + return $url; } -