cvs: php4 /ext/imap php_imap.c

kalowsky Mon Feb 26 08:36:08 2001 EDT Modified files: /php4/ext/imap php_imap.c Log: # Bad patch job on the last commit by me. I take the BAD_CODER award for # the day. Removes two unnecessary REGISTER_MAIN_LONG_CONSTANT's. # what should be done about the PHP_MINFO_FUNCTION Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.60 php4/ext/imap/php_imap.c:1.61 --- php4/ext/imap/php_imap.c:1.60 Mon Feb 26 07:17:12 2001 +++ php4/ext/imap/php_imap.c Mon Feb 26 08:36:08 2001 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.60 2001/02/26 15:17:12 kalowsky Exp $ */ +/* $Id: php_imap.c,v 1.61 2001/02/26 16:36:08 kalowsky Exp $ */ #define IMAP41 @@ -551,14 +551,6 @@ /* next UID to be assigned */ REGISTER_MAIN_LONG_CONSTANT("SA_UIDVALIDITY",SA_UIDVALIDITY , CONST_PERSISTENT | CONST_CS); /* UID validity value */ -#ifdef HAVE_IMAP2000 - sa_all |= GET_QUOTA; - REGISTER_MAIN_LONG_CONSTANT("GET_QUOTA",GET_QUOTA , CONST_PERSISTENT | CONST_CS); - /* Disk space taken up by mailbox. */ - sa_all |= GET_QUOTAROOT; - REGISTER_MAIN_LONG_CONSTANT("GET_QUOTAROOT",GET_QUOTAROOT , CONST_PERSISTENT | CONST_CS); -#endif - /* Disk space taken up by all mailboxes owned by user. */ REGISTER_MAIN_LONG_CONSTANT("SA_ALL", sa_all, CONST_PERSISTENT | CONST_CS); /* get all status information */ @@ -1042,12 +1034,13 @@ /* set the callback for the GET_QUOTA function */ mail_parameters(NIL, SET_QUOTA, (void *) mail_getquota); - if(!imap_getquota(imap_le_struct->imap_stream, Z_STRVAL_PP(qroot))) { php_error(E_WARNING, "c-client imap_getquota failed"); RETURN_FALSE; } + /* MAKE_STD_ZVAL(quota_array); */ + /* if (array_init(quota_array) != SUCCESS) { */ if (array_init(return_value) == FAILURE) { php_error(E_WARNING, "Unable to allocate array memory"); RETURN_FALSE; @@ -1058,6 +1051,7 @@ } /* }}} */ + /* {{{ proto int imap_set_quota(int stream_id, string qroot, int mailbox_size) Will set the quota for qroot mailbox */ PHP_FUNCTION(imap_set_quota) @@ -1085,7 +1079,7 @@ php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } - RETURN_LONG(imap_setquota(imap_le_struct->imap_stream, Z_STRVAL_PP(qroot), &limits)); + RETURN_LONG(imap_setquota(imap_le_struct->imap_stream, Z_STRVAL_PP(qroot), &limits)); } /* }}} */ #endif