Version 4.2.0

This commit is contained in:
Neo committed 2025-12-19 05:44:59 -08:00
1 parent 0dc2aee5ed
commit 96997ddd8e
2074 files changed
+125454 -55780

No files matched your search

@@ -1,12 +1,11 @@
<?php
/**
* @brief Bulk mail handler
* @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 18 Jun 2013
* @version SVN_VERSION_NUMBER
*/
namespace IPS\core\modules\admin\bulkmail;
@@ -91,8 +90,9 @@ class _bulkmail extends \IPS\Dispatcher\Controller
/* Specify the buttons */
if ( \IPS\Member::loggedIn()->hasAcpRestriction( 'core', 'bulkmail', 'bulkmail_add' ) )
{
$table->rootButtons = array(
\IPS\Output::i()->sidebar['actions'] = array(
'add' => array(
'primary' => TRUE,
'icon' => 'plus',
'title' => 'bulkmail_add',
'link' => \IPS\Http\Url::internal( 'app=core&module=bulkmail&controller=bulkmail&do=form' ),
@@ -155,7 +155,7 @@ class _bulkmail extends \IPS\Dispatcher\Controller
/* Display */
\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('manage_bulk_mail');
\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global' )->block( 'title', (string) $table );
\IPS\Output::i()->output = (string) $table;
}
/**
@@ -462,13 +462,13 @@ class _bulkmail extends \IPS\Dispatcher\Controller
/* Start the form */
$form = new \IPS\Helpers\Form;
$form->class = 'ipsForm_vertical';
$form->addTab( 'bulkmail__main' );
$form->class = '';
$form->addTab( 'bulkmail__main', NULL, NULL, 'ipsForm_vertical' );
$form->add( new \IPS\Helpers\Form\Text( 'mail_subject', $mail->subject, TRUE ) );
$form->add( new \IPS\Helpers\Form\Editor( 'mail_body', $mail->content ?: '', TRUE, array( 'app' => 'core', 'key' => 'Admin', 'autoSaveKey' => 'bulkmail' . ( $mail->id ? '-' . $mail->id : '' ), 'tags' => $tags, 'attachIds' => array( $mail->id, NULL, 'bulkmail' ) ) ) );
/* Add the filters tab and the "generic filters" header */
$form->addTab( 'bulkmail__filters' );
$form->addTab( 'bulkmail__filters', NULL, NULL, 'ipsForm_horizontal' );
$form->addHeader( 'generic_bm_filters' );
$lastApp = 'core';
@@ -476,7 +476,7 @@ class _bulkmail extends \IPS\Dispatcher\Controller
/* Now grab bulk mail extensions */
foreach ( \IPS\Application::allExtensions( 'core', 'MemberFilter', TRUE, 'core' ) as $key => $extension )
{
if( method_exists( $extension, 'getSettingField' ) )
if( method_exists( $extension, 'getSettingField' ) AND $extension->availableIn( 'bulkmail' ) )
{
/* See if we need a new form header - one per app */
$_key = explode( '_', $key );
@@ -512,7 +512,7 @@ class _bulkmail extends \IPS\Dispatcher\Controller
/* Loop over bulk mail extensions to format the options */
foreach ( \IPS\Application::allExtensions( 'core', 'MemberFilter', TRUE, 'core' ) as $key => $extension )
{
if( method_exists( $extension, 'save' ) )
if( method_exists( $extension, 'save' ) AND $extension->availableIn( 'bulkmail' ) )
{
/* Grab our fields and add to the form */
$_value = $extension->save( $values );