Moving the mail.conf.php because the charset was always ISO-8859-1

main/inc/global.inc.php

@@ -289,6 +289,12 @@ require_once $lib_path.'formvalidator/Rule/allowed_tags.inc.php';
 // include the local (contextual) parameters of this course or section
 require $includePath.'/local.inc.php';
 
+//Include Chamilo Mail conf this is added here because the api_get_setting works
+$mail_conf = api_get_path(CONFIGURATION_PATH).'mail.conf.php';
+if (file_exists($mail_conf)) {
+	require_once $mail_conf; 
+}
+
 // ===== "who is logged in?" module section =====
 
 

main/inc/lib/mail.lib.inc.php

@@ -8,7 +8,7 @@
  * Code
  */
 require_once api_get_path(LIBRARY_PATH).'phpmailer/class.phpmailer.php';
-require_once api_get_path(CONFIGURATION_PATH).'mail.conf.php';
+
 
 // A regular expression for testing against valid email addresses.
 // It should actually be revised for using the complete RFC3696 description:
@@ -127,7 +127,7 @@ function api_mail_html($recipient_name, $recipient_email, $subject, $message, $s
     $mail->Mailer  = $platform_email['SMTP_MAILER'];
     $mail->Host    = $platform_email['SMTP_HOST'];
     $mail->Port    = $platform_email['SMTP_PORT'];
-    $mail->CharSet = $platform_email['SMTP_CHARSET'];
+    $mail->CharSet = $platform_email['SMTP_CHARSET'];    
     $mail->WordWrap = 200; // Stay far below SMTP protocol 980 chars limit.
 
     if ($platform_email['SMTP_AUTH']) {

main/inc/lib/main_api.lib.php

@@ -4730,7 +4730,6 @@ function api_sql_query($query, $file = '', $line = 0) {
 function api_send_mail($to, $subject, $message, $additional_headers = null, $additional_parameters = null) {
 
     require_once api_get_path(LIBRARY_PATH).'phpmailer/class.phpmailer.php';
-    require_once api_get_path(CONFIGURATION_PATH).'mail.conf.php';
 
     if (empty($platform_email['SMTP_FROM_NAME'])) {
         $platform_email['SMTP_FROM_NAME'] = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);

main/inc/lib/message.lib.php

@@ -287,6 +287,8 @@ class MessageManager
 				}
 			}
 			
+			
+			
 			//Load user settings			
 			$notification = new Notification();			    
 		    if (empty($group_id)) {                

main/messages/new_message.php

@@ -17,6 +17,7 @@
 $language_file= array('messages','userInfo', 'admin');
 $cidReset	= true;
 require_once '../inc/global.inc.php';
+require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
 
 api_block_anonymous_users();
 
@@ -129,10 +130,8 @@ div.row div.formw {
     width:80%;
 }
 </style>';
-
 $nameTools = get_lang('ComposeMessage');
-
-/*		FUNCTIONS */
+/*		FUNCTIONS  */
 
 /**
 * Shows the compose area + a list of users to select from.