cvs: php4 /ext/ircg ircg.c

sas Mon Aug 6 02:19:53 2001 EDT Modified files: /php4/ext/ircg ircg.c Log: support room keys Index: php4/ext/ircg/ircg.c diff -u php4/ext/ircg/ircg.c:1.97 php4/ext/ircg/ircg.c:1.98 --- php4/ext/ircg/ircg.c:1.97 Fri Aug 3 07:14:38 2001 +++ php4/ext/ircg/ircg.c Mon Aug 6 02:19:52 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ircg.c,v 1.97 2001/08/03 11:14:38 sas Exp $ */ +/* $Id: ircg.c,v 1.98 2001/08/06 06:19:52 sas Exp $ */ #include <time.h> @@ -1081,20 +1081,28 @@ PHP_FUNCTION(ircg_join) { - zval **p1, **p2; + zval **p1, **p2, **p3; php_irconn_t *conn; + char *key = NULL; - if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &p1, &p2) == FAILURE) + if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 3 + || zend_get_parameters_ex(ZEND_NUM_ARGS(), &p1, &p2, &p3) == FAILURE) WRONG_PARAM_COUNT; convert_to_long_ex(p1); convert_to_string_ex(p2); + if (ZEND_NUM_ARGS() > 2) { + convert_to_string_ex(p3); + key = Z_STRVAL_PP(p3); + } + conn = lookup_irconn(Z_LVAL_PP(p1)); if (!conn) RETURN_FALSE; - irc_join(&conn->conn, Z_STRVAL_PP(p2), NULL, conn); + irc_join(&conn->conn, Z_STRVAL_PP(p2), key, conn); + RETVAL_TRUE; }