chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge

Browse Source
skala
Julio Montoya 13 years ago
parent 41f0447aa0 ada1f107a2
commit ee7c0e31f7
36 changed files with 74 additions and 107 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      custompages/index-logged.php
  2. 5
      documentation/credits.html
  3. 2
      index.php
  4. 5
      main/auth/shibboleth/_readme.txt
  5. 5
      main/auth/shibboleth/app/controller/shibboleth_controller.class.php
  6. 10
      main/auth/shibboleth/app/lib/model.class.php
  7. 5
      main/auth/shibboleth/app/lib/scaffolder/scaffolder.class.php
  8. 5
      main/auth/shibboleth/app/lib/scaffolder/template/default.php
  9. 5
      main/auth/shibboleth/app/lib/scaffolder/template/model.php
  10. 5
      main/auth/shibboleth/app/lib/scaffolder/template/public.php
  11. 5
      main/auth/shibboleth/app/lib/shibboleth_config.class.php
  12. 5
      main/auth/shibboleth/app/lib/shibboleth_session.class.php
  13. 5
      main/auth/shibboleth/app/lib/store.class.php
  14. 5
      main/auth/shibboleth/app/model/scaffold/user.class.php
  15. 5
      main/auth/shibboleth/app/model/shibboleth_store.class.php
  16. 5
      main/auth/shibboleth/app/model/shibboleth_user.class.php
  17. 5
      main/auth/shibboleth/app/model/user.class.php
  18. 5
      main/auth/shibboleth/app/shibboleth.class.php
  19. 5
      main/auth/shibboleth/app/view/admin_login.php
  20. 5
      main/auth/shibboleth/app/view/request.php
  21. 6
      main/auth/shibboleth/app/view/shibboleth_display.class.php
  22. 5
      main/auth/shibboleth/app/view/shibboleth_email_form.class.php
  23. 5
      main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php
  24. 5
      main/auth/shibboleth/config-dist.php
  25. 5
      main/auth/shibboleth/config.php
  26. 5
      main/auth/shibboleth/config/aai.class.php
  27. 5
      main/auth/shibboleth/db/shibboleth_upgrade.class.php
  28. 5
      main/auth/shibboleth/index.php
  29. 5
      main/auth/shibboleth/init.php
  30. 5
      main/auth/shibboleth/login.php
  31. 5
      main/auth/shibboleth/script/scaffold.php
  32. 5
      main/auth/shibboleth/test/shibboleth_test.class.php
  33. 5
      main/auth/shibboleth/test/shibboleth_test_helper.class.php
  34. 5
      main/auth/shibboleth/test/test.php
  35. 5
      main/auth/shibboleth/test/test_no_email.php
  36. 2
      main/inc/lib/userportal.lib.php

6
custompages/index-logged.php
Unescape View File

@ -1,6 +1,6 @@
<?php
require_once(dirname(__FILE__).'/../main/inc/global.inc.php');
//require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
header("Location: /user_portal.php");
?>
$www = api_get_path('WEB_PATH');
header("Location: $www/user_portal.php");

5
documentation/credits.html
Unescape View File

@ -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 />

2
index.php
Unescape View File

@ -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();

5
main/auth/shibboleth/_readme.txt
Unescape View File

@ -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.

5
main/auth/shibboleth/app/controller/shibboleth_controller.class.php
Unescape View File

@ -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
{

10
main/auth/shibboleth/app/lib/model.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/app/lib/scaffolder/scaffolder.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/app/lib/scaffolder/template/default.php
Unescape View File

@ -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';

5
main/auth/shibboleth/app/lib/scaffolder/template/model.php
Unescape View File

@ -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';

5
main/auth/shibboleth/app/lib/scaffolder/template/public.php
Unescape View File

@ -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';

5
main/auth/shibboleth/app/lib/shibboleth_config.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/app/lib/shibboleth_session.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/app/lib/store.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/app/model/scaffold/user.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/app/model/shibboleth_store.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/app/model/shibboleth_user.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/app/model/user.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/app/shibboleth.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/app/view/admin_login.php
Unescape View File

@ -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");

5
main/auth/shibboleth/app/view/request.php
Unescape View File

@ -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");

6
main/auth/shibboleth/app/view/shibboleth_display.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/app/view/shibboleth_email_form.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/config-dist.php
Unescape View File

@ -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';

5
main/auth/shibboleth/config.php
Unescape View File

@ -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';

5
main/auth/shibboleth/config/aai.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/db/shibboleth_upgrade.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/index.php
Unescape View File

@ -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
*/

5
main/auth/shibboleth/init.php
Unescape View File

@ -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__) . '/';

5
main/auth/shibboleth/login.php
Unescape View File

@ -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');

5
main/auth/shibboleth/script/scaffold.php
Unescape View File

@ -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');

5
main/auth/shibboleth/test/shibboleth_test.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/test/shibboleth_test_helper.class.php
Unescape View File

@ -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
{

5
main/auth/shibboleth/test/test.php
Unescape View File

@ -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');

5
main/auth/shibboleth/test/test_no_email.php
Unescape View File

@ -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');

2
main/inc/lib/userportal.lib.php
Unescape View File

@ -397,7 +397,7 @@ class IndexManager {
* @version 1.1
* @author Patrick Cool <patrick.cool@UGent.be>, 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();

Write Preview
Loading…
Cancel
Save