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

[svn r16708] Fix e-mail sending (see FS#2929) (by cfasanando)

Browse Source
skala
Yannick Warnier 18 years ago
parent b5ddb4e635
commit 3f978f1386
6 changed files with 13 additions and 13 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. 4
      main/admin/session_import.php
  2. 6
      main/admin/user_add.php
  3. 4
      main/admin/user_edit.php
  4. 4
      main/admin/user_import.php
  5. 6
      main/auth/inscription.php
  6. 2
      main/mySpace/user_import.php

4
main/admin/session_import.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: session_import.php 15000 2008-04-22 02:32:46Z yannoo $
<?php // $Id: session_import.php 16708 2008-11-10 22:14:49Z yannoo $
/*
==============================================================================
Dokeos - elearning and course management software
@ -133,7 +133,7 @@ if($_POST['formSent'])
if(mysql_affected_rows()>0 && $sendMail)
{
$emailto='"'.$firstname.' '.$lastname.'" <'.$email.'>';
$emailto=$firstname.' '.$lastname.' <'.$email.'>';
$emailsubject='['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName');
$emailbody="[NOTE:] ".get_lang('ThisIsAutomaticEmailNoReply').".\n\n".get_lang('langDear')." $firstname $lastname,\n\n".get_lang('langYouAreReg')." ". get_setting('siteName') ." ".get_lang('langSettings')." $username\n". get_lang('langPass')." : $password\n\n".get_lang('langAddress') ." ". get_lang('langIs') ." ". $serverAddress ."\n\n".get_lang('YouWillSoonReceiveMailFromCoach')."\n\n". get_lang('langProblem'). "\n\n". get_lang('langFormula');
//#287 modifiee par Stephane DEBIEVE - FOREM

6
main/admin/user_add.php
Unescape View File

@ -1,9 +1,9 @@
<?php // $Id: user_add.php 16479 2008-10-09 17:31:44Z yannoo $
<?php // $Id: user_add.php 16708 2008-11-10 22:14:49Z yannoo $
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004-2008 Dokeos S.A.
Copyright (c) 2004-2008 Dokeos SPRL
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) Olivier Brouckaert
@ -330,7 +330,7 @@ if( $form->validate())
}
if (!empty ($email) && $send_mail)
{
$emailto = '"'.$firstname.' '.$lastname.'" <'.$email.'>';
$emailto = $firstname.' '.$lastname.' <'.$email.'>';
$emailsubject = '['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName');
$emailheaders = 'From: '.get_setting('administratorName').' '.get_setting('administratorSurname').' <'.get_setting('emailAdministrator').">\n";
$emailheaders .= 'Reply-To: '.get_setting('emailAdministrator');

4
main/admin/user_edit.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: user_edit.php 16673 2008-11-05 23:04:48Z yannoo $
<?php // $Id: user_edit.php 16708 2008-11-10 22:14:49Z yannoo $
/*
==============================================================================
Dokeos - elearning and course management software
@ -392,7 +392,7 @@ if( $form->validate())
if (!empty ($email) && $send_mail)
{
$emailto = '"'.$firstname.' '.$lastname.'" <'.$email.'>';
$emailto = $firstname.' '.$lastname.' <'.$email.'>';
$emailsubject = '['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName');
$emailheaders = 'From: '.get_setting('administratorName').' '.get_setting('administratorSurname').' <'.get_setting('emailAdministrator').">\n";
$emailheaders .= 'Reply-To: '.get_setting('emailAdministrator');

4
main/admin/user_import.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: user_import.php 14792 2008-04-08 20:57:53Z yannoo $
<?php // $Id: user_import.php 16708 2008-11-10 22:14:49Z yannoo $
/*
==============================================================================
Dokeos - elearning and course management software
@ -173,7 +173,7 @@ function save_data($users)
$emailbody = get_lang('Dear').$user['FirstName'].' '.$user['LastName'].",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('Settings')." $user[UserName]\n".get_lang('Pass')." : $user[Password]\n\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('Is')." : ".api_get_path('WEB_PATH')." \n\n".get_lang('Problem')."\n\n".get_lang('Formula').",\n\n".api_get_setting('administratorName')." ".api_get_setting('administratorSurname')."\n".get_lang('Manager')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator')."";
$emailheaders = 'From: '.api_get_setting('administratorName').' '.api_get_setting('administratorSurname').' <'.api_get_setting('emailAdministrator').">\n";
$emailheaders .= 'Reply-To: '.api_get_setting('emailAdministrator');
@ api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
@api_send_mail($user['Email'], $emailsubject, $emailbody, $emailheaders);
}
}

6
main/auth/inscription.php
Unescape View File

@ -1,5 +1,5 @@
<?php
// $Id: inscription.php 15661 2008-06-30 20:57:38Z juliomontoya $
// $Id: inscription.php 16708 2008-11-10 22:14:49Z yannoo $
/*
==============================================================================
Dokeos - elearning and course management software
@ -305,7 +305,7 @@ if ($form->validate())
// Lets predefine some variables. Be sure to change the from address!
$firstname = $values['firstname'];
$lastname = $values['lastname'];
$emailto = "\"$firstname $lastname\" <".$values['email'].">";
$emailto = $firstname.' '.$lastname.' <'.$values['email'].'>';
$emailfromaddr = api_get_setting('emailAdministrator');
$emailfromname = api_get_setting('siteName');
$emailsubject = "[".get_setting('siteName')."] ".get_lang('YourReg')." ".get_setting('siteName');
@ -320,7 +320,7 @@ if ($form->validate())
$emailheaders .= "Reply-To: ".get_setting('emailAdministrator');
// Because I predefined all of my variables, this api_send_mail() function looks nice and clean hmm?
@ api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
@api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
}
}

2
main/mySpace/user_import.php
Unescape View File

@ -394,7 +394,7 @@ function save_data($users, $CourseList,$id_session)
$i=0;
foreach ($users as $index => $user)
{
$emailto ='"'.$user['FirstName'].' '.$user['LastName'].'" <'.$user['Email'].'>';
$emailto =$user['FirstName'].' '.$user['LastName'].' <'.$user['Email'].'>';
$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
$emailbody = get_lang('Dear').' '.$user['FirstName'].' '.$user['LastName'].",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('Settings')." $user[UserName]\n".get_lang('Pass')." : $user[Password]\n\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('Is')." : ".api_get_path('WEB_PATH')." \n\n".get_lang('Problem')."\n\n".get_lang('Formula').",\n\n".api_get_setting('administratorName')." ".api_get_setting('administratorSurname')."\n".get_lang('Manager')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator')."";
$emailheaders = 'From: '.api_get_setting('administratorName').' '.api_get_setting('administratorSurname').' <'.api_get_setting('emailAdministrator').">\n";

Write Preview
Loading…
Cancel
Save