Version 3.4.5
This commit is contained in:
1 parent
fb6b5baabc
commit
e4478369d8
1360 files changed
+228921
-179445
No files matched your search
@@ -0,0 +1,98 @@
|
||||
<?php
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.5
|
||||
* Bulk Mail Recipients List Generator (AJAX)
|
||||
* Last Updated: $Date: 2012-07-12 18:15:50 +0100 (Thu, 12 Jul 2012) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
* @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: 11070 $
|
||||
*/
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
class admin_members_ajax_bulkmail extends ipsAjaxCommand
|
||||
{
|
||||
/**
|
||||
* Main class entry point
|
||||
*
|
||||
* @param object ipsRegistry reference
|
||||
* @return @e void [Outputs to screen]
|
||||
*/
|
||||
public function doExecute( ipsRegistry $registry )
|
||||
{
|
||||
//-----------------------------------------
|
||||
// Init
|
||||
//-----------------------------------------
|
||||
|
||||
require_once IPSLib::getAppDir( 'members' ) . '/sources/classes/bulkMailFilter.php';
|
||||
$this->html = $this->registry->output->loadTemplate('cp_skin_bulkmail');
|
||||
ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'admin_bulkmail' ) );
|
||||
$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'bulkmail_send' );
|
||||
|
||||
$controllerClass = IPSLib::loadActionOverloader( IPSLib::getAppDir('members') . '/modules_admin/bulkmail/bulkmail.php', 'admin_members_bulkmail_bulkmail' );
|
||||
$controller = new $controllerClass( $registry );
|
||||
$controller->makeRegistryShortcuts( $registry );
|
||||
|
||||
//-----------------------------------------
|
||||
// Load Mail
|
||||
//-----------------------------------------
|
||||
|
||||
$id = intval( $this->request['id'] );
|
||||
$mail = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'bulk_mail', 'where' => 'mail_id=' . $id ) );
|
||||
|
||||
if ( ! $mail['mail_id'] )
|
||||
{
|
||||
$this->returnHTML( '' );
|
||||
}
|
||||
if ( ! $mail['mail_subject'] and ! $mail['mail_content'] )
|
||||
{
|
||||
$this->returnHTML( '' );
|
||||
}
|
||||
|
||||
$opts = unserialize( stripslashes( $mail['mail_opts'] ) );
|
||||
$mail['mail_html_on'] = $opts['mail_html_on'];
|
||||
|
||||
//-----------------------------------------
|
||||
// Get Members
|
||||
//-----------------------------------------
|
||||
|
||||
/* Start with a basic query */
|
||||
$queryData = array(
|
||||
'select' => 'm.member_id, m.members_display_name, m.email',
|
||||
'from' => array( 'members' => 'm' ),
|
||||
'order' => 'm.members_display_name',
|
||||
'limit' => array( ( 10000 * ( $this->request['page'] - 1 ) ), 10000 )
|
||||
);
|
||||
|
||||
/* Add in filters */
|
||||
$_queryData = $controller->_buildMembersQuery( $opts['filters'] );
|
||||
$queryData['add_join'] = $_queryData['add_join'];
|
||||
$queryData['where'] = implode( ' AND ' , $_queryData['where'] );
|
||||
|
||||
/* Count */
|
||||
$this->DB->build( $queryData );
|
||||
$this->DB->execute();
|
||||
while ( $row = $this->DB->fetch() )
|
||||
{
|
||||
$members[] = $row;
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
// Display
|
||||
//-----------------------------------------
|
||||
|
||||
$this->returnHTML( $this->html->mss_recipients( $this->request['page'], $this->request['countmembers'], $members ) );
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@
|
||||
* $Author: ips_terabyte $
|
||||
* @since 20th February 2002
|
||||
* $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
|
||||
* @version v3.3.4
|
||||
* @version v3.4.5
|
||||
* $Revision: 8655 $
|
||||
*/
|
||||
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Member property updater (AJAX)
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2012-07-12 13:15:50 -0400 (Thu, 12 Jul 2012) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
@@ -13,7 +13,7 @@
|
||||
* @package IP.Board
|
||||
* @subpackage Members
|
||||
* @link http://www.invisionpower.com
|
||||
* @version $Revision: 10914 $
|
||||
* @version $Revision: 11070 $
|
||||
*/
|
||||
|
||||
if ( ! defined( 'IN_IPB' ) )
|
||||
@@ -251,7 +251,13 @@ class admin_members_ajax_editform extends ipsAjaxCommand
|
||||
{
|
||||
$member['_group_title'] = $group['g_title'];
|
||||
}
|
||||
|
||||
|
||||
/* If it's an admin group, make sure the admin banning can promote to this group */
|
||||
if ( $group['g_access_cp'] AND !$this->registry->getClass('class_permissions')->checkPermission('member_move_admin2'))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
$member_groups[] = array( $group['g_id'], $group['g_title'] );
|
||||
}
|
||||
|
||||
|
||||
@@ -2,18 +2,18 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Member list AJAX handler
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2012-10-26 11:50:52 -0400 (Fri, 26 Oct 2012) $
|
||||
* </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: 10914 $
|
||||
* @version $Revision: 11525 $
|
||||
*/
|
||||
|
||||
if ( ! defined( 'IN_IPB' ) )
|
||||
@@ -525,7 +525,7 @@ class admin_members_ajax_members extends ipsAjaxCommand
|
||||
{
|
||||
try
|
||||
{
|
||||
$message = $this->_getManagementClass()->unmarkMembersAsSpam( $ids, $this->request['type'] == 'unspam_posts' ? true : false );
|
||||
$message = $this->_getManagementClass()->unmarkMembersAsSpam( $ids, ( $this->request['type'] == 'unspam' OR $this->request['type'] == 'unspam_posts' ) ? true : false );
|
||||
}
|
||||
catch( Exception $error )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user