Version 4.7.23

applications/core/modules/admin/moderation/report.php

@@ -0,0 +1,262 @@
+<?php
+/**
+ * @brief		report
+ * @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		17 Sep 2024
+ */
+
+namespace IPS\core\modules\admin\moderation;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+
+use IPS\Db;
+use IPS\Dispatcher;
+use IPS\Dispatcher\Controller;
+use IPS\Helpers\Form;
+use IPS\Helpers\Form\Number;
+use IPS\Helpers\Form\YesNo;
+use IPS\Http\Url;
+use IPS\Member;
+use IPS\Output;
+use IPS\Session;
+use IPS\Settings;
+use IPS\Theme;
+use function defined;
+
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * report
+ */
+class _report extends Controller
+{
+	/**
+	 * @brief	Has been CSRF-protected
+	 */
+	public static $csrfProtected = TRUE;
+
+	/**
+	 * Execute
+	 *
+	 * @return	void
+	 */
+	public function execute()
+	{
+		/* Add a button for settings */
+		\IPS\Output::i()->sidebar['actions'] = array(
+			'automatic'	=> array(
+				'title'		=> 'manage_automatic_rules',
+				'icon'		=> 'bolt',
+				'link'		=> \IPS\Http\Url::internal( 'app=core&module=moderation&controller=reportedContent' )
+			),
+			'settings'	=> array(
+				'title'		=> 'reportedContent_types',
+				'icon'		=> 'cog',
+				'link'		=> \IPS\Http\Url::internal( 'app=core&module=moderation&controller=reportedContentTypes' )
+			)
+		);
+
+		Dispatcher::i()->checkAcpPermission( 'reportedContentTypes_manage' );
+		parent::execute();
+	}
+
+	/**
+	 * Settings form
+	 *
+	 * @return	void
+	 */
+	protected function manage()
+	{
+		Dispatcher::i()->checkAcpPermission( 'reportedContent_manage' );
+
+		/* Work out output */
+		\IPS\Request::i()->tab = isset( \IPS\Request::i()->tab ) ? \IPS\Request::i()->tab : 'settings';
+		if ( $pos = mb_strpos( \IPS\Request::i()->tab, '-' ) )
+		{
+			$tabMethod			= '_manage' . mb_ucfirst( mb_substr( \IPS\Request::i()->tab, 0, $pos ) );
+			$activeTabContents	= $this->$tabMethod( mb_substr( \IPS\Request::i()->tab, $pos + 1 ) );
+		}
+		else
+		{
+			$tabMethod			= '_manage' . mb_ucfirst( \IPS\Request::i()->tab );
+			$activeTabContents	= $this->$tabMethod();
+		}
+
+		/* If this is an AJAX request, just return it */
+		if( \IPS\Request::i()->isAjax() )
+		{
+			\IPS\Output::i()->output = $activeTabContents;
+			return;
+		}
+
+		/* Build tab list */
+		$tabs = [
+			'settings'	=> 'menu__core_moderation_report',
+			'notifications' => 'report_author_notification_title'
+		];
+
+		/* Display */
+		\IPS\Output::i()->title		= \IPS\Member::loggedIn()->language()->addToStack('menu__core_moderation_report');
+		\IPS\Output::i()->output 	= \IPS\Theme::i()->getTemplate( 'global' )->tabs( $tabs, \IPS\Request::i()->tab, $activeTabContents, \IPS\Http\Url::internal( "app=core&module=moderation&controller=report" ) );
+	}
+
+	/**
+	 * Manage settings
+	 *
+	 * @return string
+	 */
+	protected function _manageSettings(): string
+	{
+		$form = new Form;
+
+		/* Can guests report */
+		$guest = new \IPS\Member;
+		$guestDisabled = false;
+		$guestSetting = Settings::i()->report_capture_guest_details;
+		if ( ! $guest->group['g_can_report'] )
+		{
+			$guestDisabled = true;
+			$guestSetting = false;
+			\IPS\Member::loggedIn()->language()->words['report_capture_guest_details_warning'] =  \IPS\Member::loggedIn()->language()->addToStack( 'report_capture_guest_details__warning' );
+		}
+
+		$form->add( new YesNo( 'report_capture_guest_details', $guestSetting, FALSE, array( 'disabled' => $guestDisabled, 'togglesOn' => [ 'report_guest_details_name_mandatory', 'report_guest_details_store_days'] ), NULL, NULL, NULL, 'report_capture_guest_details' ) );
+		$form->add( new YesNo( 'report_guest_details_name_mandatory', Settings::i()->report_guest_details_name_mandatory, FALSE, array(), NULL, NULL, NULL, 'report_guest_details_name_mandatory' ) );
+		$form->add( new Number( 'report_guest_details_store_days', Settings::i()->report_guest_details_store_days, FALSE, array( 'unlimited' => -1, 'unlimitedLang' => 'report_guest_details_store_unlimited' ), NULL, NULL, Member::loggedIn()->language()->addToStack('days'), 'report_guest_details_store_days' ) );
+
+		$form->add( new YesNo( 'report_content_mandatory', Settings::i()->report_content_mandatory, FALSE, array(), NULL, NULL, NULL, 'report_content_mandatory' ) );
+
+		$form->add( new YesNo( 'automoderation_enabled', Settings::i()->automoderation_enabled, FALSE, array( 'togglesOn' => [ 'automoderation_report_again_mins' ] ), NULL, NULL, NULL, 'automoderation_enabled' ) );
+		$form->add( new Number( 'automoderation_report_again_mins', Settings::i()->automoderation_report_again_mins, FALSE, array(), NULL, NULL, Member::loggedIn()->language()->addToStack('automoderation_report_again_mins_suffix'), 'automoderation_report_again_mins' ) );
+
+		if ( $values = $form->values() )
+		{
+			$form->saveAsSettings();
+
+			Db::i()->update( 'core_tasks', array( 'enabled' => (int) $values['automoderation_enabled'] ), array( '`key`=?', 'automaticmoderation' ) );
+
+			Session::i()->log( 'acplog__automoderation_settings' );
+			Output::i()->redirect( Url::internal( 'app=core&module=moderation&controller=report&tab=settings' ), 'saved' );
+		}
+
+		return Theme::i()->getTemplate('forms')->blurb( 'reporting_content_blurb', true, true ) . $form;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function _manageNotifications(): string
+	{
+		/* Init */
+		$table = new \IPS\Helpers\Table\Db( 'core_rc_author_notification_text', \IPS\Http\Url::internal( 'app=core&module=moderation&controller=report&tab=notifications' ) );
+		$table->include = array( 'title' );
+		$table->sortBy        = $table->sortBy        ?: 'title';
+		$table->sortDirection = $table->sortDirection ?: 'asc';
+
+		/* Row buttons */
+		$table->rowButtons = function( $row )
+		{
+			$return = array();
+
+			$return['edit'] = array(
+				'icon'	=> 'pencil',
+				'link'	=> \IPS\Http\Url::internal( 'app=core&module=moderation&controller=report&tab=notifications&do=notificationForm&id=' ) . $row['id'],
+				'title'	=> 'edit',
+				'data'	=> array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('edit') )
+			);
+
+			$return['delete'] = array(
+				'icon'	=> 'times-circle',
+				'link'	=> \IPS\Http\Url::internal( 'app=core&module=moderation&controller=report&tab=notifications&do=notificationDelete&id=' ) . $row['id'],
+				'title'	=> 'delete',
+				'data'	=> array( 'delete' => '' )
+			);
+
+			return $return;
+		};
+
+		/* Add button */
+		$table->rootButtons = array(
+			'add'	=> array(
+				'icon'	=> 'plus',
+				'link'	=> \IPS\Http\Url::internal( 'app=core&module=moderation&controller=report&tab=notifications&do=notificationForm' ),
+				'title'	=> 'add',
+				'data'	=> array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('add') )
+			)
+		);
+
+		/* Display */
+		return Theme::i()->getTemplate('forms')->blurb( 'reporting_content_notifications_blurb', true, true ) . $table;
+	}
+
+	/**
+	 * Report notification to author of content form
+	 *
+	 * @return	void
+	 */
+	protected function notificationForm()
+	{
+		$current = NULL;
+		if ( \IPS\Request::i()->id )
+		{
+			$current = \IPS\Db::i()->select( '*', 'core_rc_author_notification_text', array( 'id=?', \IPS\Request::i()->id ) )->first();
+		}
+
+		$form = new \IPS\Helpers\Form;
+		$form->add( new \IPS\Helpers\Form\Text( 'report_notifications_title', ( $current ? $current['title'] : '' ), true ) );
+		$form->add( new \IPS\Helpers\Form\TextArea( 'report_notifications_text', ( $current ? $current['text'] : '' ), true, [ 'rows' => 20 ] ) );
+
+		if ( $values = $form->values() )
+		{
+			$save = [
+				'title'	=> $values['report_notifications_title'],
+				'text'	=> $values['report_notifications_text']
+			];
+
+			if ( $current )
+			{
+				\IPS\Db::i()->update( 'core_rc_author_notification_text', $save, array( 'id=?', $current['id'] ) );
+				\IPS\Session::i()->log( 'acplog__report_author_notification_edited', array( $current['title'] => true ) );
+			}
+			else
+			{
+				\IPS\Db::i()->insert( 'core_rc_author_notification_text', $save );
+				\IPS\Session::i()->log( 'acplog__report_author_notification_created', array( $save['title'] => true ) );
+			}
+
+			\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=moderation&controller=report&tab=notifications' ), 'saved' );
+		}
+
+		\IPS\Output::i()->output .= \IPS\Theme::i()->getTemplate( 'global' )->block( 'report_author_notification_title', $form, FALSE );
+	}
+
+	/**
+	 * Report notification to author of content delete
+	 *
+	 * @return	void
+	 */
+	protected function notificationDelete()
+	{
+		/* Make sure the user confirmed the deletion */
+		\IPS\Request::i()->confirmedDelete();
+
+		try
+		{
+			$current = \IPS\Db::i()->select( '*', 'core_rc_author_notification_text', array( 'id=?', \IPS\Request::i()->id ) )->first();
+
+			\IPS\Session::i()->log( 'acplog__report_author_notification_deleted', array( $current['title'] => true ) );
+			\IPS\Db::i()->delete( 'core_rc_author_notification_text', array( 'id=?', \IPS\Request::i()->id ) );
+		}
+		catch ( \UnderflowException $e ) { }
+
+		\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=moderation&controller=report&tab=notifications' ), 'deleted' );
+	}
+}

applications/core/modules/admin/moderation/reportedContent.php

@@ -12,6 +12,10 @@
 namespace IPS\core\modules\admin\moderation;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
+
+use IPS\Http\Url;
+use IPS\Output;
+
 if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
@@ -40,20 +44,8 @@ class _reportedContent extends \IPS\Node\Controller
 	 */
 	public function execute()
 	{
-		/* Add a button for settings */
-		\IPS\Output::i()->sidebar['actions'] = array(
-			'settings'	=> array(
-				'title'		=> 'reportedContent_settings',
-				'icon'		=> 'cog',
-				'link'		=> \IPS\Http\Url::internal( 'app=core&module=moderation&controller=reportedContent&do=settings' ),
-				'data'		=> array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('reportedContent_settings') )
-			),
-			'types'	=> array(
-				'title'		=> 'reportedContent_types',
-				'icon'		=> 'cog',
-				'link'		=> \IPS\Http\Url::internal( 'app=core&module=moderation&controller=reportedContentTypes' )
-			)
-		);
+		Output::i()->breadcrumb[] = array( Url::internal( "app=core&module=moderation&controller=report" ), 'menu__core_moderation_report' );
+		Output::i()->breadcrumb[] = array( NULL, 'manage_automatic_rules' );
 
 		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate('forms')->blurb( 'automaticmoderation_blurb' );
 		
@@ -65,32 +57,4 @@ class _reportedContent extends \IPS\Node\Controller
 		\IPS\Dispatcher::i()->checkAcpPermission( 'reportedContent_manage' );
 		parent::execute();
 	}
-	
-	/**
-	 * Profile Settings
-	 *
-	 * @return	void
-	 */
-	protected function settings()
-	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'reportedContent_manage' );
-
-		$form = new \IPS\Helpers\Form;
-
-		$form->add( new \IPS\Helpers\Form\YesNo( 'automoderation_enabled', \IPS\Settings::i()->automoderation_enabled, FALSE, array(), NULL, NULL, NULL, 'automoderation_enabled' ) );
-		$form->add( new \IPS\Helpers\Form\Number( 'automoderation_report_again_mins', \IPS\Settings::i()->automoderation_report_again_mins, FALSE, array(), NULL, NULL, \IPS\Member::loggedIn()->language()->addToStack('automoderation_report_again_mins_suffix'), 'automoderation_report_again_mins' ) );
-		
-		if ( $values = $form->values() )
-		{
-			$form->saveAsSettings();
-			
-			\IPS\Db::i()->update( 'core_tasks', array( 'enabled' => (int) $values['automoderation_enabled'] ), array( '`key`=?', 'automaticmoderation' ) );
-			
-			\IPS\Session::i()->log( 'acplog__automoderation_settings' );
-			\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=moderation&controller=reportedContent' ), 'saved' );
-		}
-		
-		\IPS\Output::i()->title		= \IPS\Member::loggedIn()->language()->addToStack('reportedContent_settings');
-		\IPS\Output::i()->output 	= \IPS\Theme::i()->getTemplate('global')->block( 'reportedContent_settings', $form, FALSE );
-	}
 }

applications/core/modules/admin/moderation/reportedContentTypes.php

@@ -12,6 +12,12 @@
 namespace IPS\core\modules\admin\moderation;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
+
+use IPS\Http\Url;
+use IPS\Output;
+use IPS\Request;
+use IPS\Theme;
+
 if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
@@ -40,6 +46,14 @@ class _reportedContentTypes extends \IPS\Node\Controller
 	 */
 	public function execute()
 	{
+		Output::i()->breadcrumb[] = array( Url::internal( "app=core&module=moderation&controller=report" ), 'menu__core_moderation_report' );
+		Output::i()->breadcrumb[] = array( NULL, 'reportedContent_types' );
+
+		if ( ! Request::i()->do )
+		{
+			Output::i()->output = Theme::i()->getTemplate( 'forms', 'core' )->blurb( 'moderation_reporttypes_desc' );
+		}
+
 		\IPS\Dispatcher::i()->checkAcpPermission( 'reportedContentTypes_manage' );
 		parent::execute();
 	}

applications/core/modules/admin/moderation/spam.php

@@ -11,6 +11,12 @@
 namespace IPS\core\modules\admin\moderation;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
+
+use IPS\Helpers\Form;
+use IPS\Helpers\Form\Radio;
+use IPS\Helpers\Form\Text;
+use IPS\Settings;
+
 if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
@@ -116,26 +122,45 @@ class _spam extends \IPS\Dispatcher\Controller
 	 * @param	string	$type	'options' for the select options, 'toggles' for the toggles
 	 * @return	array
 	 */
-	protected function getCaptchaOptions( $type='options' )
+	protected static function getCaptchaOptions( string $type='options' ) : array
 	{
 		switch( $type )
 		{
 			case 'options':
-				return array( 'none' => 'captcha_type_none', 'invisible' => 'captcha_type_invisible', 'recaptcha2' => 'captcha_type_recaptcha2', 'keycaptcha' => 'captcha_type_keycaptcha', 'hcaptcha' => 	'captcha_type_hcaptcha' );
-				break;
+				$options = [
+					'none' 			=> 'captcha_type_none',
+					'turnstile'		=> 'captcha_type_turnstile',
+					'invisible' 	=> 'captcha_type_invisible',
+					'recaptcha2' 	=> 'captcha_type_recaptcha2',
+					'keycaptcha' 	=> 'captcha_type_keycaptcha',
+					'hcaptcha' 		=> 'captcha_type_hcaptcha'
+				];
+
+				if( \IPS\Settings::i()->bot_antispam_type  != 'keycaptcha' )
+				{
+					unset( $options['keycaptcha'] );
+				}
+
+				return $options;
 
 			case 'toggles':
-				return array(
-					'none'			=> array( 'bot_antispam_type_warning' ),
-					'recaptcha2'	=> array( 'guest_captcha', 'recaptcha2_public_key', 'recaptcha2_private_key' ),
-					'invisible'		=> array( 'guest_captcha', 'recaptcha2_public_key', 'recaptcha2_private_key' ),
-					'keycaptcha'	=> array( 'guest_captcha', 'keycaptcha_privatekey' ),
-					'hcaptcha'		=> array( 'guest_captcha', 'hcaptcha_sitekey', 'hcaptcha_secret')
-				);
-				break;
+				$toggles = [
+					'none'			=> [ 'bot_antispam_type_warning' ],
+					'turnstile'		=> [ 'turnstile_site_key', 'turnstile_secret_key' ],
+					'recaptcha2'	=> [ 'recaptcha2_public_key', 'recaptcha2_private_key' ],
+					'invisible'		=> [ 'recaptcha2_public_key', 'recaptcha2_private_key' ],
+					'keycaptcha'	=> [ 'keycaptcha_privatekey' ],
+					'hcaptcha'		=> [ 'hcaptcha_sitekey', 'hcaptcha_secret' ]
+				];
+
+				if( \IPS\Settings::i()->bot_antispam_type  != 'keycaptcha' )
+				{
+					unset( $toggles['keycaptcha'] );
+				}
+				return $toggles;
 		}
 
-		return array();
+		return [];
 	}
 
 	/**
@@ -147,16 +172,7 @@ class _spam extends \IPS\Dispatcher\Controller
 	{
 		/* Build Form */
 		$form = new \IPS\Helpers\Form;
-		$form->add( new \IPS\Helpers\Form\Radio( 'bot_antispam_type', \IPS\Settings::i()->bot_antispam_type, TRUE, array(
-			'options'	=> $this->getCaptchaOptions( 'options' ),
-			'toggles'	=> $this->getCaptchaOptions( 'toggles' ),
-		), NULL, NULL, NULL, 'bot_antispam_type' ) );
-		$form->add( new \IPS\Helpers\Form\Text( 'recaptcha2_public_key', \IPS\Settings::i()->recaptcha2_public_key, FALSE, array(), NULL, NULL, NULL, 'recaptcha2_public_key' ) );
-		$form->add( new \IPS\Helpers\Form\Text( 'recaptcha2_private_key', \IPS\Settings::i()->recaptcha2_private_key, FALSE, array(), NULL, NULL, NULL, 'recaptcha2_private_key' ) );
-		$form->add( new \IPS\Helpers\Form\Text( 'keycaptcha_privatekey', \IPS\Settings::i()->keycaptcha_privatekey, FALSE, array(), NULL, NULL, NULL, 'keycaptcha_privatekey' ) );
-		$form->add( new \IPS\Helpers\Form\Text( 'hcaptcha_sitekey', \IPS\Settings::i()->hcaptcha_sitekey, FALSE, array(), NULL, NULL, NULL, 'hcaptcha_sitekey' ) );
-		$form->add( new \IPS\Helpers\Form\Text( 'hcaptcha_secret', \IPS\Settings::i()->hcaptcha_secret, FALSE, array(), NULL, NULL, NULL, 'hcaptcha_secret' ) );
-		$form->add( new \IPS\Helpers\Form\YesNo( 'guest_captcha', \IPS\Settings::i()->guest_captcha, FALSE, array(), NULL, NULL, NULL, 'guest_captcha' ) );
+		static::captchaForm( $form );
 
 		/* Save values */
 		if ( $form->values() )
@@ -172,6 +188,35 @@ class _spam extends \IPS\Dispatcher\Controller
 		return $form;
 	}
 
+	/**
+	 * @param \IPS\Helpers\Form $form
+	 * @return void
+	 */
+	public static function captchaForm( Form $form ): void
+	{
+		$form->add( new Radio( 'bot_antispam_type', Settings::i()->bot_antispam_type, TRUE, array(
+			'options'	=> static::getCaptchaOptions( 'options' ),
+			'toggles'	=> static::getCaptchaOptions( 'toggles' ),
+		), NULL, NULL, NULL, 'bot_antispam_type' ) );
+		$form->add( new Text( 'turnstile_site_key', Settings::i()->turnstile_site_key, id: 'turnstile_site_key' ) );
+		$form->add( new Text( 'turnstile_secret_key', Settings::i()->turnstile_secret_key, id: 'turnstile_secret_key' ) );
+
+		if( \IPS\CIC )
+		{
+			\IPS\Member::loggedIn()->language()->words['turnstile_secret_key_desc'] = \IPS\Member::loggedIn()->language()->addToStack('turnstile_secret_key_cloud_desc');
+		}
+
+		$form->add( new Text( 'recaptcha2_public_key', Settings::i()->recaptcha2_public_key, FALSE, array(), NULL, NULL, NULL, 'recaptcha2_public_key' ) );
+		$form->add( new Text( 'recaptcha2_private_key', Settings::i()->recaptcha2_private_key, FALSE, array(), NULL, NULL, NULL, 'recaptcha2_private_key' ) );
+		if( \IPS\Settings::i()->bot_antispam_type  == 'keycaptcha' )
+		{
+			$form->add( new Text( 'keycaptcha_privatekey', Settings::i()->keycaptcha_privatekey, FALSE, [], NULL, NULL, NULL, 'keycaptcha_privatekey' ) );
+		}
+		$form->add( new Text( 'hcaptcha_sitekey', Settings::i()->hcaptcha_sitekey, FALSE, array(), NULL, NULL, NULL, 'hcaptcha_sitekey' ) );
+		$form->add( new Text( 'hcaptcha_secret', Settings::i()->hcaptcha_secret, FALSE, array(), NULL, NULL, NULL, 'hcaptcha_secret' ) );
+
+	}
+
 	/**
 	 * Show spammer flagging settings
 	 *
@@ -217,16 +262,16 @@ class _spam extends \IPS\Dispatcher\Controller
 			$disabled = TRUE;
 			if( !\IPS\Settings::i()->ipb_reg_number )
 			{
-				\IPS\Member::loggedIn()->language()->words['spam_service_enabled_desc'] = \IPS\Member::loggedIn()->language()->addToStack( '__nulling_null_alert' ); //Changing error message to custom
+				\IPS\Member::loggedIn()->language()->words['spam_service_enabled_desc'] = \IPS\Member::loggedIn()->language()->addToStack( '__ipbmafia__nulling_null_alert' ); //Changing error message to custom
 			}
 			else
 			{
-				\IPS\Member::loggedIn()->language()->words['spam_service_enabled_desc'] = \IPS\Member::loggedIn()->language()->addToStack( '__nulling_null_alert' ); //Changing error message to custom
+				\IPS\Member::loggedIn()->language()->words['spam_service_enabled_desc'] = \IPS\Member::loggedIn()->language()->addToStack( '__ipbmafia__nulling_null_alert' ); //Changing error message to custom
 			}
 		}
 		
-		$form->add( new \IPS\Helpers\Form\YesNo( 'spam_service_enabled', 0, FALSE, array( 'disabled' => $disabled, 'togglesOn' => array( 'spam_service_send_to_ips', 'spam_service_action_0', 'spam_service_action_1', 'spam_service_action_2', 'spam_service_action_3', 'spam_service_action_4', 'spam_service_disposable' ) ) ) );
-		$form->add( new \IPS\Helpers\Form\YesNo( 'spam_service_send_to_ips', 0, FALSE, array( 'disabled' => $disabled ), NULL, NULL, NULL, 'spam_service_send_to_ips' ) );
+		$form->add( new \IPS\Helpers\Form\YesNo( 'spam_service_enabled', \IPS\Settings::i()->spam_service_enabled, FALSE, array( 'disabled' => $disabled, 'togglesOn' => array( 'spam_service_send_to_ips', 'spam_service_action_0', 'spam_service_action_1', 'spam_service_action_2', 'spam_service_action_3', 'spam_service_action_4', 'spam_service_disposable' ) ) ) );
+		$form->add( new \IPS\Helpers\Form\YesNo( 'spam_service_send_to_ips', \IPS\Settings::i()->spam_service_send_to_ips, FALSE, array( 'disabled' => $disabled ), NULL, NULL, NULL, 'spam_service_send_to_ips' ) );
 		$form->add( new \IPS\Helpers\Form\Select( 'spam_service_action_1', \IPS\Settings::i()->spam_service_action_1, FALSE, array( 'disabled' => $disabled, 'options' => $actions, 'toggles' => array( '5' => array( 'spam_service_action_1_num' ) ) ), NULL, NULL, NULL, 'spam_service_action_1' ) );
 		$form->add( new \IPS\Helpers\Form\Number( 'spam_service_action_1_num', ( isset( $days[1] ) ? $days[1] : -1 ), FALSE, array( 'unlimited' => -1, 'unlimitedLang' => 'spam_service_action_unlimited_days'), NULL, NULL, \IPS\Member::loggedIn()->language()->addToStack('days'), 'spam_service_action_1_num' ) );
 		$form->add( new \IPS\Helpers\Form\Select( 'spam_service_action_2', \IPS\Settings::i()->spam_service_action_2, FALSE, array( 'disabled' => $disabled, 'options' => $actions, 'toggles' => array( '5' => array( 'spam_service_action_2_num' ) ) ), NULL, NULL, NULL, 'spam_service_action_2' ) );
@@ -697,11 +742,11 @@ class _spam extends \IPS\Dispatcher\Controller
 		{
 			if( !\IPS\Settings::i()->ipb_reg_number )
 			{
-				\IPS\Member::loggedIn()->language()->words['spam_service_enabled_desc'] = \IPS\Member::loggedIn()->language()->addToStack( '__nulling_null_alert' ); //Changing error message to custom
+				\IPS\Member::loggedIn()->language()->words['spam_service_enabled_desc'] = \IPS\Member::loggedIn()->language()->addToStack( '__ipbmafia__nulling_null_alert' ); //Changing error message to custom
 			}
 			else
 			{
-				\IPS\Member::loggedIn()->language()->words['spam_service_enabled_desc'] = \IPS\Member::loggedIn()->language()->addToStack( '__nulling_null_alert' ); //Changing error message to custom
+				\IPS\Member::loggedIn()->language()->words['spam_service_enabled_desc'] = \IPS\Member::loggedIn()->language()->addToStack( '__ipbmafia__nulling_null_alert' ); //Changing error message to custom
 			}
 		}