diff options
| author | Christophe Nowicki <cnowicki@easter-eggs.com> | 2004-08-17 15:25:58 +0000 |
|---|---|---|
| committer | Christophe Nowicki <cnowicki@easter-eggs.com> | 2004-08-17 15:25:58 +0000 |
| commit | 73c8f9754b3cb6812a26a68dc581c20f98c1a448 (patch) | |
| tree | f360f2c1a7e2e68a096af3b7c53a5f523c2cce33 /php | |
| parent | ac83eafc8248e724cf7e014ca37e6cf49cf1a7c7 (diff) | |
| download | lasso-73c8f9754b3cb6812a26a68dc581c20f98c1a448.tar.gz lasso-73c8f9754b3cb6812a26a68dc581c20f98c1a448.tar.xz lasso-73c8f9754b3cb6812a26a68dc581c20f98c1a448.zip | |
fix cvs sticky state problem.
Diffstat (limited to 'php')
| -rw-r--r-- | php/environs/lasso_profile.c | 35 | ||||
| -rw-r--r-- | php/environs/lasso_server.c | 4 |
2 files changed, 32 insertions, 7 deletions
diff --git a/php/environs/lasso_profile.c b/php/environs/lasso_profile.c index ecaa0137..1b631f96 100644 --- a/php/environs/lasso_profile.c +++ b/php/environs/lasso_profile.c @@ -244,7 +244,7 @@ PHP_FUNCTION(lasso_profile_get_msg_relaystate) { /* }}} */ -/* {{{ proto string lasso_profile_get_identity(resource ctx) */ +/* {{{ proto resource lasso_profile_get_identity(resource ctx) */ PHP_FUNCTION(lasso_profile_get_identity) { LassoProfile *ctx; LassoIdentity *identity; @@ -264,12 +264,14 @@ PHP_FUNCTION(lasso_profile_get_identity) { ZEND_FETCH_RESOURCE(ctx, LassoProfile *, &parm, -1, le_lassoprofile_name, le_lassoprofile); identity = lasso_profile_get_identity(ctx); + + // zend_printf("value of %p\n", identity); ZEND_REGISTER_RESOURCE(return_value, identity, le_lassoidentity); } /* }}} */ -/* {{{ proto string lasso_profile_is_identity_dirty(resource ctx) */ +/* {{{ proto bool lasso_profile_is_identity_dirty(resource ctx) */ PHP_FUNCTION(lasso_profile_is_identity_dirty) { LassoProfile *ctx; @@ -293,7 +295,7 @@ PHP_FUNCTION(lasso_profile_is_identity_dirty) { } /* }}} */ -/* {{{ proto string lasso_profile_get_session(resource ctx) */ +/* {{{ proto lasso_profile_get_session(resource ctx) */ PHP_FUNCTION(lasso_profile_get_session) { LassoProfile *ctx; LassoSession *session; @@ -318,7 +320,7 @@ PHP_FUNCTION(lasso_profile_get_session) { } /* }}} */ -/* {{{ proto string lasso_profile_is_session_dirty(resource ctx) */ +/* {{{ proto bool lasso_profile_is_session_dirty(resource ctx) */ PHP_FUNCTION(lasso_profile_is_session_dirty) { LassoProfile *ctx; @@ -341,3 +343,28 @@ PHP_FUNCTION(lasso_profile_is_session_dirty) { RETURN_BOOL(ret); } /* }}} */ + + +/* {{{ proto string lasso_profile_get_nameidentifier(resource ctx) */ +PHP_FUNCTION(lasso_profile_get_nameidentifier) { + LassoProfile *ctx; + + + zval *parm; + + int num_args; + int ret; + + if ((num_args = ZEND_NUM_ARGS()) != 1) + WRONG_PARAM_COUNT + + if (zend_parse_parameters(num_args TSRMLS_CC, "z", &parm) == FAILURE) { + return; + } + + ZEND_FETCH_RESOURCE(ctx, LassoProfile *, &parm, -1, le_lassoprofile_name, le_lassoprofile); + + if (ctx->nameIdentifier) + RETURN_STRING(ctx->nameIdentifier, 1); +} +/* }}} */ diff --git a/php/environs/lasso_server.c b/php/environs/lasso_server.c index 15af83ab..d2355c64 100644 --- a/php/environs/lasso_server.c +++ b/php/environs/lasso_server.c @@ -102,7 +102,7 @@ PHP_FUNCTION(lasso_server_add_provider) { } /* }}} */ -/* {{{ proto string lasso_server_new(resource server) */ +/* {{{ proto string lasso_server_dump(resource server) */ PHP_FUNCTION(lasso_server_dump) { LassoServer *server; @@ -176,5 +176,3 @@ PHP_FUNCTION(lasso_server_new_from_dump) { ZEND_REGISTER_RESOURCE(return_value, server, le_lassoserver); } /* }}} */ - - |