cvs: pecl /filter filter.c filter_private.h
| From: | Derick Rethans | Date: | Sat, 21 Jan 2006 12:48:46 +0000 |
| Subject: | cvs: pecl /filter filter.c filter_private.h | ||
| Groups: | php.pecl.cvs | ||
| Request: | Send a blank email to pecl-cvs+get-5003@lists.php.net to get a copy of this message | ||
derick Sat Jan 21 12:48:46 2006 UTC
Modified files:
/pecl/filter filter.c filter_private.h
Log:
- namespace protect constants
http://cvs.php.net/viewcvs.cgi/pecl/filter/filter.c?r1=1.32&r2=1.33&diff_format=u Index: pecl/filter/filter.c diff -u pecl/filter/filter.c:1.32 pecl/filter/filter.c:1.33 --- pecl/filter/filter.c:1.32 Sat Jan 14 15:10:54 2006 +++ pecl/filter/filter.c Sat Jan 21 12:48:45 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.32 2006/01/14 15:10:54 sniper Exp $ */ +/* $Id: filter.c,v 1.33 2006/01/21 12:48:45 derick Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,27 +36,27 @@ } filter_list_entry; filter_list_entry filter_list[] = { - { "int", FL_INT, php_filter_int }, - { "boolean", FL_BOOLEAN, php_filter_boolean }, - { "float", FL_FLOAT, php_filter_float }, - - { "validate_regexp", FL_REGEXP, php_filter_validate_regexp }, - { "validate_url", FL_URL, php_filter_validate_url }, - { "validate_email", FL_EMAIL, php_filter_validate_email }, - { "validate_ip", FL_IP, php_filter_validate_ip }, - - { "string", FS_STRING, php_filter_string }, - { "stripped", FS_STRING, php_filter_string }, - { "encoded", FS_ENCODED, php_filter_encoded }, - { "special_chars", FS_SPECIAL_CHARS, php_filter_special_chars }, - { "unsafe_raw", FS_UNSAFE_RAW, php_filter_unsafe_raw }, - { "email", FS_EMAIL, php_filter_email }, - { "url", FS_URL, php_filter_url }, - { "number_int", FS_NUMBER_INT, php_filter_number_int }, - { "number_float", FS_NUMBER_FLOAT, php_filter_number_float }, - { "magic_quotes", FS_MAGIC_QUOTES, php_filter_magic_quotes }, + { "int", FILTER_VALIDATE_INT, php_filter_int }, + { "boolean", FILTER_VALIDATE_BOOLEAN, php_filter_boolean }, + { "float", FILTER_VALIDATE_FLOAT, php_filter_float }, + + { "validate_regexp", FILTER_VALIDATE_REGEXP, php_filter_validate_regexp }, + { "validate_url", FILTER_VALIDATE_URL, php_filter_validate_url }, + { "validate_email", FILTER_VALIDATE_EMAIL, php_filter_validate_email }, + { "validate_ip", FILTER_VALIDATE_IP, php_filter_validate_ip }, + + { "string", FILTER_SANITIZE_STRING, php_filter_string }, + { "stripped", FILTER_SANITIZE_STRING, php_filter_string }, + { "encoded", FILTER_SANITIZE_ENCODED, php_filter_encoded }, + { "special_chars", FILTER_SANITIZE_SPECIAL_CHARS, php_filter_special_chars }, + { "unsafe_raw", FILTER_UNSAFE_RAW, php_filter_unsafe_raw }, + { "email", FILTER_SANITIZE_EMAIL, php_filter_email }, + { "url", FILTER_SANITIZE_URL, php_filter_url }, + { "number_int", FILTER_SANITIZE_NUMBER_INT, php_filter_number_int }, + { "number_float", FILTER_SANITIZE_NUMBER_FLOAT, php_filter_number_float }, + { "magic_quotes", FILTER_SANITIZE_MAGIC_QUOTES, php_filter_magic_quotes }, - { "callback", FC_CALLBACK, php_filter_callback }, + { "callback", FILTER_CALLBACK, php_filter_callback }, }; #ifndef PARSE_ENV @@ -120,7 +120,7 @@ } } /* Fallback to "string" filter */ - IF_G(default_filter) = FS_DEFAULT; + IF_G(default_filter) = FILTER_DEFAULT; return SUCCESS; } /* }}} */ @@ -153,7 +153,7 @@ filter_globals->env_array = NULL; filter_globals->server_array = NULL; filter_globals->session_array = NULL; - filter_globals->default_filter = FS_DEFAULT; + filter_globals->default_filter = FILTER_DEFAULT; } /* }}} */ @@ -175,29 +175,31 @@ REGISTER_LONG_CONSTANT("INPUT_SESSION", PARSE_SESSION, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_FLAG_NONE", FILTER_FLAG_NONE, CONST_CS | CONST_PERSISTENT); +/* + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_INT", FILTER_VALIDATE_INT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_BOOLEAN", FILTER_VALIDATE_BOOLEAN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_FLOAT", FILTER_VALIDATE_FLOAT, CONST_CS | CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_REGEXP", FILTER_VALIDATE_REGEXP, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_URL", FILTER_VALIDATE_URL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_EMAIL", FILTER_VALIDATE_EMAIL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_IP", FILTER_VALIDATE_IP, CONST_CS | CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("FILTER_DEFAULT", FILTER_SANITIZE_DEFAULT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_UNSAFE_RAW", FILTER_UNSAFE_RAW, CONST_CS | CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_STRING", FILTER_SANITIZE_STRING, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_STRIPPED", FILTER_SANITIZE_STRING, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_ENCODED", FILTER_SANITIZE_ENCODED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_SPECIAL_CHARS", FILTER_SANITIZE_SPECIAL_CHARS, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_EMAIL", FILTER_SANITIZE_EMAIL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_URL", FILTER_SANITIZE_URL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_NUMBER_INT", FILTER_SANITIZE_NUMBER_INT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_NUMBER_FLOAT", FILTER_SANITIZE_NUMBER_FLOAT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_MAGIC_QUOTES", FILTER_SANITIZE_MAGIC_QUOTES, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FL_INT", FL_INT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FL_BOOLEAN", FL_BOOLEAN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FL_FLOAT", FL_FLOAT, CONST_CS | CONST_PERSISTENT); - - REGISTER_LONG_CONSTANT("FL_REGEXP", FL_REGEXP, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FL_URL", FL_URL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FL_EMAIL", FL_EMAIL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FL_IP", FL_IP, CONST_CS | CONST_PERSISTENT); - - REGISTER_LONG_CONSTANT("FS_DEFAULT", FS_DEFAULT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_STRING", FS_STRING, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_STRIPPED", FS_STRING, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_ENCODED", FS_ENCODED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_SPECIAL_CHARS", FS_SPECIAL_CHARS, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_UNSAFE_RAW", FS_UNSAFE_RAW, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_EMAIL", FS_EMAIL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_URL", FS_URL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_NUMBER_INT", FS_NUMBER_INT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_NUMBER_FLOAT", FS_NUMBER_FLOAT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_MAGIC_QUOTES", FS_MAGIC_QUOTES, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FC_CALLBACK", FC_CALLBACK, CONST_CS | CONST_PERSISTENT); - + REGISTER_LONG_CONSTANT("FILTER_CALLBACK", FILTER_CALLBACK, CONST_CS | CONST_PERSISTENT); +*/ REGISTER_LONG_CONSTANT("FILTER_FLAG_ALLOW_OCTAL", FILTER_FLAG_ALLOW_OCTAL, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_FLAG_ALLOW_HEX", FILTER_FLAG_ALLOW_HEX, CONST_CS | CONST_PERSISTENT); @@ -263,7 +265,7 @@ { php_info_print_table_start(); php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); - php_info_print_table_row( 2, "Revision", "$Revision: 1.32 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.33 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -281,7 +283,7 @@ } /* Fallback to "string" filter */ for (i = 0; i < size; ++i) { - if (filter_list[i].id == FS_DEFAULT) { + if (filter_list[i].id == FILTER_DEFAULT) { return filter_list[i]; } } @@ -297,7 +299,7 @@ if (!filter_func.id) { /* Find default filter */ - filter_func = php_find_filter(FS_DEFAULT); + filter_func = php_find_filter(FILTER_DEFAULT); } /* Here be strings */ @@ -365,7 +367,7 @@ Z_TYPE(new_var) = IS_STRING; if (val_len) { - if (! (IF_G(default_filter) == FS_UNSAFE_RAW)) { + if (! (IF_G(default_filter) == FILTER_UNSAFE_RAW)) { php_zval_filter(&new_var, IF_G(default_filter), IF_G(default_filter_flags), NULL, NULL/*charset*/ TSRMLS_CC); } } @@ -459,7 +461,7 @@ */ PHP_FUNCTION(input_get) { - long arg, filter = FS_DEFAULT; + long arg, filter = FILTER_DEFAULT; char *var, *charset = NULL; int var_len, charset_len; zval *flags = NULL; @@ -510,7 +512,7 @@ switch (*p) { case 'p': case 'P': - if (IF_G(default_filter) != FS_UNSAFE_RAW) { + if (IF_G(default_filter) != FILTER_UNSAFE_RAW) { *a_ptr = IF_G(post_array); } else { *a_ptr = PG(http_globals)[TRACK_VARS_POST]; @@ -518,7 +520,7 @@ break; case 'g': case 'G': - if (IF_G(default_filter) != FS_UNSAFE_RAW) { + if (IF_G(default_filter) != FILTER_UNSAFE_RAW) { *a_ptr = IF_G(get_array); } else { *a_ptr = PG(http_globals)[TRACK_VARS_GET]; @@ -526,7 +528,7 @@ break; case 'c': case 'C': - if (IF_G(default_filter) != FS_UNSAFE_RAW) { + if (IF_G(default_filter) != FILTER_UNSAFE_RAW) { *a_ptr = IF_G(cookie_array); } else { *a_ptr = PG(http_globals)[TRACK_VARS_COOKIE]; @@ -623,7 +625,7 @@ */ PHP_FUNCTION(filter_data) { - long filter = FS_DEFAULT; + long filter = FILTER_DEFAULT; char *charset = NULL; int charset_len; zval *var, *flags = NULL; @@ -634,7 +636,7 @@ return; } - if (filter != FC_CALLBACK) { + if (filter != FILTER_CALLBACK) { if (flags) { switch (Z_TYPE_P(flags)) { case IS_ARRAY: http://cvs.php.net/viewcvs.cgi/pecl/filter/filter_private.h?r1=1.9&r2=1.10&diff_format=u Index: pecl/filter/filter_private.h diff -u pecl/filter/filter_private.h:1.9 pecl/filter/filter_private.h:1.10 --- pecl/filter/filter_private.h:1.9 Sat Jan 14 15:10:54 2006 +++ pecl/filter/filter_private.h Sat Jan 21 12:48:46 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter_private.h,v 1.9 2006/01/14 15:10:54 sniper Exp $ */ +/* $Id: filter_private.h,v 1.10 2006/01/21 12:48:46 derick Exp $ */ #ifndef FILTER_PRIVATE_H #define FILTER_PRIVATE_H @@ -48,32 +48,32 @@ #define FILTER_FLAG_NO_RES_RANGE 0x400000 #define FILTER_FLAG_NO_PRIV_RANGE 0x800000 -#define FL_INT 0x0101 -#define FL_BOOLEAN 0x0102 -#define FL_FLOAT 0x0103 - -#define FL_REGEXP 0x0110 -#define FL_URL 0x0111 -#define FL_EMAIL 0x0112 -#define FL_IP 0x0113 - -#define FL_ALL 0x0100 - -#define FS_DEFAULT 0x0201 - -#define FS_STRING 0x0201 -#define FS_ENCODED 0x0202 -#define FS_SPECIAL_CHARS 0x0203 -#define FS_UNSAFE_RAW 0x0204 -#define FS_EMAIL 0x0205 -#define FS_URL 0x0206 -#define FS_NUMBER_INT 0x0207 -#define FS_NUMBER_FLOAT 0x0208 -#define FS_MAGIC_QUOTES 0x0209 +#define FILTER_VALIDATE_INT 0x0101 +#define FILTER_VALIDATE_BOOLEAN 0x0102 +#define FILTER_VALIDATE_FLOAT 0x0103 + +#define FILTER_VALIDATE_REGEXP 0x0110 +#define FILTER_VALIDATE_URL 0x0111 +#define FILTER_VALIDATE_EMAIL 0x0112 +#define FILTER_VALIDATE_IP 0x0113 + +#define FILTER_VALIDATE_ALL 0x0100 + +#define FILTER_DEFAULT 0x0201 +#define FILTER_UNSAFE_RAW 0x0204 + +#define FILTER_SANITIZE_STRING 0x0201 +#define FILTER_SANITIZE_ENCODED 0x0202 +#define FILTER_SANITIZE_SPECIAL_CHARS 0x0203 +#define FILTER_SANITIZE_EMAIL 0x0205 +#define FILTER_SANITIZE_URL 0x0206 +#define FILTER_SANITIZE_NUMBER_INT 0x0207 +#define FILTER_SANITIZE_NUMBER_FLOAT 0x0208 +#define FILTER_SANITIZE_MAGIC_QUOTES 0x0209 -#define FS_ALL 0x0200 +#define FILTER_SANITIZE_ALL 0x0200 -#define FC_CALLBACK 0x0400 +#define FILTER_CALLBACK 0x0400 #endif /* FILTER_PRIVATE_H */
http://cvs.php.net/viewcvs.cgi/pecl/filter/filter.c?r1=1.32&r2=1.33&diff_format=u Index: pecl/filter/filter.c diff -u pecl/filter/filter.c:1.32 pecl/filter/filter.c:1.33 --- pecl/filter/filter.c:1.32 Sat Jan 14 15:10:54 2006 +++ pecl/filter/filter.c Sat Jan 21 12:48:45 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.32 2006/01/14 15:10:54 sniper Exp $ */ +/* $Id: filter.c,v 1.33 2006/01/21 12:48:45 derick Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,27 +36,27 @@ } filter_list_entry; filter_list_entry filter_list[] = { - { "int", FL_INT, php_filter_int }, - { "boolean", FL_BOOLEAN, php_filter_boolean }, - { "float", FL_FLOAT, php_filter_float }, - - { "validate_regexp", FL_REGEXP, php_filter_validate_regexp }, - { "validate_url", FL_URL, php_filter_validate_url }, - { "validate_email", FL_EMAIL, php_filter_validate_email }, - { "validate_ip", FL_IP, php_filter_validate_ip }, - - { "string", FS_STRING, php_filter_string }, - { "stripped", FS_STRING, php_filter_string }, - { "encoded", FS_ENCODED, php_filter_encoded }, - { "special_chars", FS_SPECIAL_CHARS, php_filter_special_chars }, - { "unsafe_raw", FS_UNSAFE_RAW, php_filter_unsafe_raw }, - { "email", FS_EMAIL, php_filter_email }, - { "url", FS_URL, php_filter_url }, - { "number_int", FS_NUMBER_INT, php_filter_number_int }, - { "number_float", FS_NUMBER_FLOAT, php_filter_number_float }, - { "magic_quotes", FS_MAGIC_QUOTES, php_filter_magic_quotes }, + { "int", FILTER_VALIDATE_INT, php_filter_int }, + { "boolean", FILTER_VALIDATE_BOOLEAN, php_filter_boolean }, + { "float", FILTER_VALIDATE_FLOAT, php_filter_float }, + + { "validate_regexp", FILTER_VALIDATE_REGEXP, php_filter_validate_regexp }, + { "validate_url", FILTER_VALIDATE_URL, php_filter_validate_url }, + { "validate_email", FILTER_VALIDATE_EMAIL, php_filter_validate_email }, + { "validate_ip", FILTER_VALIDATE_IP, php_filter_validate_ip }, + + { "string", FILTER_SANITIZE_STRING, php_filter_string }, + { "stripped", FILTER_SANITIZE_STRING, php_filter_string }, + { "encoded", FILTER_SANITIZE_ENCODED, php_filter_encoded }, + { "special_chars", FILTER_SANITIZE_SPECIAL_CHARS, php_filter_special_chars }, + { "unsafe_raw", FILTER_UNSAFE_RAW, php_filter_unsafe_raw }, + { "email", FILTER_SANITIZE_EMAIL, php_filter_email }, + { "url", FILTER_SANITIZE_URL, php_filter_url }, + { "number_int", FILTER_SANITIZE_NUMBER_INT, php_filter_number_int }, + { "number_float", FILTER_SANITIZE_NUMBER_FLOAT, php_filter_number_float }, + { "magic_quotes", FILTER_SANITIZE_MAGIC_QUOTES, php_filter_magic_quotes }, - { "callback", FC_CALLBACK, php_filter_callback }, + { "callback", FILTER_CALLBACK, php_filter_callback }, }; #ifndef PARSE_ENV @@ -120,7 +120,7 @@ } } /* Fallback to "string" filter */ - IF_G(default_filter) = FS_DEFAULT; + IF_G(default_filter) = FILTER_DEFAULT; return SUCCESS; } /* }}} */ @@ -153,7 +153,7 @@ filter_globals->env_array = NULL; filter_globals->server_array = NULL; filter_globals->session_array = NULL; - filter_globals->default_filter = FS_DEFAULT; + filter_globals->default_filter = FILTER_DEFAULT; } /* }}} */ @@ -175,29 +175,31 @@ REGISTER_LONG_CONSTANT("INPUT_SESSION", PARSE_SESSION, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_FLAG_NONE", FILTER_FLAG_NONE, CONST_CS | CONST_PERSISTENT); +/* + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_INT", FILTER_VALIDATE_INT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_BOOLEAN", FILTER_VALIDATE_BOOLEAN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_FLOAT", FILTER_VALIDATE_FLOAT, CONST_CS | CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_REGEXP", FILTER_VALIDATE_REGEXP, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_URL", FILTER_VALIDATE_URL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_EMAIL", FILTER_VALIDATE_EMAIL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_IP", FILTER_VALIDATE_IP, CONST_CS | CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("FILTER_DEFAULT", FILTER_SANITIZE_DEFAULT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_UNSAFE_RAW", FILTER_UNSAFE_RAW, CONST_CS | CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_STRING", FILTER_SANITIZE_STRING, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_STRIPPED", FILTER_SANITIZE_STRING, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_ENCODED", FILTER_SANITIZE_ENCODED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_SPECIAL_CHARS", FILTER_SANITIZE_SPECIAL_CHARS, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_EMAIL", FILTER_SANITIZE_EMAIL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_URL", FILTER_SANITIZE_URL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_NUMBER_INT", FILTER_SANITIZE_NUMBER_INT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_NUMBER_FLOAT", FILTER_SANITIZE_NUMBER_FLOAT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_SANITIZE_MAGIC_QUOTES", FILTER_SANITIZE_MAGIC_QUOTES, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FL_INT", FL_INT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FL_BOOLEAN", FL_BOOLEAN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FL_FLOAT", FL_FLOAT, CONST_CS | CONST_PERSISTENT); - - REGISTER_LONG_CONSTANT("FL_REGEXP", FL_REGEXP, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FL_URL", FL_URL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FL_EMAIL", FL_EMAIL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FL_IP", FL_IP, CONST_CS | CONST_PERSISTENT); - - REGISTER_LONG_CONSTANT("FS_DEFAULT", FS_DEFAULT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_STRING", FS_STRING, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_STRIPPED", FS_STRING, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_ENCODED", FS_ENCODED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_SPECIAL_CHARS", FS_SPECIAL_CHARS, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_UNSAFE_RAW", FS_UNSAFE_RAW, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_EMAIL", FS_EMAIL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_URL", FS_URL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_NUMBER_INT", FS_NUMBER_INT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_NUMBER_FLOAT", FS_NUMBER_FLOAT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FS_MAGIC_QUOTES", FS_MAGIC_QUOTES, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FC_CALLBACK", FC_CALLBACK, CONST_CS | CONST_PERSISTENT); - + REGISTER_LONG_CONSTANT("FILTER_CALLBACK", FILTER_CALLBACK, CONST_CS | CONST_PERSISTENT); +*/ REGISTER_LONG_CONSTANT("FILTER_FLAG_ALLOW_OCTAL", FILTER_FLAG_ALLOW_OCTAL, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_FLAG_ALLOW_HEX", FILTER_FLAG_ALLOW_HEX, CONST_CS | CONST_PERSISTENT); @@ -263,7 +265,7 @@ { php_info_print_table_start(); php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); - php_info_print_table_row( 2, "Revision", "$Revision: 1.32 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.33 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -281,7 +283,7 @@ } /* Fallback to "string" filter */ for (i = 0; i < size; ++i) { - if (filter_list[i].id == FS_DEFAULT) { + if (filter_list[i].id == FILTER_DEFAULT) { return filter_list[i]; } } @@ -297,7 +299,7 @@ if (!filter_func.id) { /* Find default filter */ - filter_func = php_find_filter(FS_DEFAULT); + filter_func = php_find_filter(FILTER_DEFAULT); } /* Here be strings */ @@ -365,7 +367,7 @@ Z_TYPE(new_var) = IS_STRING; if (val_len) { - if (! (IF_G(default_filter) == FS_UNSAFE_RAW)) { + if (! (IF_G(default_filter) == FILTER_UNSAFE_RAW)) { php_zval_filter(&new_var, IF_G(default_filter), IF_G(default_filter_flags), NULL, NULL/*charset*/ TSRMLS_CC); } } @@ -459,7 +461,7 @@ */ PHP_FUNCTION(input_get) { - long arg, filter = FS_DEFAULT; + long arg, filter = FILTER_DEFAULT; char *var, *charset = NULL; int var_len, charset_len; zval *flags = NULL; @@ -510,7 +512,7 @@ switch (*p) { case 'p': case 'P': - if (IF_G(default_filter) != FS_UNSAFE_RAW) { + if (IF_G(default_filter) != FILTER_UNSAFE_RAW) { *a_ptr = IF_G(post_array); } else { *a_ptr = PG(http_globals)[TRACK_VARS_POST]; @@ -518,7 +520,7 @@ break; case 'g': case 'G': - if (IF_G(default_filter) != FS_UNSAFE_RAW) { + if (IF_G(default_filter) != FILTER_UNSAFE_RAW) { *a_ptr = IF_G(get_array); } else { *a_ptr = PG(http_globals)[TRACK_VARS_GET]; @@ -526,7 +528,7 @@ break; case 'c': case 'C': - if (IF_G(default_filter) != FS_UNSAFE_RAW) { + if (IF_G(default_filter) != FILTER_UNSAFE_RAW) { *a_ptr = IF_G(cookie_array); } else { *a_ptr = PG(http_globals)[TRACK_VARS_COOKIE]; @@ -623,7 +625,7 @@ */ PHP_FUNCTION(filter_data) { - long filter = FS_DEFAULT; + long filter = FILTER_DEFAULT; char *charset = NULL; int charset_len; zval *var, *flags = NULL; @@ -634,7 +636,7 @@ return; } - if (filter != FC_CALLBACK) { + if (filter != FILTER_CALLBACK) { if (flags) { switch (Z_TYPE_P(flags)) { case IS_ARRAY: http://cvs.php.net/viewcvs.cgi/pecl/filter/filter_private.h?r1=1.9&r2=1.10&diff_format=u Index: pecl/filter/filter_private.h diff -u pecl/filter/filter_private.h:1.9 pecl/filter/filter_private.h:1.10 --- pecl/filter/filter_private.h:1.9 Sat Jan 14 15:10:54 2006 +++ pecl/filter/filter_private.h Sat Jan 21 12:48:46 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter_private.h,v 1.9 2006/01/14 15:10:54 sniper Exp $ */ +/* $Id: filter_private.h,v 1.10 2006/01/21 12:48:46 derick Exp $ */ #ifndef FILTER_PRIVATE_H #define FILTER_PRIVATE_H @@ -48,32 +48,32 @@ #define FILTER_FLAG_NO_RES_RANGE 0x400000 #define FILTER_FLAG_NO_PRIV_RANGE 0x800000 -#define FL_INT 0x0101 -#define FL_BOOLEAN 0x0102 -#define FL_FLOAT 0x0103 - -#define FL_REGEXP 0x0110 -#define FL_URL 0x0111 -#define FL_EMAIL 0x0112 -#define FL_IP 0x0113 - -#define FL_ALL 0x0100 - -#define FS_DEFAULT 0x0201 - -#define FS_STRING 0x0201 -#define FS_ENCODED 0x0202 -#define FS_SPECIAL_CHARS 0x0203 -#define FS_UNSAFE_RAW 0x0204 -#define FS_EMAIL 0x0205 -#define FS_URL 0x0206 -#define FS_NUMBER_INT 0x0207 -#define FS_NUMBER_FLOAT 0x0208 -#define FS_MAGIC_QUOTES 0x0209 +#define FILTER_VALIDATE_INT 0x0101 +#define FILTER_VALIDATE_BOOLEAN 0x0102 +#define FILTER_VALIDATE_FLOAT 0x0103 + +#define FILTER_VALIDATE_REGEXP 0x0110 +#define FILTER_VALIDATE_URL 0x0111 +#define FILTER_VALIDATE_EMAIL 0x0112 +#define FILTER_VALIDATE_IP 0x0113 + +#define FILTER_VALIDATE_ALL 0x0100 + +#define FILTER_DEFAULT 0x0201 +#define FILTER_UNSAFE_RAW 0x0204 + +#define FILTER_SANITIZE_STRING 0x0201 +#define FILTER_SANITIZE_ENCODED 0x0202 +#define FILTER_SANITIZE_SPECIAL_CHARS 0x0203 +#define FILTER_SANITIZE_EMAIL 0x0205 +#define FILTER_SANITIZE_URL 0x0206 +#define FILTER_SANITIZE_NUMBER_INT 0x0207 +#define FILTER_SANITIZE_NUMBER_FLOAT 0x0208 +#define FILTER_SANITIZE_MAGIC_QUOTES 0x0209 -#define FS_ALL 0x0200 +#define FILTER_SANITIZE_ALL 0x0200 -#define FC_CALLBACK 0x0400 +#define FILTER_CALLBACK 0x0400 #endif /* FILTER_PRIVATE_H */