sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 3.4.6

Browse Source
This commit is contained in:
Neo committed 2025-12-19 00:40:53 -08:00
1 parent e4478369d8
commit b45ea0dffb
1568 files changed
+155104 -161665
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

upload/admin/applications/members/modules_admin/bulkmail/bulkmail.php
+16 -16
View File
@@ -2,18 +2,18 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Bulk mail management
* Last Updated: $Date: 2013-05-09 23:39:45 -0400 (Thu, 09 May 2013) $
* Last Updated: $Date: 2013-10-16 12:57:41 -0400 (Wed, 16 Oct 2013) $
* </pre>
*
* @author $Author: bfarber $
* @author $Author: AndyMillne $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/company/standards.php#license
* @package IP.Board
* @subpackage Members
* @link http://www.invisionpower.com
* @version $Revision: 12243 $
* @version $Revision: 12380 $
*/
if ( ! defined( 'IN_ACP' ) )
@@ -51,7 +51,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
* @param object ipsRegistry reference
* @return @e void [Outputs to screen]
*/
public function doExecute( ipsRegistry $registry )
public function doExecute( ipsRegistry $registry )
{
require_once IPSLib::getAppDir( 'members' ) . '/sources/classes/bulkMailFilter.php';
@@ -270,7 +270,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
IPSText::getTextClass('email')->setPlainTextTemplate( $contents );
}
/* Build it */
/* Build it */
IPSText::getTextClass('email')->from = $this->settings['email_out'];
IPSText::getTextClass('email')->to = $r['email'];
IPSText::getTextClass('email')->subject = $mail['mail_subject'];
@@ -301,7 +301,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
{
$this->DB->update( 'bulk_mail', array( 'mail_active' => 0,
'mail_updated' => time(),
'mail_sentto' => $sofar + $sent
'mail_sentto' => $sofar + $sent
), 'mail_id=' . $mail['mail_id'] );
$this->DB->update( 'task_manager', array( 'task_enabled' => 0 ), "task_key='bulkmail'" );
@@ -309,9 +309,9 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
else
{
$this->DB->update( 'bulk_mail', array( 'mail_updated' => time(),
'mail_sentto' => $sofar + $sent
'mail_sentto' => $sofar + $sent
), 'mail_id=' . $mail['mail_id'] );
}
}
}
/**
@@ -411,7 +411,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
// Build Content
//-----------------------------------------
/* Sort out member vars */
/* Sort out member vars */
$content = $mail['mail_content'];
foreach ( $this->_getVariableInformation( $this->memberData ) as $k => $v )
{
@@ -597,12 +597,12 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
* @return @e void
*/
protected function _mailSendStart()
{
{
//-----------------------------------------
// Init
//-----------------------------------------
$id = intval( $this->request['id'] );
$id = intval( $this->request['id'] );
$mail = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'bulk_mail', 'where' => 'mail_id=' . $id ) );
if ( ! $mail['mail_subject'] and ! $mail['mail_content'] )
@@ -951,7 +951,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
}
/* We want the members tab to be first so it shows groups, which will be the most common filter */
uasort( $filters, create_function( '$a, $b', 'if ( $a[\'appKey\'] == "members" ) { return -1; } else { return 0; }' ) );
uasort( $filters, create_function( '$a, $b', 'if ( $a[\'appKey\'] == "members" ) { return 0; } else { return 1; }' ) );
//-----------------------------------------
// Output
@@ -1032,7 +1032,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
if( isset( $r['where'] ) )
{
$haveCriteria = TRUE;
$haveCriteria = TRUE;
$queryData['where'] = array_merge( $queryData['where'], $r['where'] );
}
}
@@ -1114,7 +1114,7 @@ CONTENT;
}
else
{
return "{member_name},\n\n";
return "{member_name},\n\n";
}
}
}
}