Version 3.2.3

upload/admin/applications/members/modules_admin/bulkmail/bulkmail.php

@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Bulk mail management
- * Last Updated: $Date: 2010-10-21 07:08:38 -0400 (Thu, 21 Oct 2010) $
+ * Last Updated: $Date: 2011-07-27 20:58:18 -0400 (Wed, 27 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7007 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 9327 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -49,7 +49,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -137,7 +137,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Delete a bulk mail
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _mailDelete()
 	{
@@ -159,7 +159,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Cancels a bulk mail
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _mailSendCancel()
 	{
@@ -176,7 +176,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Processes a bulk mail
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function mailSendProcess()
 	{
@@ -230,11 +230,6 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 		{
 			$mail[ $k ] = $v;
 		}
-		
-		if ( $mail['mail_html_on'] )
-		{
-			$this->settings['html_email'] = 1;
-		}
 
 		//-----------------------------------------
  		// Format the query
@@ -265,6 +260,13 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 			
 			$contents				= $this->_convertQuicktags( $mail['mail_content'], $r );
 			
+			/* @link http://community.invisionpower.com/tracker/issue-32116-bulk-mail-only-sends-html-to-first-recipient
+				Needs to be set inside the loop because email handler resets it back */
+			if ( $mail['mail_html_on'] )
+			{
+				IPSText::getTextClass('email')->html_email	= 1;
+			}
+		
 			IPSText::getTextClass('email')->from		= $this->settings['email_out'];
 			IPSText::getTextClass('email')->to			= $r['email'];
 			IPSText::getTextClass('email')->message		= str_replace( "\r\n", "\n", $contents );
@@ -281,9 +283,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 		{
 			$done	= 1;
 		}
-		
-		$this->settings['html_email'] = 0;
-		
+
 		//-----------------------------------------
 		// Save out..
 		//-----------------------------------------
@@ -308,7 +308,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Complete bulk mail processing
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailSendComplete()
 	{
@@ -376,7 +376,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Start the sending of the bulk mail
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailSendStart()
 	{
@@ -437,7 +437,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Process the sending of the bulk mail
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailPreviewComplete()
 	{
@@ -494,7 +494,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Preview the email (javascript popup)
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailPreviewStart()
 	{
@@ -506,7 +506,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Save the new or edited bulk mail
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailSave()
 	{
@@ -639,7 +639,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	 * Show the edit bulk mail form
 	 *
 	 * @param	string		[add|edit]
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailForm( $type='add' )
 	{
@@ -683,7 +683,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Show the main bulk mail overview screen
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailStart()
 	{

upload/admin/applications/members/modules_admin/bulkmail/defaultSection.php

@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default bulkmail section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'bulkmail' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'bulkmail';
+$DEFAULT_SECTION = 'bulkmail';

upload/admin/applications/members/modules_admin/bulkmail/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>

upload/admin/applications/members/modules_admin/bulkmail/xml/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>

upload/admin/applications/members/modules_admin/bulkmail/xml/menu.xml

@@ -6,6 +6,7 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Рассылки</subitemtitle>
+					<subitemlang>bulkmail</subitemlang>
 					<subsection>bulkmail</subsection>
 					<subitemurl>do=bulk_mail</subitemurl>
 					<subitemrolekey></subitemrolekey>

upload/admin/applications/members/modules_admin/bulkmail/xml/permissions.xml

@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Управление рассылками</grouptitle>
+		<grouplang>mem_bulkmail</grouplang>
 		<items>
 			<item>
 				<key>bulkmail_addedit</key>
@@ -15,6 +16,7 @@
 	</group>
 	<group>
 		<grouptitle>Отправка рассылок</grouptitle>
+		<grouplang>mem_bulkmailsend</grouplang>
 		<items>
 			<item>
 				<key>bulkmail_view</key>