Version 4.2.0
This commit is contained in:
1 parent
0dc2aee5ed
commit
96997ddd8e
2074 files changed
+125454
-55780
No files matched your search
@@ -1,12 +1,11 @@
|
||||
<?php
|
||||
/**
|
||||
* @brief Bulkmail central library
|
||||
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/legal/standards/
|
||||
* @package IPS Community Suite
|
||||
* @author <a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) Invision Power Services, Inc.
|
||||
* @license https://www.invisioncommunity.com/legal/standards/
|
||||
* @package Invision Community
|
||||
* @since 25 Jun 2013
|
||||
* @version SVN_VERSION_NUMBER
|
||||
*/
|
||||
|
||||
namespace IPS\core\BulkMail;
|
||||
@@ -165,10 +164,11 @@ class _Bulkmailer extends \IPS\Patterns\ActiveRecord
|
||||
$where[] = array( "core_members.allow_admin_mails=1" );
|
||||
$where[] = array( "core_members.temp_ban=0" );
|
||||
$where[] = array( "core_members.email!=''" );
|
||||
|
||||
$where[] = array( '( ! ' . \IPS\Db::i()->bitwiseWhere( \IPS\Member::$bitOptions['members_bitoptions'], 'bw_is_spammer' ) . ' )' );
|
||||
|
||||
foreach ( \IPS\Application::allExtensions( 'core', 'MemberFilter', FALSE, 'core' ) as $key => $extension )
|
||||
{
|
||||
if( method_exists( $extension, 'getQueryWhereClause' ) )
|
||||
if( method_exists( $extension, 'getQueryWhereClause' ) AND $extension->availableIn( 'bulkmail' ) )
|
||||
{
|
||||
/* Grab our fields and add to the form */
|
||||
if( !empty( $this->_options[ $key ] ) )
|
||||
@@ -194,7 +194,7 @@ class _Bulkmailer extends \IPS\Patterns\ActiveRecord
|
||||
/* Run callbacks */
|
||||
foreach ( \IPS\Application::allExtensions( 'core', 'MemberFilter', FALSE, 'core' ) as $key => $extension )
|
||||
{
|
||||
if( method_exists( $extension, 'queryCallback' ) )
|
||||
if( method_exists( $extension, 'queryCallback' ) AND $extension->availableIn( 'bulkmail' ) )
|
||||
{
|
||||
/* Grab our fields and add to the form */
|
||||
if( !empty( $this->_options[ $key ] ) )
|
||||
@@ -242,6 +242,7 @@ class _Bulkmailer extends \IPS\Patterns\ActiveRecord
|
||||
$tags['{member_id}'] = $member->member_id;
|
||||
$tags['{member_email}'] = $member->email;
|
||||
$tags['{member_name}'] = $member->name;
|
||||
$tags['{member_url}'] = $member->url();
|
||||
$tags['{member_joined}'] = $member->joined->localeDate();
|
||||
$tags['{member_last_visit}'] = \IPS\DateTime::ts( $member->last_visit )->localeDate();
|
||||
$tags['{member_posts}'] = $member->member_posts;
|
||||
@@ -277,6 +278,7 @@ class _Bulkmailer extends \IPS\Patterns\ActiveRecord
|
||||
$tags = array(
|
||||
'{member_id}' => \IPS\Member::loggedIn()->language()->addToStack('bmtag_member_id'),
|
||||
'{member_name}' => \IPS\Member::loggedIn()->language()->addToStack('bmtag_member_name'),
|
||||
'{member_url}' => \IPS\Member::loggedIn()->language()->addToStack('bmtag_member_profileurl'),
|
||||
'{member_joined}' => \IPS\Member::loggedIn()->language()->addToStack('bmtag_member_joined'),
|
||||
'{member_last_visit}' => \IPS\Member::loggedIn()->language()->addToStack('bmtag_member_last_visit'),
|
||||
'{member_posts}' => \IPS\Member::loggedIn()->language()->addToStack('bmtag_member_posts'),
|
||||
|
||||
Reference in new issue
Block a user