X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_querystring_object.c;h=6f452b968ffae5e3ab2ee71f98bbdf16b124dff0;hb=650dad8564d53bd3fb6c9867fa81e0abf17f6f7b;hp=4da97b376007e00a18ae37dcb742afc5c4a8b76a;hpb=1a0dbb96fbe46a2edec1c813798cef7b0898eebe;p=m6w6%2Fext-http diff --git a/http_querystring_object.c b/http_querystring_object.c index 4da97b3..6f452b9 100644 --- a/http_querystring_object.c +++ b/http_querystring_object.c @@ -21,7 +21,7 @@ #include "zend_interfaces.h" #include "php_http_api.h" -#include "php_http_url_api.h" +#include "php_http_querystring_api.h" #include "php_http_querystring_object.h" #include "php_http_exception_object.h" @@ -36,7 +36,7 @@ HTTP_BEGIN_ARGS(__construct, 0) HTTP_END_ARGS; #ifndef WONKY -HTTP_BEGIN_ARGS(getInstance, 0) +HTTP_BEGIN_ARGS(singleton, 0) HTTP_ARG_VAL(global, 0) HTTP_END_ARGS; #endif @@ -61,11 +61,18 @@ HTTP_BEGIN_ARGS(__getter, 1) HTTP_ARG_VAL(delete, 0) HTTP_END_ARGS; -#define http_querystring_object_declare_default_properties() _http_querystring_object_declare_default_properties(TSRMLS_C) -static inline void _http_querystring_object_declare_default_properties(TSRMLS_D); +#ifdef HAVE_ICONV +HTTP_BEGIN_ARGS(xlate, 2) + HTTP_ARG_VAL(from_encoding, 0) + HTTP_ARG_VAL(to_encoding, 0) +HTTP_END_ARGS; +#endif + +HTTP_EMPTY_ARGS(serialize); +HTTP_BEGIN_ARGS(unserialize, 1) + HTTP_ARG_VAL(serialized, 0) +HTTP_END_ARGS; -#define GET_STATIC_PROP(n) *GET_STATIC_PROP_EX(http_querystring_object_ce, n) -#define SET_STATIC_PROP(n, v) SET_STATIC_PROP_EX(http_querystring_object_ce, n, v) #define OBJ_PROP_CE http_querystring_object_ce zend_class_entry *http_querystring_object_ce; zend_function_entry http_querystring_object_fe[] = { @@ -78,10 +85,6 @@ zend_function_entry http_querystring_object_fe[] = { HTTP_QUERYSTRING_ME(get, ZEND_ACC_PUBLIC) HTTP_QUERYSTRING_ME(set, ZEND_ACC_PUBLIC) -#ifndef WONKY - HTTP_QUERYSTRING_ME(getInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -#endif - HTTP_QUERYSTRING_GME(getBool, ZEND_ACC_PUBLIC) HTTP_QUERYSTRING_GME(getInt, ZEND_ACC_PUBLIC) HTTP_QUERYSTRING_GME(getFloat, ZEND_ACC_PUBLIC) @@ -89,6 +92,17 @@ zend_function_entry http_querystring_object_fe[] = { HTTP_QUERYSTRING_GME(getArray, ZEND_ACC_PUBLIC) HTTP_QUERYSTRING_GME(getObject, ZEND_ACC_PUBLIC) +#ifndef WONKY + HTTP_QUERYSTRING_ME(singleton, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) +#endif +#ifdef HAVE_ICONV + HTTP_QUERYSTRING_ME(xlate, ZEND_ACC_PUBLIC) +#endif + + /* Implements Serializable */ + HTTP_QUERYSTRING_ME(serialize, ZEND_ACC_PUBLIC) + HTTP_QUERYSTRING_ME(unserialize, ZEND_ACC_PUBLIC) + EMPTY_FUNCTION_ENTRY }; static zend_object_handlers http_querystring_object_handlers; @@ -97,6 +111,23 @@ PHP_MINIT_FUNCTION(http_querystring_object) { HTTP_REGISTER_CLASS_EX(HttpQueryString, http_querystring_object, NULL, 0); +#ifndef WONKY + zend_class_implements(http_querystring_object_ce TSRMLS_CC, 1, zend_ce_serializable); +#endif + + DCL_STATIC_PROP_N(PRIVATE, instance); + DCL_PROP_N(PRIVATE, queryArray); + DCL_PROP(PRIVATE, string, queryString, ""); + +#ifndef WONKY + DCL_CONST(long, "TYPE_BOOL", HTTP_QUERYSTRING_TYPE_BOOL); + DCL_CONST(long, "TYPE_INT", HTTP_QUERYSTRING_TYPE_INT); + DCL_CONST(long, "TYPE_FLOAT", HTTP_QUERYSTRING_TYPE_FLOAT); + DCL_CONST(long, "TYPE_STRING", HTTP_QUERYSTRING_TYPE_STRING); + DCL_CONST(long, "TYPE_ARRAY", HTTP_QUERYSTRING_TYPE_ARRAY); + DCL_CONST(long, "TYPE_OBJECT", HTTP_QUERYSTRING_TYPE_OBJECT); +#endif + HTTP_LONG_CONSTANT("HTTP_QUERYSTRING_TYPE_BOOL", HTTP_QUERYSTRING_TYPE_BOOL); HTTP_LONG_CONSTANT("HTTP_QUERYSTRING_TYPE_INT", HTTP_QUERYSTRING_TYPE_INT); HTTP_LONG_CONSTANT("HTTP_QUERYSTRING_TYPE_FLOAT", HTTP_QUERYSTRING_TYPE_FLOAT); @@ -125,7 +156,7 @@ zend_object_value _http_querystring_object_new_ex(zend_class_entry *ce, http_que } ALLOC_HASHTABLE(OBJ_PROP(o)); - zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0); + zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); ov.handle = putObject(http_querystring_object, o); @@ -134,25 +165,6 @@ zend_object_value _http_querystring_object_new_ex(zend_class_entry *ce, http_que return ov; } -static inline void _http_querystring_object_declare_default_properties(TSRMLS_D) -{ - zend_class_entry *ce = http_querystring_object_ce; - - DCL_STATIC_PROP_N(PRIVATE, instance); - - DCL_PROP_N(PRIVATE, queryArray); - DCL_PROP(PRIVATE, string, queryString, ""); - -#ifndef WONKY - DCL_CONST(long, "TYPE_BOOL", HTTP_QUERYSTRING_TYPE_BOOL); - DCL_CONST(long, "TYPE_INT", HTTP_QUERYSTRING_TYPE_INT); - DCL_CONST(long, "TYPE_FLOAT", HTTP_QUERYSTRING_TYPE_FLOAT); - DCL_CONST(long, "TYPE_STRING", HTTP_QUERYSTRING_TYPE_STRING); - DCL_CONST(long, "TYPE_ARRAY", HTTP_QUERYSTRING_TYPE_ARRAY); - DCL_CONST(long, "TYPE_OBJECT", HTTP_QUERYSTRING_TYPE_OBJECT); -#endif -} - void _http_querystring_object_free(zend_object *object TSRMLS_DC) { http_querystring_object *o = (http_querystring_object *) object; @@ -164,89 +176,7 @@ void _http_querystring_object_free(zend_object *object TSRMLS_DC) efree(o); } -#define http_querystring_update(qa, qs) _http_querystring_update((qa), (qs) TSRMLS_CC) -static inline void _http_querystring_update(zval *qarray, zval *qstring TSRMLS_DC) -{ - char *s = NULL; - size_t l = 0; - - if (Z_TYPE_P(qarray) != IS_ARRAY) { - convert_to_array(qarray); - } - if (SUCCESS == http_urlencode_hash_ex(Z_ARRVAL_P(qarray), 0, NULL, 0, &s, &l)) { - zval_dtor(qstring); - ZVAL_STRINGL(qstring, s, l, 0); - } else { - http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Failed to update query string"); - } -} - -#define http_querystring_modify_ex(a, k, l, v) _http_querystring_modify_ex((a), (k), (l), (v) TSRMLS_CC) -static inline int _http_querystring_modify_ex(zval *qarray, char *key, uint keylen, zval *data TSRMLS_DC) -{ - if (Z_TYPE_P(data) == IS_NULL) { - if (SUCCESS != zend_hash_del(Z_ARRVAL_P(qarray), key, keylen)) { - return 0; - } - } else { - ZVAL_ADDREF(data); - add_assoc_zval(qarray, key, data); - } - return 1; -} - -#define http_querystring_modify_array(q, a) _http_querystring_modify_array((q), (a) TSRMLS_CC) -static inline int _http_querystring_modify_array(zval *qarray, zval *array TSRMLS_DC) -{ - zval **value; - HashPosition pos; - char *key = NULL; - uint keylen = 0; - ulong idx = 0; - int rv = 0; - - FOREACH_KEYLENVAL(pos, array, key, keylen, idx, value) { - if (key) { - if (http_querystring_modify_ex(qarray, key, keylen, *value)) { - rv = 1; - } - } else { - keylen = spprintf(&key, 0, "%lu", idx); - if (http_querystring_modify_ex(qarray, key, keylen, *value)) { - rv = 1; - } - efree(key); - } - key = NULL; - } - - return rv; -} - -#define http_querystring_modify(q, p) _http_querystring_modify((q), (p) TSRMLS_CC) -static inline int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC) -{ - if ((Z_TYPE_P(params) == IS_OBJECT) && instanceof_function(Z_OBJCE_P(params), http_querystring_object_ce TSRMLS_CC)) { - return http_querystring_modify_array(qarray, GET_PROP_EX(params, queryArray)); - } else if (Z_TYPE_P(params) == IS_ARRAY) { - return http_querystring_modify_array(qarray, params); - } else { - int rv; - zval array; - - INIT_PZVAL(&array); - array_init(&array); - - ZVAL_ADDREF(params); - convert_to_string_ex(¶ms); - sapi_module.treat_data(PARSE_STRING, estrdup(Z_STRVAL_P(params)), &array TSRMLS_CC); - zval_ptr_dtor(¶ms); - rv = http_querystring_modify_array(qarray, &array); - zval_dtor(&array); - return rv; - } -} - +/* {{{ querystring helpers */ #ifndef WONKY #define http_querystring_instantiate(g) _http_querystring_instantiate((g) TSRMLS_CC) static inline zval *_http_querystring_instantiate(zend_bool global TSRMLS_DC) @@ -265,14 +195,14 @@ static inline zval *_http_querystring_instantiate(zend_bool global TSRMLS_DC) return zobj; } -#endif +#endif /* WONKY */ #define http_querystring_get(o, t, n, l, def, del, r) _http_querystring_get((o), (t), (n), (l), (def), (del), (r) TSRMLS_CC) static inline void _http_querystring_get(zval *this_ptr, int type, char *name, uint name_len, zval *defval, zend_bool del, zval *return_value TSRMLS_DC) { zval **arrval, *qarray = GET_PROP(queryArray); - if ((Z_TYPE_P(qarray) == IS_ARRAY) && (SUCCESS == zend_hash_find(Z_ARRVAL_P(qarray), name, name_len + 1, (void **) &arrval))) { + if ((Z_TYPE_P(qarray) == IS_ARRAY) && (SUCCESS == zend_hash_find(Z_ARRVAL_P(qarray), name, name_len + 1, (void *) &arrval))) { RETVAL_ZVAL(*arrval, 1, 0); if (type) { @@ -286,8 +216,9 @@ static inline void _http_querystring_get(zval *this_ptr, int type, char *name, u RETURN_ZVAL(defval, 1, 0); } } +/* }}} */ -/* {{{ proto void HttpQueryString::__construct([bool global = true[, mixed add]) +/* {{{ proto final void HttpQueryString::__construct([bool global = true[, mixed add]) * * Creates a new HttpQueryString object instance. * Operates on and modifies $_GET and $_SERVER['QUERY_STRING'] if global is TRUE. @@ -298,15 +229,22 @@ PHP_METHOD(HttpQueryString, __construct) zval *params = NULL, *qarray = NULL, *qstring = NULL, **_GET, **_SERVER, **QUERY_STRING; SET_EH_THROW_HTTP(); - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bz", &global, ¶ms)) { + if (!sapi_module.treat_data) { + http_error(HE_ERROR, HTTP_E_QUERYSTRING, "The SAPI does not have a treat_data function registered"); + } else if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bz", &global, ¶ms)) { if (global) { - if ( (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &_SERVER)) && +#ifdef ZEND_ENGINE_2 + zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC); +#endif + if ( (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &_SERVER)) && (Z_TYPE_PP(_SERVER) == IS_ARRAY) && - (SUCCESS == zend_hash_find(Z_ARRVAL_PP(_SERVER), "QUERY_STRING", sizeof("QUERY_STRING"), (void **) &QUERY_STRING))) { + (SUCCESS == zend_hash_find(Z_ARRVAL_PP(_SERVER), "QUERY_STRING", sizeof("QUERY_STRING"), (void *) &QUERY_STRING))) { qstring = *QUERY_STRING; - - if ((SUCCESS == zend_hash_find(&EG(symbol_table), "_GET", sizeof("_GET"), (void **) &_GET)) && (Z_TYPE_PP(_GET) == IS_ARRAY)) { +#ifdef ZEND_ENGINE_2 + zend_is_auto_global("_GET", lenof("_GET") TSRMLS_CC); +#endif + if ((SUCCESS == zend_hash_find(&EG(symbol_table), "_GET", sizeof("_GET"), (void *) &_GET)) && (Z_TYPE_PP(_GET) == IS_ARRAY)) { qarray = *_GET; } else { http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Could not acquire reference to superglobal GET array"); @@ -325,9 +263,10 @@ PHP_METHOD(HttpQueryString, __construct) GET_PROP(queryArray)->is_ref = 1; GET_PROP(queryString)->is_ref = 1; - if (params && http_querystring_modify(GET_PROP(queryArray), params)) { - http_querystring_update(GET_PROP(queryArray), GET_PROP(queryString)); + if (params) { + http_querystring_modify(GET_PROP(queryArray), params); } + http_querystring_update(GET_PROP(queryArray), GET_PROP(queryString)); } } else { qarray = ecalloc(1, sizeof(zval)); @@ -388,13 +327,19 @@ PHP_METHOD(HttpQueryString, get) if (Z_TYPE_P(ztype) == IS_LONG) { type = Z_LVAL_P(ztype); } else if(Z_TYPE_P(ztype) == IS_STRING) { - switch (tolower(Z_STRVAL_P(ztype)[0])) + switch (Z_STRVAL_P(ztype)[0]) { + case 'B': case 'b': type = HTTP_QUERYSTRING_TYPE_BOOL; break; + case 'I': case 'i': type = HTTP_QUERYSTRING_TYPE_INT; break; + case 'F': case 'f': type = HTTP_QUERYSTRING_TYPE_FLOAT; break; + case 'S': case 's': type = HTTP_QUERYSTRING_TYPE_STRING; break; + case 'A': case 'a': type = HTTP_QUERYSTRING_TYPE_ARRAY; break; + case 'O': case 'o': type = HTTP_QUERYSTRING_TYPE_OBJECT; break; } } @@ -429,11 +374,11 @@ PHP_METHOD(HttpQueryString, set) /* }}} */ #ifndef WONKY -/* {{{ proto HttpQueryString HttpQueryString::getInstance([bool global = true]) +/* {{{ proto static HttpQueryString HttpQueryString::singleton([bool global = true]) * * Get a single instance (differentiates between the global setting). */ -PHP_METHOD(HttpQueryString, getInstance) +PHP_METHOD(HttpQueryString, singleton) { zend_bool global = 1; zval *instance = GET_STATIC_PROP(instance); @@ -443,7 +388,7 @@ PHP_METHOD(HttpQueryString, getInstance) zval **zobj_ptr = NULL, *zobj = NULL; if (Z_TYPE_P(instance) == IS_ARRAY) { - if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(instance), global, (void **) &zobj_ptr)) { + if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(instance), global, (void *) &zobj_ptr)) { RETVAL_ZVAL(*zobj_ptr, 1, 0); } else { zobj = http_querystring_instantiate(global); @@ -487,6 +432,77 @@ HTTP_QUERYSTRING_GETTER(getArray, IS_ARRAY); HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT); /* }}} */ +#ifdef HAVE_ICONV +/* {{{ proto bool HttpQueryString::xlate(string ie, string oe) + * + * Converts the query string from the source encoding ie to the target encoding oe. + * WARNING: Don't use any character set that can contain NUL bytes like UTF-16. + * + * Returns TRUE on success or FALSE on failure. + */ +PHP_METHOD(HttpQueryString, xlate) +{ + char *ie, *oe; + int ie_len, oe_len; + zval xa, *qa, *qs; + STATUS rs; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &ie, &ie_len, &oe, &oe_len)) { + RETURN_FALSE; + } + + qa = GET_PROP(queryArray); + qs = GET_PROP(queryString); + INIT_PZVAL(&xa); + array_init(&xa); + + if (SUCCESS == (rs = http_querystring_xlate(&xa, qa, ie, oe))) { + zend_hash_clean(Z_ARRVAL_P(qa)); + zend_hash_copy(Z_ARRVAL_P(qa), Z_ARRVAL(xa), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + http_querystring_update(qa, qs); + } + zval_dtor(&xa); + + RETURN_SUCCESS(rs); +} +/* }}} */ +#endif /* HAVE_ICONV */ + +/* {{{ proto string HttpQueryString::serialize() + * + * Implements Serializable. + */ +PHP_METHOD(HttpQueryString, serialize) +{ + NO_ARGS; + RETURN_PROP(queryString); +} +/* }}} */ + +/* {{{ proto void HttpQueryString::unserialize(string serialized) + * + * Implements Serializable. + */ +PHP_METHOD(HttpQueryString, unserialize) +{ + zval *serialized; + + SET_EH_THROW_HTTP(); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &serialized)) { + if (Z_TYPE_P(serialized) == IS_STRING) { + zval *qa = GET_PROP(queryArray); + + zend_hash_clean(Z_ARRVAL_P(qa)); + http_querystring_modify(qa, serialized); + http_querystring_update(qa, GET_PROP(queryString)); + } else { + http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Expected a string as parameter"); + } + } + SET_EH_NORMAL(); +} +/* }}} */ + #endif /* ZEND_ENGINE_2 */ /*