From 3b575968c120386491543ad8ffdf9b92b4ee0ee4 Mon Sep 17 00:00:00 2001
From: Laurent Opprecht <laurent.opprecht@unige.ch>
Date: Fri, 13 Apr 2012 09:36:57 +0200
Subject: [PATCH 01/12] Add classes to course block actions

---
 main/inc/lib/userportal.lib.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index 579e2044e8..4ff887d76e 100644
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -242,12 +242,12 @@ class IndexManager {
 		if ($show_menu) {
 			$html .= '<ul class="menulist">';
 			if ($show_create_link) {			
-				$html .= '<li><a href="main/create_course/add_course.php">'.(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
+				$html .= '<li><a href="main/create_course/add_course.php" class="add course">'.(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
 			}
 			
 			if ($show_course_link) {
 				if (!api_is_drh() && !api_is_session_admin()) {
-					$html .=  '<li><a href="main/auth/courses.php">'.get_lang('CourseManagement').'</a></li>';					
+					$html .=  '<li><a href="main/auth/courses.php" class="list course">'.get_lang('CourseManagement').'</a></li>';					
 				} else {
 					$html .= '<li><a href="main/dashboard/index.php">'.get_lang('Dashboard').'</a></li>';
 				}
@@ -871,23 +871,23 @@ class IndexManager {
 		$my_account_content = '<ul class="menulist">';
         
 		if ($show_create_link) {
-			$my_account_content .= '<li><a href="main/create_course/add_course.php">'.(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
+			$my_account_content .= '<li><a href="main/create_course/add_course.php" class="add course">'.(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
 		}
         
         //Sort courses
         $url = api_get_path(WEB_CODE_PATH).'auth/courses.php?action=sortmycourses';
-        $my_account_content .= '<li>'.Display::url(get_lang('SortMyCourses'), $url).'</li>';
+        $my_account_content .= '<li>'.Display::url(get_lang('SortMyCourses'), $url, array('class' => 'sort course')).'</li>';
 
         //Course management                
 		if ($show_course_link) {
 			if (!api_is_drh()) {
-				$my_account_content .= '<li><a href="main/auth/courses.php">'.get_lang('CourseManagement').'</a></li>';
+				$my_account_content .= '<li><a href="main/auth/courses.php" class="list course">'.get_lang('CourseManagement').'</a></li>';
 	
 				if (api_get_setting('use_session_mode') == 'true') {
 					if (isset($_GET['history']) && intval($_GET['history']) == 1) {
 						$my_account_content .= '<li><a href="user_portal.php">'.get_lang('DisplayTrainingList').'</a></li>';
 					} else {
-						$my_account_content .= '<li><a href="user_portal.php?history=1">'.get_lang('HistoryTrainingSessions').'</a></li>';
+						$my_account_content .= '<li><a href="user_portal.php?history=1"  class="history course">'.get_lang('HistoryTrainingSessions').'</a></li>';
 					}
 				}
 			} else {

From 1440d03a0098a250ee86b3713ab8c039d3d31828 Mon Sep 17 00:00:00 2001
From: Laurent Opprecht <laurent.opprecht@unige.ch>
Date: Fri, 13 Apr 2012 15:17:49 +0200
Subject: [PATCH 02/12] shibboleth authentication module #4554: ensure auth
 source is set to shibb

---
 main/auth/shibboleth/app/shibboleth.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/main/auth/shibboleth/app/shibboleth.class.php b/main/auth/shibboleth/app/shibboleth.class.php
index 186443c8a4..73cdd8c3db 100644
--- a/main/auth/shibboleth/app/shibboleth.class.php
+++ b/main/auth/shibboleth/app/shibboleth.class.php
@@ -10,6 +10,7 @@
 class Shibboleth
 {
 
+    const NAME = 'shibboleth';
     const UNKNOWN_STATUS = -1;
     const TEACHER_STATUS = 1;
     const STUDENT_STATUS = 5;
@@ -152,6 +153,7 @@ class Shibboleth
         $user = User::store()->get_by_shibboleth_id($shibb_user->unique_id);
         if (empty($user))
         {
+            $shibb_user->auth_source == self::NAME;
             return User::create($shibb_user)->save();
         }
 
@@ -163,6 +165,7 @@ class Shibboleth
             {
                 $user->{$key} = $shibb_user->{$key};
             }
+            $user->auth_source == self::NAME;
         }
         $user->save();
         return $result;

From ea5f1e192e1cccca3194bd2d7773d475ed7dfeda Mon Sep 17 00:00:00 2001
From: Laurent Opprecht <laurent.opprecht@unige.ch>
Date: Fri, 13 Apr 2012 15:20:49 +0200
Subject: [PATCH 03/12] Add custom logged out page #4610

---
 custompages/loggedout.php       | 57 +++++++++++++++++++++++++++++++++
 index.php                       | 12 +++++--
 main/inc/global.inc.php         |  1 +
 main/inc/lib/request.class.php  | 36 +++++++++++++++++++++
 main/inc/lib/userportal.lib.php |  1 +
 5 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 custompages/loggedout.php
 create mode 100644 main/inc/lib/request.class.php

diff --git a/custompages/loggedout.php b/custompages/loggedout.php
new file mode 100644
index 0000000000..2b45579c46
--- /dev/null
+++ b/custompages/loggedout.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Displayed after the user has been logged out.
+ */
+
+$called_direcly = !function_exists('api_get_path');
+if ($called_direcly)
+{
+    return '';
+}
+
+require_once('language.php');
+$www = api_get_path('WEB_PATH');
+
+?>
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Custompage - logged out</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <!--[if !IE 6]><!-->
+        <link rel="stylesheet" type="text/css" href="<?php echo $www ?>custompages/style.css" />
+        <!--<![endif]-->
+        <!--[if IE 6]>
+        <link rel="stylesheet" type="text/css" href="/custompages/style-ie6.css" />
+        <![endif]-->
+
+        <script type="text/javascript" src="<?php echo $www ?>custompages/jquery-1.5.1.min.js"></script>
+
+        <script type="text/javascript">
+            $(document).ready(function() {
+                if (top.location != location) 
+                    top.location.href = document.location.href ;
+            });
+        </script>
+    </head>
+    <body>
+        <div id="backgroundimage">
+            <img src="<?php echo $www ?>/custompages/images/page-background.png" class="backgroundimage" alt="background"/>
+        </div>
+        <div id="wrapper">
+            <div id="header">
+                <img src="<?php echo $www ?>/custompages/images/header.png" alt="Logo" />
+            </div>
+
+            <div id="login-form-box" class="form-box">
+                <div id="login-form-info" class="form-info">
+                    You have been logged out.
+                </div>
+            </div>
+            <a href="<?php echo $www . 'user_portal.php'; ?>">Go to your portal</a>
+            <div id="footer">
+                <img src="<?php echo $www ?>/custompages/images/footer.png" alt="footer"/>
+            </div> 
+        </div> 
+    </body>
+</html>
diff --git a/index.php b/index.php
index 72c46bbc49..cc0845bd19 100644
--- a/index.php
+++ b/index.php
@@ -79,9 +79,17 @@ if (api_get_setting('allow_terms_conditions') == 'true') {
 	unset($_SESSION['info_current_user']);
 }
 //If we are not logged in and customapages activated
-if (!api_get_user_id() && api_get_setting('use_custom_pages') == 'true' ){
+if (!api_get_user_id() && api_get_setting('use_custom_pages') == 'true' )
+{
   require_once api_get_path(LIBRARY_PATH).'custompages.lib.php';
-  CustomPages::displayPage('index-unlogged');
+  if(Request::get('loggedout'))
+  {      
+    CustomPages::displayPage('loggedout');
+  }
+  else
+  {      
+    CustomPages::displayPage('index-unlogged');
+  }
 }
 
 /**
diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php
index c5441f6914..1e45c60eac 100644
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@@ -92,6 +92,7 @@ ini_set('include_path', api_create_include_path_setting());
 ini_set('auto_detect_line_endings', '1');
 
 // Include the libraries that are necessary everywhere
+require_once $lib_path.'request.class.php';
 require_once $lib_path.'database.lib.php';
 require_once $lib_path.'template.lib.php';
 require_once $lib_path.'display.lib.php';
diff --git a/main/inc/lib/request.class.php b/main/inc/lib/request.class.php
new file mode 100644
index 0000000000..d5ae0c2397
--- /dev/null
+++ b/main/inc/lib/request.class.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Description of request
+ *
+ * @author Laurent Opprecht <laurent@opprecht.info>
+ */
+class Request
+{
+
+    public static function get($key, $default = null)
+    {
+        return isset($_GET[$key]) ? isset($_GET[$key]) : $default;
+    }
+    
+    public static function post($key, $default = null)
+    {
+        return isset($_POST[$key]) ? isset($_POST[$key]) : $default;
+    }
+   
+    static function server($key, $default = null)
+    {
+        return isset($_SERVER[$key]) ? isset($_SERVER[$key]) : $default;
+    }
+
+    static function file($key, $default = null)
+    {
+        return isset($_FILES[$key]) ? isset($_FILES[$key]) : $default;
+    }
+
+    static function environment($key, $default = null)
+    {
+        return isset($_ENV[$key]) ? isset($_ENV[$key]) : $default;
+    }
+
+}
\ No newline at end of file
diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index 4ff887d76e..c302326715 100644
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -158,6 +158,7 @@ class IndexManager {
 		}
 		exit_of_chat($uid);
 		api_session_destroy();
+                $query_string = $query_string ? "$query_string&loggedout=true" : '?loggedout=true';
 		header("Location: index.php$query_string");
 		exit();
 	}

From a1616001d6a779da9c95b862dc30b4fc04390e6f Mon Sep 17 00:00:00 2001
From: Laurent Opprecht <laurent.opprecht@unige.ch>
Date: Fri, 13 Apr 2012 15:56:54 +0200
Subject: [PATCH 04/12] shibboleth authentication module #4554: ensure admin
 setting

---
 .../app/lib/shibboleth_session.class.php      | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/main/auth/shibboleth/app/lib/shibboleth_session.class.php b/main/auth/shibboleth/app/lib/shibboleth_session.class.php
index 59fcde9b3b..9efd43ce44 100644
--- a/main/auth/shibboleth/app/lib/shibboleth_session.class.php
+++ b/main/auth/shibboleth/app/lib/shibboleth_session.class.php
@@ -44,12 +44,20 @@ class ShibbolethSession
     /**
      * Create a Shibboleth session for the user ID
      *
-     * @param  string $_uid - The user ID
+     * @param  string $uid - The user ID
      * @return $_user (array) - The user infos array created when the user logs in
      */
-    function login($_uid)
+    function login($uid)
     {
-        $user = User::store()->get_by_user_id($_uid);
+        /* This must be set for local.inc.php to register correctly the global variables in session
+         * This is BAD. Logic should be migrated into a function and stop relying on global variables.
+         */
+        global $_uid, $is_allowedCreateCourse, $is_platformAdmin, $_real_cid, $_courseUser, $is_courseAdmin;
+        global $is_courseMember, $is_courseTutor, $is_courseCoach, $is_allowed_in_course, $is_sessionAdmin, $_gid;
+        $_uid = $uid;
+        
+        //is_allowedCreateCourse
+        $user = User::store()->get_by_user_id($uid);
         if (empty($user))
         {
             return;
@@ -80,11 +88,6 @@ class ShibbolethSession
         $mainDbName = Database :: get_main_database();
         $includePath = api_get_path(INCLUDE_PATH);
         
-        global $is_platformAdmin; 
-        /* This must be set for local.inc.php to set up correctly the platform admin
-         * This is BAD.
-         */
-
         require("$includePath/local.inc.php");
 
 

From f74957e044fa44d32d1d4754b9baa38fe6b53688 Mon Sep 17 00:00:00 2001
From: Laurent Opprecht <laurent.opprecht@unige.ch>
Date: Mon, 16 Apr 2012 11:21:57 +0200
Subject: [PATCH 05/12] shibboleth authentication module #4554: move /lib

---
 main/auth/shibboleth/{app => }/lib/model.class.php               | 0
 .../shibboleth/{app => }/lib/scaffolder/scaffolder.class.php     | 0
 .../shibboleth/{app => }/lib/scaffolder/template/default.php     | 0
 main/auth/shibboleth/{app => }/lib/scaffolder/template/model.php | 0
 .../auth/shibboleth/{app => }/lib/scaffolder/template/public.php | 0
 main/auth/shibboleth/{app => }/lib/shibboleth_config.class.php   | 0
 main/auth/shibboleth/{app => }/lib/shibboleth_session.class.php  | 1 +
 main/auth/shibboleth/{app => }/lib/store.class.php               | 0
 8 files changed, 1 insertion(+)
 rename main/auth/shibboleth/{app => }/lib/model.class.php (100%)
 rename main/auth/shibboleth/{app => }/lib/scaffolder/scaffolder.class.php (100%)
 rename main/auth/shibboleth/{app => }/lib/scaffolder/template/default.php (100%)
 rename main/auth/shibboleth/{app => }/lib/scaffolder/template/model.php (100%)
 rename main/auth/shibboleth/{app => }/lib/scaffolder/template/public.php (100%)
 rename main/auth/shibboleth/{app => }/lib/shibboleth_config.class.php (100%)
 rename main/auth/shibboleth/{app => }/lib/shibboleth_session.class.php (98%)
 rename main/auth/shibboleth/{app => }/lib/store.class.php (100%)

diff --git a/main/auth/shibboleth/app/lib/model.class.php b/main/auth/shibboleth/lib/model.class.php
similarity index 100%
rename from main/auth/shibboleth/app/lib/model.class.php
rename to main/auth/shibboleth/lib/model.class.php
diff --git a/main/auth/shibboleth/app/lib/scaffolder/scaffolder.class.php b/main/auth/shibboleth/lib/scaffolder/scaffolder.class.php
similarity index 100%
rename from main/auth/shibboleth/app/lib/scaffolder/scaffolder.class.php
rename to main/auth/shibboleth/lib/scaffolder/scaffolder.class.php
diff --git a/main/auth/shibboleth/app/lib/scaffolder/template/default.php b/main/auth/shibboleth/lib/scaffolder/template/default.php
similarity index 100%
rename from main/auth/shibboleth/app/lib/scaffolder/template/default.php
rename to main/auth/shibboleth/lib/scaffolder/template/default.php
diff --git a/main/auth/shibboleth/app/lib/scaffolder/template/model.php b/main/auth/shibboleth/lib/scaffolder/template/model.php
similarity index 100%
rename from main/auth/shibboleth/app/lib/scaffolder/template/model.php
rename to main/auth/shibboleth/lib/scaffolder/template/model.php
diff --git a/main/auth/shibboleth/app/lib/scaffolder/template/public.php b/main/auth/shibboleth/lib/scaffolder/template/public.php
similarity index 100%
rename from main/auth/shibboleth/app/lib/scaffolder/template/public.php
rename to main/auth/shibboleth/lib/scaffolder/template/public.php
diff --git a/main/auth/shibboleth/app/lib/shibboleth_config.class.php b/main/auth/shibboleth/lib/shibboleth_config.class.php
similarity index 100%
rename from main/auth/shibboleth/app/lib/shibboleth_config.class.php
rename to main/auth/shibboleth/lib/shibboleth_config.class.php
diff --git a/main/auth/shibboleth/app/lib/shibboleth_session.class.php b/main/auth/shibboleth/lib/shibboleth_session.class.php
similarity index 98%
rename from main/auth/shibboleth/app/lib/shibboleth_session.class.php
rename to main/auth/shibboleth/lib/shibboleth_session.class.php
index 9efd43ce44..2c964df6af 100644
--- a/main/auth/shibboleth/app/lib/shibboleth_session.class.php
+++ b/main/auth/shibboleth/lib/shibboleth_session.class.php
@@ -88,6 +88,7 @@ class ShibbolethSession
         $mainDbName = Database :: get_main_database();
         $includePath = api_get_path(INCLUDE_PATH);
         
+        $no_redirection = true;
         require("$includePath/local.inc.php");
 
 
diff --git a/main/auth/shibboleth/app/lib/store.class.php b/main/auth/shibboleth/lib/store.class.php
similarity index 100%
rename from main/auth/shibboleth/app/lib/store.class.php
rename to main/auth/shibboleth/lib/store.class.php

From 22410183b1ec7ad5d1679492ab23839a11e1d738 Mon Sep 17 00:00:00 2001
From: Laurent Opprecht <laurent.opprecht@unige.ch>
Date: Mon, 16 Apr 2012 11:22:38 +0200
Subject: [PATCH 06/12] autoload and utility classes

---
 main/inc/global.inc.php         |  4 +-
 main/inc/lib/autoload.class.php | 60 +++++++++++++++++++++++++
 main/inc/lib/redirect.class.php | 77 +++++++++++++++++++++++++++++++++
 3 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 main/inc/lib/autoload.class.php
 create mode 100644 main/inc/lib/redirect.class.php

diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php
index 1e45c60eac..8ebb1d3a02 100644
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@@ -92,7 +92,9 @@ ini_set('include_path', api_create_include_path_setting());
 ini_set('auto_detect_line_endings', '1');
 
 // Include the libraries that are necessary everywhere
-require_once $lib_path.'request.class.php';
+require_once $lib_path.'autoload.class.php';
+Autoload::register();
+
 require_once $lib_path.'database.lib.php';
 require_once $lib_path.'template.lib.php';
 require_once $lib_path.'display.lib.php';
diff --git a/main/inc/lib/autoload.class.php b/main/inc/lib/autoload.class.php
new file mode 100644
index 0000000000..123617ab12
--- /dev/null
+++ b/main/inc/lib/autoload.class.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Autoload Chamilo classes
+ * 
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info> for the Univesity of Geneva
+ */
+class Autoload
+{
+
+    /**
+     * Register the Chamilo autoloader on the stack. 
+     */
+    static public function register()
+    {
+        $f = array(new self, 'load');
+        spl_autoload_register($f);
+    }
+
+    static public function map()
+    {
+        static $result = false;
+
+        if ($result)
+        {
+            return $result;
+        }
+
+        $dir = dirname(__FILE__);
+
+        $result = array();
+        $result['Redirect'] = $dir . '/redirect.class.php';
+        $result['Request'] = $dir . '/request.class.php';
+        return $result;
+    }
+
+    /**
+     * Handles autoloading of classes.
+     *
+     * @param  string  $class_name  A class name.
+     *
+     * @return boolean returns true if the class has been loaded
+     */
+    public function load($class_name)
+    {
+        $map = self::map();
+        if (isset($map[$class_name]))
+        {
+            $path = $map[$class_name];
+            require_once $path;
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+}
diff --git a/main/inc/lib/redirect.class.php b/main/inc/lib/redirect.class.php
new file mode 100644
index 0000000000..468cb0df0f
--- /dev/null
+++ b/main/inc/lib/redirect.class.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Send a redirect to the user agent and exist
+ * 
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info> for the Univesity of Geneva
+ */
+class Redirect
+{
+
+    static function www()
+    {
+        static $result = false;
+        if (empty($result))
+        {
+            $result = api_get_path('WEB_PATH');
+        }
+        return $result;
+    }
+
+    static function go($url = '')
+    {
+        if (empty($url))
+        {
+            Redirect::session_request_uri();
+            $www = self::www();
+            self::navigate($www);
+        }
+
+        $is_full_uri = (strpos($url, 'http') === 0);
+        if ($is_full_uri)
+        {
+            self::navigate($url);
+        }
+
+        $url = self::www() . $url;
+        self::navigate($url);
+    }
+
+    /**
+     * Redirect to the session "request uri" if it exists. 
+     */
+    static function session_request_uri()
+    {
+//        if (api_is_anonymous())
+//        {
+//            return;
+//        }
+        $url = isset($_SESSION['request_uri']) ? $_SESSION['request_uri'] : '';
+        unset($_SESSION['request_uri']);
+        if ($url)
+        {
+            self::navigate($url);
+        }
+    }
+
+    static function home()
+    {
+        $www = self::www();
+        self::navigate($www);
+    }
+
+    static function user_home()
+    {
+        $www = self::www();
+        self::navigate("$www/user_portal.php");
+    }
+
+    protected static function navigate($url)
+    {
+        session_write_close(); //should not be neeeded 
+        header("Location: $url");
+        exit;
+    }
+
+}
\ No newline at end of file

From 0f0cabe8ddfc08ef5ada3fcc8ccfa252b1094e00 Mon Sep 17 00:00:00 2001
From: Laurent Opprecht <laurent.opprecht@unige.ch>
Date: Mon, 16 Apr 2012 11:23:00 +0200
Subject: [PATCH 07/12] autoload and utility classes

---
 main/inc/lib/request.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/main/inc/lib/request.class.php b/main/inc/lib/request.class.php
index d5ae0c2397..86a9de5aaa 100644
--- a/main/inc/lib/request.class.php
+++ b/main/inc/lib/request.class.php
@@ -1,9 +1,10 @@
 <?php
 
 /**
- * Description of request
- *
- * @author Laurent Opprecht <laurent@opprecht.info>
+ * Provides access to various HTTP request elements: GET, POST, FILE, etc paramaters.
+ 
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info> for the Univesity of Geneva
  */
 class Request
 {

From 6a84b59559f803c39784c71a5e070b51c765bad2 Mon Sep 17 00:00:00 2001
From: Laurent Opprecht <laurent.opprecht@unige.ch>
Date: Mon, 16 Apr 2012 11:23:30 +0200
Subject: [PATCH 08/12] shibboleth authentication module #4554: allow to bypass
 automatic redirect

---
 main/auth/shibboleth/app/shibboleth.class.php | 11 ++---------
 main/inc/local.inc.php                        |  4 +++-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/main/auth/shibboleth/app/shibboleth.class.php b/main/auth/shibboleth/app/shibboleth.class.php
index 73cdd8c3db..5bf9ad91fb 100644
--- a/main/auth/shibboleth/app/shibboleth.class.php
+++ b/main/auth/shibboleth/app/shibboleth.class.php
@@ -126,17 +126,10 @@ class Shibboleth
                 $first_slash_pos = strpos($rootWeb, '/', 8);
                 $rootWeb_wo_uri = substr($rootWeb, 0, $first_slash_pos);
                 $url = $rootWeb_wo_uri . $course_url . '_stop';
-                header("Location: $url");
+                Redirect::go($url);
             }
         }
-        else
-        {
-            $_SESSION['request_uri'];
-        }
-
-        $url = api_get_path('WEB_PATH') . $url;
-        header("Location: $url");
-        die;
+        Redirect::go();
     }
 
     /**
diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php
index ff755bdc70..fd10e877a0 100644
--- a/main/inc/local.inc.php
+++ b/main/inc/local.inc.php
@@ -1132,7 +1132,9 @@ if (isset($_cid)) {
 	$sql="UPDATE $tbl_course SET last_visit= '$time' WHERE code='$_cid'";
 	Database::query($sql);
 }
-if (isset($_SESSION['request_uri']) && !empty($_SESSION['request_uri'])){
+
+$no_redirection = isset($no_redirection) ? $no_redirection : false;
+if (!$no_redirection && (isset($_SESSION['request_uri']) && !empty($_SESSION['request_uri']))){
     $req= $_SESSION['request_uri'];
     unset($_SESSION['request_uri']);
     header('Location: '.$req);

From 0dba18f7b94959a8706595ef99c07fe0499aab80 Mon Sep 17 00:00:00 2001
From: Laurent Opprecht <laurent.opprecht@unige.ch>
Date: Mon, 16 Apr 2012 11:34:36 +0200
Subject: [PATCH 09/12] shibboleth authentication module #4554: allow to bypass
 automatic redirect

---
 main/auth/shibboleth/init.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/auth/shibboleth/init.php b/main/auth/shibboleth/init.php
index a26db19bd6..84fa5582c5 100644
--- a/main/auth/shibboleth/init.php
+++ b/main/auth/shibboleth/init.php
@@ -9,6 +9,7 @@
  */
 
 $__dir = dirname(__FILE__) . '/';
+$no_redirection = true; 
 include_once($__dir . '/../../inc/global.inc.php');
 
 require_once $__dir . 'app/lib/shibboleth_config.class.php';

From 453ce908726900e2f7f2c4d25a7b8dfb9c4585c4 Mon Sep 17 00:00:00 2001
From: Laurent Opprecht <laurent.opprecht@unige.ch>
Date: Mon, 16 Apr 2012 11:38:44 +0200
Subject: [PATCH 10/12] shibboleth authentication module #4554: move /lib

---
 main/auth/shibboleth/init.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/auth/shibboleth/init.php b/main/auth/shibboleth/init.php
index 84fa5582c5..30df67252d 100644
--- a/main/auth/shibboleth/init.php
+++ b/main/auth/shibboleth/init.php
@@ -9,12 +9,12 @@
  */
 
 $__dir = dirname(__FILE__) . '/';
-$no_redirection = true; 
+$no_redirection = true;  //no redirection in global.
 include_once($__dir . '/../../inc/global.inc.php');
 
-require_once $__dir . 'app/lib/shibboleth_config.class.php';
-require_once $__dir . 'app/lib/shibboleth_session.class.php';
-require_once $__dir . 'app/lib/store.class.php';
+require_once $__dir . 'lib/shibboleth_config.class.php';
+require_once $__dir . 'lib/shibboleth_session.class.php';
+require_once $__dir . 'lib/store.class.php';
 require_once $__dir . 'app/controller/shibboleth_controller.class.php';
 require_once $__dir . 'app/model/shibboleth_store.class.php';
 require_once $__dir . 'app/model/shibboleth_user.class.php';

From 8470d127f08ac401f645748e97835d6223a73d9a Mon Sep 17 00:00:00 2001
From: Laurent Opprecht <laurent.opprecht@unige.ch>
Date: Mon, 16 Apr 2012 11:45:16 +0200
Subject: [PATCH 11/12] shibboleth authentication module #4554: allow to bypass
 automatic redirect

---
 .../app/controller/shibboleth_controller.class.php          | 2 +-
 main/auth/shibboleth/app/view/shibboleth_display.class.php  | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/main/auth/shibboleth/app/controller/shibboleth_controller.class.php b/main/auth/shibboleth/app/controller/shibboleth_controller.class.php
index 00a2d35f50..6624e31f27 100644
--- a/main/auth/shibboleth/app/controller/shibboleth_controller.class.php
+++ b/main/auth/shibboleth/app/controller/shibboleth_controller.class.php
@@ -31,7 +31,7 @@ class ShibbolethController
 
         if (Shibboleth::session()->is_logged_in())
         {
-            Shibboleth::redirect();
+            Redirect::home();
         }
 
         $user = Shibboleth::store()->get_user();
diff --git a/main/auth/shibboleth/app/view/shibboleth_display.class.php b/main/auth/shibboleth/app/view/shibboleth_display.class.php
index 2ba00058cb..138e6f21dc 100644
--- a/main/auth/shibboleth/app/view/shibboleth_display.class.php
+++ b/main/auth/shibboleth/app/view/shibboleth_display.class.php
@@ -25,8 +25,6 @@ class ShibbolethDisplay
 
     public function error_page($message)
     {
-        $include_path = api_get_path(INCLUDE_PATH);
-        require("$include_path/local.inc.php");
         $page_title = get_lang('page_title');
 
         Display :: display_header($page_title);
@@ -37,8 +35,6 @@ class ShibbolethDisplay
     
     public function message_page($message, $title = '')
     {
-        $include_path = api_get_path(INCLUDE_PATH);
-        require("$include_path/local.inc.php");
         $title = $title ? $title : get_lang('page_title');
 
         Display :: display_header($title);
@@ -49,8 +45,6 @@ class ShibbolethDisplay
     
     public function page($content, $title = '')
     {
-        $include_path = api_get_path(INCLUDE_PATH);
-        require("$include_path/local.inc.php");
         $title = $title ? $title : get_lang('page_title');
 
         Display :: display_header($title);

From cd78b5dc0d8df11644170534f5723f7511afa6c1 Mon Sep 17 00:00:00 2001
From: Laurent Opprecht <laurent.opprecht@unige.ch>
Date: Tue, 17 Apr 2012 11:12:25 +0200
Subject: [PATCH 12/12] plugin rss: minor css change

---
 plugin/rss/resources/rss.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugin/rss/resources/rss.css b/plugin/rss/resources/rss.css
index 0657d8a391..7ba812a4f4 100644
--- a/plugin/rss/resources/rss.css
+++ b/plugin/rss/resources/rss.css
@@ -24,7 +24,6 @@
 }
 
 .gfg-root {
-    font-family: Verdana,Geneva,Arial,Helvetica,sans-serif !important;
     border-left:0px;
     border-right:0px;
     border-top:0px ;