Separate SAML-related functions from functions.php

Prevent loading SimpleSAMLphp in the CLI context because it fails to load.

Author: shingo78

auth-proxy/resources/htdocs/php/logout-fed.php

@@ -1,5 +1,5 @@
 <?php
-require_once __DIR__ . '/../../lib/functions.php';
+require_once __DIR__ . '/../../lib/functions-fed.php';
 
 logout_fed();
 header('Location: /test');

auth-proxy/resources/htdocs/php/logout.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/functions.php';
+require_once __DIR__ . '/../../lib/functions-fed.php';
 @session_start();
 
 // remove cookies

auth-proxy/resources/htdocs/php/sp.php

@@ -1,7 +1,7 @@
 <?php
 require_once __DIR__ . '/../../lib/const.php';
 require_once __DIR__ . '/../../lib/hub-const.php';
-require_once __DIR__ . '/../../lib/functions.php';
+require_once __DIR__ . '/../../lib/functions-fed.php';
 require_once __DIR__ . '/../../simplesamlphp/public/_include.php';
 
 @session_start();

auth-proxy/resources/lib/functions-fed.php

@@ -0,0 +1,16 @@
+<?php
+require_once __DIR__ . '/../simplesamlphp/public/_include.php';
+require_once __DIR__ . '/functions.php';
+
+/**
+ * Logout from the federation
+ */
+function logout_fed()
+{
+    $as = new \SimpleSAML\Auth\Simple('default-sp');
+    if ($as->isAuthenticated()) {
+        $as->logout();
+    }
+}
+
+?>

auth-proxy/resources/lib/functions.php

@@ -1,22 +1,10 @@
 <?php
 require_once __DIR__ . '/hub-const.php';
 require_once __DIR__ . '/const.php';
-require_once __DIR__ . '/../simplesamlphp/public/_include.php';
 
 $SESSION_NAME = session_name();
 
 
-/**
- * Logout from the federation
- */
-function logout_fed()
-{
-    $as = new \SimpleSAML\Auth\Simple('default-sp');
-    if ($as->isAuthenticated()) {
-        $as->logout();
-    }
-}
-
 /**
  * Check the user autorization of this Coursen
  *