| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#include "php_variables.h"
#include "zend_interfaces.h"
-#ifdef HAVE_ICONV
-# undef PHP_ATOM_INC
-# include "ext/iconv/php_iconv.h"
-# include "ext/standard/url.h"
-#endif
-
#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"
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);
HTTP_ARG_VAL(params, 0)
HTTP_END_ARGS;
+HTTP_BEGIN_ARGS(mod, 0)
+ HTTP_ARG_VAL(params, 0)
+HTTP_END_ARGS;
+
HTTP_BEGIN_ARGS(__getter, 1)
HTTP_ARG_VAL(name, 0)
HTTP_ARG_VAL(defval, 0)
HTTP_ARG_VAL(delete, 0)
HTTP_END_ARGS;
-#ifdef HAVE_ICONV
+#ifdef HTTP_HAVE_ICONV
HTTP_BEGIN_ARGS(xlate, 2)
HTTP_ARG_VAL(from_encoding, 0)
HTTP_ARG_VAL(to_encoding, 0)
HTTP_ARG_VAL(serialized, 0)
HTTP_END_ARGS;
-#define OBJ_PROP_CE http_querystring_object_ce
+HTTP_BEGIN_ARGS(offsetGet, 1)
+ HTTP_ARG_VAL(offset, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(offsetSet, 2)
+ HTTP_ARG_VAL(offset, 0)
+ HTTP_ARG_VAL(value, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(offsetExists, 1)
+ HTTP_ARG_VAL(offset, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(offsetUnset, 1)
+ HTTP_ARG_VAL(offset, 0)
+HTTP_END_ARGS;
+
+
+#define THIS_CE http_querystring_object_ce
zend_class_entry *http_querystring_object_ce;
zend_function_entry http_querystring_object_fe[] = {
HTTP_QUERYSTRING_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR|ZEND_ACC_FINAL)
HTTP_QUERYSTRING_ME(get, ZEND_ACC_PUBLIC)
HTTP_QUERYSTRING_ME(set, ZEND_ACC_PUBLIC)
+ HTTP_QUERYSTRING_ME(mod, ZEND_ACC_PUBLIC)
HTTP_QUERYSTRING_GME(getBool, ZEND_ACC_PUBLIC)
HTTP_QUERYSTRING_GME(getInt, ZEND_ACC_PUBLIC)
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
-#ifdef HAVE_ICONV
+#ifdef HTTP_HAVE_ICONV
HTTP_QUERYSTRING_ME(xlate, ZEND_ACC_PUBLIC)
#endif
HTTP_QUERYSTRING_ME(serialize, ZEND_ACC_PUBLIC)
HTTP_QUERYSTRING_ME(unserialize, ZEND_ACC_PUBLIC)
+ /* Implements ArrayAccess */
+ HTTP_QUERYSTRING_ME(offsetGet, ZEND_ACC_PUBLIC)
+ HTTP_QUERYSTRING_ME(offsetSet, ZEND_ACC_PUBLIC)
+ HTTP_QUERYSTRING_ME(offsetExists, ZEND_ACC_PUBLIC)
+ HTTP_QUERYSTRING_ME(offsetUnset, ZEND_ACC_PUBLIC)
+
EMPTY_FUNCTION_ENTRY
};
static zend_object_handlers http_querystring_object_handlers;
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);
+ zend_class_implements(http_querystring_object_ce TSRMLS_CC, 2, zend_ce_serializable, zend_ce_arrayaccess);
#endif
- DCL_STATIC_PROP_N(PRIVATE, instance);
- DCL_PROP_N(PRIVATE, queryArray);
- DCL_PROP(PRIVATE, string, queryString, "");
+ zend_declare_property_null(THIS_CE, ZEND_STRS("instance")-1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC);
+ zend_declare_property_null(THIS_CE, ZEND_STRS("queryArray")-1, ZEND_ACC_PRIVATE TSRMLS_CC);
+ zend_declare_property_string(THIS_CE, ZEND_STRS("queryString")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC);
#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);
+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_BOOL")-1, HTTP_QUERYSTRING_TYPE_BOOL TSRMLS_CC);
+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_INT")-1, HTTP_QUERYSTRING_TYPE_INT TSRMLS_CC);
+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_FLOAT")-1, HTTP_QUERYSTRING_TYPE_FLOAT TSRMLS_CC);
+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_STRING")-1, HTTP_QUERYSTRING_TYPE_STRING TSRMLS_CC);
+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_ARRAY")-1, HTTP_QUERYSTRING_TYPE_ARRAY TSRMLS_CC);
+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_OBJECT")-1, HTTP_QUERYSTRING_TYPE_OBJECT TSRMLS_CC);
#endif
HTTP_LONG_CONSTANT("HTTP_QUERYSTRING_TYPE_BOOL", HTTP_QUERYSTRING_TYPE_BOOL);
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;
*ptr = o;
}
+#ifdef ZEND_ENGINE_2_4
+ zend_object_std_init(o, ce TSRMLS_CC);
+ object_properties_init(o, ce);
+#else
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 *));
+#endif
ov.handle = putObject(http_querystring_object, o);
ov.handlers = &http_querystring_object_handlers;
{
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_update(qa, qs) _http_querystring_update((qa), (qs) TSRMLS_CC)
-static inline void _http_querystring_update(zval *qarray, zval *qstring TSRMLS_DC);
-#define http_querystring_modify_array_ex(q, k, kl, pe) _http_querystring_modify_array_ex((q), (k), (kl), (pe) TSRMLS_CC)
-static inline int _http_querystring_modify_array_ex(zval *qarray, char *key, int keylen, zval *params_entry TSRMLS_DC);
-#define http_querystring_modify_array(q, p) _http_querystring_modify_array((q), (p) TSRMLS_CC)
-static inline int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC);
-#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);
-#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);
-#ifdef HAVE_ICONV
-#define http_querystring_xlate(a, p, ie, oe) _http_querystring_xlate((a), (p), (ie), (oe) TSRMLS_CC)
-static inline int _http_querystring_xlate(zval *array, zval *param, const char *ie, const char *oe 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)
{
- HashPosition pos;
- zval **entry = NULL;
- char *xlate_str = NULL, *xkey, *kstr = NULL;
- size_t xlate_len = 0, xlen;
- uint klen = 0;
- ulong kidx = 0;
-
- FOREACH_KEYLENVAL(pos, param, kstr, klen, kidx, entry) {
- if (kstr) {
- if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(kstr, klen-1, &xkey, &xlen, oe, ie)) {
- http_error_ex(HE_WARNING, HTTP_E_QUERYSTRING, "Failed to convert '%.*s' from '%s' to '%s'", klen-1, kstr, ie, oe);
- return FAILURE;
- }
- }
-
- if (Z_TYPE_PP(entry) == IS_STRING) {
- if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry), &xlate_str, &xlate_len, oe, ie)) {
- if (kstr) {
- efree(xkey);
- }
- http_error_ex(HE_WARNING, HTTP_E_QUERYSTRING, "Failed to convert '%.*s' from '%s' to '%s'", Z_STRLEN_PP(entry), Z_STRVAL_PP(entry), ie, oe);
- return FAILURE;
- }
- if (kstr) {
- add_assoc_stringl_ex(array, xkey, xlen+1, xlate_str, xlate_len, 0);
- } else {
- add_index_stringl(array, kidx, xlate_str, xlate_len, 0);
- }
- } else if (Z_TYPE_PP(entry) == IS_ARRAY) {
- zval *subarray;
+ zval *qarray = NULL, *qstring = NULL, **_SERVER = NULL, **_GET = NULL, **QUERY_STRING = NULL;;
+
+ 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))) {
- MAKE_STD_ZVAL(subarray);
- array_init(subarray);
- if (kstr) {
- add_assoc_zval_ex(array, xkey, xlen+1, subarray);
+ 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 {
- add_index_zval(array, kidx, subarray);
- }
- if (SUCCESS != http_querystring_xlate(subarray, *entry, ie, oe)) {
- if (kstr) {
- efree(xkey);
- }
- return FAILURE;
+ 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 (kstr) {
- kstr = NULL;
- efree(xkey);
- }
- }
- return SUCCESS;
-}
-#endif /* HAVE_ICONV */
-#ifndef WONKY
-#define http_querystring_instantiate(g) _http_querystring_instantiate((g) TSRMLS_CC)
-static inline zval *_http_querystring_instantiate(zend_bool global TSRMLS_DC)
-{
- zval *zobj, *zglobal;
-
- 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);
-
- zval_ptr_dtor(&zglobal);
-
- return zobj;
-}
-#endif /* WONKY */
-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");
- }
-}
-static inline int _http_querystring_modify_array_ex(zval *qarray, char *key, int keylen, zval *params_entry TSRMLS_DC)
-{
- zval **qarray_entry;
-
- /* delete */
- if (Z_TYPE_P(params_entry) == IS_NULL) {
- return (SUCCESS == zend_hash_del(Z_ARRVAL_P(qarray), key, keylen));
- }
-
- /* update */
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(qarray), key, keylen, (void **) &qarray_entry)) {
- zval equal;
-
- /* recursive */
- if (Z_TYPE_P(params_entry) == IS_ARRAY) {
- return http_querystring_modify_array(*qarray_entry, params_entry);
- }
- /* equal */
- if ((SUCCESS == is_equal_function(&equal, *qarray_entry, params_entry TSRMLS_CC)) && Z_BVAL(equal)) {
- return 0;
- }
- }
+ if (qarray && qstring) {
+ if (Z_TYPE_P(qstring) != IS_STRING) {
+ convert_to_string(qstring);
+ }
+
+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, qarray TSRMLS_CC);
+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, qstring TSRMLS_CC);
+#ifdef Z_SET_ISREF
+ Z_SET_ISREF_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC));
+ Z_SET_ISREF_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC));
+#else
+ zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)->is_ref = 1;
+ zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)->is_ref = 1;
+#endif
- /* add */
- ZVAL_ADDREF(params_entry);
- add_assoc_zval_ex(qarray, key, keylen, params_entry);
- return 1;
-}
-static inline int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC)
-{
- int rv = 0;
- char *key;
- uint keylen;
- ulong idx;
- HashPosition pos;
- zval **params_entry;
-
- FOREACH_KEYLENVAL(pos, params, key, keylen, idx, params_entry) {
- if (key) {
- if (http_querystring_modify_array_ex(qarray, key, keylen, *params_entry)) {
- rv = 1;
+ if (params) {
+ http_querystring_modify(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC), params);
}
- } else {
- keylen = spprintf(&key, 0, "%lu", idx);
- if (http_querystring_modify_array_ex(qarray, key, keylen, *params_entry)) {
- rv = 1;
+ if (!defer_update) {
+ http_querystring_update(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC), zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC));
}
- efree(key);
}
- key = NULL;
- }
-
- return rv;
-}
-static inline int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC)
-{
- if (Z_TYPE_P(params) == IS_ARRAY) {
- return http_querystring_modify_array(qarray, params);
- } else if (Z_TYPE_P(params) == IS_OBJECT) {
- if (!instanceof_function(Z_OBJCE_P(params), http_querystring_object_ce TSRMLS_CC)) {
- zval temp_array;
- INIT_ZARR(temp_array, HASH_OF(params));
- return http_querystring_modify_array(qarray, &temp_array);
- }
- return http_querystring_modify_array(qarray, GET_PROP_EX(params, queryArray));
} else {
- int rv;
- zval array;
+ MAKE_STD_ZVAL(qarray);
+ array_init(qarray);
+
+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, qarray TSRMLS_CC);
+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("queryString")-1, "", 0 TSRMLS_CC);
- INIT_PZVAL(&array);
- array_init(&array);
+ if (params && http_querystring_modify(qarray, params) && !defer_update) {
+ http_querystring_update(qarray, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC));
+ }
- 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;
+ zval_ptr_dtor(&qarray);
}
+
+ 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)
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))) {
- RETVAL_ZVAL(*arrval, 1, 0);
+ zval **arrval, *qarray = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC);
+ if ((Z_TYPE_P(qarray) == IS_ARRAY) && (SUCCESS == zend_hash_find(Z_ARRVAL_P(qarray), name, name_len + 1, (void *) &arrval))) {
if (type) {
- convert_to_type(type, return_value);
+ zval *value = http_zsep(type, *arrval);
+ RETVAL_ZVAL(value, 1, 1);
+ } else {
+ RETVAL_ZVAL(*arrval, 1, 0);
}
if (del && (SUCCESS == zend_hash_del(Z_ARRVAL_P(qarray), name, name_len + 1))) {
- http_querystring_update(qarray, GET_PROP(queryString));
+ http_querystring_update(qarray, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC));
}
} else if(defval) {
RETURN_ZVAL(defval, 1, 0);
/* }}} */
/* {{{ 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) {
- 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;
-
- 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;
/* }}} */
/* {{{ proto array HttpQueryString::toArray()
- *
- * Returns the array representation.
- */
+ Returns the array representation. */
PHP_METHOD(HttpQueryString, toArray)
{
NO_ARGS;
/* }}} */
/* {{{ 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;
if (Z_TYPE_P(ztype) == IS_LONG) {
type = Z_LVAL_P(ztype);
} else if(Z_TYPE_P(ztype) == IS_STRING) {
- switch (Z_STRVAL_P(ztype)[0])
- {
+ switch (Z_STRVAL_P(ztype)[0]) {
case 'B':
case 'b': type = HTTP_QUERYSTRING_TYPE_BOOL; break;
case 'I':
/* }}} */
/* {{{ 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;
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶ms)) {
- zval *qarray = GET_PROP(queryArray);
+ zval *qarray = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC);
if (http_querystring_modify(qarray, params)) {
- http_querystring_update(qarray, GET_PROP(queryString));
+ http_querystring_update(qarray, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC));
}
}
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(queryString);
}
}
/* }}} */
+/* {{{ proto HttpQueryString HttpQueryString::mod(mixed params)
+ Copies the query string object and sets provided params at the clone. */
+PHP_METHOD(HttpQueryString, mod)
+{
+ zval *zobj, *qarr, *qstr, *params;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶ms)) {
+ zobj = http_querystring_instantiate(NULL, 0, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC), 1);
+ qarr = zend_read_property(THIS_CE, zobj, ZEND_STRS("queryArray")-1, 0 TSRMLS_CC);
+ qstr = zend_read_property(THIS_CE, zobj, ZEND_STRS("queryString")-1, 0 TSRMLS_CC);
+
+ http_querystring_modify(qarr, params);
+ http_querystring_update(qarr, qstr);
+
+ RETURN_ZVAL(zobj, 1, 1);
+ }
+}
+/* }}} */
+
#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;
- zval *instance = GET_STATIC_PROP(instance);
+ zval *instance = *zend_std_get_static_property(THIS_CE, ZEND_STRS("instance")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC);
SET_EH_THROW_HTTP();
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &global)) {
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);
+ zobj = http_querystring_instantiate(NULL, global, NULL, (zend_bool) !global);
add_index_zval(instance, global, zobj);
RETVAL_OBJECT(zobj, 1);
}
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);
- SET_STATIC_PROP(instance, instance);
+ zend_update_static_property(THIS_CE, ZEND_STRS("instance")-1, instance TSRMLS_CC);
zval_ptr_dtor(&instance);
}
}
HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT);
/* }}} */
-#ifdef HAVE_ICONV
+#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;
RETURN_FALSE;
}
- qa = GET_PROP(queryArray);
- qs = GET_PROP(queryString);
+ qa = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC);
+ qs = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC);
INIT_PZVAL(&xa);
array_init(&xa);
#endif /* HAVE_ICONV */
/* {{{ proto string HttpQueryString::serialize()
- *
- * Implements Serializable.
- */
+ Implements Serializable::serialize(). */
PHP_METHOD(HttpQueryString, serialize)
{
NO_ARGS;
/* }}} */
/* {{{ proto void HttpQueryString::unserialize(string serialized)
- *
- * Implements Serializable.
- */
+ Implements Serializable::unserialize(). */
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));
+ http_querystring_instantiate(getThis(), 0, serialized, 0);
} else {
http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Expected a string as parameter");
}
}
/* }}} */
+/* {{{ proto mixed HttpQueryString::offsetGet(string offset)
+ Implements ArrayAccess::offsetGet(). */
+PHP_METHOD(HttpQueryString, offsetGet)
+{
+ char *offset_str;
+ int offset_len;
+ zval **value;
+
+ if ( (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) &&
+ (SUCCESS == zend_hash_find(Z_ARRVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)), offset_str, offset_len + 1, (void *) &value))) {
+ RETVAL_ZVAL(*value, 1, 0);
+ }
+}
+/* }}} */
+
+/* {{{ proto void HttpQueryString::offsetSet(string offset, mixed value)
+ Implements ArrayAccess::offsetGet(). */
+PHP_METHOD(HttpQueryString, offsetSet)
+{
+ char *offset_str;
+ int offset_len;
+ zval *value;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &offset_str, &offset_len, &value)) {
+ zval *qarr = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC), *qstr = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC);
+
+ ZVAL_ADDREF(value);
+ add_assoc_zval_ex(qarr, offset_str, offset_len + 1, value);
+ http_querystring_update(qarr, qstr);
+ }
+}
+/* }}} */
+
+/* {{{ proto bool HttpQueryString::offsetExists(string offset)
+ Implements ArrayAccess::offsetExists(). */
+PHP_METHOD(HttpQueryString, offsetExists)
+{
+ char *offset_str;
+ int offset_len;
+ zval **value;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) {
+ RETURN_BOOL((SUCCESS == zend_hash_find(Z_ARRVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)), offset_str, offset_len + 1, (void *) &value)) && (Z_TYPE_PP(value) != IS_NULL));
+ }
+}
+/* }}} */
+
+/* {{{ proto void HttpQueryString::offsetUnset(string offset)
+ Implements ArrayAccess::offsetUnset(). */
+PHP_METHOD(HttpQueryString, offsetUnset)
+{
+ char *offset_str;
+ int offset_len;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) {
+ zval *qarr = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC);
+
+ if (SUCCESS == zend_hash_del(Z_ARRVAL_P(qarr), offset_str, offset_len + 1)) {
+ http_querystring_update(qarr, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC));
+ }
+ }
+}
+/* }}} */
+
#endif /* ZEND_ENGINE_2 */
/*
projects / m6w6 / ext-http / blobdiff