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

Removing unused library lost_password.lib.php all code was moved to login.lib.php

Browse Source
skala
Julio Montoya 13 years ago
parent d97757dc8f
commit 0d4384e4b7
5 changed files with 7 additions and 224 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. 1
      main/auth/lostPassword.php
  2. 214
      main/auth/lost_password.lib.php
  3. 5
      main/inc/lib/login.lib.php
  4. 2
      tests/main/inc/lib/legal.lib.test.php
  5. 7
      tests/main/inc/lib/login.lib.test.php

1
main/auth/lostPassword.php
Unescape View File

@ -23,7 +23,6 @@ $language_file = array('registration', 'index');
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'login.lib.php'; require_once api_get_path(LIBRARY_PATH).'login.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php'; require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
//require_once api_get_path(LIBRARY_PATH).'custompages.lib.php';moved to autoload
// Custom pages // Custom pages
// Had to move the form handling in here, because otherwise there would // Had to move the form handling in here, because otherwise there would

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

@ -1,214 +0,0 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Code
* @package chamilo.auth
*/
/**
* @deprecated by Ivan Tcholakov, 09-OCT-2009.
* Get email headers
*
* @return string
* @author Olivier Cauberghe <olivier.cauberghe@UGent.be>, Ghent University
*/
/*
function get_email_headers() {
$emailHeaders = "From: \"".addslashes(api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS))."\" <".api_get_setting('emailAdministrator').">\n";
$emailHeaders .= "Reply-To: ".api_get_setting('emailAdministrator')."\n";
$emailHeaders .= "Return-Path: ".api_get_setting('emailAdministrator')."\n";
$emailHeaders .= "X-Sender: ".api_get_setting('emailAdministrator')."\n";
$emailHeaders .= "X-Mailer: PHP / ".phpversion()."\n";
$emailHeaders .= "Content-Type: text/plain;\n\tcharset=\"".api_get_system_encoding()."\"\n";
$emailHeaders .= "Mime-Version: 1.0";
return $emailHeaders;
}
*/
/**
* Get list of user accounts with a reset link for each
* @param unknown_type $user
* @param boolean $reset
* @param boolean $by_username
* @return unknown
* @author Olivier Cauberghe <olivier.cauberghe@UGent.be>, Ghent University
*/
function get_user_account_list($user, $reset = false, $by_username = false) {
global $_configuration;
$portal_url = api_get_path(WEB_PATH);
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1 ) {
$url = api_get_access_url($access_url_id);
$portal_url = $url['url'];
}
}
if ($reset) {
if ($by_username) {
$secret_word = get_secret_word($user['email']);
if ($reset) {
$reset_link = $portal_url."main/auth/lostPassword.php?reset=".$secret_word."&id=".$user['uid'];
} else {
$reset_link = get_lang('Pass')." : $user[password]";
}
$user_account_list = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$user['loginName']."\n".get_lang('ResetLink').' : '.$reset_link.'';
if ($user_account_list) {
$user_account_list = "\n------------------------\n" . $user_account_list;
}
} else {
foreach ($user as $this_user) {
$secret_word = get_secret_word($this_user['email']);
if ($reset) {
$reset_link = $portal_url."main/auth/lostPassword.php?reset=".$secret_word."&id=".$this_user['uid'];
} else {
$reset_link = get_lang('Pass')." : $this_user[password]";
}
$user_account_list[] = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$this_user['loginName']."\n".get_lang('ResetLink').' : '.$reset_link.'';
}
if ($user_account_list) {
$user_account_list = implode("\n------------------------\n", $user_account_list);
}
}
} else {
if (!$by_username) {
$user = $user[0];
}
$reset_link = get_lang('Pass')." : $user[password]";
$user_account_list = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$user['loginName']."\n".$reset_link.'';
}
return $user_account_list;
}
/**
* This function sends the actual password to the user
*
* @param unknown_type $user
* @author Olivier Cauberghe <olivier.cauberghe@UGent.be>, Ghent University
*/
function send_password_to_user($user, $by_username = false) {
global $_configuration;
/*
$emailHeaders = get_email_headers(); // Email Headers
*/
$email_subject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
if ($by_username) { // Show only for lost password
$user_account_list = get_user_account_list($user, false, $by_username); // BODY
$email_to = $user['email'];
} else {
$user_account_list = get_user_account_list($user); // BODY
$email_to = $user[0]['email'];
}
$portal_url = $_configuration['root_web'];
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1 ) {
$url = api_get_access_url($access_url_id);
$portal_url = $url['url'];
}
}
$email_body = get_lang('YourAccountParam')." ".$portal_url."\n\n$user_account_list \n\n";
$emailBody .= get_lang('Formula').",\n".api_get_setting('administratorName')." ".api_get_setting('administratorSurname')."\n".get_lang('PlataformAdmin')." ".api_get_setting('siteName');
// SEND MESSAGE
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
if (@api_mail('', $email_to, $email_subject, $email_body, $sender_name, $email_admin) == 1) {
Display::display_confirmation_message(get_lang('YourPasswordHasBeenEmailed'));
} else {
$message = get_lang('SystemUnableToSendEmailContact').' '.Display :: encrypted_mailto_link(api_get_setting('emailAdministrator'), get_lang('PlatformAdmin')).".</p>";
}
}
/**
* Enter description here...
*
* @param unknown_type $user
* @param bool $by_username
* @return unknown
*
* @author Olivier Cauberghe <olivier.cauberghe@UGent.be>, Ghent University
*/
function handle_encrypted_password($user, $by_username = false) {
global $_configuration;
/*
$emailHeaders = get_email_headers(); // Email Headers
*/
$email_subject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
if ($by_username) { // Show only for lost password
$user_account_list = get_user_account_list($user, true, $by_username); // BODY
$email_to = $user['email'];
} else {
$user_account_list = get_user_account_list($user, true); // BODY
$email_to = $user[0]['email'];
}
$secret_word = get_secret_word($email_to);
$email_body = get_lang('DearUser')." :\n".get_lang('password_request')."\n\n";
$email_body .= "-----------------------------------------------\n".$user_account_list."\n-----------------------------------------------\n\n";
$email_body .= get_lang('PasswordEncryptedForSecurity');
$emailBody .= " \n\n";
$emailBody .= get_lang('Formula').",\n".api_get_setting('administratorName')." ".api_get_setting('administratorSurname')."\n".get_lang('PlataformAdmin')." ".api_get_setting('siteName');
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
if (@api_mail('', $email_to, $email_subject, $email_body, $sender_name, $email_admin) == 1) {
Display::display_confirmation_message(get_lang('YourPasswordHasBeenEmailed'));
} else {
$message = get_lang('SystemUnableToSendEmailContact').' '.Display :: encrypted_mailto_link(api_get_setting('emailAdministrator'), get_lang('PlatformAdmin')).".</p>";
Display::display_error_message($message, false);
}
}
/**
* Enter description here...
* @author Olivier Cauberghe <olivier.cauberghe@UGent.be>, Ghent University
*/
function get_secret_word($add) {
global $_configuration;
return $secret_word = md5($_configuration['security_key'].$add);
}
/**
* Enter description here...
* @author Olivier Cauberghe <olivier.cauberghe@UGent.be>, Ghent University
*/
function reset_password($secret, $id, $by_username = false) {
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$id = intval($id);
$sql = "SELECT user_id AS uid, lastname AS lastName, firstname AS firstName, username AS loginName, password, email FROM ".$tbl_user." WHERE user_id=$id";
$result = Database::query($sql);
$num_rows = Database::num_rows($result);
if ($result && $num_rows > 0) {
$user = Database::fetch_array($result);
} else {
return 'Could not reset password.'; // TODO: This message has to be translated.
}
if (get_secret_word($user['email']) == $secret) { // OK, secret word is good. Now change password and mail it.
$user['password'] = api_generate_password();
$crypted = $user['password'];
$crypted = api_get_encrypted_password($crypted);
$sql = "UPDATE ".$tbl_user." SET password='$crypted' WHERE user_id=$id";
$result = Database::query($sql);
return send_password_to_user($user, $by_username);
} else {
return 'Not allowed.'; // TODO: This message has to be translated.
}
}

5
main/inc/lib/login.lib.php
Unescape View File

@ -83,8 +83,7 @@ class Login
* @param int $user * @param int $user
* @author Olivier Cauberghe <olivier.cauberghe@UGent.be>, Ghent University * @author Olivier Cauberghe <olivier.cauberghe@UGent.be>, Ghent University
*/ */
public static function send_password_to_user($user, $by_username = false) public static function send_password_to_user($user, $by_username = false) {
{
global $_configuration; global $_configuration;
$email_subject = "[" . api_get_setting('siteName') . "] " . get_lang('LoginRequest'); // SUBJECT $email_subject = "[" . api_get_setting('siteName') . "] " . get_lang('LoginRequest'); // SUBJECT
@ -96,7 +95,7 @@ class Login
$email_to = $user[0]['email']; $email_to = $user[0]['email'];
} }
$portal_url = $_configuration['root_web']; $portal_url = api_get_path(WEB_PATH);
if ($_configuration['multiple_access_urls']) { if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id(); $access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) { if ($access_url_id != -1) {

2
tests/main/inc/lib/legal.lib.test.php
Unescape View File

@ -1,5 +1,5 @@
<?php <?php
require_once(api_get_path(LIBRARY_PATH).'legal.lib.php'); require_once api_get_path(LIBRARY_PATH).'legal.lib.php';
class TestLegal extends UnitTestCase{ class TestLegal extends UnitTestCase{

7
tests/main/auth/lost_password.lib.test.php → tests/main/inc/lib/login.lib.test.php
Unescape View File

@ -1,8 +1,8 @@
<?php <?php
require_once(api_get_path(LIBRARY_PATH).'login.lib.php'); require_once api_get_path(LIBRARY_PATH).'login.lib.php';
require_once(api_get_path(LIBRARY_PATH).'course.lib.php'); require_once api_get_path(LIBRARY_PATH).'course.lib.php';
class TestLostPassword extends UnitTestCase { class TestLogin extends UnitTestCase {
public function __construct(){ public function __construct(){
$this->UnitTestCase('Lost password library - main/auth/lost_password.lib.test.php'); $this->UnitTestCase('Lost password library - main/auth/lost_password.lib.test.php');
@ -81,4 +81,3 @@ class TestLostPassword extends UnitTestCase {
//var_dump($res); //var_dump($res);
} }
} }
?>
Write Preview
Loading…
Cancel
Save