X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_querystring_object.c;h=8bea12e849bb30b97e1be1766d98a3e57b19be66;hp=33e4356f947bbd4a31dd12d71e6afa1b614aaf1a;hb=22bbc9d47c33e366c4fe7def52063a25d8aa0224;hpb=096937185b5e249341eec6899ef35462034895be diff --git a/http_querystring_object.c b/http_querystring_object.c index 33e4356..8bea12e 100644 --- a/http_querystring_object.c +++ b/http_querystring_object.c @@ -41,6 +41,12 @@ HTTP_BEGIN_ARGS(singleton, 0) HTTP_END_ARGS; #endif +HTTP_BEGIN_ARGS(factory, 0) + HTTP_ARG_VAL(global, 0) + HTTP_ARG_VAL(params, 0) + HTTP_ARG_VAL(class_name, 0) +HTTP_END_ARGS; + HTTP_EMPTY_ARGS(toArray); HTTP_EMPTY_ARGS(toString); @@ -115,6 +121,7 @@ zend_function_entry http_querystring_object_fe[] = { HTTP_QUERYSTRING_GME(getArray, ZEND_ACC_PUBLIC) HTTP_QUERYSTRING_GME(getObject, ZEND_ACC_PUBLIC) + HTTP_QUERYSTRING_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) #ifndef WONKY HTTP_QUERYSTRING_ME(singleton, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) #endif @@ -169,10 +176,10 @@ PHP_MINIT_FUNCTION(http_querystring_object) zend_object_value _http_querystring_object_new(zend_class_entry *ce TSRMLS_DC) { - return http_querystring_object_new_ex(ce, NULL); + return http_querystring_object_new_ex(ce, NULL, NULL); } -zend_object_value _http_querystring_object_new_ex(zend_class_entry *ce, http_querystring_object **ptr TSRMLS_DC) +zend_object_value _http_querystring_object_new_ex(zend_class_entry *ce, void *nothing, http_querystring_object **ptr TSRMLS_DC) { zend_object_value ov; http_querystring_object *o; @@ -198,30 +205,71 @@ void _http_querystring_object_free(zend_object *object TSRMLS_DC) { http_querystring_object *o = (http_querystring_object *) object; - if (OBJ_PROP(o)) { - zend_hash_destroy(OBJ_PROP(o)); - FREE_HASHTABLE(OBJ_PROP(o)); - } - efree(o); + freeObject(o); } /* {{{ querystring helpers */ -#define http_querystring_instantiate(g) _http_querystring_instantiate((g) TSRMLS_CC) -static inline zval *_http_querystring_instantiate(zend_bool global TSRMLS_DC) +#define http_querystring_instantiate(t, g, p, u) _http_querystring_instantiate((t), (g), (p), (u) TSRMLS_CC) +static inline zval *_http_querystring_instantiate(zval *this_ptr, zend_bool global, zval *params, zend_bool defer_update TSRMLS_DC) { - zval *zobj, *zglobal; + zval *qarray = NULL, *qstring = NULL, **_SERVER = NULL, **_GET = NULL, **QUERY_STRING = NULL;; - MAKE_STD_ZVAL(zglobal); - ZVAL_BOOL(zglobal, global); - - MAKE_STD_ZVAL(zobj); - Z_TYPE_P(zobj) = IS_OBJECT; - Z_OBJVAL_P(zobj) = http_querystring_object_new(http_querystring_object_ce); - zend_call_method_with_1_params(&zobj, Z_OBJCE_P(zobj), NULL, "__construct", NULL, zglobal); + if (!this_ptr) { + MAKE_STD_ZVAL(this_ptr); + Z_TYPE_P(this_ptr) = IS_OBJECT; + this_ptr->value.obj = http_querystring_object_new(http_querystring_object_ce); + } + if (global) { +#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))) { + + qstring = *QUERY_STRING; +#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"); + } + } else { + http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Could not acquire reference to QUERY_STRING"); + } + + if (qarray && qstring) { + if (Z_TYPE_P(qstring) != IS_STRING) { + convert_to_string(qstring); + } + + SET_PROP(queryArray, qarray); + SET_PROP(queryString, qstring); + GET_PROP(queryArray)->is_ref = 1; + GET_PROP(queryString)->is_ref = 1; - zval_ptr_dtor(&zglobal); + if (params) { + http_querystring_modify(GET_PROP(queryArray), params); + } + if (!defer_update) { + http_querystring_update(GET_PROP(queryArray), GET_PROP(queryString)); + } + } + } else { + qarray = ecalloc(1, sizeof(zval)); + array_init(qarray); + + SET_PROP(queryArray, qarray); + UPD_STRL(queryString, "", 0); + + if (params && http_querystring_modify(qarray, params) && !defer_update) { + http_querystring_update(qarray, GET_PROP(queryString)); + } + } - return zobj; + return this_ptr; } #define http_querystring_get(o, t, n, l, def, del, r) _http_querystring_get((o), (t), (n), (l), (def), (del), (r) TSRMLS_CC) @@ -246,75 +294,46 @@ static inline void _http_querystring_get(zval *this_ptr, int type, char *name, u /* }}} */ /* {{{ 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. - */ + Creates a new HttpQueryString object instance. Operates on and modifies $_GET and $_SERVER['QUERY_STRING'] if global is TRUE. */ PHP_METHOD(HttpQueryString, __construct) { zend_bool global = 1; - zval *params = NULL, *qarray = NULL, *qstring = NULL, **_GET, **_SERVER, **QUERY_STRING; + zval *params = NULL; SET_EH_THROW_HTTP(); 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) { -#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))) { - - qstring = *QUERY_STRING; -#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"); - } - } else { - http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Could not acquire reference to QUERY_STRING"); - } - - if (qarray && qstring) { - if (Z_TYPE_P(qstring) != IS_STRING) { - convert_to_string(qstring); - } - - SET_PROP(queryArray, qarray); - SET_PROP(queryString, qstring); - 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)); - } - } else { - qarray = ecalloc(1, sizeof(zval)); - array_init(qarray); - - SET_PROP(queryArray, qarray); - UPD_STRL(queryString, "", 0); - - if (params && http_querystring_modify(qarray, params)) { - http_querystring_update(qarray, GET_PROP(queryString)); - } - } + http_querystring_instantiate(getThis(), global, params, 0); + } + SET_EH_NORMAL(); +} +/* }}} */ + +/* {{{ proto HttpQueryString HttpQueryString::factory([bool global = TRUE[, mixed params[, string class_name = "HttpQueryString"]) + Creates a new HttpQueryString object instance. */ +PHP_METHOD(HttpQueryString, factory) +{ + zend_bool global = 1; + zval *params = NULL; + char *cn = NULL; + int cl = 0; + zend_object_value ov; + + SET_EH_THROW_HTTP(); + 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, "|bzs", &global, ¶ms, &cn, &cl) && + SUCCESS == http_object_new(&ov, cn, cl, _http_querystring_object_new_ex, http_querystring_object_ce, NULL, NULL)) { + RETVAL_OBJVAL(ov, 0); + http_querystring_instantiate(return_value, global, params, 0); } SET_EH_NORMAL(); } /* }}} */ /* {{{ proto string HttpQueryString::toString() - * - * Returns the string representation. - */ + Returns the string representation. */ PHP_METHOD(HttpQueryString, toString) { NO_ARGS; @@ -323,9 +342,7 @@ PHP_METHOD(HttpQueryString, toString) /* }}} */ /* {{{ proto array HttpQueryString::toArray() - * - * Returns the array representation. - */ + Returns the array representation. */ PHP_METHOD(HttpQueryString, toArray) { NO_ARGS; @@ -334,12 +351,7 @@ PHP_METHOD(HttpQueryString, toArray) /* }}} */ /* {{{ proto mixed HttpQueryString::get([string key[, mixed type = 0[, mixed defval = NULL[, bool delete = false]]]]) - * - * Get (part of) the query string. - * - * The type parameter is either one of the HttpQueryString::TYPE_* constants or a type abbreviation like - * "b" for bool, "i" for int, "f" for float, "s" for string, "a" for array and "o" for a stdClass object. - */ + Get (part of) the query string. The type parameter is either one of the HttpQueryString::TYPE_* constants or a type abbreviation like "b" for bool, "i" for int, "f" for float, "s" for string, "a" for array and "o" for a stdClass object. */ PHP_METHOD(HttpQueryString, get) { char *name = NULL; @@ -379,9 +391,7 @@ PHP_METHOD(HttpQueryString, get) /* }}} */ /* {{{ proto string HttpQueryString::set(mixed params) - * - * Set query string entry/entries. NULL values will unset the variable. - */ + Set query string entry/entries. NULL values will unset the variable. */ PHP_METHOD(HttpQueryString, set) { zval *params; @@ -400,30 +410,19 @@ PHP_METHOD(HttpQueryString, set) /* }}} */ /* {{{ proto HttpQueryString HttpQueryString::mod(mixed params) - * - * Copies the query string object and sets provided params at the clone. - * This is basically shorthand for: - * 
- * set($other_params);
- * ?>
- *
- */ + Copies the query string object and sets provided params at the clone. */ PHP_METHOD(HttpQueryString, mod) { - zval *orig, *zobj, *qarr, *qstr, *params; + zval *zobj, *qarr, *qstr, *params; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶ms)) { - zobj = http_querystring_instantiate(0); - orig = GET_PROP(queryArray); + zobj = http_querystring_instantiate(NULL, 0, GET_PROP(queryArray), 1); qarr = GET_PROP_EX(zobj, queryArray); qstr = GET_PROP_EX(zobj, queryString); - array_copy(orig, qarr); http_querystring_modify(qarr, params); http_querystring_update(qarr, qstr); - + RETURN_ZVAL(zobj, 1, 1); } } @@ -431,9 +430,7 @@ PHP_METHOD(HttpQueryString, mod) #ifndef WONKY /* {{{ proto static HttpQueryString HttpQueryString::singleton([bool global = true]) - * - * Get a single instance (differentiates between the global setting). - */ + Get a single instance (differentiates between the global setting). */ PHP_METHOD(HttpQueryString, singleton) { zend_bool global = 1; @@ -447,7 +444,7 @@ PHP_METHOD(HttpQueryString, singleton) 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); + zobj = http_querystring_instantiate(NULL, global, NULL, (zend_bool) !global); add_index_zval(instance, global, zobj); RETVAL_OBJECT(zobj, 1); } @@ -455,7 +452,7 @@ PHP_METHOD(HttpQueryString, singleton) MAKE_STD_ZVAL(instance); array_init(instance); - zobj = http_querystring_instantiate(global); + zobj = http_querystring_instantiate(NULL, global, NULL, (zend_bool) !global); add_index_zval(instance, global, zobj); RETVAL_OBJECT(zobj, 1); @@ -490,12 +487,7 @@ HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT); #ifdef HTTP_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. - */ + 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. */ PHP_METHOD(HttpQueryString, xlate) { char *ie, *oe; @@ -525,9 +517,7 @@ PHP_METHOD(HttpQueryString, xlate) #endif /* HAVE_ICONV */ /* {{{ proto string HttpQueryString::serialize() - * - * Implements Serializable. - */ + Implements Serializable::serialize(). */ PHP_METHOD(HttpQueryString, serialize) { NO_ARGS; @@ -536,9 +526,7 @@ PHP_METHOD(HttpQueryString, serialize) /* }}} */ /* {{{ proto void HttpQueryString::unserialize(string serialized) - * - * Implements Serializable. - */ + Implements Serializable::unserialize(). */ PHP_METHOD(HttpQueryString, unserialize) { zval *serialized; @@ -546,11 +534,7 @@ PHP_METHOD(HttpQueryString, unserialize) 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)); + http_querystring_instantiate(getThis(), 0, serialized, 0); } else { http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Expected a string as parameter"); } @@ -560,9 +544,7 @@ PHP_METHOD(HttpQueryString, unserialize) /* }}} */ /* {{{ proto mixed HttpQueryString::offsetGet(string offset) - * - * Implements ArrayAccess. - */ + Implements ArrayAccess::offsetGet(). */ PHP_METHOD(HttpQueryString, offsetGet) { char *offset_str; @@ -577,9 +559,7 @@ PHP_METHOD(HttpQueryString, offsetGet) /* }}} */ /* {{{ proto void HttpQueryString::offsetSet(string offset, mixed value) - * - * Implements ArrayAccess. - */ + Implements ArrayAccess::offsetGet(). */ PHP_METHOD(HttpQueryString, offsetSet) { char *offset_str; @@ -597,9 +577,7 @@ PHP_METHOD(HttpQueryString, offsetSet) /* }}} */ /* {{{ proto bool HttpQueryString::offsetExists(string offset) - * - * Implements ArrayAccess. - */ + Implements ArrayAccess::offsetExists(). */ PHP_METHOD(HttpQueryString, offsetExists) { char *offset_str; @@ -613,9 +591,7 @@ PHP_METHOD(HttpQueryString, offsetExists) /* }}} */ /* {{{ proto void HttpQueryString::offsetUnset(string offset) - * - * Implements ArrayAccess. - */ + Implements ArrayAccess::offsetUnset(). */ PHP_METHOD(HttpQueryString, offsetUnset) { char *offset_str;