diff options
author | Dan Kalowsky <kalowsky@php.net> | 2001-02-26 15:17:12 +0000 |
---|---|---|
committer | Dan Kalowsky <kalowsky@php.net> | 2001-02-26 15:17:12 +0000 |
commit | d883ff47ed8563107e686cb5ec18a99a1c81d5ff (patch) | |
tree | e0d556002abf5a0e5fc183218a15b3593b84d29b /ext/imap/php_imap.c | |
parent | 08d3e700fa0f8debcf8364ee4cca6c31771619c5 (diff) | |
download | php-git-d883ff47ed8563107e686cb5ec18a99a1c81d5ff.tar.gz |
Correctly checks for the proper header files, and excludes the QUOTA functions
from non-imap2000 systems (unavailable for testing at this time).
# anyone willing to test this out on non-imap2000?
PR:
Submitted by:
Reviewed by: Sascha Schumann
Obtained from:
Diffstat (limited to 'ext/imap/php_imap.c')
-rw-r--r-- | ext/imap/php_imap.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index a52e6fe318..8e4a3b91f7 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -101,8 +101,10 @@ function_entry imap_functions[] = { PHP_FE(imap_createmailbox, NULL) PHP_FE(imap_renamemailbox, NULL) PHP_FE(imap_deletemailbox, NULL) +#ifdef HAVE_IMAP2000 PHP_FE(imap_get_quota, NULL) PHP_FE(imap_set_quota, NULL) +#endif PHP_FALIAS(imap_listmailbox, imap_list, NULL) PHP_FALIAS(imap_getmailboxes, imap_list_full, NULL) PHP_FALIAS(imap_scanmailbox, imap_listscan, NULL) @@ -357,6 +359,7 @@ MESSAGELIST *mail_newmessagelist(void) sizeof(MESSAGELIST)); } +#ifdef HAVE_IMAP2000 /* Mail GET_QUOTA callback * Called via the mail_parameter function in c-client:src/c-client/mail.c * Author DRK @@ -370,6 +373,7 @@ void mail_getquota(MAILSTREAM *stream, char *qroot,QUOTALIST *qlist) IMAPG(quota_limit) = qlist->limit; } } +#endif /* Mail garbage collect MESSAGELIST * Accepts: pointer to MESSAGELIST pointer @@ -547,12 +551,13 @@ PHP_MINIT_FUNCTION(imap) /* 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 */ @@ -1011,7 +1016,7 @@ PHP_FUNCTION(imap_num_recent) } /* }}} */ - +#ifdef HAVE_IMAP2000 /* {{{ proto array imap_get_quota(int stream_id, string qroot) Returns the quota set to the mailbox account qroot */ PHP_FUNCTION(imap_get_quota) @@ -1053,7 +1058,6 @@ PHP_FUNCTION(imap_get_quota) } /* }}} */ - /* {{{ 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) @@ -1084,6 +1088,7 @@ PHP_FUNCTION(imap_set_quota) RETURN_LONG(imap_setquota(imap_le_struct->imap_stream, Z_STRVAL_PP(qroot), &limits)); } /* }}} */ +#endif /* {{{ proto int imap_expunge(int stream_id) |