Feature #272 - Mailing: Duplicate statements for loading the configuration file have been removed.

main/announcements/announcements.php

@@ -124,7 +124,6 @@ $lib = api_get_path(LIBRARY_PATH); //avoid useless function calls
 require_once($lib.'groupmanager.lib.php');
 require_once('announcements.inc.php');
 require_once($lib.'mail.lib.inc.php');
-require_once(api_get_path(INCLUDE_PATH).'conf/mail.conf.php');
 require_once($lib.'debug.lib.inc.php');
 require_once($lib.'tracking.lib.php');
 require_once($lib.'fckeditor/fckeditor.php');
@@ -149,11 +148,8 @@ if (!empty($_POST['To']))
     $_SESSION['formelements'] = $form_elements;
 
     $form_elements            	= $_SESSION['formelements'];
-
 	$title_to_modify            = $form_elements["emailTitle"];
-
 	$content_to_modify          = $form_elements["newContent"];
-
 	$announcement_to_modify     = $form_elements["id"];
 }
 
@@ -726,10 +722,10 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 								//set the charset and use it for the encoding of the email - small fix, not really clean (should check the content encoding origin first)
 								//here we use the encoding used for the webpage where the text is encoded (ISO-8859-1 in this case)
 
-								$recipient_name	= api_get_person_name($myrow["lastname"], $myrow["firstname"], null, PERSON_NAME_EMAIL_ADDRESS);
+								$recipient_name	= api_get_person_name($myrow["firstname"], $myrow["lastname"], null, PERSON_NAME_EMAIL_ADDRESS);
 		                        $mailid = $myrow["email"];
 
-		                        $sender_name = api_get_person_name($_SESSION['_user']['lastName'], $_SESSION['_user']['firstName'], null, PERSON_NAME_EMAIL_ADDRESS);
+		                        $sender_name = api_get_person_name($_SESSION['_user']['firstName'], $_SESSION['_user']['lastName'], null, PERSON_NAME_EMAIL_ADDRESS);
 		                        $sender_email = $_SESSION['_user']['mail'];
 
 								$data_file = array();
@@ -974,8 +970,6 @@ if (!$surveyid) {
 			//validation when belongs to a session
 			$session_img = api_get_session_image($myrow['session_id'], $_user['status']);
 
-			
-			
 			echo "\t\t\t\t\t\t".Display::return_icon('lp_announcement.png', api_ucfirst(format_locale_date($dateFormatLong,strtotime($myrow['end_date']))), array('align' => 'absmiddle', 'Width' => '10', 'Height' => '10'))."  <a style=\"text-decoration:none\" href=\"announcements.php?".api_get_cidreq()."#".$myrow['id']."\" ".$class.">" . api_trunc_str($title, $length) . "</a>\n" . $session_img;
 			echo "\t\t\t\t\t</td>\n\t\t\t\t</tr>\n";
 		}

main/dropbox/dropbox_init.inc.php

@@ -50,8 +50,6 @@ require_once('dropbox_config.inc.php');
 // the dropbox file that contains additional functions
 require_once('dropbox_functions.inc.php');
 
-require(api_get_path(INCLUDE_PATH).'/conf/mail.conf.php');
-
 include_once(api_get_path(LIBRARY_PATH) . 'mail.lib.inc.php');
 include_once(api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php');
 

main/forum/forumfunction.inc.php

@@ -68,7 +68,6 @@
 */
 require_once(api_get_path(LIBRARY_PATH).'mail.lib.inc.php');
 require_once(api_get_path(LIBRARY_PATH).'text.lib.php');
-require_once(api_get_path(INCLUDE_PATH).'/conf/mail.conf.php');
 require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php');
 require_once(api_get_path(LIBRARY_PATH).'text.lib.php');
 get_notifications_of_user();

main/wiki/index.php

@@ -54,8 +54,7 @@ require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'text.lib.php';
 require_once api_get_path(LIBRARY_PATH).'security.lib.php';
-require_once api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php';
-require_once api_get_path(INCLUDE_PATH).'conf/mail.conf.php';
+require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php';
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 require_once 'wiki.inc.php';