diff -Nur php-5.2.5/ext/imap/php_imap.c php-5.2.5-ws/ext/imap/php_imap.c --- php-5.2.5/ext/imap/php_imap.c 2007-07-30 21:31:10.000000000 -0300 +++ php-5.2.5-ws/ext/imap/php_imap.c 2008-01-27 20:32:53.540813138 -0200 @@ -154,6 +154,7 @@ PHP_FE(imap_set_quota, NULL) PHP_FE(imap_setacl, NULL) PHP_FE(imap_getacl, NULL) + PHP_FE(imap_myrights, NULL) #endif PHP_FE(imap_mail, NULL) @@ -413,6 +414,20 @@ } /* }}} */ +/* {{{ mail_myrights + * + * Mail MYRIGHTS callback + * Called via the mail_parameter function in c-client:src/c-client/mail.c + */ +void mail_myrights(MAILSTREAM *stream, char *mailbox, char *rights) +{ + TSRMLS_FETCH(); + + ZVAL_STRING(IMAPG(imap_acl_list), rights, 1) + +} +/* }}} */ + #endif @@ -1090,6 +1105,38 @@ } /* }}} */ +/* {{{ proto array imap_getacl(resource stream_id, string mailbox) + Gets the ACL for a given mailbox */ +PHP_FUNCTION(imap_myrights) +{ + zval **streamind, **mailbox; + pils *imap_le_struct; + + if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &mailbox) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_string_ex(mailbox); + + /* initializing the special array for the return values */ + array_init(return_value); + + IMAPG(imap_acl_list) = return_value; + + /* set the callback for the GET_ACL function */ + mail_parameters(NIL, SET_MYRIGHTS, (void *) mail_myrights); + if(!imap_myrights(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox))) { + php_error(E_WARNING, "c-client imap_myrights failed"); + zval_dtor(return_value); + RETURN_FALSE; + } + + IMAPG(imap_acl_list) = NIL; +} +/* }}} */ + #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ diff -Nur php-5.2.5/ext/imap/php_imap.h php-5.2.5-ws/ext/imap/php_imap.h --- php-5.2.5/ext/imap/php_imap.h 2007-01-01 06:36:02.000000000 -0300 +++ php-5.2.5-ws/ext/imap/php_imap.h 2008-01-27 19:48:45.030813138 -0200 @@ -174,6 +174,7 @@ PHP_FUNCTION(imap_set_quota); PHP_FUNCTION(imap_setacl); PHP_FUNCTION(imap_getacl); +PHP_FUNCTION(imap_myrights); #endif