summaryrefslogtreecommitdiff
path: root/php/patches/php-5.2.3
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2009-05-18 08:45:59 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2009-05-18 08:45:59 (GMT)
commit2f1da3da4d4d18e59c80de94490da6f9e72bdf8d (patch)
tree462821f9495ad253b761f7b8b19240ec7d157ad4 /php/patches/php-5.2.3
parent9e5908e4e6887534b0be96f246ed46fb49af5837 (diff)
downloadserver-2f1da3da4d4d18e59c80de94490da6f9e72bdf8d.tar.gz
Moved php patches from the server/patches dir into server/php.
Diffstat (limited to 'php/patches/php-5.2.3')
-rw-r--r--php/patches/php-5.2.3/KOLAB_Annotations.patch264
1 files changed, 264 insertions, 0 deletions
diff --git a/php/patches/php-5.2.3/KOLAB_Annotations.patch b/php/patches/php-5.2.3/KOLAB_Annotations.patch
new file mode 100644
index 0000000..a0ca6c2
--- /dev/null
+++ b/php/patches/php-5.2.3/KOLAB_Annotations.patch
@@ -0,0 +1,264 @@
+Provides get/set ANNOTATIONS support to php. [Version: 5.2.3]
+
+diff -r 3bd462c02589 ext/imap/php_imap.c
+--- a/ext/imap/php_imap.c Sat Sep 29 12:38:38 2007 +0200
++++ b/ext/imap/php_imap.c Sat Sep 29 12:47:11 2007 +0200
+@@ -129,6 +129,7 @@ zend_function_entry imap_functions[] = {
+ PHP_FE(imap_binary, NULL)
+ PHP_FE(imap_utf8, NULL)
+ PHP_FE(imap_status, NULL)
++ PHP_FE(imap_status_current, NULL)
+ PHP_FE(imap_mailboxmsginfo, NULL)
+ PHP_FE(imap_setflag_full, NULL)
+ PHP_FE(imap_clearflag_full, NULL)
+@@ -155,6 +156,10 @@ zend_function_entry imap_functions[] = {
+ PHP_FE(imap_setacl, NULL)
+ PHP_FE(imap_getacl, NULL)
+ #endif
++#if defined(HAVE_IMAP2005)
++ PHP_FE(imap_setannotation, NULL)
++ PHP_FE(imap_getannotation, NULL)
++#endif
+
+ PHP_FE(imap_mail, NULL)
+
+@@ -415,6 +420,30 @@ void mail_getacl(MAILSTREAM *stream, cha
+
+ #endif
+
++
++#if defined(HAVE_IMAP2005)
++/* {{{ mail_getannotation
++ *
++ * Mail GET_ANNOTATION callback
++ * Called via the mail_parameter function in c-client:src/c-client/mail.c
++ */
++void mail_getannotation(MAILSTREAM *stream, ANNOTATION *alist)
++{
++ ANNOTATION_VALUES *cur;
++
++ TSRMLS_FETCH();
++
++ /* walk through the ANNOTATION_VALUES */
++
++ for(cur = alist->values; cur; cur = cur->next) {
++ if (cur->value)
++ add_assoc_stringl(IMAPG(imap_annotation_list), cur->attr, cur->value, strlen(cur->value), 1);
++ else
++ add_assoc_stringl(IMAPG(imap_annotation_list), cur->attr, "", 0, 1);
++ }
++}
++/* }}} */
++#endif
+
+ /* {{{ PHP_GINIT_FUNCTION
+ */
+@@ -1092,6 +1121,122 @@ PHP_FUNCTION(imap_getacl)
+
+ #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
+
++#if defined(HAVE_IMAP2005)
++
++/* {{{ proto bool imap_setannotation(resource stream_id, string mailbox, string entry, string attr, string value)
++ Sets an annotation for a given mailbox */
++PHP_FUNCTION(imap_setannotation)
++{
++ zval **streamind, **mailbox, **entry, **attr, **value;
++ pils *imap_le_struct;
++ long ret;
++
++ // TODO: Use zend_parse_parameters here
++ if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(5, &streamind, &mailbox, &entry, &attr, &value) == FAILURE) {
++ ZEND_WRONG_PARAM_COUNT();
++ }
++
++ ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
++
++ convert_to_string_ex(mailbox);
++ convert_to_string_ex(entry);
++ convert_to_string_ex(attr);
++ convert_to_string_ex(value);
++
++ // create annotation object
++ ANNOTATION *annotation = mail_newannotation();
++ if (!annotation)
++ RETURN_FALSE;
++ annotation->values = mail_newannotationvalue();
++ if (!annotation->values) {
++ mail_free_annotation(&annotation);
++ RETURN_FALSE;
++ }
++
++ // fill in annotation values
++ annotation->mbox = Z_STRVAL_PP(mailbox);
++ annotation->entry = Z_STRVAL_PP(entry);
++ annotation->values->attr = Z_STRVAL_PP(attr);
++ annotation->values->value = Z_STRVAL_PP(value);
++
++ ret = imap_setannotation(imap_le_struct->imap_stream, annotation);
++
++ // make sure mail_free_annotation doesn't free our variables
++ annotation->mbox = NULL;
++ annotation->entry = NULL;
++ annotation->values->attr = NULL;
++ annotation->values->value = NULL;
++ mail_free_annotation(&annotation);
++
++ RETURN_BOOL(ret);
++}
++/* }}} */
++
++/* {{{ proto array imap_getannotation(resource stream_id, string mailbox, string entry, string attr)
++ Gets the ACL for a given mailbox */
++PHP_FUNCTION(imap_getannotation)
++{
++ zval **streamind, **mailbox, **entry, **attr;
++ pils *imap_le_struct;
++ long ret;
++
++ if(ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &streamind, &mailbox, &entry, &attr) == FAILURE) {
++ ZEND_WRONG_PARAM_COUNT();
++ }
++
++ ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
++
++ convert_to_string_ex(mailbox);
++ convert_to_string_ex(entry);
++ convert_to_string_ex(attr);
++
++ /* initializing the special array for the return values */
++ if (array_init(return_value) == FAILURE) {
++ RETURN_FALSE;
++ }
++
++ // fillup calling parameters
++ STRINGLIST *entries = mail_newstringlist();
++ if (!entries)
++ RETURN_FALSE;
++
++ STRINGLIST *cur = entries;
++ cur->text.data = (unsigned char *)cpystr(Z_STRVAL_PP(entry));
++ cur->text.size = Z_STRLEN_PP(entry);
++ cur->next = NIL;
++
++ STRINGLIST *attributes = mail_newstringlist();
++ cur = attributes;
++ cur->text.data = (unsigned char *)cpystr (Z_STRVAL_PP(attr));
++ cur->text.size = Z_STRLEN_PP(attr);
++ cur->next = NIL;
++
++ /* initializing the special array for the return values */
++ if (array_init(return_value) == FAILURE) {
++ mail_free_stringlist(&entries);
++ mail_free_stringlist(&attributes);
++ RETURN_FALSE;
++ }
++
++ IMAPG(imap_annotation_list) = return_value;
++
++ /* set the callback for the GET_ANNOTATION function */
++ mail_parameters(NIL, SET_ANNOTATION, (void *) mail_getannotation);
++ ret = imap_getannotation(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox), entries, attributes);
++
++ mail_free_stringlist(&entries);
++ mail_free_stringlist(&attributes);
++
++ if (!ret) {
++ zval_dtor(return_value);
++ RETURN_FALSE;
++ }
++
++ IMAPG(imap_annotation_list) = NIL;
++}
++/* }}} */
++
++#endif /* HAVE_IMAP2005 */
+
+ /* {{{ proto bool imap_expunge(resource stream_id)
+ Permanently delete all messages marked for deletion */
+@@ -2699,6 +2844,42 @@ PHP_FUNCTION(imap_msgno)
+ convert_to_long_ex(msgno);
+
+ RETURN_LONG(mail_msgno(imap_le_struct->imap_stream, Z_LVAL_PP(msgno)));
++}
++/* }}} */
++
++/* {{{ proto object imap_status_current(resource stream_id, int options)
++ Get (cached) status info from current mailbox */
++PHP_FUNCTION(imap_status_current)
++{
++ zval **streamind, **pflags;
++ pils *imap_le_struct;
++ long flags = 0L;
++
++ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &pflags) == FAILURE) {
++ ZEND_WRONG_PARAM_COUNT();
++ }
++
++ ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
++
++ convert_to_long_ex(pflags);
++ flags = Z_LVAL_PP(pflags);
++
++ if (object_init(return_value) == FAILURE) {
++ RETURN_FALSE;
++ }
++
++ if (flags & SA_MESSAGES) {
++ add_property_long(return_value, "messages", imap_le_struct->imap_stream->nmsgs);
++ }
++ if (flags & SA_RECENT) {
++ add_property_long(return_value, "recent", imap_le_struct->imap_stream->recent);
++ }
++ if (flags & SA_UIDNEXT) {
++ add_property_long(return_value, "uidnext", imap_le_struct->imap_stream->uid_last+1);
++ }
++ if (flags & SA_UIDVALIDITY) {
++ add_property_long(return_value, "uidvalidity", imap_le_struct->imap_stream->uid_validity);
++ }
+ }
+ /* }}} */
+
+diff -r 3bd462c02589 ext/imap/php_imap.h
+--- a/ext/imap/php_imap.h Sat Sep 29 12:38:38 2007 +0200
++++ b/ext/imap/php_imap.h Sat Sep 29 12:47:11 2007 +0200
+@@ -152,6 +152,7 @@ PHP_FUNCTION(imap_lsub_full);
+ PHP_FUNCTION(imap_lsub_full);
+ PHP_FUNCTION(imap_create);
+ PHP_FUNCTION(imap_rename);
++PHP_FUNCTION(imap_status_current);
+ PHP_FUNCTION(imap_status);
+ PHP_FUNCTION(imap_bodystruct);
+ PHP_FUNCTION(imap_fetch_overview);
+@@ -168,6 +169,9 @@ PHP_FUNCTION(imap_thread);
+ PHP_FUNCTION(imap_thread);
+ PHP_FUNCTION(imap_timeout);
+
++// TODO: Needs fixing in configure in
++#define HAVE_IMAP2005 1
++
+ #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+ PHP_FUNCTION(imap_get_quota);
+ PHP_FUNCTION(imap_get_quotaroot);
+@@ -175,7 +179,10 @@ PHP_FUNCTION(imap_setacl);
+ PHP_FUNCTION(imap_setacl);
+ PHP_FUNCTION(imap_getacl);
+ #endif
+-
++#if defined(HAVE_IMAP2005)
++PHP_FUNCTION(imap_setannotation);
++PHP_FUNCTION(imap_getannotation);
++#endif
+
+ ZEND_BEGIN_MODULE_GLOBALS(imap)
+ char *imap_user;
+@@ -206,6 +213,9 @@ ZEND_BEGIN_MODULE_GLOBALS(imap)
+ zval **quota_return;
+ zval *imap_acl_list;
+ #endif
++#if defined(HAVE_IMAP2005)
++ zval *imap_annotation_list;
++#endif
+ /* php_stream for php_mail_gets() */
+ php_stream *gets_stream;
+ ZEND_END_MODULE_GLOBALS(imap)