Version 3.4.9

upload/admin/applications/members/extensions/enhancements/mandrill.php

@@ -7,7 +7,7 @@
  * $Author: mark $
  * @since		24 July 2012
  * $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
- * @version		v3.4.8
+ * @version		v3.4.9
  * $Revision: 10952 $
  */
 
@@ -99,24 +99,16 @@ class enhancements_members_mandrill
 			$update = array( 'mandrill_username' => ipsRegistry::$request['username'], 'mandrill_api_key' => ipsRegistry::$request['api_key'] );
 		}
 		
-		/* Fire that off to IPS so Mandrill knows it's one of ours */
-		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
-		$file = new $classToLoad();
-		$json = NULL;
-		
-		/* If they want to use Mandrill for SMTP too, that call will contain the SMTP info,
-		   so set it if we got it, or if the call failed, throw an error */
+		/* If they want to use Mandrill for SMTP too, update those settings */
 		if ( ipsRegistry::$request['smtp'] )
 		{
-			if ( $json )
-			{
-				$json = json_decode( $json, TRUE );
-				$update = array_merge( $update, $json );
-			}
-			else
-			{
-				return $this->editSettings( 'mandrill_error' );
-			}
+			$update['smtp_host']	= 'smtp.mandrillapp.com';
+			$update['mail_method']	= 'smtp';
+			$update['smtp_port']	= 587;
+			$update['mail_wrap_brackets']	= 0;
+			$update['smtp_user']	= ipsRegistry::$request['username'];
+			$update['smtp_pass']	= ipsRegistry::$request['api_key'];
+			$update['smtp_helo']	= 'HELO';
 		}
 		
 		/* Update the settings */