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 r17747] Logic Changes - Added definition Return-path and charset correctly and change the function api_send_mail by api_mail - see FS#2445

Browse Source
skala
Cristian Fasanando 17 years ago
parent 80d2d9aac3
commit b261277568
11 changed files with 93 additions and 74 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. 17
      main/admin/session_import.php
  2. 13
      main/admin/user_add.php
  3. 14
      main/admin/user_edit.php
  4. 12
      main/admin/user_import.php
  5. 4
      main/auth/courses.php
  6. 24
      main/auth/inscription.php
  7. 3
      main/auth/lostPassword.php
  8. 15
      main/auth/lost_password.lib.php
  9. 8
      main/inc/lib/course.lib.php
  10. 10
      main/user/user_add.php
  11. 13
      main/work/work.php

17
main/admin/session_import.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: session_import.php 16708 2008-11-10 22:14:49Z yannoo $
<?php // $Id: session_import.php 17747 2009-01-15 21:03:02Z cfasanando $
/*
==============================================================================
Dokeos - elearning and course management software
@ -38,7 +38,7 @@ api_protect_admin_script(true);
require_once(api_get_path(LIBRARY_PATH).'fileManage.lib.php');
require(api_get_path(CONFIGURATION_PATH).'add_course.conf.php');
require_once(api_get_path(LIBRARY_PATH).'add_course.lib.inc.php');
require_once(api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php');
$formSent=0;
$errorMsg='';
@ -133,14 +133,13 @@ if($_POST['formSent'])
if(mysql_affected_rows()>0 && $sendMail)
{
$emailto=$firstname.' '.$lastname.' <'.$email.'>';
$emailsubject='['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName');
$recipient_name = $firstname.' '.$lastname;
$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
$emailheaders='From: '.get_setting('administratorName').' '.get_setting('administratorSurname').' <'.get_setting('emailAdministrator').">\n";
$emailheaders.='Reply-To: '.get_setting('emailAdministrator');
@api_send_mail($emailto,$emailsubject,$emailbody,$emailheaders);
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$headers="From: $sender_name <$email_admin>\r\nReply-to: $email_admin\r\nReturn-Path: $email_admin\r\ncharset=$charset";
@api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name,$email_admin,$headers);
}
}
else

13
main/admin/user_add.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: user_add.php 17663 2009-01-12 20:26:15Z cfasanando $
<?php // $Id: user_add.php 17747 2009-01-15 21:03:02Z cfasanando $
/*
==============================================================================
Dokeos - elearning and course management software
@ -39,6 +39,8 @@ require_once ($libpath.'fileUpload.lib.php');
require_once ($libpath.'usermanager.lib.php');
require_once ($libpath.'formvalidator/FormValidator.class.php');
require_once (api_get_path(LIBRARY_PATH).'image.lib.php');
require_once(api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php');
// section for the tabs
$this_section=SECTION_PLATFORM_ADMIN;
@ -412,12 +414,13 @@ if( $form->validate())
}
if (!empty ($email) && $send_mail)
{
$emailto = $firstname.' '.$lastname.' <'.$email.'>';
$recipient_name = $firstname.' '.$lastname;
$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');
$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". get_setting('siteName') ." ".get_lang('Settings')." ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". get_setting('siteName') ." ". get_lang('Is') ." : ". $_configuration['root_web'] ."\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');
@api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$headers="From: $sender_name <$email_admin>\r\nReply-to: $email_admin\r\nReturn-Path: $email_admin\r\ncharset=$charset";
@api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name,$email_admin,$headers);
}
Security::clear_token();
if(isset($user['submit_plus']))

14
main/admin/user_edit.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: user_edit.php 17663 2009-01-12 20:26:15Z cfasanando $
<?php // $Id: user_edit.php 17747 2009-01-15 21:03:02Z cfasanando $
/*
==============================================================================
Dokeos - elearning and course management software
@ -69,6 +69,7 @@ require_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php');
require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
require_once (api_get_path(LIBRARY_PATH).'image.lib.php');
require_once(api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php');
$user_id=isset($_GET['user_id']) ? intval($_GET['user_id']) : intval($_POST['user_id']);
$noPHP_SELF=true;
$tool_name=get_lang('ModifyUserInfo');
@ -428,18 +429,19 @@ if( $form->validate())
if (!empty ($email) && $send_mail)
{
$emailto = $firstname.' '.$lastname.' <'.$email.'>';
$recipient_name = $firstname.' '.$lastname;
$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');
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$headers="From: $sender_name <$email_admin>\r\nReply-to: $email_admin\r\nReturn-Path: $email_admin\r\ncharset=$charset";
$emailbody = get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". get_setting('siteName') ." ".get_lang('Settings')." ". $username;
// Send password by e-mail if it has been modified, even if encrypted in DB (it doesn't make sense to send an e-mail with login info without the password, even if the password is encrypted)
if($reset_password > 0)
{
$emailbody .= "\n".get_lang('Pass')." : ".stripslashes($password);
}
$emailbody .= "\n\n" .get_lang('Address') ." ". get_setting('siteName') ." ". get_lang('Is') ." : ". $_configuration['root_web'] ."\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');
@api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
@api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name,$email_admin,$headers);
}
$tok = Security::get_token();
header('Location: user_list.php?action=show_message&message='.urlencode(get_lang('UserUpdated')).'&sec_token='.$tok);

12
main/admin/user_import.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: user_import.php 16708 2008-11-10 22:14:49Z yannoo $
<?php // $Id: user_import.php 17747 2009-01-15 21:03:02Z cfasanando $
/*
==============================================================================
Dokeos - elearning and course management software
@ -147,6 +147,7 @@ function complete_missing_data($user)
*/
function save_data($users)
{
require_once(api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php');
$user_table = Database :: get_main_table(TABLE_MAIN_USER);
$sendMail = $_POST['sendMail'] ? 1 : 0;
foreach ($users as $index => $user)
@ -168,12 +169,13 @@ function save_data($users)
}
if ($sendMail)
{
$emailto = '"'.$user['FirstName'].' '.$user['LastName'].'" <'.$user['Email'].'>';
$recipient_name = $user['FirstName'].' '.$user['LastName'];
$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";
$emailheaders .= 'Reply-To: '.api_get_setting('emailAdministrator');
@api_send_mail($user['Email'], $emailsubject, $emailbody, $emailheaders);
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$headers="From: $sender_name <$email_admin>\r\nReply-to: $email_admin\r\nReturn-Path: $email_admin\r\ncharset=$charset";
@api_mail($recipient_name, $user['Email'], $emailsubject, $emailbody, $sender_name,$email_admin,$headers);
}
}

4
main/auth/courses.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: courses.php 17548 2009-01-06 16:12:51Z cvargas1 $
<?php // $Id: courses.php 17747 2009-01-15 21:03:02Z cfasanando $
/*
==============================================================================
Dokeos - elearning and course management software
@ -56,7 +56,7 @@ api_block_anonymous_users();
// include additional libraries
include_once(api_get_path(LIBRARY_PATH) . 'debug.lib.inc.php');
include_once(api_get_path(LIBRARY_PATH) . 'course.lib.php');
require_once(api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php');
$ctok = $_SESSION['sec_token'];
$stok = Security::get_token();

24
main/auth/inscription.php
Unescape View File

@ -1,5 +1,5 @@
<?php
// $Id: inscription.php 17680 2009-01-13 16:33:00Z cfasanando $
// $Id: inscription.php 17747 2009-01-15 21:03:02Z cfasanando $
/*
==============================================================================
Dokeos - elearning and course management software
@ -38,6 +38,7 @@ include ("../inc/global.inc.php");
require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
require_once (api_get_path(CONFIGURATION_PATH).'profile.conf.php');
require_once(api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php');
//require_once(api_get_path(LIBRARY_PATH).'fileManage.lib.php');
//require_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
//require_once (api_get_path(LIBRARY_PATH).'image.lib.php');
@ -366,9 +367,11 @@ if ($form->validate()) {
$emailbody .=get_lang('Email').': '.$values['email']."\n";
$emailbody .=get_lang('Status').': '.$values['status']."\n\n";
$emailbody .=get_lang('ManageUser').': '.api_get_path(WEB_CODE_PATH).'admin/user_edit.php?user_id='.$user_id;
$emailheaders = "From: ".get_setting('administratorSurname')." ".get_setting('administratorName')." <".get_setting('emailAdministrator').">\n";
$emailheaders .= "Reply-To: ".get_setting('emailAdministrator');
@ api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$headers="From: $sender_name <$email_admin>\r\nReply-to: $email_admin\r\nReturn-Path: $email_admin\r\ncharset=$charset";
@api_mail('', $emailto, $emailsubject, $emailbody, $sender_name,$email_admin,$headers);
// 3. exit the page
unset($user_id);
@ -404,9 +407,8 @@ if ($form->validate()) {
if (strstr($values['email'], '@'))
{
// Lets predefine some variables. Be sure to change the from address!
$firstname = $values['firstname'];
$lastname = $values['lastname'];
$emailto = $firstname.' '.$lastname.' <'.$values['email'].'>';
$recipient_name = $values['firstname'].' '.$values['lastname'];
$email = $values['email'];
$emailfromaddr = api_get_setting('emailAdministrator');
$emailfromname = api_get_setting('siteName');
$emailsubject = "[".get_setting('siteName')."] ".get_lang('YourReg')." ".get_setting('siteName');
@ -417,11 +419,11 @@ if ($form->validate()) {
// Here we are forming one large header line
// Every header must be followed by a \n except the last
$emailheaders = "From: ".get_setting('administratorSurname')." ".get_setting('administratorName')." <".get_setting('emailAdministrator').">\n";
$emailheaders .= "Reply-To: ".get_setting('emailAdministrator');
$headers="From: $sender_name <$email_admin>\r\nReply-to: $email_admin\r\nReturn-Path: $email_admin\r\ncharset=$charset";
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = 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_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name,$email_admin,$headers);
}
}

3
main/auth/lostPassword.php
Unescape View File

@ -1,6 +1,6 @@
<?php
// $Id: lostPassword.php 11873 2007-04-04 19:46:04Z pcool $
// $Id: lostPassword.php 17747 2009-01-15 21:03:02Z cfasanando $
/*
==============================================================================
Dokeos - elearning and course management software
@ -44,6 +44,7 @@ $language_file = "registration";
require ('../inc/global.inc.php');
require_once ('lost_password.lib.php');
require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
require_once(api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php');
$tool_name = get_lang('LostPassword');
Display :: display_header($tool_name);

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

@ -1,5 +1,5 @@
<?php
// $Id: lost_password.lib.php 14021 2007-12-18 19:48:14Z yannoo $
// $Id: lost_password.lib.php 17747 2009-01-15 21:03:02Z cfasanando $
/*
==============================================================================
Dokeos - elearning and course management software
@ -34,6 +34,7 @@ function get_email_headers()
global $charset;
$emailHeaders = "From: \"".addslashes(get_setting('administratorSurname')." ".get_setting('administratorName'))."\" <".get_setting('emailAdministrator').">\n";
$emailHeaders .= "Reply-To: ".get_setting('emailAdministrator')."\n";
$emailHeaders .= "Return-Path: ".get_setting('emailAdministrator')."\n";
$emailHeaders .= "X-Sender: ".get_setting('emailAdministrator')."\n";
$emailHeaders .= "X-Mailer: PHP / ".phpversion()."\n";
$emailHeaders .= "Content-Type: text/plain;\n\tcharset=\"".$charset."\"\n";
@ -80,14 +81,16 @@ function send_password_to_user($user)
{
global $charset;
global $_configuration;
$emailHeaders = get_email_headers(); // Email Headers
$emailSubject = "[".get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
$userAccountList = get_user_account_list($user); // BODY
$emailBody = get_lang('YourAccountParam')." ".$_configuration['root_web']."\n\n$userAccountList";
// SEND MESSAGE
$emailTo = $user[0]["email"];
if (@ api_send_mail($emailTo, $emailSubject, $emailBody, $emailHeaders))
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
if (@api_mail('', $emailTo, $emailSubject, $emailBody, $sender_name,$email_admin,$emailHeaders)==1)
{
Display::display_confirmation_message(get_lang('YourPasswordHasBeenEmailed'));
}
@ -114,12 +117,14 @@ function handle_encrypted_password($user)
$userAccountList = get_user_account_list($user, true); // BODY
$emailTo = $user[0]["email"];
$secretword = get_secret_word($emailTo);
//$emailBody = get_lang("password_request")."\n\n\n".get_lang("YourAccountParam")." ".$_configuration['root_web']."\n\n".$userAccountList;
$emailBody = get_lang('DearUser')." :\n".get_lang("password_request")."\n\n";
$emailBody .= "-----------------------------------------------\n".$userAccountList."\n-----------------------------------------------\n\n";
$emailBody .=get_lang('PasswordEncryptedForSecurity');
$emailBody .="\n\n".get_lang('Formula').",\n".get_lang('PlataformAdmin');
if (@ api_send_mail($emailTo, $emailSubject, $emailBody, $emailHeaders))
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
if (@api_mail('', $emailTo, $emailSubject, $emailBody, $sender_name,$email_admin,$emailHeaders)==1)
{
Display::display_confirmation_message(get_lang('YourPasswordHasBeenEmailed'));
}

8
main/inc/lib/course.lib.php
Unescape View File

@ -1863,9 +1863,11 @@ class CourseManager
$emailbody .=get_lang('LastName').': '.$student['lastname']."\n";
$emailbody .=get_lang('FirstName').': '.$student['firstname']."\n";
$emailbody .=get_lang('Email').': '.$student['email']."\n\n";
$emailheaders = "From: ".get_setting('administratorSurname')." ".get_setting('administratorName')." <".get_setting('emailAdministrator').">\n";
$emailheaders .= "Reply-To: ".get_setting('emailAdministrator');
@ api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
$recipient_name = $tutor['firstname'].' '.$tutor['lastname'];
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
$headers="From: $sender_name <$email_admin>\r\nReply-to: $email_admin\r\nReturn-Path: $email_admin\r\ncharset=$charset";
@api_mail($recipient_name, $emailto, $emailsubject, $emailbody, $sender_name,$email_admin,$headers);
}
}

10
main/user/user_add.php
Unescape View File

@ -35,6 +35,7 @@ $language_file="registration";
include("../inc/global.inc.php");
require_once(api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php');
$this_section=SECTION_COURSES;
if (! ($is_courseAdmin || $is_platformAdmin)) api_not_allowed(true);
@ -200,13 +201,16 @@ if($register)
$emailheaders = "From: ".get_setting('administratorSurname')." ".get_setting('administratorName')." <".$administratorEmail.">\n";
$emailheaders .= "Reply-To: ".$administratorEmail."\n";
$emailheaders .= "Return-Path: ".$administratorEmail."\n";
$emailheaders .= "charset: ".$charset."\n";
$emailheaders .= "X-Mailer: PHP/" . phpversion() . "\n";
$emailheaders .= "X-Sender-IP: $REMOTE_ADDR"; // (small security precaution...)
$recipient_name = $firstname_form.' '.$lastname_form;
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
if ($courseRegSucceed)
{
$emailbody = get_lang('Dear')." ".stripslashes("$firstname_form $lastname_form").",\n".get_lang('OneResp')." $currentCourseName ".get_lang('RegYou')." ".get_setting('siteName')." ".get_lang('Settings')." $username_form\n".get_lang('Pass').": $password_form\n".get_lang('Address')." ".get_setting('siteName')." ".get_lang('Is').": ".$_configuration['root_web']."\n".get_lang('Problem')."\n".get_lang('Formula').",\n".get_setting('administratorSurname')." ".get_setting('administratorName')."\n".get_lang('Manager')." ".get_setting('siteName')." \nT. ".get_setting('administratorTelephone')."\n".get_lang('Email').": ".get_setting('emailAdministrator')."\n";
$message = get_lang('TheU')." ".stripslashes("$firstname_form $lastname_form")." ".get_lang('AddedToCourse')."<a href=\"user.php\">".get_lang('BackUser')."</a>\n";
}
else
@ -216,7 +220,7 @@ if($register)
$message = stripslashes("$firstname_form $lastname_form")." ".get_lang('AddedU');
}
@api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
@api_mail($recipient_name, $email_form, $emailsubject, $emailbody, $sender_name,$email_admin,$emailheaders);
/*
* remove <form> variables to prevent any pre-filled fields

13
main/work/work.php
Unescape View File

@ -27,7 +27,7 @@
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default.
* @author Roan Embrechts, code refactoring and virtual course support
* @author Frederic Vauthier, directories management
* @version $Id: work.php 17746 2009-01-15 20:33:37Z cvargas1 $
* @version $Id: work.php 17747 2009-01-15 21:03:02Z cfasanando $
*
* @todo refactor more code into functions, use quickforms, coding standards, ...
*/
@ -110,6 +110,7 @@ require_once (api_get_path(LIBRARY_PATH) . 'security.lib.php');
require_once (api_get_path(LIBRARY_PATH) . 'formvalidator/FormValidator.class.php');
require_once(api_get_path(LIBRARY_PATH) . 'document.lib.php');
require_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
require_once(api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php');
// Section (for the tabs)
$this_section = SECTION_COURSES;
$ctok = $_SESSION['sec_token'];
@ -987,19 +988,17 @@ if (!empty($_POST['submitWork']) && !empty($succeed) && !$id) {
$emailfromaddr = get_setting('emailAdministrator');
$emailfromname = get_setting('siteName');
$emailsubject = "[" . get_setting('siteName') . "] ";
$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
$email_admin = get_setting('emailAdministrator');
// The body can be as long as you wish, and any combination of text and variables
//$emailbody=get_lang('SendMailBody').' '.api_get_path(WEB_CODE_PATH)."work/work.php?".api_get_cidreq()." ($title)\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('SendMailBody').' '.api_get_path(WEB_CODE_PATH)."work/work.php?".api_get_cidreq()."&amp;curdirpath=".$my_cur_dir_path." (" . stripslashes($title) . ")\n\n" . get_setting('administratorName') . " " . get_setting('administratorSurname') . "\n" . get_lang('Manager') . " " . get_setting('siteName') . "\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
$emailheaders = "From: " . get_setting('administratorName') . " " . get_setting('administratorSurname') . " <" . get_setting('emailAdministrator') . ">\n";
$emailheaders .= "Reply-To: " . get_setting('emailAdministrator');
$headers="From: $sender_name <$email_admin>\r\nReply-to: $email_admin\r\nReturn-Path: $email_admin\r\ncharset=$charset";
@api_mail('', $emailto, $emailsubject, $emailbody, $sender_name,$email_admin,$headers);
// Because I predefined all of my variables, this api_send_mail() function looks nice and clean hmm?
@ api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
}
}
$message = get_lang('DocAdd');

Write Preview
Loading…
Cancel
Save