Changeset 1838 in ExiteCMS

Timestamp:

10/09/08 12:48:28 (3 years ago)

Author:

hverton

Message:

fixed not loading PHPmailer

Location:

modules/common/mail2forum/php-files/modules/mail2forum

Files:

• m2f_pop3.php (modified) (1 diff)
• m2f_smtp.php (modified) (4 diffs)

modules/common/mail2forum/php-files/modules/mail2forum/m2f_pop3.php

@@ -493 +493 @@
 // initialize the SMTP mailer if required
 if ($settings['m2f_send_ndr']) {
-    require_once PATH_INCLUDES."phpmailer_include.php";
+    require_once PATH_INCLUDES."class.phpmailer.php";
     $mail = new PHPMailer();
     if (file_exists(PATH_INCLUDES."languages/phpmailer.lang-".$settings['phpmailer_locale'].".php")) {

modules/common/mail2forum/php-files/modules/mail2forum/m2f_smtp.php

@@ -24 +24 @@
 }
 require_once $webroot."includes/core_functions.php";
+require_once PATH_INCLUDES."forum_functions_include.php";
 
 // create a siteurl link from the m2f host settings
@@ -70 +71 @@
     if ($settings['m2f_smtp_debug']) $mail->SMTPDebug = 2;
 
-    if (file_exists(PATH_INCLUDES."languages/phpmailer.lang-".$settings['phpmailer_locale'].".php")) {
-        $mail->SetLanguage($settings['phpmailer_locale'], PATH_INCLUDES."language/");
+    if (file_exists(PATH_INCLUDES."languages/phpmailer.lang-".$settings['PHPmailer_locale'].".php")) {
+        $mail->SetLanguage($settings['PHPmailer_locale'], PATH_INCLUDES."language/");
     } else {
         $mail->SetLanguage("en", PATH_INCLUDES."language/");
@@ -267 +268 @@
 
 // initialize PHP-Mailer
-require_once PATH_INCLUDES."phpmailer_include.php";
+require_once PATH_INCLUDES."class.phpmailer.php";
 $mail = new PHPMailer();
 mailer_init();
 
 // get the last polled time from the configuration
-if (empty($settings['m2f_last_polled']) {
+if (empty($settings['m2f_last_polled'])) {
     // the first time we start. Forget all old posts for now
     $lastpoll = time();
@@ -374 +375 @@
                     $HTMLbody = $postrecord['post_message'];
 //                  if ($postrecord['post_showsig']) { $HTMLbody = $HTMLbody."\n\n<hr>".$postrecord['user_sig']; }
-                    if ($postrecord['post_smileys']) { $HTMLbody = parsesmileys($HTMLbody); }
-                    $HTMLbody = parseubb($HTMLbody);
-                    $HTMLbody = nl2br($HTMLbody);
+                    $HTMLbody = parsemessage(array(), $HTMLbody, $postrecord['post_smileys'], false);
 
                     $TEXTbody = $edit_post?($locale['m2f814']."\r\n\r\n"):"";