diff --git a/custompages/index-logged.php b/custompages/index-logged.php index 3f3a39f971..d4b580cc52 100644 --- a/custompages/index-logged.php +++ b/custompages/index-logged.php @@ -1,6 +1,6 @@ +$www = api_get_path('WEB_PATH'); + +header("Location: $www/user_portal.php"); \ No newline at end of file diff --git a/documentation/credits.html b/documentation/credits.html index b87c492f0a..3c305830e5 100644 --- a/documentation/credits.html +++ b/documentation/credits.html @@ -487,6 +487,11 @@ rewritten by
  • Nanogong integration: Juan Carlos Raña Trabado
  • Wami-recorder integration: Juan Carlos Raña Trabado
    • +

    Shibboleth authentication, plugins, etc - University of Geneva

    +

    Translations

    There are too much translators to list them all. Please check http://translate.chamilo.org
    diff --git a/index.php b/index.php index 3c39a1c63c..72c46bbc49 100644 --- a/index.php +++ b/index.php @@ -123,7 +123,7 @@ if (!empty($_POST['submitAuth'])) { } if (api_get_setting('display_categories_on_homepage') == 'true') { - $controller->tpl->assign('content', $controller->display_anonymous_course_list()); + $controller->tpl->assign('content', $controller->return_anonymous_course_list()); } $controller->set_login_form(); diff --git a/main/auth/shibboleth/_readme.txt b/main/auth/shibboleth/_readme.txt index 72b5b93c4e..a09be0a547 100644 --- a/main/auth/shibboleth/_readme.txt +++ b/main/auth/shibboleth/_readme.txt @@ -1,8 +1,7 @@ Shibboleth authentication module. -@copyright (c) 2012 University of Geneva -@license GNU General Public License - http://www.gnu.org/copyleft/gpl.html -@author Laurent Opprecht , Nicolas Rod +@license see /license.txt +@author Laurent Opprecht , Nicolas Rod for the University of Geneva To use install Shibboleth on your web server and secure the application url with a web server security directive. diff --git a/main/auth/shibboleth/app/controller/shibboleth_controller.class.php b/main/auth/shibboleth/app/controller/shibboleth_controller.class.php index 2790ea2b13..00a2d35f50 100644 --- a/main/auth/shibboleth/app/controller/shibboleth_controller.class.php +++ b/main/auth/shibboleth/app/controller/shibboleth_controller.class.php @@ -3,9 +3,8 @@ /** * Controller for the Shibboleth authentication system. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class ShibbolethController { diff --git a/main/auth/shibboleth/app/lib/model.class.php b/main/auth/shibboleth/app/lib/model.class.php index 6be129c896..9bc004830f 100644 --- a/main/auth/shibboleth/app/lib/model.class.php +++ b/main/auth/shibboleth/app/lib/model.class.php @@ -1,16 +1,10 @@ + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class Model { diff --git a/main/auth/shibboleth/app/lib/scaffolder/scaffolder.class.php b/main/auth/shibboleth/app/lib/scaffolder/scaffolder.class.php index e7ec066266..4f4df08203 100644 --- a/main/auth/shibboleth/app/lib/scaffolder/scaffolder.class.php +++ b/main/auth/shibboleth/app/lib/scaffolder/scaffolder.class.php @@ -4,9 +4,8 @@ * Scaffolder. Genereate code templates from the database layout. * See /template/ for the code being generated * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class Scaffolder { diff --git a/main/auth/shibboleth/app/lib/scaffolder/template/default.php b/main/auth/shibboleth/app/lib/scaffolder/template/default.php index 52bf8fbbde..b5b918b57b 100644 --- a/main/auth/shibboleth/app/lib/scaffolder/template/default.php +++ b/main/auth/shibboleth/app/lib/scaffolder/template/default.php @@ -2,9 +2,8 @@ /** * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ echo ' + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ echo ' + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ echo ', Nicolas Rod + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class ShibbolethConfig { diff --git a/main/auth/shibboleth/app/lib/shibboleth_session.class.php b/main/auth/shibboleth/app/lib/shibboleth_session.class.php index c188eaf834..4079d6bc4a 100644 --- a/main/auth/shibboleth/app/lib/shibboleth_session.class.php +++ b/main/auth/shibboleth/app/lib/shibboleth_session.class.php @@ -4,9 +4,8 @@ * A Chamilo user session. Used as there is no session object so far provided by the core API. * Should be moved to the core library.Prefixed by Shibboleth to avoid name clashes. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht , Nicolas Rod + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class ShibbolethSession { diff --git a/main/auth/shibboleth/app/lib/store.class.php b/main/auth/shibboleth/app/lib/store.class.php index ca71226911..fa8c03b898 100644 --- a/main/auth/shibboleth/app/lib/store.class.php +++ b/main/auth/shibboleth/app/lib/store.class.php @@ -5,9 +5,8 @@ * * One store = one table. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class Store { diff --git a/main/auth/shibboleth/app/model/scaffold/user.class.php b/main/auth/shibboleth/app/model/scaffold/user.class.php index 895293605f..fdf04b8cef 100644 --- a/main/auth/shibboleth/app/model/scaffold/user.class.php +++ b/main/auth/shibboleth/app/model/scaffold/user.class.php @@ -7,9 +7,8 @@ * * Model for table user * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class _User { diff --git a/main/auth/shibboleth/app/model/shibboleth_store.class.php b/main/auth/shibboleth/app/model/shibboleth_store.class.php index c18999f606..2bb26de74a 100644 --- a/main/auth/shibboleth/app/model/shibboleth_store.class.php +++ b/main/auth/shibboleth/app/model/shibboleth_store.class.php @@ -7,9 +7,8 @@ * * If a user is not authenticated nothing is returned. * - * @copyright 2010, University of Geneva - * @author laurent.opprecht@unige.ch, Nicolas Rod - * @license GNU, http://www.gnu.org/licenses/gpl.html + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class ShibbolethStore { diff --git a/main/auth/shibboleth/app/model/shibboleth_user.class.php b/main/auth/shibboleth/app/model/shibboleth_user.class.php index bdab166e23..a311cdedc2 100644 --- a/main/auth/shibboleth/app/model/shibboleth_user.class.php +++ b/main/auth/shibboleth/app/model/shibboleth_user.class.php @@ -4,9 +4,8 @@ * Represent a Shibboleth user. Not to be missunderstand with a Chamilo user * since they don't have the same attributes. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht , Nicolas Rod + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class ShibbolethUser { diff --git a/main/auth/shibboleth/app/model/user.class.php b/main/auth/shibboleth/app/model/user.class.php index 5fd404643f..1c73beac51 100644 --- a/main/auth/shibboleth/app/model/user.class.php +++ b/main/auth/shibboleth/app/model/user.class.php @@ -12,9 +12,8 @@ require_once dirname(__FILE__) . '/scaffold/user.class.php'; * modifications without touching the generated file. Don't modify _User as * it may change in the future. Instead add modifications to this class. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class User extends _User { diff --git a/main/auth/shibboleth/app/shibboleth.class.php b/main/auth/shibboleth/app/shibboleth.class.php index 8f0c883f57..186443c8a4 100644 --- a/main/auth/shibboleth/app/shibboleth.class.php +++ b/main/auth/shibboleth/app/shibboleth.class.php @@ -4,9 +4,8 @@ * Shibboleth main class. Provides access to various Shibboleth sub components and * provides the high level functionalities. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht , Nicolas Rod + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class Shibboleth { diff --git a/main/auth/shibboleth/app/view/admin_login.php b/main/auth/shibboleth/app/view/admin_login.php index 723aed3d42..1fa133a338 100644 --- a/main/auth/shibboleth/app/view/admin_login.php +++ b/main/auth/shibboleth/app/view/admin_login.php @@ -7,9 +7,8 @@ * This page allow administrators to log into the application using the standard * Chamilo method when Shibboleth is not available. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht , Nicolas Rod + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ $dir = dirname(__FILE__); include_once("$dir/../../init.php"); diff --git a/main/auth/shibboleth/app/view/request.php b/main/auth/shibboleth/app/view/request.php index 1f458d57ff..b52776c532 100644 --- a/main/auth/shibboleth/app/view/request.php +++ b/main/auth/shibboleth/app/view/request.php @@ -9,9 +9,8 @@ * * Other users - teachers, students - are directly logged-in. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht , Nicolas Rod + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ $dir = dirname(__FILE__); include_once("$dir/../../init.php"); diff --git a/main/auth/shibboleth/app/view/shibboleth_display.class.php b/main/auth/shibboleth/app/view/shibboleth_display.class.php index 0a660a8d35..2ba00058cb 100644 --- a/main/auth/shibboleth/app/view/shibboleth_display.class.php +++ b/main/auth/shibboleth/app/view/shibboleth_display.class.php @@ -3,10 +3,8 @@ /** * Utility display functions tailored for the Shibboleth pluging. * - * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class ShibbolethDisplay { diff --git a/main/auth/shibboleth/app/view/shibboleth_email_form.class.php b/main/auth/shibboleth/app/view/shibboleth_email_form.class.php index 2808f26521..d5ab8f357f 100644 --- a/main/auth/shibboleth/app/view/shibboleth_email_form.class.php +++ b/main/auth/shibboleth/app/view/shibboleth_email_form.class.php @@ -6,9 +6,8 @@ * * @todo: add email validation * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht , Nicolas Rod + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class ShibbolethEmailForm { diff --git a/main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php b/main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php index 8e2506f9f6..0267207b4f 100644 --- a/main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php +++ b/main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php @@ -4,9 +4,8 @@ * Status request form. Display a form allowing the user to request additional * rights/ another status. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht , Nicolas Rod + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class ShibbolethStatusRequestForm { diff --git a/main/auth/shibboleth/config-dist.php b/main/auth/shibboleth/config-dist.php index fd3f0e7b90..9356e6b6b3 100644 --- a/main/auth/shibboleth/config-dist.php +++ b/main/auth/shibboleth/config-dist.php @@ -6,9 +6,8 @@ * * By default set up the aai configuration. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht , Nicolas Rod + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ require_once dirname(__FILE__) . '/config/aai.class.php'; diff --git a/main/auth/shibboleth/config.php b/main/auth/shibboleth/config.php index a02d6523dd..aa9ee77ada 100644 --- a/main/auth/shibboleth/config.php +++ b/main/auth/shibboleth/config.php @@ -3,9 +3,8 @@ /** * Shibboleth configuration. See /config/aai.php for an example. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht , Nicolas Rod + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ require_once dirname(__FILE__) . '/config/aai.class.php'; diff --git a/main/auth/shibboleth/config/aai.class.php b/main/auth/shibboleth/config/aai.class.php index 9fbde51ba5..39a711ab43 100644 --- a/main/auth/shibboleth/config/aai.class.php +++ b/main/auth/shibboleth/config/aai.class.php @@ -3,9 +3,8 @@ /** * Shibboleth configuration for the AAI federation. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class aai { diff --git a/main/auth/shibboleth/db/shibboleth_upgrade.class.php b/main/auth/shibboleth/db/shibboleth_upgrade.class.php index bc772609f7..0ee0bc07e4 100644 --- a/main/auth/shibboleth/db/shibboleth_upgrade.class.php +++ b/main/auth/shibboleth/db/shibboleth_upgrade.class.php @@ -5,9 +5,8 @@ * Upgrade is checked at each user login so there is no need to manually run * an upgrade. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class ShibbolethUpgrade { diff --git a/main/auth/shibboleth/index.php b/main/auth/shibboleth/index.php index 89928f0781..6de1992fba 100644 --- a/main/auth/shibboleth/index.php +++ b/main/auth/shibboleth/index.php @@ -3,7 +3,6 @@ * Display nothing. This ensure Apache doesn't display the list of files and folders * when it is not propertly configured. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht , Nicolas Rod + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ \ No newline at end of file diff --git a/main/auth/shibboleth/init.php b/main/auth/shibboleth/init.php index 16ed913f0c..a26db19bd6 100644 --- a/main/auth/shibboleth/init.php +++ b/main/auth/shibboleth/init.php @@ -4,9 +4,8 @@ * Initialize the Shibboleth authentication system. All scripts that can be directly * called must include this file * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht , Nicolas Rod + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ $__dir = dirname(__FILE__) . '/'; diff --git a/main/auth/shibboleth/login.php b/main/auth/shibboleth/login.php index bdd53f2b2b..501866b668 100644 --- a/main/auth/shibboleth/login.php +++ b/main/auth/shibboleth/login.php @@ -10,9 +10,8 @@ * When Shibboleth is properly set up this page will only be available for * authenticated users. The plugin ensure those people are created and logged in. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht , Nicolas Rod + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ include_once(dirname(__FILE__) . '/init.php'); diff --git a/main/auth/shibboleth/script/scaffold.php b/main/auth/shibboleth/script/scaffold.php index 26125d888f..2474e69e2f 100644 --- a/main/auth/shibboleth/script/scaffold.php +++ b/main/auth/shibboleth/script/scaffold.php @@ -6,9 +6,8 @@ * * Will only run when the server is a test server. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ $dir = dirname(__FILE__); include_once($dir . '/../init.php'); diff --git a/main/auth/shibboleth/test/shibboleth_test.class.php b/main/auth/shibboleth/test/shibboleth_test.class.php index cc8d6ef7b8..dddeed5a57 100644 --- a/main/auth/shibboleth/test/shibboleth_test.class.php +++ b/main/auth/shibboleth/test/shibboleth_test.class.php @@ -4,9 +4,8 @@ * Various Unit Tests. Note that those tests create users in the database but * don't delete them. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class ShibbolethTest { diff --git a/main/auth/shibboleth/test/shibboleth_test_helper.class.php b/main/auth/shibboleth/test/shibboleth_test_helper.class.php index f3796f84f6..8e178e381a 100644 --- a/main/auth/shibboleth/test/shibboleth_test_helper.class.php +++ b/main/auth/shibboleth/test/shibboleth_test_helper.class.php @@ -3,9 +3,8 @@ /** * Helper functions for the tests. Set up various dummy user types: teacher, student, etc. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ class ShibbolethTestHelper { diff --git a/main/auth/shibboleth/test/test.php b/main/auth/shibboleth/test/test.php index 15db40ede3..7b1cdbd772 100644 --- a/main/auth/shibboleth/test/test.php +++ b/main/auth/shibboleth/test/test.php @@ -3,9 +3,8 @@ /** * Run unit tests. Server needs to be a test server to run those. * - * @copyright (c) 2012 University of Geneva - * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html - * @author Laurent Opprecht + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ include_once(dirname(__FILE__) . '/../init.php'); diff --git a/main/auth/shibboleth/test/test_no_email.php b/main/auth/shibboleth/test/test_no_email.php index 71acd7edbc..87a7e68483 100644 --- a/main/auth/shibboleth/test/test_no_email.php +++ b/main/auth/shibboleth/test/test_no_email.php @@ -1,9 +1,8 @@ + * @license see /license.txt + * @author Laurent Opprecht , Nicolas Rod for the University of Geneva */ include_once(dirname(__FILE__) . '/../init.php'); diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php index 23c0015c94..579e2044e8 100644 --- a/main/inc/lib/userportal.lib.php +++ b/main/inc/lib/userportal.lib.php @@ -397,7 +397,7 @@ class IndexManager { * @version 1.1 * @author Patrick Cool , Ghent University - refactoring and code cleaning */ - function display_anonymous_course_list() { + function return_anonymous_course_list() { $result = ''; $ctok = $_SESSION['sec_token']; $stok = Security::get_token();