From 63f8709d36107ed74a2a0b0489c13473638d59b4 Mon Sep 17 00:00:00 2001 From: stevel Date: Mon, 25 May 2015 09:41:30 +0200 Subject: [PATCH] Issue #2134581 by Stevel: Allow role sync rules with commas in values --- simplesamlphp_auth.info | 1 + simplesamlphp_auth.module | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/simplesamlphp_auth.info b/simplesamlphp_auth.info index d5f1f82..f5f63ef 100644 --- a/simplesamlphp_auth.info +++ b/simplesamlphp_auth.info @@ -2,3 +2,4 @@ name = SimpleSAMLphp authentication description = Allows users to authenticate to a remote SAML identity provider (IdP) via a locally configured SimpleSAMLphp service point (SP). core = 7.x configure = admin/config/people/simplesamlphp_auth +php = 5.3 diff --git a/simplesamlphp_auth.module b/simplesamlphp_auth.module index a91bb6a..e492d92 100644 --- a/simplesamlphp_auth.module +++ b/simplesamlphp_auth.module @@ -592,7 +592,7 @@ function _simplesamlphp_auth_rolepopulation($rolemap) { watchdog('simplesamlphp_auth', 'Evaluate role evaulation: %roleruleeval', array('%roleruleeval' => $roleruleevaluation), WATCHDOG_DEBUG); - $roleruleevaluationdc = explode(',', $roleruleevaluation); + $roleruleevaluationdc = str_getcsv($roleruleevaluation); if (!_simplesamlphp_auth_evaulaterolerule($roleruleevaluationdc, $attributes)) { $addnew = FALSE; }