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
jmontoya 16 years ago
parent 034f8d56d4 a48e986956
commit 8a1486fb92
3 changed files with 31 additions and 88 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. 8
      main/auth/inscription.php
  2. 34
      main/auth/lostPassword.php
  3. 55
      main/auth/lost_password.lib.php

8
main/auth/inscription.php
Unescape View File

@ -502,8 +502,7 @@ if ($form->validate()) {
EMAIL NOTIFICATION
--------------------------------------*/
if (strstr($values['email'], '@'))
{
if (strstr($values['email'], '@')) {
// Lets predefine some variables. Be sure to change the from address!
$recipient_name = $values['firstname'].' '.$values['lastname'];
$email = $values['email'];
@ -521,7 +520,7 @@ if ($form->validate()) {
}
}
$emailbody = get_lang('Dear')." ".stripslashes(Security::remove_XSS($firstname)." ".Security::remove_XSS($lastname)).",\n\n".get_lang('YouAreReg')." ".get_setting('siteName')." ".get_lang('Settings')." ".$values['username']."\n".get_lang('Pass')." : ".stripslashes($values['pass1'])."\n\n".get_lang('Address')." ".get_setting('siteName')." ".get_lang('Is')." : ".$portal_url."\n\n".get_lang('Problem')."\n\n".get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n".get_lang('Manager')." ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n".get_lang('Email')." : ".get_setting('emailAdministrator');
$emailbody = get_lang('Dear')." ".stripslashes(Security::remove_XSS($recipient_name)).",\n\n".get_lang('YouAreReg')." ".get_setting('siteName')." ".get_lang('Settings')." ".$values['username']."\n".get_lang('Pass')." : ".stripslashes($values['pass1'])."\n\n".get_lang('Address')." ".get_setting('siteName')." ".get_lang('Is')." : ".$portal_url."\n\n".get_lang('Problem')."\n\n".get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n".get_lang('Manager')." ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n".get_lang('Email')." : ".get_setting('emailAdministrator');
// Here we are forming one large header line
// Every header must be followed by a \n except the last
@ -533,8 +532,7 @@ if ($form->validate()) {
echo "<p>".get_lang('Dear')." ".stripslashes(Security::remove_XSS($recipient_name)).",<br /><br />".get_lang('PersonalSettings').".</p>\n";
if (!empty ($values['email']))
{
if (!empty ($values['email'])) {
echo "<p>".get_lang('MailHasBeenSent').".</p>";
}

34
main/auth/lostPassword.php
Unescape View File

@ -1,28 +1,5 @@
<?php
// $Id: lostPassword.php 20254 2009-05-02 21:24:08Z iflorespaz $
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004 Dokeos S.A.
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) various contributors
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
==============================================================================
*/
/* For licensing terms, see /dokeos_license.txt */
/**
==============================================================================
* SCRIPT PURPOSE :
@ -57,16 +34,11 @@ echo '<div class="actions-title">';
echo $tool_name;
echo '</div>';
$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
if (isset ($_GET["reset"]) && isset ($_GET["id"]))
{
if (isset ($_GET["reset"]) && isset ($_GET["id"])) {
$msg = reset_password($_GET["reset"], $_GET["id"]);
$msg .= '. <br/>'.get_lang('YourPasswordHasBeenEmailed');
$msg1= '<a href="'.api_get_path(WEB_PATH).'main/auth/lostPassword.php" class="fake_button_back" >'.get_lang('Back').'</a>';
Display::display_normal_message($msg);
echo '<br/><br/><div class="actions" >'.$msg1.'</div>';
}
else
{
} else {
$form = new FormValidator('lost_password');
$form->add_textfield('email', get_lang('Email'), false, 'size="40"');
$form->applyFilter('email','strtolower');

55
main/auth/lost_password.lib.php
Unescape View File

@ -1,32 +1,10 @@
<?php
// $Id: lost_password.lib.php 18942 2009-03-10 23:42:21Z juliomontoya $
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004 Dokeos S.A.
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) various contributors
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
==============================================================================
*/
/* For licensing terms, see /dokeos_license.txt */
/**
* Enter description here...
* Get email headers
*
* @return unknown
* @return string
* @author Olivier Cauberghe <olivier.cauberghe@UGent.be>, Ghent University
*/
function get_email_headers()
@ -45,7 +23,7 @@ function get_email_headers()
* Enter description here...
*
* @param unknown_type $user
* @param unknown_type $reset
* @param boolean $reset
* @return unknown
* @author Olivier Cauberghe <olivier.cauberghe@UGent.be>, Ghent University
*/
@ -61,23 +39,25 @@ function get_user_account_list($user, $reset = false)
}
}
if ($reset==true) {
foreach ($user as $thisUser) {
$secretword = get_secret_word($thisUser["email"]);
if ($reset) {
$reset_link = $portal_url."main/auth/lostPassword.php?reset=".$secretword."&id=".$thisUser['uid'];
}
else
{
} else {
$reset_link = get_lang('Pass')." : $thisUser[password]";
}
$userAccountList[] = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$thisUser["loginName"]."\n".get_lang('ResetLink').' : '.$reset_link.'';
$userAccountList[] = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$thisUser['loginName']."\n".get_lang('ResetLink').' : '.$reset_link.'';
}
if ($userAccountList)
{
$userAccountList = implode("\n------------------------\n", $userAccountList);
}
} else {
$user = $user[0];
$reset_link = get_lang('Pass')." : $user[password]";
$userAccountList = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$user['loginName']."\n".$reset_link.'';
}
return $userAccountList;
}
/**
@ -108,12 +88,9 @@ function send_password_to_user($user)
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
if (@api_mail('', $emailTo, $emailSubject, $emailBody, $sender_name,$email_admin)==1)
{
if (@api_mail('', $emailTo, $emailSubject, $emailBody, $sender_name,$email_admin)==1) {
Display::display_confirmation_message(get_lang('YourPasswordHasBeenEmailed'));
}
else
{
} else {
$message = get_lang('SystemUnableToSendEmailContact') . Display :: encrypted_mailto_link(get_setting('emailAdministrator'), get_lang('PlatformAdmin')).".</p>";
Display::display_error_message($message, false);
}
@ -185,10 +162,6 @@ function reset_password($secret, $id)
$user[0]["password"] = api_generate_password();
$crypted = $user[0]["password"];
$crypted = api_get_encrypted_password($crypted);
/*if( $userPasswordCrypted)
{
$crypted = md5($crypted);
}*/
api_sql_query("UPDATE ".$tbl_user." SET password='$crypted' WHERE user_id=$id");
return send_password_to_user($user, $your_password_has_been_reset);
}

Write Preview
Loading…
Cancel
Save