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 branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x

Browse Source
1.10.x
Yannick Warnier 9 years ago
parent c92044a429 870361f06a
commit f13a1293dc
7 changed files with 16 additions and 10 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. 3
      custompages/first_login-dist.php
  2. 3
      custompages/index-unlogged-dist.php
  3. 2
      custompages/loggedout-dist.php
  4. 5
      custompages/lostpassword-dist.php
  5. 4
      custompages/registration-dist.php
  6. 4
      custompages/registration-feedback-dist.php
  7. 5
      plugin/createdrupaluser/src/HookCreateDrupalUser.php

3
custompages/first_login-dist.php
Unescape View File

@ -59,6 +59,7 @@ if ($_GET['invalid'] == 1) {
if ($_GET['invalid'] == 2) {
$error_message = get_lang('PassTwo');
}
$www = api_get_path('WEB_PATH');
/**
* HTML output
*/
@ -75,7 +76,7 @@ if ($_GET['invalid'] == 2) {
<link rel="stylesheet" type="text/css" href="/custompages/style-ie6.css" />
<![endif]-->
<script type="text/javascript" src="/main/inc/lib/javascript/jquery.min.js"></script>
<script type="text/javascript" src="<?php echo $www ?>web/assets/jquery/jquery.min.js"></script>
<script type="text/javascript">
$(document).ready(function() {
if (top.location != location)

3
custompages/index-unlogged-dist.php
Unescape View File

@ -52,8 +52,7 @@ $rootWeb = api_get_path('WEB_PATH');
<!--[if IE 6]>
<link rel="stylesheet" type="text/css" href="/custompages/style-ie6.css" />
<![endif]-->
<script type="text/javascript" src="<?php echo $rootWeb ?>main/inc/lib/javascript/jquery.min.js"></script>
<script type="text/javascript" src="<?php echo $rootWeb ?>web/assets/jquery/jquery.min.js"></script>
<script type="text/javascript">
$(document).ready(function() {
if (top.location != location) {

2
custompages/loggedout-dist.php
Unescape View File

@ -30,7 +30,7 @@ $www = api_get_path('WEB_PATH');
<!--[if IE 6]>
<link rel="stylesheet" type="text/css" href="/custompages/style-ie6.css" />
<![endif]-->
<script type="text/javascript" src="<?php echo $www ?>main/inc/lib/javascript/jquery.min.js"></script>
<script type="text/javascript" src="<?php echo $www ?>web/assets/jquery/jquery.min.js"></script>
<script type="text/javascript">
$(document).ready(function() {
if (top.location != location)

5
custompages/lostpassword-dist.php
Unescape View File

@ -7,7 +7,7 @@
require_once('../../main/inc/global.inc.php');
require_once('language.php');
$rootWeb = api_get_path('WEB_PATH');
?>
<html>
<head>
@ -19,7 +19,8 @@ require_once('language.php');
<!--[if IE 6]>
<link rel="stylesheet" type="text/css" href="../../custompages/style-ie6.css" />
<![endif]-->
<script type="text/javascript" src="../../main/inc/lib/javascript/jquery.min.js"></script>
<script type="text/javascript" src="<?php echo $rootWeb ?>web/assets/jquery/jquery.min.js"></script>
<script type="text/javascript">
$(document).ready(function() {
// Handler pour la touche retour

4
custompages/registration-dist.php
Unescape View File

@ -23,6 +23,8 @@ if (isset($content['form']->_elementIndex['status'])) {
$content['form']->removeElement('status');
$content['form']->removeElement('status');
}
$rootWeb = api_get_path('WEB_PATH');
// Deprecated since 2015-03-26
/**
* Code to change the way QuickForm render html
@ -95,7 +97,7 @@ EOT;
<script src="js/vendor/html5shiv.js"></script>
<script src="js/vendor/respond.min.js"></script>
<![endif]-->
<script type="text/javascript" src="/main/inc/lib/javascript/jquery.min.js"></script>
<script type="text/javascript" src="<?php echo $rootWeb ?>web/assets/jquery/jquery.min.js"></script>
</head>
<body>
<img id="backgroundimage" src="/custompages/images/page-background.png"">

4
custompages/registration-feedback-dist.php
Unescape View File

@ -8,6 +8,8 @@
* HTML output
*/
require_once('language.php');
$rootWeb = api_get_path('WEB_PATH');
?>
<html>
<head>
@ -23,7 +25,7 @@ require_once('language.php');
<script src="js/vendor/html5shiv.js"></script>
<script src="js/vendor/respond.min.js"></script>
<![endif]-->
<script type="text/javascript" src="<?php echo api_get_path('WEB_PATH') ?>/main/inc/lib/javascript/jquery.min.js"></script>
<script type="text/javascript" src="<?php echo $rootWeb ?>web/assets/jquery/jquery.min.js"></script>
</head>
<body>
<img src="/custompages/images/page-background.png" class="backgroundimage" />

5
plugin/createdrupaluser/src/HookCreateDrupalUser.php
Unescape View File

@ -43,9 +43,10 @@ class HookCreateDrupalUser extends HookObserver implements HookCreateUserObserve
'status' => 1,
'init' => $userInfo['email']
);
$extraFields = array(
'firstname' => $userInfo['firstname'],
'lastname' => $userInfo['lastname']
'first_name' => $userInfo['firstname'],
'last_name' => $userInfo['lastname']
);
$options = array(

Write Preview
Loading…
Cancel
Save