From 71d02cef2a881136aab52b50eff19279695cb7a3 Mon Sep 17 00:00:00 2001
From: Andjelko Horvat <comel@vingd.com>
Date: Mon, 18 Nov 2013 17:19:37 +0000
Subject: [PATCH] authtwitter: use SimpleSAML_Configuration::loadFromArray
(related to #587).
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3293 44740490-163a-0410-bde0-09ae8108e29a
---
modules/authtwitter/lib/Auth/Source/Twitter.php | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/modules/authtwitter/lib/Auth/Source/Twitter.php b/modules/authtwitter/lib/Auth/Source/Twitter.php
index af50d4441..8ee8c7d97 100644
--- a/modules/authtwitter/lib/Auth/Source/Twitter.php
+++ b/modules/authtwitter/lib/Auth/Source/Twitter.php
@@ -38,18 +38,10 @@ class sspmod_authtwitter_Auth_Source_Twitter extends SimpleSAML_Auth_Source {
/* Call the parent constructor first, as required by the interface. */
parent::__construct($info, $config);
- if (!array_key_exists('key', $config))
- throw new Exception('Twitter authentication source is not properly configured: missing [key]');
-
- $this->key = $config['key'];
-
- if (!array_key_exists('secret', $config))
- throw new Exception('Twitter authentication source is not properly configured: missing [secret]');
-
- $this->secret = $config['secret'];
-
- // require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/extlibinc/facebook.php');
+ $configObject = SimpleSAML_Configuration::loadFromArray($config, 'authsources[' . var_export($this->authId, TRUE) . ']');
+ $this->key = $configObject->getString('key');
+ $this->secret = $configObject->getString('secret');
}
@@ -127,5 +119,3 @@ class sspmod_authtwitter_Auth_Source_Twitter extends SimpleSAML_Auth_Source {
}
}
-
-?>
\ No newline at end of file
--
GitLab