clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
ae3295e1b9
php-src/ext/standard/html.c

1449 lines
42 KiB
C
Raw Normal View History

First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
/*
+----------------------------------------------------------------------+
- A belated happy holidays and PHP 5
2004-01-08 08:18:22 +00:00
| PHP Version 5 |
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
+----------------------------------------------------------------------+
MFH: Bump copyright year, 2 of 2.
2007-12-31 07:17:19 +00:00
| Copyright (c) 1997-2008 The PHP Group |
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
+----------------------------------------------------------------------+
bump year and license version
2006-01-01 12:51:34 +00:00
| This source file is subject to version 3.01 of the PHP license, |
License update
1999-07-16 13:13:16 +00:00
| that is bundled with this package in the file LICENSE, and is |
updating license information in the headers.
2003-06-10 20:04:29 +00:00
| available through the world-wide-web at the following url: |
bump year and license version
2006-01-01 12:51:34 +00:00
| http://www.php.net/license/3_01.txt |
License update
1999-07-16 13:13:16 +00:00
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
+----------------------------------------------------------------------+
Maintain headers.
2002-02-28 08:29:35 +00:00
| Authors: Rasmus Lerdorf <rasmus@php.net> |
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
| Jaakko Hyv<EFBFBD>tti <jaakko.hyvatti@iki.fi> |
(PHP nl_langinfo) Added function when provided by OS (PHP htmlentities, htmlspecialchars) Uses nl_langinfo to determine charset @- Added nl_langinfo() (when OS provides it) that returns locale information. (Wez Furlong) # There are a lot of constants used by nl_langinfo; should we do something # along the lines of what we do for syslog?
2001-07-04 10:10:30 +00:00
| Wez Furlong <wez@thebrainroom.com> |
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
+----------------------------------------------------------------------+
Changed lots of PHP 3 licence headers to PHP 4, mainly in .h files. Added a few RCS $Id$ tags. # Note: I have avoided changing any .h files if the corresponding .c file # had not already been changed as I am not sure if there are any legal # issues here. So some extensions still have PHP 3 headers.
2000-07-24 01:40:02 +00:00
*/
/* $Id$ */
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
Added links to HTML entity resources
2003-05-05 19:50:15 +00:00
/*
* HTML entity resources:
*
* http://msdn.microsoft.com/workshop/author/dhtml/reference/charsets/charset2.asp
* http://msdn.microsoft.com/workshop/author/dhtml/reference/charsets/charset3.asp
* http://www.unicode.org/Public/MAPPINGS/OBSOLETE/UNI2SGML.TXT
*
- MF43: Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping).
2005-03-09 10:13:05 +00:00
* http://www.w3.org/TR/2002/REC-xhtml1-20020801/dtds.html#h-A2
*
Added links to HTML entity resources
2003-05-05 19:50:15 +00:00
*/
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
#include "php.h"
Fix Win32 build.
2002-11-16 08:30:31 +00:00
#if PHP_WIN32
#include "config.w32.h"
#else
- Fix outside-source-tree builds. Always include generated header files with #include <some_header.h> to make sure the correct file is used.
2005-01-09 21:05:06 +00:00
#include <php_config.h>
Fix Win32 build.
2002-11-16 08:30:31 +00:00
#endif
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
#include "html.h"
New PHP streams...
2002-03-15 21:03:08 +00:00
#include "php_string.h"
Improved determine_charset() to look up SG(default_charset) value
2002-10-24 22:04:28 +00:00
#include "SAPI.h"
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
#if HAVE_LOCALE_H
#include <locale.h>
#endif
(PHP nl_langinfo) Added function when provided by OS (PHP htmlentities, htmlspecialchars) Uses nl_langinfo to determine charset @- Added nl_langinfo() (when OS provides it) that returns locale information. (Wez Furlong) # There are a lot of constants used by nl_langinfo; should we do something # along the lines of what we do for syslog?
2001-07-04 10:10:30 +00:00
#if HAVE_LANGINFO_H
#include <langinfo.h>
#endif
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
Improved determine_charset() to use mbstring.internal_encoding when the last param is a null string. (If the param is omitted, it takes iso-8859-1 as the default charset in favour of backwards compatibility.)
2002-10-22 20:11:48 +00:00
#if HAVE_MBSTRING
# include "ext/mbstring/mbstring.h"
ZEND_EXTERN_MODULE_GLOBALS(mbstring)
#endif
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
enum entity_charset { cs_terminator, cs_8859_1, cs_cp1252,
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
cs_8859_15, cs_utf_8, cs_big5, cs_gb2312,
Added koi8-r, cp866, and cp1251 support for htmlentities
2003-03-24 19:13:02 +00:00
cs_big5hkscs, cs_sjis, cs_eucjp, cs_koi8r,
- Test before commit - test before commit
2003-12-10 21:02:33 +00:00
cs_cp1251, cs_8859_5, cs_cp866, cs_macroman
Added koi8-r, cp866, and cp1251 support for htmlentities
2003-03-24 19:13:02 +00:00
};
Mark pointers in entity tables as const.
2005-05-11 12:54:29 +00:00
typedef const char *const entity_table_t;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
/* codepage 1252 is a Windows extension to iso-8859-1. */
static entity_table_t ent_cp_1252[] = {
Added &euro; support to cp1252 table
2002-10-24 19:52:30 +00:00
"euro", NULL, "sbquo", "fnof", "bdquo", "hellip", "dagger",
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
"Dagger", "circ", "permil", "Scaron", "lsaquo", "OElig",
NULL, NULL, NULL, NULL, "lsquo", "rsquo", "ldquo", "rdquo",
"bull", "ndash", "mdash", "tilde", "trade", "scaron", "rsaquo",
"oelig", NULL, NULL, "Yuml"
};
static entity_table_t ent_iso_8859_1[] = {
Whitespace
2001-08-11 17:03:37 +00:00
"nbsp", "iexcl", "cent", "pound", "curren", "yen", "brvbar",
"sect", "uml", "copy", "ordf", "laquo", "not", "shy", "reg",
"macr", "deg", "plusmn", "sup2", "sup3", "acute", "micro",
"para", "middot", "cedil", "sup1", "ordm", "raquo", "frac14",
"frac12", "frac34", "iquest", "Agrave", "Aacute", "Acirc",
"Atilde", "Auml", "Aring", "AElig", "Ccedil", "Egrave",
"Eacute", "Ecirc", "Euml", "Igrave", "Iacute", "Icirc",
"Iuml", "ETH", "Ntilde", "Ograve", "Oacute", "Ocirc", "Otilde",
"Ouml", "times", "Oslash", "Ugrave", "Uacute", "Ucirc", "Uuml",
"Yacute", "THORN", "szlig", "agrave", "aacute", "acirc",
"atilde", "auml", "aring", "aelig", "ccedil", "egrave",
"eacute", "ecirc", "euml", "igrave", "iacute", "icirc",
"iuml", "eth", "ntilde", "ograve", "oacute", "ocirc", "otilde",
"ouml", "divide", "oslash", "ugrave", "uacute", "ucirc",
"uuml", "yacute", "thorn", "yuml"
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
};
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
static entity_table_t ent_iso_8859_15[] = {
"nbsp", "iexcl", "cent", "pound", "euro", "yen", "Scaron",
"sect", "scaron", "copy", "ordf", "laquo", "not", "shy", "reg",
"macr", "deg", "plusmn", "sup2", "sup3", NULL, /* Zcaron */
"micro", "para", "middot", NULL, /* zcaron */ "sup1", "ordm",
"raquo", "OElig", "oelig", "Yuml", "iquest", "Agrave", "Aacute",
"Acirc", "Atilde", "Auml", "Aring", "AElig", "Ccedil", "Egrave",
Whitespace
2001-08-11 17:03:37 +00:00
"Eacute", "Ecirc", "Euml", "Igrave", "Iacute", "Icirc",
"Iuml", "ETH", "Ntilde", "Ograve", "Oacute", "Ocirc", "Otilde",
"Ouml", "times", "Oslash", "Ugrave", "Uacute", "Ucirc", "Uuml",
"Yacute", "THORN", "szlig", "agrave", "aacute", "acirc",
"atilde", "auml", "aring", "aelig", "ccedil", "egrave",
"eacute", "ecirc", "euml", "igrave", "iacute", "icirc",
"iuml", "eth", "ntilde", "ograve", "oacute", "ocirc", "otilde",
"ouml", "divide", "oslash", "ugrave", "uacute", "ucirc",
"uuml", "yacute", "thorn", "yuml"
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
};
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
static entity_table_t ent_uni_338_402[] = {
- MF43: Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping).
2005-03-09 10:13:05 +00:00
/* 338 (0x0152) */
"OElig", "oelig", NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 352 (0x0160) */
"Scaron", "scaron", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- Fixed bug #29119 (html_decode_entities handling of U+0152-U+0192 range) (merge error from 4.3)
2005-05-11 12:43:07 +00:00
/* 376 (0x0178) */
- MF43: Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping).
2005-03-09 10:13:05 +00:00
"Yuml", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- Fixed bug #29119 (html_decode_entities handling of U+0152-U+0192 range) (merge error from 4.3)
2005-05-11 12:43:07 +00:00
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 400 (0x0190) */
- MF43: Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping).
2005-03-09 10:13:05 +00:00
NULL, NULL, "fnof"
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
};
static entity_table_t ent_uni_spacing[] = {
/* 710 */
"circ",
- Fix the fix :)
2005-01-11 20:58:46 +00:00
/* 711 - 730 */
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- Fix the fix :)
2005-01-11 20:58:46 +00:00
/* 731 - 732 */
NULL, "tilde"
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
};
static entity_table_t ent_uni_greek[] = {
/* 913 */
"Alpha", "Beta", "Gamma", "Delta", "Epsilon", "Zeta", "Eta", "Theta",
- MFH: Fix for bug #28042 (greek letters in html to entitity mapping not correct)
2004-04-17 23:08:02 +00:00
"Iota", "Kappa", "Lambda", "Mu", "Nu", "Xi", "Omicron", "Pi", "Rho",
NULL, "Sigma", "Tau", "Upsilon", "Phi", "Chi", "Psi", "Omega",
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
/* 938 - 944 are not mapped */
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"alpha", "beta", "gamma", "delta", "epsilon", "zeta", "eta", "theta",
- MFH: Fix for bug #28042 (greek letters in html to entitity mapping not correct)
2004-04-17 23:08:02 +00:00
"iota", "kappa", "lambda", "mu", "nu", "xi", "omicron", "pi", "rho",
"sigmaf", "sigma", "tau", "upsilon", "phi", "chi", "psi", "omega",
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
/* 970 - 976 are not mapped */
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- MF43: Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping).
2005-03-09 10:13:05 +00:00
"thetasym", "upsih",
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
NULL, NULL, NULL,
- MF43: Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping).
2005-03-09 10:13:05 +00:00
"piv"
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
};
static entity_table_t ent_uni_punct[] = {
/* 8194 */
"ensp", "emsp", NULL, NULL, NULL, NULL, NULL,
"thinsp", NULL, NULL, "zwnj", "zwj", "lrm", "rlm",
NULL, NULL, NULL, "ndash", "mdash", NULL, NULL, NULL,
- Fix bug #29199 (html_entity_decode() misbehaves with UTF-8)
2004-07-19 17:46:30 +00:00
/* 8216 */
"lsquo", "rsquo", "sbquo", NULL, "ldquo", "rdquo", "bdquo", NULL,
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
"dagger", "Dagger", "bull", NULL, NULL, NULL, "hellip",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, "permil", NULL,
- Fix bug #29199 (html_entity_decode() misbehaves with UTF-8)
2004-07-19 17:46:30 +00:00
/* 8242 */
"prime", "Prime", NULL, NULL, NULL, NULL, NULL, "lsaquo", "rsaquo", NULL,
NULL, NULL, "oline", NULL, NULL, NULL, NULL, NULL,
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
"frasl"
};
Added "&euro;" support for htmlentities() and html_entity_decode()
2003-05-08 15:43:34 +00:00
static entity_table_t ent_uni_euro[] = {
"euro"
};
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
static entity_table_t ent_uni_8465_8501[] = {
/* 8465 */
"image", NULL, NULL, NULL, NULL, NULL, NULL,
/* 8472 */
"weierp", NULL, NULL, NULL,
/* 8476 */
"real", NULL, NULL, NULL, NULL, NULL,
/* 8482 */
"trade", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8501 */
"alefsym",
};
static entity_table_t ent_uni_8592_9002[] = {
Fixed bug #23449
2003-05-02 11:00:42 +00:00
/* 8592 (0x2190) */
"larr", "uarr", "rarr", "darr", "harr", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8608 (0x21a0) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8624 (0x21b0) */
- MF43: Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping).
2005-03-09 10:13:05 +00:00
NULL, NULL, NULL, NULL, NULL, "crarr", NULL, NULL,
Fixed bug #23449
2003-05-02 11:00:42 +00:00
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8640 (0x21c0) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8656 (0x21d0) */
"lArr", "uArr", "rArr", "dArr", "hArr", "vArr", NULL, NULL,
NULL, NULL, "lAarr", "rAarr", NULL, "rarrw", NULL, NULL,
/* 8672 (0x21e0) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8704 (0x2200) */
"forall", "comp", "part", "exist", "nexist", "empty", NULL, "nabla",
- MF43: Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping).
2005-03-09 10:13:05 +00:00
"isin", "notin", "epsis", "ni", "notni", "bepsi", NULL, "prod",
Fixed bug #23449
2003-05-02 11:00:42 +00:00
/* 8720 (0x2210) */
- MF43: Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping).
2005-03-09 10:13:05 +00:00
"coprod", "sum", "minus", "mnplus", "plusdo", NULL, "setmn", "lowast",
Fixed bug #23449
2003-05-02 11:00:42 +00:00
"compfn", NULL, "radic", NULL, NULL, "prop", "infin", "ang90",
/* 8736 (0x2220) */
"ang", "angmsd", "angsph", "mid", "nmid", "par", "npar", "and",
"or", "cap", "cup", "int", NULL, NULL, "conint", NULL,
/* 8752 (0x2230) */
NULL, NULL, NULL, NULL, "there4", "becaus", NULL, NULL,
NULL, NULL, NULL, NULL, "sim", "bsim", NULL, NULL,
/* 8768 (0x2240) */
"wreath", "nsim", NULL, "sime", "nsime", "cong", NULL, "ncong",
- MF43: Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping).
2005-03-09 10:13:05 +00:00
"asymp", "nap", "ape", NULL, "bcong", "asymp", "bump", "bumpe",
Fixed bug #23449
2003-05-02 11:00:42 +00:00
/* 8784 (0x2250) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8800 (0x2260) */
"ne", "equiv", NULL, NULL, "le", "ge", "lE", "gE",
"lnE", "gnE", "Lt", "Gt", "twixt", NULL, "nlt", "ngt",
/* 8816 (0x2270) */
"nles", "nges", "lsim", "gsim", NULL, NULL, "lg", "gl",
NULL, NULL, "pr", "sc", "cupre", "sscue", "prsim", "scsim",
/* 8832 (0x2280) */
"npr", "nsc", "sub", "sup", "nsub", "nsup", "sube", "supe",
- Fix htmlentities() / html_decode_entity() UTF-8 related bugs initially reported by Kamesh Jayachandran
2005-01-11 20:44:04 +00:00
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8848 (0x2290) */
NULL, NULL, NULL, NULL, NULL, "oplus", NULL, "otimes",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8864 (0x22a0) */
NULL, NULL, NULL, NULL, NULL, "perp", NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8880 (0x22b0) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8896 (0x22c0) */
NULL, NULL, NULL, NULL, NULL, "sdot", NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8912 (0x22d0) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8928 (0x22e0) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8944 (0x22f0) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8960 (0x2300) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"lceil", "rceil", "lfloor", "rfloor", NULL, NULL, NULL, NULL,
/* 8976 (0x2310) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8992 (0x2320) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, "lang", "rang"
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
};
static entity_table_t ent_uni_9674[] = {
/* 9674 */
"loz"
};
static entity_table_t ent_uni_9824_9830[] = {
/* 9824 */
"spades", NULL, NULL, "clubs", NULL, "hearts", "diams"
};
Added koi8-r, cp866, and cp1251 support for htmlentities
2003-03-24 19:13:02 +00:00
static entity_table_t ent_koi8r[] = {
"#1105", /* "jo "*/
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, "#1025", /* "JO" */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"#1102", "#1072", "#1073", "#1094", "#1076", "#1077", "#1092",
"#1075", "#1093", "#1080", "#1081", "#1082", "#1083", "#1084",
"#1085", "#1086", "#1087", "#1103", "#1088", "#1089", "#1090",
"#1091", "#1078", "#1074", "#1100", "#1099", "#1079", "#1096",
"#1101", "#1097", "#1095", "#1098", "#1070", "#1040", "#1041",
"#1062", "#1044", "#1045", "#1060", "#1043", "#1061", "#1048",
"#1049", "#1050", "#1051", "#1052", "#1053", "#1054", "#1055",
"#1071", "#1056", "#1057", "#1058", "#1059", "#1046", "#1042",
"#1068", "#1067", "#1047", "#1064", "#1069", "#1065", "#1063",
"#1066"
};
static entity_table_t ent_cp_1251[] = {
"#1026", "#1027", "#8218", "#1107", "#8222", "hellip", "dagger",
"Dagger", "euro", "permil", "#1033", "#8249", "#1034", "#1036",
"#1035", "#1039", "#1106", "#8216", "#8217", "#8219", "#8220",
"bull", "ndash", "mdash", NULL, "trade", "#1113", "#8250",
"#1114", "#1116", "#1115", "#1119", "nbsp", "#1038", "#1118",
"#1032", "curren", "#1168", "brvbar", "sect", "#1025", "copy",
"#1028", "laquo", "not", "shy", "reg", "#1031", "deg", "plusmn",
"#1030", "#1110", "#1169", "micro", "para", "middot", "#1105",
"#8470", "#1108", "raquo", "#1112", "#1029", "#1109", "#1111",
"#1040", "#1041", "#1042", "#1043", "#1044", "#1045", "#1046",
"#1047", "#1048", "#1049", "#1050", "#1051", "#1052", "#1053",
"#1054", "#1055", "#1056", "#1057", "#1058", "#1059", "#1060",
"#1061", "#1062", "#1063", "#1064", "#1065", "#1066", "#1067",
"#1068", "#1069", "#1070", "#1071", "#1072", "#1073", "#1074",
"#1075", "#1076", "#1077", "#1078", "#1079", "#1080", "#1081",
"#1082", "#1083", "#1084", "#1085", "#1086", "#1087", "#1088",
"#1089", "#1090", "#1091", "#1092", "#1093", "#1094", "#1095",
"#1096", "#1097", "#1098", "#1099", "#1100", "#1101", "#1102",
"#1103"
};
static entity_table_t ent_iso_8859_5[] = {
"#1056", "#1057", "#1058", "#1059", "#1060", "#1061", "#1062",
"#1063", "#1064", "#1065", "#1066", "#1067", "#1068", "#1069",
"#1070", "#1071", "#1072", "#1073", "#1074", "#1075", "#1076",
"#1077", "#1078", "#1079", "#1080", "#1081", "#1082", "#1083",
"#1084", "#1085", "#1086", "#1087", "#1088", "#1089", "#1090",
"#1091", "#1092", "#1093", "#1094", "#1095", "#1096", "#1097",
"#1098", "#1099", "#1100", "#1101", "#1102", "#1103", "#1104",
"#1105", "#1106", "#1107", "#1108", "#1109", "#1110", "#1111",
"#1112", "#1113", "#1114", "#1115", "#1116", "#1117", "#1118",
"#1119"
};
static entity_table_t ent_cp_866[] = {
"#9492", "#9524", "#9516", "#9500", "#9472", "#9532", "#9566",
"#9567", "#9562", "#9556", "#9577", "#9574", "#9568", "#9552",
"#9580", "#9575", "#9576", "#9572", "#9573", "#9561", "#9560",
"#9554", "#9555", "#9579", "#9578", "#9496", "#9484", "#9608",
"#9604", "#9612", "#9616", "#9600", "#1088", "#1089", "#1090",
"#1091", "#1092", "#1093", "#1094", "#1095", "#1096", "#1097",
"#1098", "#1099", "#1100", "#1101", "#1102", "#1103", "#1025",
"#1105", "#1028", "#1108", "#1031", "#1111", "#1038", "#1118",
"#176", "#8729", "#183", "#8730", "#8470", "#164", "#9632",
"#160"
};
- Added support for MacRoman encoding to htmlentities(). (Marcus Bointon)
2003-12-10 18:17:23 +00:00
/* MacRoman has a couple of low-ascii chars that need mapping too */
/* Vertical tab (ASCII 11) is often used to store line breaks inside */
/* DB exports, this mapping changes it to a space */
static entity_table_t ent_macroman[] = {
"sp", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, "quot", NULL,
NULL, NULL, "amp", NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, "lt", NULL, "gt", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, "Auml", "Aring", "Ccedil", "Eacute", "Ntilde", "Ouml",
"Uuml", "aacute", "agrave", "acirc", "auml", "atilde", "aring",
"ccedil", "eacute", "egrave", "ecirc", "euml", "iacute", "igrave",
"icirc", "iuml", "ntilde", "oacute", "ograve", "ocirc", "ouml",
"otilde", "uacute", "ugrave", "ucirc", "uuml", "dagger", "deg",
"cent", "pound", "sect", "bull", "para", "szlig", "reg",
"copy", "trade", "acute", "uml", "ne", "AElig", "Oslash",
"infin", "plusmn", "le", "ge", "yen", "micro", "part",
"sum", "prod", "pi", "int", "ordf", "ordm", "Omega",
"aelig", "oslash", "iquest", "iexcl", "not", "radic", "fnof",
"asymp", "#8710", "laquo", "raquo", "hellip", "nbsp", "Agrave",
"Atilde", "Otilde", "OElig", "oelig", "ndash", "mdash", "ldquo",
"rdquo", "lsquo", "rsquo", "divide", "loz", "yuml", "Yuml",
"frasl", "euro", "lsaquo", "rsaquo", "#xFB01", "#xFB02", "Dagger",
"middot", "sbquo", "bdquo", "permil", "Acirc", "Ecirc", "Aacute",
"Euml", "Egrave", "Iacute", "Icirc", "Iuml", "Igrave", "Oacute",
"Ocirc", "#xF8FF", "Ograve", "Uacute", "Ucirc", "Ugrave", "#305",
"circ", "tilde", "macr", "#728", "#729", "#730", "cedil",
"#733", "#731", "#711"
};
Added koi8-r, cp866, and cp1251 support for htmlentities
2003-03-24 19:13:02 +00:00
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
struct html_entity_map {
enum entity_charset charset; /* charset identifier */
unsigned short basechar; /* char code at start of table */
unsigned short endchar; /* last char code in the table */
* formatting, plus remove some old fopen wrappers
2002-03-16 01:34:52 +00:00
entity_table_t *table; /* the table of mappings */
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
};
static const struct html_entity_map entity_map[] = {
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
{ cs_cp1252, 0x80, 0x9f, ent_cp_1252 },
{ cs_cp1252, 0xa0, 0xff, ent_iso_8859_1 },
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
{ cs_8859_1, 0xa0, 0xff, ent_iso_8859_1 },
{ cs_8859_15, 0xa0, 0xff, ent_iso_8859_15 },
{ cs_utf_8, 0xa0, 0xff, ent_iso_8859_1 },
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
{ cs_utf_8, 338, 402, ent_uni_338_402 },
- Fix the fix :)
2005-01-11 20:58:46 +00:00
{ cs_utf_8, 710, 732, ent_uni_spacing },
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
{ cs_utf_8, 913, 982, ent_uni_greek },
{ cs_utf_8, 8194, 8260, ent_uni_punct },
Added "&euro;" support for htmlentities() and html_entity_decode()
2003-05-08 15:43:34 +00:00
{ cs_utf_8, 8364, 8364, ent_uni_euro },
Add support for remaining entities in HTML 4 for the UTF-8 encoding in htmlentities/htmlspecial chars. This is a fix for for #17008. # I would *really* appreciate it if someone with a good eye could verify # that all the entities are there and are correctly numbered; I've checked # it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
{ cs_utf_8, 8465, 8501, ent_uni_8465_8501 },
{ cs_utf_8, 8592, 9002, ent_uni_8592_9002 },
{ cs_utf_8, 9674, 9674, ent_uni_9674 },
{ cs_utf_8, 9824, 9830, ent_uni_9824_9830 },
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
{ cs_big5, 0xa0, 0xff, ent_iso_8859_1 },
{ cs_gb2312, 0xa0, 0xff, ent_iso_8859_1 },
{ cs_big5hkscs, 0xa0, 0xff, ent_iso_8859_1 },
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
{ cs_sjis, 0xa0, 0xff, ent_iso_8859_1 },
{ cs_eucjp, 0xa0, 0xff, ent_iso_8859_1 },
Added koi8-r, cp866, and cp1251 support for htmlentities
2003-03-24 19:13:02 +00:00
{ cs_koi8r, 0xa3, 0xff, ent_koi8r },
{ cs_cp1251, 0x80, 0xff, ent_cp_1251 },
{ cs_8859_5, 0xc0, 0xff, ent_iso_8859_5 },
{ cs_cp866, 0xc0, 0xff, ent_cp_866 },
- Added support for MacRoman encoding to htmlentities(). (Marcus Bointon)
2003-12-10 18:17:23 +00:00
{ cs_macroman, 0x0b, 0xff, ent_macroman },
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
{ cs_terminator }
};
static const struct {
* formatting, plus remove some old fopen wrappers
2002-03-16 01:34:52 +00:00
const char *codeset;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
enum entity_charset charset;
} charset_map[] = {
{ "ISO-8859-1", cs_8859_1 },
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
{ "ISO8859-1", cs_8859_1 },
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
{ "ISO-8859-15", cs_8859_15 },
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
{ "ISO8859-15", cs_8859_15 },
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
{ "utf-8", cs_utf_8 },
{ "cp1252", cs_cp1252 },
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
{ "Windows-1252", cs_cp1252 },
Added support for windows code pages.
2002-11-11 13:31:08 +00:00
{ "1252", cs_cp1252 },
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
{ "BIG5", cs_big5 },
Added support for windows code pages.
2002-11-11 13:31:08 +00:00
{ "950", cs_big5 },
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
{ "GB2312", cs_gb2312 },
Added support for windows code pages.
2002-11-11 13:31:08 +00:00
{ "936", cs_gb2312 },
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
{ "BIG5-HKSCS", cs_big5hkscs },
WS
2002-11-11 13:28:34 +00:00
{ "Shift_JIS", cs_sjis },
{ "SJIS", cs_sjis },
Added support for windows code pages.
2002-11-11 13:31:08 +00:00
{ "932", cs_sjis },
WS
2002-11-11 13:28:34 +00:00
{ "EUCJP", cs_eucjp },
{ "EUC-JP", cs_eucjp },
Added koi8-r, cp866, and cp1251 support for htmlentities
2003-03-24 19:13:02 +00:00
{ "KOI8-R", cs_koi8r },
{ "koi8-ru", cs_koi8r },
{ "koi8r", cs_koi8r },
{ "cp1251", cs_cp1251 },
{ "Windows-1251", cs_cp1251 },
{ "win-1251", cs_cp1251 },
{ "iso8859-5", cs_8859_5 },
{ "iso-8859-5", cs_8859_5 },
{ "cp866", cs_cp866 },
{ "866", cs_cp866 },
{ "ibm866", cs_cp866 },
- Added support for MacRoman encoding to htmlentities(). (Marcus Bointon)
2003-12-10 18:17:23 +00:00
{ "MacRoman", cs_macroman },
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
{ NULL }
};
New PHP streams...
2002-03-15 21:03:08 +00:00
static const struct {
unsigned short charcode;
* formatting, plus remove some old fopen wrappers
2002-03-16 01:34:52 +00:00
char *entity;
New PHP streams...
2002-03-15 21:03:08 +00:00
int entitylen;
int flags;
} basic_entities[] = {
{ '"', "&quot;", 6, ENT_HTML_QUOTE_DOUBLE },
{ '\'', "&#039;", 6, ENT_HTML_QUOTE_SINGLE },
MFB: &039; which is a single-quote may also come in as &39; I see no reason not to support both in html_entity_decode()
2003-04-22 20:47:09 +00:00
{ '\'', "&#39;", 5, ENT_HTML_QUOTE_SINGLE },
New PHP streams...
2002-03-15 21:03:08 +00:00
{ '<', "&lt;", 4, 0 },
{ '>', "&gt;", 4, 0 },
{ 0, NULL, 0, 0 }
};
Improve the performance of htmlspecialchars_decode() by 20-30%.
2005-03-08 21:13:03 +00:00
struct basic_entities_dec {
unsigned short charcode;
char entity[8];
int entitylen;
};
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
#define MB_RETURN { \
*newpos = pos; \
mbseq[mbpos] = '\0'; \
*mbseqlen = mbpos; \
return this_char; }
#define MB_WRITE(mbchar) { \
mbspace--; \
if (mbspace == 0) { \
MB_RETURN; \
} \
mbseq[mbpos++] = (mbchar); }
New PHP streams...
2002-03-15 21:03:08 +00:00
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
#define CHECK_LEN(pos, chars_need) \
if((str_len - (pos)) < chars_need) { \
*status = FAILURE; \
return 0; \
}
Fix folding and clean up some extensions
2001-06-06 13:06:12 +00:00
/* {{{ get_next_char
*/
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
inline static unsigned short get_next_char(enum entity_charset charset,
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
unsigned char * str,
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
int str_len,
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
int * newpos,
unsigned char * mbseq,
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
int * mbseqlen,
int *status)
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
{
int pos = *newpos;
int mbpos = 0;
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
int mbspace = *mbseqlen;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
unsigned short this_char = str[pos++];
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
unsigned char next_char;
*status = SUCCESS;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
if (mbspace <= 0) {
*mbseqlen = 0;
return this_char;
}
MB_WRITE((unsigned char)this_char);
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
WS fix
2002-10-29 15:05:07 +00:00
switch (charset) {
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
case cs_utf_8:
{
unsigned long utf = 0;
int stat = 0;
int more = 1;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
/* unpack utf-8 encoding into a wide char.
* Code stolen from the mbstring extension */
do {
WS
2002-08-25 19:44:25 +00:00
if (this_char < 0x80) {
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
more = 0;
break;
few ws fixes.
2002-10-03 12:06:52 +00:00
} else if (this_char < 0xc0) {
switch (stat) {
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
case 0x10: /* 2, 2nd */
case 0x21: /* 3, 3rd */
case 0x32: /* 4, 4th */
case 0x43: /* 5, 5th */
case 0x54: /* 6, 6th */
/* last byte in sequence */
more = 0;
utf |= (this_char & 0x3f);
this_char = (unsigned short)utf;
break;
case 0x20: /* 3, 2nd */
case 0x31: /* 4, 3rd */
case 0x42: /* 5, 4th */
case 0x53: /* 6, 5th */
/* penultimate char */
utf |= ((this_char & 0x3f) << 6);
stat++;
break;
case 0x30: /* 4, 2nd */
case 0x41: /* 5, 3rd */
case 0x52: /* 6, 4th */
utf |= ((this_char & 0x3f) << 12);
stat++;
break;
case 0x40: /* 5, 2nd */
case 0x51:
utf |= ((this_char & 0x3f) << 18);
stat++;
break;
case 0x50: /* 6, 2nd */
utf |= ((this_char & 0x3f) << 24);
stat++;
add missing break
2004-07-13 17:14:49 +00:00
break;
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
default:
/* invalid */
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
*status = FAILURE;
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
more = 0;
}
}
/* lead byte */
else if (this_char < 0xe0) {
stat = 0x10; /* 2 byte */
utf = (this_char & 0x1f) << 6;
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
CHECK_LEN(pos, 1);
WS
2002-08-25 19:44:25 +00:00
} else if (this_char < 0xf0) {
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
stat = 0x20; /* 3 byte */
utf = (this_char & 0xf) << 12;
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
CHECK_LEN(pos, 2);
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
} else if (this_char < 0xf8) {
stat = 0x30; /* 4 byte */
utf = (this_char & 0x7) << 18;
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
CHECK_LEN(pos, 3);
WS
2002-08-25 19:44:25 +00:00
} else if (this_char < 0xfc) {
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
stat = 0x40; /* 5 byte */
utf = (this_char & 0x3) << 24;
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
CHECK_LEN(pos, 4);
WS
2002-08-25 19:44:25 +00:00
} else if (this_char < 0xfe) {
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
stat = 0x50; /* 6 byte */
utf = (this_char & 0x1) << 30;
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
CHECK_LEN(pos, 5);
WS
2002-08-25 19:44:25 +00:00
} else {
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
/* invalid; bail */
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
more = 0;
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
*status = FAILURE;
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
break;
}
WS
2002-08-25 19:44:25 +00:00
if (more) {
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
this_char = str[pos++];
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
MB_WRITE((unsigned char)this_char);
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
}
few ws fixes.
2002-10-03 12:06:52 +00:00
} while (more);
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
}
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
break;
case cs_big5:
case cs_gb2312:
case cs_big5hkscs:
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
{
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
/* check if this is the first of a 2-byte sequence */
Fixed bug #27505 (htmlentities() does not handle BIG5 correctly).
2004-03-06 18:35:41 +00:00
if (this_char >= 0xa1 && this_char <= 0xfe) {
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
/* peek at the next char */
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
CHECK_LEN(pos, 1);
next_char = str[pos];
Fixed bug #27505 (htmlentities() does not handle BIG5 correctly).
2004-03-06 18:35:41 +00:00
if ((next_char >= 0x40 && next_char <= 0x7e) ||
few ws fixes.
2002-10-03 12:06:52 +00:00
(next_char >= 0xa1 && next_char <= 0xfe)) {
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
/* yes, this a wide char */
this_char <<= 8;
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
MB_WRITE(next_char);
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
this_char |= next_char;
pos++;
}
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
}
break;
}
case cs_sjis:
{
/* check if this is the first of a 2-byte sequence */
if ( (this_char >= 0x81 && this_char <= 0x9f) ||
(this_char >= 0xe0 && this_char <= 0xef)
WS
2002-08-25 19:44:25 +00:00
) {
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
/* peek at the next char */
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
CHECK_LEN(pos, 1);
next_char = str[pos];
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
if ((next_char >= 0x40 && next_char <= 0x7e) ||
(next_char >= 0x80 && next_char <= 0xfc))
{
/* yes, this a wide char */
this_char <<= 8;
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
MB_WRITE(next_char);
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
this_char |= next_char;
pos++;
}
}
break;
}
case cs_eucjp:
{
/* check if this is the first of a multi-byte sequence */
WS
2002-08-25 19:44:25 +00:00
if (this_char >= 0xa1 && this_char <= 0xfe) {
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
/* peek at the next char */
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
CHECK_LEN(pos, 1);
next_char = str[pos];
few ws fixes.
2002-10-03 12:06:52 +00:00
if (next_char >= 0xa1 && next_char <= 0xfe) {
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
/* yes, this a jis kanji char */
this_char <<= 8;
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
MB_WRITE(next_char);
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
this_char |= next_char;
pos++;
}
WS
2002-08-25 19:44:25 +00:00
} else if (this_char == 0x8e) {
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
/* peek at the next char */
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
CHECK_LEN(pos, 1);
next_char = str[pos];
few ws fixes.
2002-10-03 12:06:52 +00:00
if (next_char >= 0xa1 && next_char <= 0xdf) {
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
/* JIS X 0201 kana */
this_char <<= 8;
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
MB_WRITE(next_char);
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
this_char |= next_char;
pos++;
}
WS
2002-08-25 19:44:25 +00:00
} else if (this_char == 0x8f) {
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
/* peek at the next two char */
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
unsigned char next2_char;
CHECK_LEN(pos, 2);
next_char = str[pos];
next2_char = str[pos+1];
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
if ((next_char >= 0xa1 && next_char <= 0xfe) &&
few ws fixes.
2002-10-03 12:06:52 +00:00
(next2_char >= 0xa1 && next2_char <= 0xfe)) {
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
/* JIS X 0212 hojo-kanji */
this_char <<= 8;
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
MB_WRITE(next_char);
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
this_char |= next_char;
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
pos++;
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
this_char <<= 8;
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
MB_WRITE(next2_char);
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
this_char |= next2_char;
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
pos++;
Added support for japanese encoding to htmlentites() and htmlspecialchars(). @ Added support for japanese encoding to htmlentites() and htmlspecialchars(). (Rui)
2001-09-15 04:48:48 +00:00
}
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
}
break;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
}
quelling a warning, and ensuring now undefined behavior
2002-03-06 16:15:28 +00:00
default:
few ws fixes.
2002-10-03 12:06:52 +00:00
break;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
}
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
MB_RETURN;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
}
Fix folding and clean up some extensions
2001-06-06 13:06:12 +00:00
/* }}} */
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
Fix folding and clean up some extensions
2001-06-06 13:06:12 +00:00
/* {{{ entity_charset determine_charset
* returns the charset identifier based on current locale or a hint.
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
* defaults to iso-8859-1 */
Emit a warning when an unsupported charset is requested in htmlentities. Fixed #18521.
2002-09-26 16:07:14 +00:00
static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC)
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
{
int i;
enum entity_charset charset = cs_8859_1;
Make sure len is defined here
2002-06-03 18:26:27 +00:00
int len = 0;
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
zval *uf_result = NULL;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
/* Guarantee default behaviour for backwards compatibility */
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
if (charset_hint == NULL)
(PHP nl_langinfo) Added function when provided by OS (PHP htmlentities, htmlspecialchars) Uses nl_langinfo to determine charset @- Added nl_langinfo() (when OS provides it) that returns locale information. (Wez Furlong) # There are a lot of constants used by nl_langinfo; should we do something # along the lines of what we do for syslog?
2001-07-04 10:10:30 +00:00
return cs_8859_1;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
if ((len = strlen(charset_hint)) != 0) {
goto det_charset;
}
Improved determine_charset() to use mbstring.internal_encoding when the last param is a null string. (If the param is omitted, it takes iso-8859-1 as the default charset in favour of backwards compatibility.)
2002-10-22 20:11:48 +00:00
#if HAVE_MBSTRING
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
#if !defined(COMPILE_DL_MBSTRING)
Improved determine_charset() to use mbstring.internal_encoding when the last param is a null string. (If the param is omitted, it takes iso-8859-1 as the default charset in favour of backwards compatibility.)
2002-10-22 20:11:48 +00:00
/* XXX: Ugly things. Why don't we look for a more sophisticated way? */
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
switch (MBSTRG(current_internal_encoding)) {
case mbfl_no_encoding_8859_1:
return cs_8859_1;
case mbfl_no_encoding_utf8:
return cs_utf_8;
case mbfl_no_encoding_euc_jp:
case mbfl_no_encoding_eucjp_win:
return cs_eucjp;
Fixed ISO-8859-1 handling.
2002-10-24 21:10:45 +00:00
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
case mbfl_no_encoding_sjis:
case mbfl_no_encoding_sjis_win:
case mbfl_no_encoding_sjis_mac:
return cs_sjis;
Improved determine_charset() to use mbstring.internal_encoding when the last param is a null string. (If the param is omitted, it takes iso-8859-1 as the default charset in favour of backwards compatibility.)
2002-10-22 20:11:48 +00:00
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
case mbfl_no_encoding_cp1252:
return cs_cp1252;
Improved determine_charset() to use mbstring.internal_encoding when the last param is a null string. (If the param is omitted, it takes iso-8859-1 as the default charset in favour of backwards compatibility.)
2002-10-22 20:11:48 +00:00
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
case mbfl_no_encoding_8859_15:
return cs_8859_15;
Improved determine_charset() to use mbstring.internal_encoding when the last param is a null string. (If the param is omitted, it takes iso-8859-1 as the default charset in favour of backwards compatibility.)
2002-10-22 20:11:48 +00:00
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
case mbfl_no_encoding_big5:
return cs_big5;
case mbfl_no_encoding_euc_cn:
case mbfl_no_encoding_hz:
case mbfl_no_encoding_cp936:
return cs_gb2312;
Added koi8-r, cp866, and cp1251 support for htmlentities
2003-03-24 19:13:02 +00:00
case mbfl_no_encoding_koi8r:
return cs_koi8r;
case mbfl_no_encoding_cp866:
return cs_cp866;
case mbfl_no_encoding_cp1251:
return cs_cp1251;
case mbfl_no_encoding_8859_5:
return cs_8859_5;
Fixed bug #22834 (compile failure due to ugly implicit casts)
2003-03-24 21:22:23 +00:00
default:
Fix compiler error on null statement in switch
2003-04-24 18:01:26 +00:00
;
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
}
#else
{
zval nm_mb_internal_encoding;
Improved determine_charset() to use mbstring.internal_encoding when the last param is a null string. (If the param is omitted, it takes iso-8859-1 as the default charset in favour of backwards compatibility.)
2002-10-22 20:11:48 +00:00
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
ZVAL_STRING(&nm_mb_internal_encoding, "mb_internal_encoding", 0);
Improved determine_charset() to use mbstring.internal_encoding when the last param is a null string. (If the param is omitted, it takes iso-8859-1 as the default charset in favour of backwards compatibility.)
2002-10-22 20:11:48 +00:00
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
if (call_user_function_ex(CG(function_table), NULL, &nm_mb_internal_encoding, &uf_result, 0, NULL, 1, NULL TSRMLS_CC) != FAILURE) {
Improved determine_charset() to use mbstring.internal_encoding when the last param is a null string. (If the param is omitted, it takes iso-8859-1 as the default charset in favour of backwards compatibility.)
2002-10-22 20:11:48 +00:00
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
charset_hint = Z_STRVAL_P(uf_result);
len = Z_STRLEN_P(uf_result);
MFH: don't try to use "auto", "none" and "pass" charsets returned from mbstring
2006-08-15 15:09:38 +00:00
if (len == 4) { /* sizeof(none|auto|pass)-1 */
if (!memcmp("pass", charset_hint, sizeof("pass") - 1) ||
!memcmp("auto", charset_hint, sizeof("auto") - 1) ||
!memcmp("none", charset_hint, sizeof("none") - 1)) {
charset_hint = NULL;
len = 0;
}
}
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
goto det_charset;
Improved determine_charset() to use mbstring.internal_encoding when the last param is a null string. (If the param is omitted, it takes iso-8859-1 as the default charset in favour of backwards compatibility.)
2002-10-22 20:11:48 +00:00
}
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
}
#endif
Improved determine_charset() to use mbstring.internal_encoding when the last param is a null string. (If the param is omitted, it takes iso-8859-1 as the default charset in favour of backwards compatibility.)
2002-10-22 20:11:48 +00:00
#endif
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
charset_hint = SG(default_charset);
if (charset_hint != NULL && (len=strlen(charset_hint)) != 0) {
goto det_charset;
}
/* try to detect the charset for the locale */
Fix probs on OpenBSD-current and RedHat 6.1
2001-08-08 20:00:09 +00:00
#if HAVE_NL_LANGINFO && HAVE_LOCALE_H && defined(CODESET)
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
charset_hint = nl_langinfo(CODESET);
if (charset_hint != NULL && (len=strlen(charset_hint)) != 0) {
goto det_charset;
}
(PHP nl_langinfo) Added function when provided by OS (PHP htmlentities, htmlspecialchars) Uses nl_langinfo to determine charset @- Added nl_langinfo() (when OS provides it) that returns locale information. (Wez Furlong) # There are a lot of constants used by nl_langinfo; should we do something # along the lines of what we do for syslog?
2001-07-04 10:10:30 +00:00
#endif
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
(PHP nl_langinfo) Added function when provided by OS (PHP htmlentities, htmlspecialchars) Uses nl_langinfo to determine charset @- Added nl_langinfo() (when OS provides it) that returns locale information. (Wez Furlong) # There are a lot of constants used by nl_langinfo; should we do something # along the lines of what we do for syslog?
2001-07-04 10:10:30 +00:00
#if HAVE_LOCALE_H
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
/* try to figure out the charset from the locale */
{
char *localename;
char *dot, *at;
/* lang[_territory][.codeset][@modifier] */
localename = setlocale(LC_CTYPE, NULL);
dot = strchr(localename, '.');
if (dot) {
dot++;
/* locale specifies a codeset */
at = strchr(dot, '@');
if (at)
len = at - dot;
else
len = strlen(dot);
charset_hint = dot;
} else {
/* no explicit name; see if the name itself
* is the charset */
charset_hint = localename;
len = strlen(charset_hint);
Improved determine_charset() to look up SG(default_charset) value
2002-10-24 22:04:28 +00:00
}
(PHP nl_langinfo) Added function when provided by OS (PHP htmlentities, htmlspecialchars) Uses nl_langinfo to determine charset @- Added nl_langinfo() (when OS provides it) that returns locale information. (Wez Furlong) # There are a lot of constants used by nl_langinfo; should we do something # along the lines of what we do for syslog?
2001-07-04 10:10:30 +00:00
}
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
#endif
det_charset:
few ws fixes.
2002-10-03 12:06:52 +00:00
if (charset_hint) {
Emit a warning when an unsupported charset is requested in htmlentities. Fixed #18521.
2002-09-26 16:07:14 +00:00
int found = 0;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
/* now walk the charset map and look for the codeset */
WS fix
2002-10-29 15:05:07 +00:00
for (i = 0; charset_map[i].codeset; i++) {
if (strncasecmp(charset_hint, charset_map[i].codeset, len) == 0) {
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
charset = charset_map[i].charset;
Emit a warning when an unsupported charset is requested in htmlentities. Fixed #18521.
2002-09-26 16:07:14 +00:00
found = 1;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
break;
}
}
Emit a warning when an unsupported charset is requested in htmlentities. Fixed #18521.
2002-09-26 16:07:14 +00:00
if (!found) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "charset `%s' not supported, assuming iso-8859-1",
charset_hint);
}
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
}
Fix build if mbstring is enabled as shared extension.
2002-10-25 13:12:05 +00:00
if (uf_result != NULL) {
zval_ptr_dtor(&uf_result);
}
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
return charset;
}
Fix folding and clean up some extensions
2001-06-06 13:06:12 +00:00
/* }}} */
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
/* {{{ php_utf32_utf8 */
size_t php_utf32_utf8(unsigned char *buf, int k)
{
size_t retval = 0;
if (k < 0x80) {
buf[0] = k;
retval = 1;
} else if (k < 0x800) {
buf[0] = 0xc0 | (k >> 6);
buf[1] = 0x80 | (k & 0x3f);
retval = 2;
} else if (k < 0x10000) {
buf[0] = 0xe0 | (k >> 12);
buf[1] = 0x80 | ((k >> 6) & 0x3f);
buf[2] = 0x80 | (k & 0x3f);
retval = 3;
} else if (k < 0x200000) {
buf[0] = 0xf0 | (k >> 18);
buf[1] = 0x80 | ((k >> 12) & 0x3f);
buf[2] = 0x80 | ((k >> 6) & 0x3f);
buf[3] = 0x80 | (k & 0x3f);
retval = 4;
} else if (k < 0x4000000) {
buf[0] = 0xf8 | (k >> 24);
buf[1] = 0x80 | ((k >> 18) & 0x3f);
buf[2] = 0x80 | ((k >> 12) & 0x3f);
buf[3] = 0x80 | ((k >> 6) & 0x3f);
buf[4] = 0x80 | (k & 0x3f);
retval = 5;
} else {
buf[0] = 0xfc | (k >> 30);
buf[1] = 0x80 | ((k >> 24) & 0x3f);
buf[2] = 0x80 | ((k >> 18) & 0x3f);
buf[3] = 0x80 | ((k >> 12) & 0x3f);
buf[4] = 0x80 | ((k >> 6) & 0x3f);
buf[5] = 0x80 | (k & 0x3f);
retval = 6;
}
buf[retval] = '\0';
return retval;
}
/* }}} */
New PHP streams...
2002-03-15 21:03:08 +00:00
/* {{{ php_unescape_html_entities
*/
Fix ZTS build.
2002-09-26 18:13:32 +00:00
PHPAPI char *php_unescape_html_entities(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char *hint_charset TSRMLS_DC)
New PHP streams...
2002-03-15 21:03:08 +00:00
{
This should help with some build problems/warnings under win32. Someone still needs to add the streams.c file to the MSVC project/workspace though (there are so many that I don't really know what I am doing :-).
2002-03-16 02:33:00 +00:00
int retlen;
New PHP streams...
2002-03-15 21:03:08 +00:00
int j, k;
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
char *replaced, *ret, *p, *q, *lim, *next;
Fix ZTS build.
2002-09-26 18:13:32 +00:00
enum entity_charset charset = determine_charset(hint_charset TSRMLS_CC);
New PHP streams...
2002-03-15 21:03:08 +00:00
unsigned char replacement[15];
I should have tested more carefully..
2003-05-08 15:39:24 +00:00
int replacement_len;
MFH - binary safety patch from Moriyoshi
2006-02-25 21:32:11 +00:00
ret = estrndup(old, oldlen);
New PHP streams...
2002-03-15 21:03:08 +00:00
retlen = oldlen;
Fixed bug #21338 (crash inside html_entity_decode() when "" is passed). Added test case for the bug.
2003-01-02 19:49:30 +00:00
if (!retlen) {
goto empty_source;
}
New PHP streams...
2002-03-15 21:03:08 +00:00
few ws fixes.
2002-10-03 12:06:52 +00:00
if (all) {
New PHP streams...
2002-03-15 21:03:08 +00:00
/* look for a match in the maps for this charset */
WS fix
2002-10-29 15:05:07 +00:00
for (j = 0; entity_map[j].charset != cs_terminator; j++) {
New PHP streams...
2002-03-15 21:03:08 +00:00
if (entity_map[j].charset != charset)
continue;
few ws fixes.
2002-10-03 12:06:52 +00:00
for (k = entity_map[j].basechar; k <= entity_map[j].endchar; k++) {
New PHP streams...
2002-03-15 21:03:08 +00:00
unsigned char entity[32];
int entity_length = 0;
if (entity_map[j].table[k - entity_map[j].basechar] == NULL)
continue;
- Fix bug #29199 (html_entity_decode() misbehaves with UTF-8)
2004-07-19 17:46:30 +00:00
snprintf() -> slprintf()
2007-02-27 03:28:17 +00:00
entity_length = slprintf(entity, sizeof(entity), "&%s;", entity_map[j].table[k - entity_map[j].basechar]);
Eliminate strncpy() and simplify code
2007-02-24 17:18:24 +00:00
if (entity_length >= sizeof(entity)) {
continue;
}
New PHP streams...
2002-03-15 21:03:08 +00:00
/* When we have MBCS entities in the tables above, this will need to handle it */
I should have tested more carefully..
2003-05-08 15:39:24 +00:00
replacement_len = 0;
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
switch (charset) {
case cs_8859_1:
case cs_cp1252:
case cs_8859_15:
case cs_cp1251:
case cs_8859_5:
case cs_cp866:
fix #43927 (koi8r is missing from html_entity_decode()) patch by andy at demos dot su
2008-01-28 23:07:12 +00:00
case cs_koi8r:
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
replacement[0] = k;
replacement[1] = '\0';
I should have tested more carefully..
2003-05-08 15:39:24 +00:00
replacement_len = 1;
Added missing break
2003-05-08 16:45:59 +00:00
break;
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
case cs_big5:
case cs_gb2312:
case cs_big5hkscs:
case cs_sjis:
case cs_eucjp:
I should have tested more carefully..
2003-05-08 15:39:24 +00:00
/* we cannot properly handle those multibyte encodings
* with php_str_to_str. skip it. */
continue;
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
case cs_utf_8:
I should have tested more carefully..
2003-05-08 15:39:24 +00:00
replacement_len = php_utf32_utf8(replacement, k);
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
break;
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot yet handle MBCS!");
MFH
2006-12-21 01:18:28 +00:00
efree(ret);
return NULL;
few ws fixes.
2002-10-03 12:06:52 +00:00
}
New PHP streams...
2002-03-15 21:03:08 +00:00
Make html_entity_decode() 15-20% faster by avoiding pointless string duplication.
2005-03-06 19:36:51 +00:00
if (php_memnstr(ret, entity, entity_length, ret+retlen)) {
replaced = php_str_to_str(ret, retlen, entity, entity_length, replacement, replacement_len, &retlen);
efree(ret);
ret = replaced;
}
New PHP streams...
2002-03-15 21:03:08 +00:00
}
}
}
WS fix
2002-10-29 15:05:07 +00:00
for (j = 0; basic_entities[j].charcode != 0; j++) {
New PHP streams...
2002-03-15 21:03:08 +00:00
if (basic_entities[j].flags && (quote_style & basic_entities[j].flags) == 0)
continue;
This should help with some build problems/warnings under win32. Someone still needs to add the streams.c file to the MSVC project/workspace though (there are so many that I don't really know what I am doing :-).
2002-03-16 02:33:00 +00:00
replacement[0] = (unsigned char)basic_entities[j].charcode;
New PHP streams...
2002-03-15 21:03:08 +00:00
replacement[1] = '\0';
Make html_entity_decode() 15-20% faster by avoiding pointless string duplication.
2005-03-06 19:36:51 +00:00
if (php_memnstr(ret, basic_entities[j].entity, basic_entities[j].entitylen, ret+retlen)) {
replaced = php_str_to_str(ret, retlen, basic_entities[j].entity, basic_entities[j].entitylen, replacement, 1, &retlen);
efree(ret);
ret = replaced;
}
New PHP streams...
2002-03-15 21:03:08 +00:00
}
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
/* replace numeric entities & "&amp;" */
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
lim = ret + retlen;
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
for (p = ret, q = ret; p < lim;) {
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
int code;
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
if (p[0] == '&') {
if (p + 2 < lim) {
if (p[1] == '#') {
Drop multibyte character support in html_entity_decode(). # This has never worked as expected.
2003-10-02 19:06:44 +00:00
int invalid_code = 0;
Add support for hexadecimal-style numeric entities (&#x..;)
2003-10-02 19:07:59 +00:00
if (p[2] == 'x' || p[2] == 'X') {
code = strtol(p + 3, &next, 16);
} else {
code = strtol(p + 2, &next, 10);
}
Drop multibyte character support in html_entity_decode(). # This has never worked as expected.
2003-10-02 19:06:44 +00:00
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
if (next != NULL && *next == ';') {
switch (charset) {
case cs_utf_8:
q += php_utf32_utf8(q, code);
break;
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
case cs_8859_1:
case cs_8859_5:
case cs_8859_15:
Drop multibyte character support in html_entity_decode(). # This has never worked as expected.
2003-10-02 19:06:44 +00:00
if ((code >= 0x80 && code < 0xa0) || code > 0xff) {
invalid_code = 1;
} else {
Fixed bug #32608 (html_entity_decode() converts single quotes even if ENT_NOQUOTES is given).
2005-05-01 19:48:55 +00:00
if (code == 39 || !quote_style) {
invalid_code = 1;
} else {
*(q++) = code;
}
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
}
break;
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
case cs_cp1252:
Drop multibyte character support in html_entity_decode(). # This has never worked as expected.
2003-10-02 19:06:44 +00:00
if (code > 0xff) {
invalid_code = 1;
} else {
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
*(q++) = code;
}
break;
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
Fix html_entity_decode when converting numeric html entities, the numeric values for the extended characters don't correspond to that of windows-1251 and cp866.
2008-01-25 18:10:45 +00:00
case cs_cp1251:
case cs_cp866:
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
case cs_big5:
case cs_big5hkscs:
case cs_sjis:
case cs_eucjp:
Drop multibyte character support in html_entity_decode(). # This has never worked as expected.
2003-10-02 19:06:44 +00:00
if (code >= 0x80) {
invalid_code = 1;
} else {
*(q++) = code;
}
break;
case cs_gb2312:
if (code >= 0x81) {
invalid_code = 1;
} else {
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
*(q++) = code;
}
break;
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
default:
Drop multibyte character support in html_entity_decode(). # This has never worked as expected.
2003-10-02 19:06:44 +00:00
/* for backwards compatilibity */
invalid_code = 1;
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
break;
}
Drop multibyte character support in html_entity_decode(). # This has never worked as expected.
2003-10-02 19:06:44 +00:00
if (invalid_code) {
for (; p <= next; p++) {
*(q++) = *p;
}
}
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
p = next + 1;
} else {
*(q++) = *(p++);
*(q++) = *(p++);
}
} else if (p + 4 < lim &&
p[1] == 'a' && p[2] == 'm' &&p[3] == 'p' &&
p[4] == ';') {
*(q++) = '&';
p += 5;
} else {
*(q++) = *(p++);
*(q++) = *(p++);
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
}
} else {
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
*(q++) = *(p++);
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
}
} else {
Fixed bug #25707 (html_entity_decode over-decodes &amp;lt;)
2003-10-02 06:57:21 +00:00
*(q++) = *(p++);
Improved html_entity_decode() so it can handle multibyte charsets and numeric entities.
2003-05-08 10:42:20 +00:00
}
}
*q = '\0';
retlen = (size_t)(q - ret);
Fixed bug #21338 (crash inside html_entity_decode() when "" is passed). Added test case for the bug.
2003-01-02 19:49:30 +00:00
empty_source:
New PHP streams...
2002-03-15 21:03:08 +00:00
*newlen = retlen;
return ret;
}
/* }}} */
[DOC] Added a 4th parameter flag to htmlspecialchars() and htmlentities() that makes the function not encode existing html entities. The feature is disabled by default and can be activated by passing FALSE as the 4th param
2007-05-22 12:37:00 +00:00
PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char *hint_charset TSRMLS_DC)
{
return php_escape_html_entities_ex(old, oldlen, newlen, all, quote_style, hint_charset, 1 TSRMLS_CC);
}
New PHP streams...
2002-03-15 21:03:08 +00:00
Fix folding and clean up some extensions
2001-06-06 13:06:12 +00:00
/* {{{ php_escape_html_entities
*/
[DOC] Added a 4th parameter flag to htmlspecialchars() and htmlentities() that makes the function not encode existing html entities. The feature is disabled by default and can be activated by passing FALSE as the 4th param
2007-05-22 12:37:00 +00:00
PHPAPI char *php_escape_html_entities_ex(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char *hint_charset, zend_bool double_encode TSRMLS_DC)
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
{
New PHP streams...
2002-03-15 21:03:08 +00:00
int i, j, maxlen, len;
char *replaced;
Fix ZTS build.
2002-09-26 18:13:32 +00:00
enum entity_charset charset = determine_charset(hint_charset TSRMLS_CC);
Fix htmlspecialchars problem.
2001-08-24 08:58:10 +00:00
int matches_map;
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
Made php_escape_html_entities() as a separate function for export.
2000-02-29 04:38:14 +00:00
maxlen = 2 * oldlen;
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
if (maxlen < 128)
maxlen = 128;
New PHP streams...
2002-03-15 21:03:08 +00:00
replaced = emalloc (maxlen);
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
len = 0;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
i = 0;
while (i < oldlen) {
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
unsigned char mbsequence[16]; /* allow up to 15 characters in a multibyte sequence */
fixed possible bufferoverflow in get_next_char malformed input to htmlentities/htmlspecialchars with utf-8 encoding crashed the server ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
int mbseqlen = sizeof(mbsequence);
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
int status = SUCCESS;
unsigned short this_char = get_next_char(charset, old, oldlen, &i, mbsequence, &mbseqlen, &status);
if(status == FAILURE) {
/* invalid MB sequence */
efree(replaced);
MFH:- Revert previous patch, it was correct to do this, error is logged if logging is enabled
2007-12-11 12:26:43 +00:00
if(!PG(display_errors)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid multibyte sequence in argument");
}
MFB do not accept partial multibyte sequences in html* functions
2007-10-03 05:05:08 +00:00
*newlen = 0;
return STR_EMPTY_ALLOC();
}
Fix htmlspecialchars problem.
2001-08-24 08:58:10 +00:00
matches_map = 0;
New PHP streams...
2002-03-15 21:03:08 +00:00
Added missing boundary checks.
2006-11-01 01:55:11 +00:00
if (len + 16 > maxlen)
New PHP streams...
2002-03-15 21:03:08 +00:00
replaced = erealloc (replaced, maxlen += 128);
WS
2002-08-25 19:44:25 +00:00
if (all) {
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
/* look for a match in the maps for this charset */
fix warning
2002-10-23 23:09:08 +00:00
unsigned char *rep = NULL;
New PHP streams...
2002-03-15 21:03:08 +00:00
- Add support for chinese encodings to htmlentities/htmlspecialchars (patch from Alan Knowles <alan_k@hklc.com>)
2001-08-23 10:43:15 +00:00
few ws fixes.
2002-10-03 12:06:52 +00:00
for (j = 0; entity_map[j].charset != cs_terminator; j++) {
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
if (entity_map[j].charset == charset
&& this_char >= entity_map[j].basechar
WS fix
2002-10-29 15:05:07 +00:00
&& this_char <= entity_map[j].endchar) {
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
rep = (unsigned char*)entity_map[j].table[this_char - entity_map[j].basechar];
WS
2002-08-25 19:44:25 +00:00
if (rep == NULL) {
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
/* there is no entity for this position; fall through and
* just output the character itself */
break;
}
New PHP streams...
2002-03-15 21:03:08 +00:00
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
matches_map = 1;
break;
}
}
WS
2002-08-25 19:44:25 +00:00
if (matches_map) {
Added missing boundary checks.
2006-11-01 01:55:11 +00:00
int l = strlen(rep);
/* increase the buffer size */
if (len + 2 + l >= maxlen) {
replaced = erealloc(replaced, maxlen += 128);
}
New PHP streams...
2002-03-15 21:03:08 +00:00
replaced[len++] = '&';
Use strlcpy() rather then strcpy()
2007-02-21 03:59:05 +00:00
strlcpy(replaced + len, rep, maxlen);
Added missing boundary checks.
2006-11-01 01:55:11 +00:00
len += l;
New PHP streams...
2002-03-15 21:03:08 +00:00
replaced[len++] = ';';
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
}
}
WS
2002-08-25 19:44:25 +00:00
if (!matches_map) {
New PHP streams...
2002-03-15 21:03:08 +00:00
int is_basic = 0;
Fix for the fix for #25707
2003-10-02 19:23:00 +00:00
if (this_char == '&') {
[DOC] Added a 4th parameter flag to htmlspecialchars() and htmlentities() that makes the function not encode existing html entities. The feature is disabled by default and can be activated by passing FALSE as the 4th param
2007-05-22 12:37:00 +00:00
if (double_encode) {
encode_amp:
memcpy(replaced + len, "&amp;", sizeof("&amp;") - 1);
len += sizeof("&amp;") - 1;
} else {
fix the new 'no-double-encoding' feature of htmlspecialchars() (the length for char search was wrong. this could lead to crashes..)
2007-05-27 15:45:18 +00:00
char *e = memchr(old + i, ';', oldlen - i);
fix handling of &&amp; by htmlentities 'no-double-encode' expand the test cases
2007-05-27 15:57:11 +00:00
char *s = old + i;
[DOC] Added a 4th parameter flag to htmlspecialchars() and htmlentities() that makes the function not encode existing html entities. The feature is disabled by default and can be activated by passing FALSE as the 4th param
2007-05-22 12:37:00 +00:00
if (!e || (e - s) > 10) { /* minor optimization to avoid "entities" over 10 chars in length */
goto encode_amp;
} else {
if (*s == '#') { /* numeric entities */
s++;
while (s < e) {
if (!isdigit(*s++)) {
goto encode_amp;
}
}
} else { /* text entities */
while (s < e) {
if (!isalnum(*s++)) {
goto encode_amp;
}
}
}
replaced[len++] = '&';
}
}
New PHP streams...
2002-03-15 21:03:08 +00:00
is_basic = 1;
Fix for the fix for #25707
2003-10-02 19:23:00 +00:00
} else {
for (j = 0; basic_entities[j].charcode != 0; j++) {
if ((basic_entities[j].charcode != this_char) ||
(basic_entities[j].flags &&
(quote_style & basic_entities[j].flags) == 0)) {
continue;
}
New PHP streams...
2002-03-15 21:03:08 +00:00
Fix for the fix for #25707
2003-10-02 19:23:00 +00:00
memcpy(replaced + len, basic_entities[j].entity, basic_entities[j].entitylen);
len += basic_entities[j].entitylen;
is_basic = 1;
break;
}
New PHP streams...
2002-03-15 21:03:08 +00:00
}
Fix for the fix for #25707
2003-10-02 19:23:00 +00:00
WS
2002-08-25 19:44:25 +00:00
if (!is_basic) {
Fixed bug #20934 (htmlspecialchars returns latin1 from UTF-8)
2002-12-12 13:25:51 +00:00
/* a wide char without a named entity; pass through the original sequence */
if (mbseqlen > 1) {
New PHP streams...
2002-03-15 21:03:08 +00:00
memcpy(replaced + len, mbsequence, mbseqlen);
len += mbseqlen;
WS
2002-08-25 19:44:25 +00:00
} else {
replaced[len++] = (unsigned char)this_char;
}
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
}
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
}
}
WS
2002-08-25 19:44:25 +00:00
replaced[len] = '\0';
Made php_escape_html_entities() as a separate function for export.
2000-02-29 04:38:14 +00:00
*newlen = len;
New PHP streams...
2002-03-15 21:03:08 +00:00
return replaced;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
Made php_escape_html_entities() as a separate function for export.
2000-02-29 04:38:14 +00:00
}
Fix folding and clean up some extensions
2001-06-06 13:06:12 +00:00
/* }}} */
Made php_escape_html_entities() as a separate function for export.
2000-02-29 04:38:14 +00:00
Fix folding and clean up some extensions
2001-06-06 13:06:12 +00:00
/* {{{ php_html_entities
*/
Made php_escape_html_entities() as a separate function for export.
2000-02-29 04:38:14 +00:00
static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all)
{
Convert to use new parameter parsing API.
2001-10-26 21:07:59 +00:00
char *str, *hint_charset = NULL;
Unify error messages
2002-07-08 12:52:22 +00:00
int str_len, hint_charset_len = 0;
int/long change.
2003-02-22 20:33:11 +00:00
int len;
long quote_style = ENT_COMPAT;
New PHP streams...
2002-03-15 21:03:08 +00:00
char *replaced;
[DOC] Added a 4th parameter flag to htmlspecialchars() and htmlentities() that makes the function not encode existing html entities. The feature is disabled by default and can be activated by passing FALSE as the 4th param
2007-05-22 12:37:00 +00:00
zend_bool double_encode = 1;
Made php_escape_html_entities() as a separate function for export.
2000-02-29 04:38:14 +00:00
Allow skipping hint_charset (fixes ext/standard/tests/strings/htmlentities18.phpt)
2007-05-25 14:09:02 +00:00
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls!b", &str, &str_len, &quote_style, &hint_charset, &hint_charset_len, &double_encode) == FAILURE) {
Convert to use new parameter parsing API.
2001-10-26 21:07:59 +00:00
return;
ws fix
2001-03-02 00:15:49 +00:00
}
Made php_escape_html_entities() as a separate function for export.
2000-02-29 04:38:14 +00:00
[DOC] Added a 4th parameter flag to htmlspecialchars() and htmlentities() that makes the function not encode existing html entities. The feature is disabled by default and can be activated by passing FALSE as the 4th param
2007-05-22 12:37:00 +00:00
replaced = php_escape_html_entities_ex(str, str_len, &len, all, quote_style, hint_charset, double_encode TSRMLS_CC);
New PHP streams...
2002-03-15 21:03:08 +00:00
RETVAL_STRINGL(replaced, len, 0);
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
}
Fix folding and clean up some extensions
2001-06-06 13:06:12 +00:00
/* }}} */
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
@- Implemented get_html_translation_table() function. (Thies) (PHP get_html_translation_table) new function.
1999-11-21 13:25:04 +00:00
#define HTML_SPECIALCHARS 0
#define HTML_ENTITIES 1
Fix folding and clean up some extensions
2001-06-06 13:06:12 +00:00
/* {{{ register_html_constants
*/
@- Implemented get_html_translation_table() function. (Thies) (PHP get_html_translation_table) new function.
1999-11-21 13:25:04 +00:00
void register_html_constants(INIT_FUNC_ARGS)
{
REGISTER_LONG_CONSTANT("HTML_SPECIALCHARS", HTML_SPECIALCHARS, CONST_PERSISTENT|CONST_CS);
REGISTER_LONG_CONSTANT("HTML_ENTITIES", HTML_ENTITIES, CONST_PERSISTENT|CONST_CS);
Clean up htmlspecialchars/htmlentities inconsistencies. @Clean up htmlspecialchars/htmlentities inconsistencies. (Rasmus)
2000-09-12 17:22:37 +00:00
REGISTER_LONG_CONSTANT("ENT_COMPAT", ENT_COMPAT, CONST_PERSISTENT|CONST_CS);
REGISTER_LONG_CONSTANT("ENT_QUOTES", ENT_QUOTES, CONST_PERSISTENT|CONST_CS);
REGISTER_LONG_CONSTANT("ENT_NOQUOTES", ENT_NOQUOTES, CONST_PERSISTENT|CONST_CS);
@- Implemented get_html_translation_table() function. (Thies) (PHP get_html_translation_table) new function.
1999-11-21 13:25:04 +00:00
}
Fix folding and clean up some extensions
2001-06-06 13:06:12 +00:00
/* }}} */
@- Implemented get_html_translation_table() function. (Thies) (PHP get_html_translation_table) new function.
1999-11-21 13:25:04 +00:00
Update proto&arginfo for double_encode in htmlspecialchars()&htmlentities()
2007-05-22 15:38:27 +00:00
/* {{{ proto string htmlspecialchars(string string [, int quote_style[, string charset[, bool double_encode]]])
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
Convert special characters to HTML entities */
conv_proto *.[ch]
1999-05-16 11:19:26 +00:00
PHP_FUNCTION(htmlspecialchars)
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
{
Whitespace
2001-08-11 17:03:37 +00:00
php_html_entities(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
}
/* }}} */
protos
2006-10-02 07:58:13 +00:00
/* {{{ proto string htmlspecialchars_decode(string string [, int quote_style])
Added htmlspecialchars_decode() function for fast conversion from htmlspecialchars() generated entities back to characters.
2005-03-07 19:37:27 +00:00
Convert special HTML entities back to characters */
PHP_FUNCTION(htmlspecialchars_decode)
{
char *str, *new_str, *e, *p;
Improve the performance of htmlspecialchars_decode() by 20-30%.
2005-03-08 21:13:03 +00:00
int len, j, i, new_len;
Added htmlspecialchars_decode() function for fast conversion from htmlspecialchars() generated entities back to characters.
2005-03-07 19:37:27 +00:00
long quote_style = ENT_COMPAT;
Improve the performance of htmlspecialchars_decode() by 20-30%.
2005-03-08 21:13:03 +00:00
struct basic_entities_dec basic_entities_dec[8];
Added htmlspecialchars_decode() function for fast conversion from htmlspecialchars() generated entities back to characters.
2005-03-07 19:37:27 +00:00
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &str, &len, &quote_style) == FAILURE) {
return;
}
new_str = estrndup(str, len);
new_len = len;
Improve the performance of htmlspecialchars_decode() by 20-30%.
2005-03-08 21:13:03 +00:00
e = new_str + new_len;
if (!(p = memchr(new_str, '&', new_len))) {
RETURN_STRINGL(new_str, new_len, 0);
}
Added htmlspecialchars_decode() function for fast conversion from htmlspecialchars() generated entities back to characters.
2005-03-07 19:37:27 +00:00
Improve the performance of htmlspecialchars_decode() by 20-30%.
2005-03-08 21:13:03 +00:00
for (j = 0, i = 0; basic_entities[i].charcode != 0; i++) {
Added htmlspecialchars_decode() function for fast conversion from htmlspecialchars() generated entities back to characters.
2005-03-07 19:37:27 +00:00
if (basic_entities[i].flags && !(quote_style & basic_entities[i].flags)) {
continue;
}
Improve the performance of htmlspecialchars_decode() by 20-30%.
2005-03-08 21:13:03 +00:00
basic_entities_dec[j].charcode = basic_entities[i].charcode;
memcpy(basic_entities_dec[j].entity, basic_entities[i].entity, basic_entities[i].entitylen + 1);
basic_entities_dec[j].entitylen = basic_entities[i].entitylen;
j++;
}
basic_entities_dec[j].charcode = '&';
basic_entities_dec[j].entitylen = sizeof("&amp;") - 1;
memcpy(basic_entities_dec[j].entity, "&amp;", sizeof("&amp;"));
i = j + 1;
do {
int l = e - p;
for (j = 0; j < i; j++) {
if (basic_entities_dec[j].entitylen > l) {
continue;
}
if (!memcmp(p, basic_entities_dec[j].entity, basic_entities_dec[j].entitylen)) {
int e_len = basic_entities_dec[j].entitylen - 1;
Added htmlspecialchars_decode() function for fast conversion from htmlspecialchars() generated entities back to characters.
2005-03-07 19:37:27 +00:00
Improve the performance of htmlspecialchars_decode() by 20-30%.
2005-03-08 21:13:03 +00:00
*p++ = basic_entities_dec[j].charcode;
memmove(p, p + e_len, (e - p - e_len));
e -= e_len;
goto done;
}
Added htmlspecialchars_decode() function for fast conversion from htmlspecialchars() generated entities back to characters.
2005-03-07 19:37:27 +00:00
}
p++;
Improve the performance of htmlspecialchars_decode() by 20-30%.
2005-03-08 21:13:03 +00:00
done:
if (p >= e) {
break;
}
} while ((p = memchr(p, '&', (e - p))));
new_len = e - new_str;
Added htmlspecialchars_decode() function for fast conversion from htmlspecialchars() generated entities back to characters.
2005-03-07 19:37:27 +00:00
new_str[new_len] = '\0';
RETURN_STRINGL(new_str, new_len, 0);
}
/* }}} */
New PHP streams...
2002-03-15 21:03:08 +00:00
/* {{{ proto string html_entity_decode(string string [, int quote_style][, string charset])
Description didn't match the function here
2002-08-28 22:14:42 +00:00
Convert all HTML entities to their applicable characters */
New PHP streams...
2002-03-15 21:03:08 +00:00
PHP_FUNCTION(html_entity_decode)
{
char *str, *hint_charset = NULL;
64-bit correction to variables passed to zend_parse_parameters @64-bit correction to variables passed to zend_parse_parameters (Dave)
2003-03-06 23:07:28 +00:00
int str_len, hint_charset_len, len;
long quote_style = ENT_COMPAT;
New PHP streams...
2002-03-15 21:03:08 +00:00
char *replaced;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls", &str, &str_len,
&quote_style, &hint_charset, &hint_charset_len) == FAILURE) {
return;
}
Fix ZTS build.
2002-09-26 18:13:32 +00:00
replaced = php_unescape_html_entities(str, str_len, &len, 1, quote_style, hint_charset TSRMLS_CC);
MFH
2006-12-21 01:18:28 +00:00
if (replaced) {
RETURN_STRINGL(replaced, len, 0);
}
RETURN_FALSE;
New PHP streams...
2002-03-15 21:03:08 +00:00
}
/* }}} */
Update proto&arginfo for double_encode in htmlspecialchars()&htmlentities()
2007-05-22 15:38:27 +00:00
/* {{{ proto string htmlentities(string string [, int quote_style[, string charset[, bool double_encode]]])
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
Convert all applicable characters to HTML entities */
conv_proto *.[ch]
1999-05-16 11:19:26 +00:00
PHP_FUNCTION(htmlentities)
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
{
Whitespace
2001-08-11 17:03:37 +00:00
php_html_entities(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
}
/* }}} */
Convert to use new parameter parsing API.
2001-10-26 21:07:59 +00:00
/* {{{ proto array get_html_translation_table([int table [, int quote_style]])
Maybe later on today. Must buy some beer first.
1999-11-21 14:06:30 +00:00
Returns the internal translation table used by htmlspecialchars and htmlentities */
@- Implemented get_html_translation_table() function. (Thies) (PHP get_html_translation_table) new function.
1999-11-21 13:25:04 +00:00
PHP_FUNCTION(get_html_translation_table)
{
64-bit correction to variables passed to zend_parse_parameters @64-bit correction to variables passed to zend_parse_parameters (Dave)
2003-03-06 23:07:28 +00:00
long which = HTML_SPECIALCHARS, quote_style = ENT_COMPAT;
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
int i, j;
Convert to use new parameter parsing API.
2001-10-26 21:07:59 +00:00
char ind[2];
Fix ZTS build.
2002-09-26 18:13:32 +00:00
enum entity_charset charset = determine_charset(NULL TSRMLS_CC);
@- Implemented get_html_translation_table() function. (Thies) (PHP get_html_translation_table) new function.
1999-11-21 13:25:04 +00:00
Convert to use new parameter parsing API.
2001-10-26 21:07:59 +00:00
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ll", &which, &quote_style) == FAILURE) {
return;
@- Implemented get_html_translation_table() function. (Thies) (PHP get_html_translation_table) new function.
1999-11-21 13:25:04 +00:00
}
array_init(return_value);
ind[1] = 0;
switch (which) {
case HTML_ENTITIES:
few ws fixes.
2002-10-03 12:06:52 +00:00
for (j=0; entity_map[j].charset != cs_terminator; j++) {
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
if (entity_map[j].charset != charset)
continue;
few ws fixes.
2002-10-03 12:06:52 +00:00
for (i = 0; i <= entity_map[j].endchar - entity_map[j].basechar; i++) {
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
char buffer[16];
if (entity_map[j].table[i] == NULL)
continue;
/* what about wide chars here ?? */
ind[0] = i + entity_map[j].basechar;
MFH
2007-01-18 16:21:32 +00:00
snprintf(buffer, sizeof(buffer), "&%s;", entity_map[j].table[i]);
Added charset awareness to htmlentities() and htmlspecialchars(); use an optional third parameter to specify the charset; otherwise tries to determine it from the LC_CTYPE locale setting.
2001-05-28 11:00:06 +00:00
add_assoc_string(return_value, ind, buffer, 1);
}
@- Implemented get_html_translation_table() function. (Thies) (PHP get_html_translation_table) new function.
1999-11-21 13:25:04 +00:00
}
/* break thru */
case HTML_SPECIALCHARS:
few ws fixes.
2002-10-03 12:06:52 +00:00
for (j = 0; basic_entities[j].charcode != 0; j++) {
New PHP streams...
2002-03-15 21:03:08 +00:00
if (basic_entities[j].flags && (quote_style & basic_entities[j].flags) == 0)
continue;
This should help with some build problems/warnings under win32. Someone still needs to add the streams.c file to the MSVC project/workspace though (there are so many that I don't really know what I am doing :-).
2002-03-16 02:33:00 +00:00
ind[0] = (unsigned char)basic_entities[j].charcode;
Missing '&' in the result of get_html_translation_table()
2003-10-21 01:46:54 +00:00
add_assoc_stringl(return_value, ind, basic_entities[j].entity, basic_entities[j].entitylen, 1);
ws fix
2001-03-02 00:15:49 +00:00
}
Missing '&' in the result of get_html_translation_table()
2003-10-21 01:46:54 +00:00
add_assoc_stringl(return_value, "&", "&amp;", sizeof("&amp;") - 1, 1);
@- Implemented get_html_translation_table() function. (Thies) (PHP get_html_translation_table) new function.
1999-11-21 13:25:04 +00:00
break;
}
}
/* }}} */
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
- Don't wrap lines... this is annoying while coding.
2001-09-09 13:29:31 +00:00
* vim600: sw=4 ts=4 fdm=marker
* vim<600: sw=4 ts=4
First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up.
1999-04-17 00:37:12 +00:00
*/
Reference in New Issue Copy Permalink