shibboleth authentication module #4554: change credits

13 years ago · 2203d73ae9
parent cd58673b01
commit 2203d73ae9
33 changed files with 69 additions and 102 deletions
--- a/documentation/credits.html
+++ b/documentation/credits.html
@ -487,6 +487,11 @@ rewritten by
 	<li>Nanogong integration: Juan Carlos Raña Trabado</li>
 	<li>Wami-recorder integration: Juan Carlos Raña Trabado</li>
 </ul>
+<h2>Shibboleth authentication, plugins, etc - University of Geneva</h2>
+<ul>
+	<li>Laurent Opprecht</li>
+	<li>Nicolas Rod</li>
+</ul>
 <h1>Translations</h1>
 There are too much translators to list them all. Please check http://translate.chamilo.org <br />

--- 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 <laurent@opprecht.info>, Nicolas Rod
+@license see /license.txt
+@author Laurent Opprecht <laurent@opprecht.info>, 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.
--- 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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class ShibbolethController
 {
--- a/main/auth/shibboleth/app/lib/model.class.php
+++ b/main/auth/shibboleth/app/lib/model.class.php
@ -1,16 +1,10 @@
 <?php

-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 /**
 * Description of model
 *
- * @copyright (c) 2012 University of Geneva
- * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html
- * @author Laurent Opprecht <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class Model
 {
--- 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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class Scaffolder
 {
--- 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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */

 echo '<?php';
--- a/main/auth/shibboleth/app/lib/scaffolder/template/model.php
+++ b/main/auth/shibboleth/app/lib/scaffolder/template/model.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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */

 echo '<?php';
--- a/main/auth/shibboleth/app/lib/scaffolder/template/public.php
+++ b/main/auth/shibboleth/app/lib/scaffolder/template/public.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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */

 echo '<?php';
--- a/main/auth/shibboleth/app/lib/shibboleth_config.class.php
+++ b/main/auth/shibboleth/app/lib/shibboleth_config.class.php
@ -4,9 +4,8 @@
 * Shibboleth configuration. All configuration for the Shibboleth authentication
 * plugin: field names mapping, etc.
 *
- * @copyright (c) 2012 University of Geneva
- * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html
- * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class ShibbolethConfig
 {    
--- 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 <laurent@opprecht.info>, Nicolas Rod
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class ShibbolethSession
 {
--- 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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class Store
 {
--- 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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class _User
 {
--- 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 <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class ShibbolethStore
 {
--- 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 <laurent@opprecht.info>, Nicolas Rod
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class ShibbolethUser
 {       
--- 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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class User extends _User
 {
--- 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 <laurent@opprecht.info>, Nicolas Rod
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class Shibboleth
 {
--- 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 <laurent@opprecht.info>, Nicolas Rod
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 $dir = dirname(__FILE__);
 include_once("$dir/../../init.php");
--- 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 <laurent@opprecht.info>, Nicolas Rod
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 $dir = dirname(__FILE__);
 include_once("$dir/../../init.php");
--- 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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class ShibbolethDisplay
 {
--- 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 <laurent@opprecht.info>, Nicolas Rod
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class ShibbolethEmailForm
 {
--- 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 <laurent@opprecht.info>, Nicolas Rod
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class ShibbolethStatusRequestForm
 {
--- 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 <laurent@opprecht.info>, Nicolas Rod
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 require_once dirname(__FILE__) . '/config/aai.class.php';

--- 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 <laurent@opprecht.info>, Nicolas Rod
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 require_once dirname(__FILE__) . '/config/aai.class.php';

--- 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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class aai
 {
--- 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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class ShibbolethUpgrade
 {
--- 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 <laurent@opprecht.info>, Nicolas Rod
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
--- 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 <laurent@opprecht.info>, Nicolas Rod
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */

 $__dir = dirname(__FILE__) . '/';
--- 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 <laurent@opprecht.info>, Nicolas Rod
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 include_once(dirname(__FILE__) . '/init.php');

--- 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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 $dir = dirname(__FILE__);
 include_once($dir . '/../init.php');
--- 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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class ShibbolethTest
 {
--- 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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 class ShibbolethTestHelper
 {
--- 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 <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 include_once(dirname(__FILE__) . '/../init.php');

--- a/main/auth/shibboleth/test/test_no_email.php
+++ b/main/auth/shibboleth/test/test_no_email.php
@ -1,9 +1,8 @@
 <?php

 /**
- * @copyright (c) 2012 University of Geneva
- * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html
- * @author Laurent Opprecht <laurent@opprecht.info>
+ * @license see /license.txt
+ * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
 */
 include_once(dirname(__FILE__) . '/../init.php');