openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 55b2e17c3e48de9cf5113eda780a7cb6b1ed09bf
parent 6c903f95ea2512d20cd0fe30141ea4a6fccaa589
Author: dankert <devnull@localhost>
Date:   Fri,  5 Nov 2010 23:10:35 +0100

Merge

Diffstat:
actionClasses/IndexAction.ini.php | 4++--
config/security.ini.php | 31+++++++++++++++++++++++++++++--
2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/actionClasses/IndexAction.ini.php b/actionClasses/IndexAction.ini.php @@ -24,8 +24,8 @@ goto=show [applications] menu=menu -;[userinfo] -; +[userinfo] +direct=true [project] goto=show diff --git a/config/security.ini.php b/config/security.ini.php @@ -49,11 +49,11 @@ use_post_token=true ; Creates a new Session on login. ; Useful against session fixation attacks. -renew_session_login=true +renew_session_login=false ; Creates a new Session on logout. ; Useful against session fixation attacks. -renew_session_logout=true +renew_session_logout=false @@ -225,6 +225,32 @@ trusted_server= ; Should Users fullname and e-mail updated from the OpenId-Server? update_user=true +; Using User-Identitys? +user_identity=true + +; List of OpenId-Provider to use +; Special name "identity" for user defined identitys +;provider=example +provider=google + +; location of the providers Yadis-document (XRDS-file) +provider.example.xrds_uri=http://google.com/accounts +; which attribute is used for mappin to the internal database +;provider.example.map_attribute=email +; which attribut of internal user database is used +; valid values are 'mail', 'username' +;provider.example.map_internal=mail + +; Google supports Open-Id 2.0 +provider.google.xrds_uri=http://google.com/accounts/o8/id +provider.google.map_attribute=email +provider.google.map_internal=mail + +; Yahoo +provider.yahoo.xrds_uri=http://?????? +provider.yahoo.map_attribute=usename +provider.yahoo.map_internal=mail + ; Single Sign-on @@ -266,6 +292,7 @@ expect_regexp="/running on/" username_regexp="/running on localhost as ([a-z]+)@localhost/" + ; Settings for a new user [newuser]