Эх сурвалжийг харах

[svn r17754] Minor - Logic changes - Fixed e-mail sender headers - see FS#2445

Cristian Fasanando 16 жил өмнө
parent
commit
d755149fd6

+ 3 - 4
main/admin/session_import.php

@@ -1,4 +1,4 @@
-<?php // $Id: session_import.php 17747 2009-01-15 21:03:02Z cfasanando $
+<?php // $Id: session_import.php 17754 2009-01-15 22:58:39Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -137,9 +137,8 @@ if($_POST['formSent'])
 							$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');						
 							$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);
+						    $email_admin = get_setting('emailAdministrator');							
+							@api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name,$email_admin);
 						}
 					}
 					else

+ 3 - 4
main/admin/user_add.php

@@ -1,4 +1,4 @@
-<?php // $Id: user_add.php 17747 2009-01-15 21:03:02Z cfasanando $
+<?php // $Id: user_add.php 17754 2009-01-15 22:58:39Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -418,9 +418,8 @@ if( $form->validate())
 			$emailsubject = '['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName');			
 			$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');						
 			$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);
+		    $email_admin = get_setting('emailAdministrator');			
+			@api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name,$email_admin);
 		}
 		Security::clear_token();
 		if(isset($user['submit_plus']))

+ 3 - 4
main/admin/user_edit.php

@@ -1,4 +1,4 @@
-<?php // $Id: user_edit.php 17747 2009-01-15 21:03:02Z cfasanando $
+<?php // $Id: user_edit.php 17754 2009-01-15 22:58:39Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -432,15 +432,14 @@ if( $form->validate())
 		$recipient_name = $firstname.' '.$lastname;
 		$emailsubject = '['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName');												
 		$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";
+	    $email_admin = get_setting('emailAdministrator');		
 		$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);
 		}
-		@api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name,$email_admin,$headers);
+		@api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name,$email_admin);
 			
 	}
 	$tok = Security::get_token();		

+ 3 - 4
main/admin/user_import.php

@@ -1,4 +1,4 @@
-<?php // $Id: user_import.php 17747 2009-01-15 21:03:02Z cfasanando $
+<?php // $Id: user_import.php 17754 2009-01-15 22:58:39Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -173,9 +173,8 @@ function save_data($users)
 			$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')."";						
 			$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);
+		    $email_admin = get_setting('emailAdministrator');			
+			@api_mail($recipient_name, $user['Email'], $emailsubject, $emailbody, $sender_name,$email_admin);
 		}
 
 	}

+ 5 - 8
main/auth/inscription.php

@@ -1,5 +1,5 @@
 <?php
-// $Id: inscription.php 17752 2009-01-15 22:43:10Z cvargas1 $
+// $Id: inscription.php 17754 2009-01-15 22:58:39Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -379,8 +379,7 @@ if ($form->validate()) {
 				$emailbody		.=get_lang('ManageUser').': '.api_get_path(WEB_CODE_PATH).'admin/user_edit.php?user_id='.$user_id;	
 				
 				$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";
+			    $email_admin = get_setting('emailAdministrator');				
 				@api_mail('', $emailto, $emailsubject, $emailbody, $sender_name,$email_admin);
 				
 			}
@@ -430,12 +429,10 @@ if ($form->validate()) {
 			$emailbody = get_lang('Dear')." ".stripslashes("$firstname $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')." : ".$_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');
 			
 			// Here we are forming one large header line
-			// Every header must be followed by a \n except the last
-			$headers="From: $sender_name <$email_admin>\r\nReply-to: $email_admin\r\nReturn-Path: $email_admin\r\ncharset=$charset";
+			// Every header must be followed by a \n except the last			
 			$sender_name = get_setting('administratorName').' '.get_setting('administratorSurname');
-		    $email_admin = get_setting('emailAdministrator');
-						
-			@api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name,$email_admin,$headers);	
+		    $email_admin = get_setting('emailAdministrator');						
+			@api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name,$email_admin);	
 		}
 	}
 

+ 3 - 3
main/auth/lost_password.lib.php

@@ -1,5 +1,5 @@
 <?php
-// $Id: lost_password.lib.php 17747 2009-01-15 21:03:02Z cfasanando $
+// $Id: lost_password.lib.php 17754 2009-01-15 22:58:39Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -90,7 +90,7 @@ 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,$emailHeaders)==1)
+	if (@api_mail('', $emailTo, $emailSubject, $emailBody, $sender_name,$email_admin)==1)
 	{
 		Display::display_confirmation_message(get_lang('YourPasswordHasBeenEmailed'));
 	}
@@ -124,7 +124,7 @@ function handle_encrypted_password($user)
 	$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)
+	if (@api_mail('', $emailTo, $emailSubject, $emailBody, $sender_name,$email_admin)==1)
 	{
 		Display::display_confirmation_message(get_lang('YourPasswordHasBeenEmailed'));
 	}

+ 2 - 3
main/inc/lib/course.lib.php

@@ -1865,9 +1865,8 @@ class CourseManager
 				$emailbody		.=get_lang('Email').': '.$student['email']."\n\n";				
 				$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);
+		    	$email_admin = get_setting('emailAdministrator');				
+				@api_mail($recipient_name, $emailto, $emailsubject, $emailbody, $sender_name,$email_admin);
 		}
 	}
 

+ 1 - 1
main/user/user_add.php

@@ -220,7 +220,7 @@ if($register)
 			$message = stripslashes("$firstname_form $lastname_form")." ".get_lang('AddedU');
 		}
 
-		@api_mail($recipient_name, $email_form, $emailsubject, $emailbody, $sender_name,$email_admin,$emailheaders);
+		@api_mail($recipient_name, $email_form, $emailsubject, $emailbody, $sender_name,$email_admin);
 
 		/*
 		 * remove <form> variables to prevent any pre-filled fields

+ 3 - 4
main/work/work.php

@@ -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 17747 2009-01-15 21:03:02Z cfasanando $
+*  	@version $Id: work.php 17754 2009-01-15 22:58:39Z cfasanando $
 *
 * 	@todo refactor more code into functions, use quickforms, coding standards, ...
 */
@@ -995,9 +995,8 @@ if (!empty($_POST['submitWork']) && !empty($succeed) && !$id) {
 			$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
-			$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);
+			// Every header must be followed by a \n except the last															
+			@api_mail('', $emailto, $emailsubject, $emailbody, $sender_name,$email_admin);
 			
 		}
 	}