SAML: Renaming / Tiny changes

ILIAS-eLearning · Aug 25, 2017 · baa1022 · baa1022
1 parent eb48f5d
commit baa1022
Show file tree

Hide file tree

Showing 11 changed files with 12,075 additions and 12,076 deletions.
diff --git a/Services/Saml/classes/class.ilAuthProviderSaml.php b/Services/Saml/classes/class.ilAuthProviderSaml.php
@@ -52,7 +52,7 @@ public function __construct(\ilAuthFrontendCredentials $credentials, $a_idp_id =
 
 		require_once 'Services/User/classes/class.ilUserDefinedFields.php';
 		require_once 'Services/Saml/classes/class.ilSamlSettings.php';
-		require_once 'Services/Saml/classes/class.ilExternalAuthAttributeMapping.php';
+		require_once 'Services/Saml/classes/class.ilExternalAuthUserAttributeMapping.php';
 		require_once 'Services/Saml/classes/class.ilSamlIdp.php';
 
 		if(null === $a_idp_id)
@@ -277,7 +277,7 @@ public function importUser($a_internal_login, $a_external_account, $a_user_data
 	{
 		require_once 'Services/Xml/classes/class.ilXmlWriter.php';
 
-		$mapping = new ilExternalAuthAttributeMapping('saml', $this->idp->getIdpId());
+		$mapping = new ilExternalAuthUserAttributeMapping('saml', $this->idp->getIdpId());
 
 		$xml_writer = new ilXmlWriter();
 		$xml_writer->xmlStartTag('Users');

diff --git a/.../class.ilExternalAuthAttributeMapping.php → ...ss.ilExternalAuthUserAttributeMapping.php b/.../class.ilExternalAuthAttributeMapping.php → ...ss.ilExternalAuthUserAttributeMapping.php
@@ -4,10 +4,10 @@
 require_once 'Services/Saml/classes/class.ilExternalAuthUserAttributeMappingRule.php';
 
 /**
- * Class ilExternalAuthAttributeMapping
+ * Class ilExternalAuthUserAttributeMapping
  * @author Michael Jansen <mjansen@databay.de>
  */
-class ilExternalAuthAttributeMapping implements ArrayAccess, Countable, Iterator
+class ilExternalAuthUserAttributeMapping implements ArrayAccess, Countable, Iterator
 {
 	/**
 	 * @var ilDB
@@ -30,7 +30,7 @@ class ilExternalAuthAttributeMapping implements ArrayAccess, Countable, Iterator
 	protected $mapping = array();
 
 	/**
-	 * ilExternalAuthAttributeMapping constructor.
+	 * ilExternalAuthUserAttributeMapping constructor.
 	 * @param string $authMode
 	 * @param int    $authSourceId
 	 */

diff --git a/Services/Saml/classes/class.ilSamlIdp.php b/Services/Saml/classes/class.ilSamlIdp.php
@@ -160,8 +160,8 @@ public function persist()
 	 */
 	public function delete()
 	{
-		require_once 'Services/Saml/classes/class.ilExternalAuthAttributeMapping.php';
-		$mapping = new ilExternalAuthAttributeMapping('saml', $this->getIdpId());
+		require_once 'Services/Saml/classes/class.ilExternalAuthUserAttributeMapping.php';
+		$mapping = new ilExternalAuthUserAttributeMapping('saml', $this->getIdpId());
 		$mapping->delete();
 
 		$this->db->manipulateF(

diff --git a/Services/Saml/classes/class.ilSamlSettingsGUI.php b/Services/Saml/classes/class.ilSamlSettingsGUI.php
@@ -92,7 +92,7 @@ class ilSamlSettingsGUI
 	protected $help;
 
 	/**
-	 * @var ilExternalAuthAttributeMapping
+	 * @var ilExternalAuthUserAttributeMapping
 	 */
 	protected $mapping;
 
@@ -325,8 +325,8 @@ protected function setSubTabs($a_view_mode)
 	 */
 	private function initUserAttributeMapping()
 	{
-		require_once 'Services/Saml/classes/class.ilExternalAuthAttributeMapping.php';
-		$this->mapping = new ilExternalAuthAttributeMapping('saml', $this->idp->getIdpId());
+		require_once 'Services/Saml/classes/class.ilExternalAuthUserAttributeMapping.php';
+		$this->mapping = new ilExternalAuthUserAttributeMapping('saml', $this->idp->getIdpId());
 	}
 
 	/**

diff --git a/Services/Saml/lib/metadata.php b/Services/Saml/lib/metadata.php
@@ -35,7 +35,7 @@
 }
 define('IL_COOKIE_PATH', $cookie_path);
 
-require_once './Services/Context/classes/class.ilContext.php';
+require_once 'Services/Context/classes/class.ilContext.php';
 ilContext::init(ilContext::CONTEXT_SAML);
 
 require_once 'Services/Init/classes/class.ilInitialisation.php';

diff --git a/Services/Saml/lib/saml1-acs.php b/Services/Saml/lib/saml1-acs.php
@@ -39,8 +39,7 @@
 }
 define('IL_COOKIE_PATH', $cookie_path);
 
-
-require_once './Services/Context/classes/class.ilContext.php';
+require_once 'Services/Context/classes/class.ilContext.php';
 ilContext::init(ilContext::CONTEXT_SAML);
 
 require_once 'Services/Init/classes/class.ilInitialisation.php';

diff --git a/Services/Saml/lib/saml2-acs.php b/Services/Saml/lib/saml2-acs.php
@@ -39,7 +39,7 @@
 }
 define('IL_COOKIE_PATH', $cookie_path);
 
-require_once './Services/Context/classes/class.ilContext.php';
+require_once 'Services/Context/classes/class.ilContext.php';
 ilContext::init(ilContext::CONTEXT_SAML);
 
 require_once 'Services/Init/classes/class.ilInitialisation.php';

diff --git a/Services/Saml/lib/saml2-logout.php b/Services/Saml/lib/saml2-logout.php
@@ -39,7 +39,7 @@
 }
 define('IL_COOKIE_PATH', $cookie_path);
 
-require_once './Services/Context/classes/class.ilContext.php';
+require_once 'Services/Context/classes/class.ilContext.php';
 ilContext::init(ilContext::CONTEXT_SAML);
 
 require_once 'Services/Init/classes/class.ilInitialisation.php';

diff --git a/libs/composer/vendor/composer/autoload_classmap.php b/libs/composer/vendor/composer/autoload_classmap.php
diff --git a/libs/composer/vendor/composer/autoload_static.php b/libs/composer/vendor/composer/autoload_static.php
diff --git a/saml.php b/saml.php
@@ -12,7 +12,7 @@
 	exit();
 }
 
-require_once './Services/Context/classes/class.ilContext.php';
+require_once 'Services/Context/classes/class.ilContext.php';
 ilContext::init(ilContext::CONTEXT_SAML);
 
 require_once 'Services/Init/classes/class.ilInitialisation.php';