Merge "Bug 1631808: auth/saml: add framework for ssphp modules"

htdocs/auth/saml/config/config.php

@@ -32,7 +32,12 @@ foreach ($metadata_files as $file) {
 // Fix up session handling config - to match Mahara
 $memcache_config = array();
 if (get_config('memcacheservers') || extension_loaded('memcache')) {
-    $sessionhandler = 'memcache';
+    if (empty(get_config('ssphpsessionhandler'))) {
+        $sessionhandler = 'memcache';
+    }
+    else {
+        $sessionhandler = get_config('ssphpsessionhandler');
+    }
     $servers = get_config('memcacheservers');
     if (empty($servers)) {
         $servers = 'localhost';

htdocs/auth/saml/extlib/_autoload.php

@@ -39,7 +39,11 @@ spl_autoload_register(
         }
         array_shift($classpath);
         $module = array_shift($classpath);
-        $filepath = get_config('docroot') . 'auth/saml/extlib/simplesamlphp/modules/$module/lib/' . implode('/', $classpath) . '.php';
+        $filepath = get_config('docroot') . 'auth/saml/extlib/simplesamlphp/modules/' . $module . '/lib/' . implode('/', $classpath) . '.php';
+        if (file_exists($filepath)) {
+            require_once($filepath);
+        }
+        $filepath = get_config('docroot') . 'auth/saml/extlib/modules/' . $module . '/lib/' . implode('/', $classpath) . '.php';
         if (file_exists($filepath)) {
             require_once($filepath);
         }

htdocs/auth/saml/extlib/modules/README.Mahara

+This is where SimpleSAMLphp modules can be directly distributed with Mahara.
+Just copy them into this directory and the autoloader will pick them up.

htdocs/lib/config-defaults.php

@@ -715,3 +715,10 @@ $cfg->passwordsaltalt1 = 'old salt value';
  * The default sources are Mozilla Backpack and openbadgepassport.com
  */
 $cfg->openbadgedisplayer_source = '{"backpack":"https://backpack.openbadges.org/","passport":"https://openbadgepassport.com/"}';
+
+/**
+ * @global string $cfg->ssphpsessionhandler
+ * An alternative session handler for SimpleSAMLphp if you do not wish to use memcache.
+ * Specify the name of the session handler.
+ */
+// $cfg->ssphpsessionhandler = 'memcached';
\ No newline at end of file