/* $Id$ */
+#define HTTP_WANT_SAPI
#include "php_http.h"
#ifdef ZEND_ENGINE_2
+#include "php_variables.h"
#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"
-#define HTTP_BEGIN_ARGS(method, ret_ref, req_args) HTTP_BEGIN_ARGS_EX(HttpQueryString, method, ret_ref, req_args)
-#define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpQueryString, method, ret_ref)
+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpQueryString, method, 0, req_args)
+#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpQueryString, method, 0)
#define HTTP_QUERYSTRING_ME(method, visibility) PHP_ME(HttpQueryString, method, HTTP_ARGS(HttpQueryString, method), visibility)
#define HTTP_QUERYSTRING_GME(method, visibility) PHP_ME(HttpQueryString, method, HTTP_ARGS(HttpQueryString, __getter), visibility)
-HTTP_BEGIN_ARGS(__construct, 0, 0)
+HTTP_BEGIN_ARGS(__construct, 0)
HTTP_ARG_VAL(global, 0)
+ HTTP_ARG_VAL(params, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(getInstance, 0, 0)
+#ifndef WONKY
+HTTP_BEGIN_ARGS(singleton, 0)
HTTP_ARG_VAL(global, 0)
HTTP_END_ARGS;
+#endif
-HTTP_EMPTY_ARGS(__toString, 0);
+HTTP_EMPTY_ARGS(toArray);
+HTTP_EMPTY_ARGS(toString);
-HTTP_BEGIN_ARGS(get, 0, 0)
+HTTP_BEGIN_ARGS(get, 0)
HTTP_ARG_VAL(name, 0)
HTTP_ARG_VAL(type, 0)
HTTP_ARG_VAL(defval, 0)
HTTP_ARG_VAL(delete, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(set, 0, 2)
- HTTP_ARG_VAL(name, 0)
- HTTP_ARG_VAL(value, 0)
-HTTP_END_ARGS;
-
-HTTP_BEGIN_ARGS(del, 0, 1)
+HTTP_BEGIN_ARGS(set, 1)
HTTP_ARG_VAL(params, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(mod, 0, 1)
- HTTP_ARG_VAL(params, 0)
-HTTP_END_ARGS;
-
-HTTP_BEGIN_ARGS(__getter, 0, 1)
+HTTP_BEGIN_ARGS(__getter, 1)
HTTP_ARG_VAL(name, 0)
HTTP_ARG_VAL(defval, 0)
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[] = {
HTTP_QUERYSTRING_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR|ZEND_ACC_FINAL)
- HTTP_QUERYSTRING_ME(__toString, ZEND_ACC_PUBLIC)
+
+ HTTP_QUERYSTRING_ME(toArray, ZEND_ACC_PUBLIC)
+ HTTP_QUERYSTRING_ME(toString, ZEND_ACC_PUBLIC)
+ ZEND_MALIAS(HttpQueryString, __toString, toString, HTTP_ARGS(HttpQueryString, toString), ZEND_ACC_PUBLIC)
+
HTTP_QUERYSTRING_ME(get, ZEND_ACC_PUBLIC)
HTTP_QUERYSTRING_ME(set, ZEND_ACC_PUBLIC)
- HTTP_QUERYSTRING_ME(del, ZEND_ACC_PUBLIC)
- HTTP_QUERYSTRING_ME(mod, ZEND_ACC_PUBLIC)
- HTTP_QUERYSTRING_ME(getInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
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)
+#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;
{
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);
}
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);
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;
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_array(a, k, l, v) _http_querystring_modify_array((a), (k), (l), (v) TSRMLS_CC)
-static inline int _http_querystring_modify_array(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 + 1)) {
- return 0;
- }
- } else {
- ZVAL_ADDREF(data);
- add_assoc_zval(qarray, key, data);
- }
- return 1;
-}
-
+/* {{{ 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)
{
return zobj;
}
+#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) {
RETURN_ZVAL(defval, 1, 0);
}
}
+/* }}} */
-/* {{{ proto void HttpQueryString::__construct([bool global = true])
+/* {{{ 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.
PHP_METHOD(HttpQueryString, __construct)
{
zend_bool global = 1;
- zval *qarray = NULL, *qstring = NULL, **_GET, **_SERVER, **QUERY_STRING;
+ 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, "|b", &global)) {
+ 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");
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));
+ }
}
}
SET_EH_NORMAL();
}
/* }}} */
-/* {{{ proto string HttpQueryString::__toString()
+/* {{{ proto string HttpQueryString::toString()
*
* Returns the string representation.
*/
-PHP_METHOD(HttpQueryString, __toString)
+PHP_METHOD(HttpQueryString, toString)
{
NO_ARGS;
RETURN_PROP(queryString);
}
/* }}} */
+/* {{{ proto array HttpQueryString::toArray()
+ *
+ * Returns the array representation.
+ */
+PHP_METHOD(HttpQueryString, toArray)
+{
+ NO_ARGS;
+ RETURN_PROP(queryArray);
+}
+/* }}} */
+
/* {{{ proto mixed HttpQueryString::get([string key[, mixed type = 0[, mixed defval = NULL[, bool delete = false]]]])
*
* Get (part of) the query string.
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;
}
}
}
/* }}} */
-/* {{{ proto string HttpQueryString::set(string name, mixed value)
+/* {{{ proto string HttpQueryString::set(mixed params)
*
- * Set a query string entry.
+ * Set query string entry/entries. NULL values will unset the variable.
*/
PHP_METHOD(HttpQueryString, set)
-{
- char *name;
- int name_len;
- zval *value;
-
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &name, &name_len, &value)) {
- zval *qarray = GET_PROP(queryArray);
-
- if (http_querystring_modify_array(qarray, name, name_len, value)) {
- http_querystring_update(qarray, GET_PROP(queryString));
- }
- }
-
- IF_RETVAL_USED {
- RETURN_PROP(queryString);
- }
-}
-/* }}} */
-
-/* {{{ proto string HttpQueryString::del(mixed param)
- *
- * Deletes entry/entries from the query string.
- */
-PHP_METHOD(HttpQueryString, del)
{
zval *params;
-
+
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶ms)) {
zval *qarray = GET_PROP(queryArray);
-
- if (Z_TYPE_P(qarray) == IS_ARRAY) {
- if (Z_TYPE_P(params) == IS_ARRAY) {
- HashPosition pos;
- zval **name;
-
- FOREACH_VAL(pos, params, name) {
- ZVAL_ADDREF(*name);
- convert_to_string_ex(name);
- zend_hash_del(Z_ARRVAL_P(qarray), Z_STRVAL_PP(name), Z_STRLEN_PP(name) + 1);
- zval_ptr_dtor(name);
- }
-
- http_querystring_update(qarray, GET_PROP(queryString));
- } else {
- ZVAL_ADDREF(params);
- convert_to_string_ex(¶ms);
- if (SUCCESS == zend_hash_del(Z_ARRVAL_P(qarray), Z_STRVAL_P(params), Z_STRLEN_P(params) + 1)) {
- http_querystring_update(qarray, GET_PROP(queryString));
- }
- zval_ptr_dtor(¶ms);
- }
- }
- }
- IF_RETVAL_USED {
- RETURN_PROP(queryString);
- }
-}
-/* }}} */
-
-/* {{{ proto string HttpQueryString::mod(array params)
- *
- * Modifies the query string according to params. NULL values will unset the variable.
- */
-PHP_METHOD(HttpQueryString, mod)
-{
- zval *params;
-
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b", ¶ms)) {
- zval **value, *qarray = GET_PROP(queryArray);
- HashPosition pos;
- char *key = NULL;
- uint keylen = 0;
- ulong idx = 0;
-
- FOREACH_KEYLENVAL(pos, params, key, keylen, idx, value) {
- if (key) {
- http_querystring_modify_array(qarray, key, keylen, *value);
- } else {
- keylen = spprintf(&key, 0, "%lu", idx);
- http_querystring_modify_array(qarray, key, keylen, *value);
- efree(key);
- }
- key = NULL;
+ if (http_querystring_modify(qarray, params)) {
+ http_querystring_update(qarray, GET_PROP(queryString));
}
-
- http_querystring_update(qarray, GET_PROP(queryString));
}
IF_RETVAL_USED {
}
/* }}} */
-/* {{{ proto HttpQueryString HttpQueryString::getInstance([bool global = true])
+#ifndef WONKY
+/* {{{ 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);
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);
SET_EH_NORMAL();
}
/* }}} */
+#endif
/* {{{ Getters by type */
#define HTTP_QUERYSTRING_GETTER(method, TYPE) \
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 */
/*