From 55fb40f07d6fe18df35aa03cceafce0ff15e28e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Fri, 9 Jan 2009 08:14:00 +0000
Subject: [PATCH] Remove embedded doc in authproc filters. Moved to separate
doc.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1111 44740490-163a-0410-bde0-09ae8108e29a
---
.../core/lib/Auth/Process/AttributeAdd.php | 21 -------------------
.../core/lib/Auth/Process/AttributeLimit.php | 7 -------
.../core/lib/Auth/Process/AttributeMap.php | 14 -------------
modules/core/lib/Auth/Process/TargetedID.php | 6 +++---
www/saml2/idp/SingleLogoutServiceiFrame.php | 3 ++-
5 files changed, 5 insertions(+), 46 deletions(-)
diff --git a/modules/core/lib/Auth/Process/AttributeAdd.php b/modules/core/lib/Auth/Process/AttributeAdd.php
index ab98be857..62b5e80d6 100644
--- a/modules/core/lib/Auth/Process/AttributeAdd.php
+++ b/modules/core/lib/Auth/Process/AttributeAdd.php
@@ -5,27 +5,6 @@
*
* This filter allows you to add attributes to the attribute set being processed.
*
- * Example - add attribute, single value:
- * <code>
- * 'authproc' => array(
- * 50 => array('class' => 'core:AttributeAdd', 'source' => 'myidp'),
- * ),
- * </code>
- *
- * Examle - add attribute, multiple values:
- * <code>
- * 'authproc' => array(
- * 50 => array('class' => 'core:AttributeAdd', 'groups' => array('users', 'members')),
- * ),
- * </code>
- *
- * Examle - replace attribute, single value:
- * <code>
- * 'authproc' => array(
- * 50 => array('class' => 'core:AttributeAdd', '%replace', 'uid' => array('guest')),
- * ),
- * </code>
- *
* @author Olav Morken, UNINETT AS.
* @package simpleSAMLphp
* @version $Id$
diff --git a/modules/core/lib/Auth/Process/AttributeLimit.php b/modules/core/lib/Auth/Process/AttributeLimit.php
index 0cf1a3f9b..53ac65212 100644
--- a/modules/core/lib/Auth/Process/AttributeLimit.php
+++ b/modules/core/lib/Auth/Process/AttributeLimit.php
@@ -3,13 +3,6 @@
/**
* A filter for limiting which attributes are passed on.
*
- * Example - remove all attributes except 'cn' and 'mail':
- * <code>
- * 'authproc' => array(
- * 50 => array('class' => 'core:AttributeLimit', 'cn', 'mail'),
- * ),
- * </code>
- *
* @author Olav Morken, UNINETT AS.
* @package simpleSAMLphp
* @version $Id$
diff --git a/modules/core/lib/Auth/Process/AttributeMap.php b/modules/core/lib/Auth/Process/AttributeMap.php
index 5209f8430..b9a8f3170 100644
--- a/modules/core/lib/Auth/Process/AttributeMap.php
+++ b/modules/core/lib/Auth/Process/AttributeMap.php
@@ -3,20 +3,6 @@
/**
* Attribute filter for renaming attributes.
*
- * Example 1 - apply map stored in attributemap/defaultmap.php:
- * <code>
- * 'authproc' => array(
- * 50 => array('class' => 'core:AttributeMap', 'defaultmaps'),
- * ),
- * </code>
- *
- * Example 2 - rename attributes 'mail' and 'uid' to 'email' and 'user':
- * <code>
- * 'authproc' => array(
- * 50 => array('class' => 'core:AttributeMap', 'mail' => 'email', 'uid' => 'user'),
- * ),
- * </code>
- *
* @author Olav Morken, UNINETT AS.
* @package simpleSAMLphp
* @version $Id$
diff --git a/modules/core/lib/Auth/Process/TargetedID.php b/modules/core/lib/Auth/Process/TargetedID.php
index b8f8a0b33..3852d63dd 100644
--- a/modules/core/lib/Auth/Process/TargetedID.php
+++ b/modules/core/lib/Auth/Process/TargetedID.php
@@ -21,7 +21,7 @@
* Example - generate from mail-attribute:
* <code>
* 'authproc' => array(
- * 50 => array('class' => 'core:TargetedID' , 'attribute' => 'mail'),
+ * 50 => array('class' => 'core:TargetedID' , 'attributename' => 'mail'),
* ),
* </code>
*
@@ -50,8 +50,8 @@ class sspmod_core_Auth_Process_TargetedID extends SimpleSAML_Auth_ProcessingFilt
assert('is_array($config)');
- if (array_key_exists('attribute', $config)) {
- $this->attribute = $config['attribute'];
+ if (array_key_exists('attributename', $config)) {
+ $this->attribute = $config['attributename'];
if (!is_string($this->attribute)) {
throw new Exception('Invalid attribute name given to core:TargetedID filter.');
}
diff --git a/www/saml2/idp/SingleLogoutServiceiFrame.php b/www/saml2/idp/SingleLogoutServiceiFrame.php
index 88b746a0e..b839c446d 100644
--- a/www/saml2/idp/SingleLogoutServiceiFrame.php
+++ b/www/saml2/idp/SingleLogoutServiceiFrame.php
@@ -108,7 +108,8 @@ function updateslostatus() {
foreach ($listofsps AS $spentityid) {
- error_log('Completed ' . $spentityid);
+ SimpleSAML_Logger::debug('SAML2.0 - IdP.SingleLogoutServiceiFrame: Completed ' . $spentityid);
+
// add a command to the response to assign the innerHTML attribute of
// the element with id="SomeElementId" to whatever the new content is
--
GitLab