Version 4.5.0

applications/core/modules/admin/settings/advanced.php

@@ -11,7 +11,7 @@
 namespace IPS\core\modules\admin\settings;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -22,6 +22,10 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _advanced extends \IPS\Dispatcher\Controller
 {
+	/**
+	 * @brief	Has been CSRF-protected
+	 */
+	public static $csrfProtected = TRUE;
 	
 	/**
 	 * Execute
@@ -45,11 +49,13 @@ class _advanced extends \IPS\Dispatcher\Controller
 		\IPS\Request::i()->tab = isset( \IPS\Request::i()->tab ) ? \IPS\Request::i()->tab : 'settings';
 		if ( $pos = mb_strpos( \IPS\Request::i()->tab, '-' ) )
 		{
-			$activeTabContents = call_user_func( array( $this, '_manage' . mb_ucfirst( mb_substr( \IPS\Request::i()->tab, 0, $pos ) ) ), mb_substr( \IPS\Request::i()->tab, $pos + 1 ) );
+			$tabMethod			= '_manage' . mb_ucfirst( mb_substr( \IPS\Request::i()->tab, 0, $pos ) );
+			$activeTabContents	= $this->$tabMethod( mb_substr( \IPS\Request::i()->tab, $pos + 1 ) );
 		}
 		else
 		{
-			$activeTabContents = call_user_func( array( $this, '_manage' . mb_ucfirst( \IPS\Request::i()->tab ) ) );
+			$tabMethod			= '_manage' . mb_ucfirst( \IPS\Request::i()->tab );
+			$activeTabContents	= $this->$tabMethod();
 		}
 		
 		/* If this is an AJAX request, just return it */
@@ -85,12 +91,19 @@ class _advanced extends \IPS\Dispatcher\Controller
 	{
 		/* Are we just checking the constants? */
 		if ( isset( \IPS\Request::i()->checkConstants ) )
-		{			
+		{
+			$cacheConfig = \IPS\CACHE_CONFIG;
+			
+			if ( \IPS\Request::i()->store_method === 'Redis' or \IPS\Request::i()->cache_method === 'Redis' )
+			{
+				$cacheConfig = \IPS\REDIS_CONFIG;
+			}
+			
 			/* If we've changed anything, explain to the admin they have to update */
-			if ( \IPS\Request::i()->store_method !== \IPS\STORE_METHOD or \IPS\Request::i()->store_config !== \IPS\STORE_CONFIG or \IPS\Request::i()->cache_method !== \IPS\CACHE_METHOD or \IPS\Request::i()->cache_config !== \IPS\CACHE_CONFIG or \IPS\Request::i()->cache_guest_page != \IPS\CACHE_PAGE_TIMEOUT )
+			if ( \IPS\Request::i()->store_method !== \IPS\STORE_METHOD or \IPS\Request::i()->store_config !== \IPS\STORE_CONFIG or \IPS\Request::i()->cache_method !== \IPS\CACHE_METHOD or \IPS\Request::i()->cache_config !== $cacheConfig or \IPS\Request::i()->cache_guest_page != \IPS\CACHE_PAGE_TIMEOUT )
 			{
 				$downloadUrl = \IPS\Http\Url::internal( 'app=core&module=settings&controller=advanced&do=downloadDatastoreConstants' )->setQueryString( array( 'store_method' => \IPS\Request::i()->store_method, 'store_config' => \IPS\Request::i()->store_config, 'cache_method' => \IPS\Request::i()->cache_method, 'cache_config' => \IPS\Request::i()->cache_config, 'cache_guest_page' => \IPS\Request::i()->cache_guest_page ) );
-				$checkUrl = \IPS\Http\Url::internal( 'app=core&module=settings&controller=advanced&tab=datastore&checkConstants=1' )->setQueryString( array( 'store_method' => \IPS\Request::i()->store_method, 'store_config' => \IPS\Request::i()->store_config, 'cache_method' => \IPS\Request::i()->cache_method, 'cache_config' => \IPS\Request::i()->cache_config, 'cache_guest_page' => \IPS\Request::i()->cache_guest_page ) );
+				$checkUrl = \IPS\Http\Url::internal( 'app=core&module=settings&controller=advanced&tab=datastore&checkConstants=1' )->setQueryString( array( 'store_method' => \IPS\Request::i()->store_method, 'store_config' => \IPS\Request::i()->store_config, 'cache_method' => \IPS\Request::i()->cache_method, 'cache_config' => \IPS\Request::i()->cache_config, 'cache_guest_page' => \IPS\Request::i()->cache_guest_page ) )->csrf();
 				return \IPS\Theme::i()->getTemplate( 'settings' )->dataStoreChange( $downloadUrl, $checkUrl, TRUE );
 			}
 			/* Otherwise just log and redirect */
@@ -111,9 +124,10 @@ class _advanced extends \IPS\Dispatcher\Controller
 		
 		/* Init */
 		$form = new \IPS\Helpers\Form;
+		$form->attributes['data-controller'] = 'core.admin.system.settings';
 
 		/* If the datastore isn't working properly, show a message */
-		if( !\IPS\Data\Store::i()->test() OR \IPS\Db::i()->select( 'COUNT(*)', 'core_log', array( '`category`=? AND `time`>?', 'datastore', \IPS\DateTime::create()->sub( new \DateInterval( 'PT1H' ) )->getTimestamp() ) )->first() >= 10 )
+		if( !\IPS\Data\Store::testStore() OR \IPS\Db::i()->select( 'COUNT(*)', 'core_log', array( '`category`=? AND `time`>?', 'datastore', \IPS\DateTime::create()->sub( new \DateInterval( 'PT1H' ) )->getTimestamp() ) )->first() >= 10 )
 		{
 			/* Have we just recently updated the configuration? If so, ignore this warning for 24 hours */
 			if( \IPS\Settings::i()->last_data_store_update < \IPS\DateTime::create()->sub( new \DateInterval( 'PT24H' ) )->getTimestamp() )
@@ -147,7 +161,7 @@ class _advanced extends \IPS\Dispatcher\Controller
 				{
 					if ( !$input->htmlId )
 					{
-						$input->htmlId = md5( mt_rand() );
+						$input->htmlId = 'id_' . $input->name;
 					}
 					
 					$extra[] = $input;
@@ -188,7 +202,26 @@ class _advanced extends \IPS\Dispatcher\Controller
 		{
 			$options['Test'] = 'datastore_method_Test';
 		}
-		$existingConfiguration = json_decode( \IPS\CACHE_CONFIG, TRUE );
+		
+		$cacheConfig = \IPS\CACHE_CONFIG;
+		
+		if ( \defined( '\IPS\REDIS_CONFIG' ) and ( \IPS\STORE_METHOD == 'Redis' OR \IPS\CACHE_METHOD == 'Redis' ) )
+		{
+			$cacheConfig = \IPS\REDIS_CONFIG;
+		}
+		
+		$existingConfiguration = json_decode( $cacheConfig, TRUE );
+
+		/* Remove deprecated options if they're not in use @todo 4.6 */
+		$deprecatedCacheMethods = array( 'Apc', 'Memcache', 'Wincache', 'Xcache' );
+		foreach( $deprecatedCacheMethods as $cache )
+		{
+			if( $cache !== \IPS\CACHE_METHOD )
+			{
+				unset( $options[ $cache ] );
+			}
+		}
+		
 		foreach ( $options as $k => $v )
 		{
 			$class = 'IPS\Data\Cache\\' . $k;
@@ -203,13 +236,19 @@ class _advanced extends \IPS\Dispatcher\Controller
 				{
 					if ( !$input->htmlId )
 					{
-						$input->htmlId = md5( mt_rand() );
+						$input->htmlId = 'id_' . $input->name;
 					}
 					
 					$extra[] = $input;
 					$toggles[ $k ][] = $input->htmlId;
 					$cacheConfigurationFields[ $k ][ $inputKey ] = $input->name;
 				}
+
+				/* Deprecated Warnings */
+				if( \in_array( $k, $deprecatedCacheMethods ) )
+				{
+					\IPS\Member::loggedIn()->language()->words["datastore_method_{$k}_desc"] = \IPS\Member::loggedIn()->language()->addToStack( 'datastore_method_deprecated', FALSE, array( 'sprintf' => array( $k ) ) );
+				}
 			}
 		}
 		$form->add( new \IPS\Helpers\Form\Radio( 'cache_method', \IPS\CACHE_METHOD, TRUE, array(
@@ -224,7 +263,7 @@ class _advanced extends \IPS\Dispatcher\Controller
 		
 		$form->add( new \IPS\Helpers\Form\YesNo( 'redis_enabled', \IPS\REDIS_ENABLED, FALSE, array(), NULL, NULL, NULL, 'redis_enabled' ) );
 		
-		$form->add( new \IPS\Helpers\Form\Number( 'cache_guest_page', \IPS\CACHE_PAGE_TIMEOUT, FALSE, array( 'unlimited' => 0, 'unlimitedLang' => 'disable' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('for'), \IPS\Member::loggedIn()->language()->addToStack('seconds'), 'cache_guest_page' ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'cache_guest_page', \IPS\CACHE_PAGE_TIMEOUT, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::SECONDS, 'unlimited' => 0, 'unlimitedLang' => 'disable' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('for'), NULL, 'cache_guest_page' ) );
 		
 		/* Handle submissions */
 		if ( $values = $form->values() )
@@ -274,10 +313,11 @@ class _advanced extends \IPS\Dispatcher\Controller
 
 				/* Reset the last update flag for data store */
 				\IPS\Settings::i()->changeValues( array( 'last_data_store_update' => time() ) );
+				\IPS\core\AdminNotification::remove( 'core', 'ConfigurationError', 'dataStorageBroken' );
 				
 				/* Display */
 				$downloadUrl = \IPS\Http\Url::internal( 'app=core&module=settings&controller=advanced&do=downloadDatastoreConstants' )->setQueryString( array( 'store_method' => $values['datastore_method'], 'store_config' => str_replace( '\\/', '/', json_encode( $storeConfiguration ) ), 'cache_method' => $values['cache_method'], 'cache_config' => json_encode( $cacheConfiguration ), 'cache_guest_page' => $values['cache_guest_page'], 'redis_enabled' => $values['redis_enabled'] ) );
-				$checkUrl = \IPS\Http\Url::internal( 'app=core&module=settings&controller=advanced&tab=datastore&checkConstants=1' )->setQueryString( array( 'store_method' => $values['datastore_method'], 'store_config' => str_replace( '\\/', '/', json_encode( $storeConfiguration ) ), 'cache_method' => $values['cache_method'], 'cache_config' => json_encode( $cacheConfiguration ), 'cache_guest_page' => $values['cache_guest_page'], 'redis_enabled' => $values['redis_enabled'] ) );
+				$checkUrl = \IPS\Http\Url::internal( 'app=core&module=settings&controller=advanced&tab=datastore&checkConstants=1' )->setQueryString( array( 'store_method' => $values['datastore_method'], 'store_config' => str_replace( '\\/', '/', json_encode( $storeConfiguration ) ), 'cache_method' => $values['cache_method'], 'cache_config' => json_encode( $cacheConfiguration ), 'cache_guest_page' => $values['cache_guest_page'], 'redis_enabled' => $values['redis_enabled'] ) )->csrf();
 				return \IPS\Theme::i()->getTemplate( 'settings' )->dataStoreChange( $downloadUrl, $checkUrl );
 			}
 			/* Otherwise just log and redirect */
@@ -287,7 +327,9 @@ class _advanced extends \IPS\Dispatcher\Controller
 				\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=settings&controller=advanced&tab=datastore' ), 'saved' );
 			}
 		}
-
+		
+		\IPS\Output::i()->jsFiles = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js('admin_system.js', 'core', 'admin') );
+		
 		return $form;
 	}
 	
@@ -303,11 +345,11 @@ class _advanced extends \IPS\Dispatcher\Controller
 		$output = "<?php\n\n";
 		foreach ( \IPS\IPS::defaultConstants() as $k => $v )
 		{
-			$val = constant( 'IPS\\' . $k );
+			$val = \constant( 'IPS\\' . $k );
 
-			if ( $val !== $v and !in_array( $k, array( 'STORE_METHOD', 'STORE_CONFIG', 'CACHE_METHOD', 'CACHE_CONFIG', 'CACHE_PAGE_TIMEOUT', 'SUITE_UNIQUE_KEY', 'READ_WRITE_SEPARATION', 'REDIS_ENABLED', 'REPORT_EXCEPTIONS' ) ) )
+			if ( $val !== $v and !\in_array( $k, array( 'STORE_METHOD', 'STORE_CONFIG', 'CACHE_METHOD', 'CACHE_CONFIG', 'CACHE_PAGE_TIMEOUT', 'SUITE_UNIQUE_KEY', 'READ_WRITE_SEPARATION', 'REDIS_ENABLED', 'REDIS_CONFIG', 'REPORT_EXCEPTIONS' ) ) )
 			{
-				$output .= "define( '{$k}', " . var_export( $val, TRUE ) . " );\n";
+				$output .= "\\define( '{$k}', " . var_export( $val, TRUE ) . " );\n";
 			}
 		}
 
@@ -323,33 +365,41 @@ class _advanced extends \IPS\Dispatcher\Controller
 
 				if( isset( $matches[1] ) )
 				{
-					$output .= "define( 'READ_WRITE_SEPARATION', " . $matches[1] . " );\n";
+					$output .= "\\define( 'READ_WRITE_SEPARATION', " . $matches[1] . " );\n";
 				}
 			}
 		}
 		
 		$output .= "\n";
-		$output .= "define( 'REDIS_ENABLED', " . var_export( (boolean) \IPS\Request::i()->redis_enabled, TRUE ) . " );\n";
-		$output .= "define( 'STORE_METHOD', " . var_export( \IPS\Request::i()->store_method, TRUE ) . " );\n";
-		$output .= "define( 'STORE_CONFIG', " . var_export( \IPS\Request::i()->store_config, TRUE ) . " );\n";
-		$output .= "define( 'CACHE_METHOD', " . var_export( \IPS\Request::i()->cache_method, TRUE ) . " );\n";
-		$output .= "define( 'CACHE_CONFIG', " . var_export( \IPS\Request::i()->cache_config, TRUE ) . " );\n";
-		$output .= "define( 'CACHE_PAGE_TIMEOUT', " . var_export( (int) \IPS\Request::i()->cache_guest_page, TRUE ) . " );\n";
-		$output .= "define( 'SUITE_UNIQUE_KEY', " . var_export( mb_substr( md5( mt_rand() ), 10, 10 ), TRUE ) . " );\n"; // Regenerate the unique key so there's no conflicts
+		$output .= "\\define( 'REDIS_ENABLED', " . var_export( (boolean) \IPS\Request::i()->redis_enabled, TRUE ) . " );\n";
+		$output .= "\\define( 'STORE_METHOD', " . var_export( \IPS\Request::i()->store_method, TRUE ) . " );\n";
+		$output .= "\\define( 'STORE_CONFIG', " . var_export( \IPS\Request::i()->store_config, TRUE ) . " );\n";
+		$output .= "\\define( 'CACHE_METHOD', " . var_export( \IPS\Request::i()->cache_method, TRUE ) . " );\n";
+		
+		if ( \IPS\Request::i()->store_method === 'Redis' or \IPS\Request::i()->cache_method === 'Redis' )
+		{
+			$output .= "\\define( 'REDIS_CONFIG', " . var_export( \IPS\Request::i()->cache_config, TRUE ) . " );\n";
+		}
+		else
+		{
+			$output .= "\\define( 'CACHE_CONFIG', " . var_export( \IPS\Request::i()->cache_config, TRUE ) . " );\n";
+		}
+		
+		$output .= "\\define( 'CACHE_PAGE_TIMEOUT', " . var_export( (int) \IPS\Request::i()->cache_guest_page, TRUE ) . " );\n";
+		$output .= "\\define( 'SUITE_UNIQUE_KEY', " . var_export( mb_substr( md5( mt_rand() ), 10, 10 ), TRUE ) . " );\n"; // Regenerate the unique key so there's no conflicts
 		$output .= "\n\n\n";
 				
 		\IPS\Output::i()->sendOutput( $output, 200, 'text/x-php', array( 'Content-Disposition' => 'attachment; filename=constants.php' ) );
 	}
-	
+
 	/**
-	 * Settings
+	 * Get setting to configure tasks
 	 *
-	 * @return	string
+	 * @param	\IPS\Form	$form	Form to add the setting to
+	 * @return	void
 	 */
-	protected function _manageSettings()
+	public static function taskSetting( $form )
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'advanced_manage_server' );
-		
 		/* Generate a cron key if we don't have one */
 		if ( !\IPS\Settings::i()->task_cron_key )
 		{
@@ -398,9 +448,6 @@ class _advanced extends \IPS\Dispatcher\Controller
 			);
 		}
 
-		/* Build and show form */
-		$form = new \IPS\Helpers\Form;
-		$form->addHeader('task_manager');
 		$form->add( new \IPS\Helpers\Form\Radio( 'task_use_cron', \IPS\CIC ? 'ips' : \IPS\Settings::i()->task_use_cron, FALSE, $options, function ( $val )
 		{
 			$cronFile = \IPS\ROOT_PATH . '/applications/core/interface/task/task.php';
@@ -409,6 +456,26 @@ class _advanced extends \IPS\Dispatcher\Controller
 				throw new \DomainException( \IPS\Member::loggedIn()->language()->addToStack('task_use_cron_executable', FALSE, array( 'sprintf' => array( $cronFile ) ) ) );
 			}
 		}, NULL, NULL, 'task_use_cron' ) );
+	}
+	
+	/**
+	 * Settings
+	 *
+	 * @return	string
+	 */
+	protected function _manageSettings()
+	{
+		\IPS\Dispatcher::i()->checkAcpPermission( 'advanced_manage_server' );
+		
+		/* Build and show form */
+		$form = new \IPS\Helpers\Form;
+		\IPS\Output::i()->jsFiles = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'admin_settings.js', 'core', 'admin' ) );
+		$form->attributes['data-controller'] = 'core.admin.settings.advanced';
+		$form->hiddenValues['rebuildPosts'] = \IPS\Request::i()->rebuildPosts ?: 0;
+		$form->addHeader('task_manager');
+		
+		static::taskSetting( $form );
+
 		$form->addHeader( 'security_header_ips' );
 		if ( !\IPS\CIC )
 		{
@@ -419,8 +486,20 @@ class _advanced extends \IPS\Dispatcher\Controller
 		{
 			\IPS\Member::loggedIn()->language()->words['match_ipaddress_warning'] = \IPS\Member::loggedIn()->language()->addToStack('ip_override_warn');
 		}
+		$form->add( new \IPS\Helpers\Form\Radio( 'clickjackprevention', \IPS\Settings::i()->clickjackprevention, FALSE, array(
+			'options'	=> array(
+				'xframe'	=> 'clickjackprevention_xframe',
+				'csp'		=> 'clickjackprevention_csp',
+				'none'		=> 'clickjackprevention_none',
+			),
+			'toggles'	=> array(
+				'csp'		=> array( 'csp_header' )
+			)
+		) ) );
+		$form->add( new \IPS\Helpers\Form\Text( 'csp_header', \IPS\Settings::i()->csp_header, FALSE, array( 'placeholder' => "default-src *; frame-ancestors 'self' *.example.com" ), NULL, NULL, NULL, 'csp_header' ) );
 		$form->addHeader('performance_settings');
-		$form->add( new \IPS\Helpers\Form\Number( 'widget_cache_ttl', ( isset( \IPS\Settings::i()->widget_cache_ttl ) ) ? \IPS\Settings::i()->widget_cache_ttl : 60, FALSE, array( 'min' => 60 ), NULL, \IPS\Member::loggedIn()->language()->addToStack('for'), \IPS\Member::loggedIn()->language()->addToStack('seconds') ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'widget_cache_ttl', ( isset( \IPS\Settings::i()->widget_cache_ttl ) ) ? \IPS\Settings::i()->widget_cache_ttl : 60, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::SECONDS, 'min' => 60 ), NULL, \IPS\Member::loggedIn()->language()->addToStack('for'), NULL ) );
+		$form->add( new \IPS\Helpers\Form\YesNo( 'lazy_load_enabled', \IPS\Settings::i()->lazy_load_enabled, FALSE ) );
 		$form->add( new \IPS\Helpers\Form\YesNo( 'auto_polling_enabled', \IPS\Settings::i()->auto_polling_enabled, FALSE ) );
 		
 		if ( ! \IPS\CIC )
@@ -440,7 +519,40 @@ class _advanced extends \IPS\Dispatcher\Controller
 		
 		if ( $values = $form->values() )
 		{
-			$form->saveAsSettings();			
+			/* Run the rebuild posts routine */
+			if( $values['rebuildPosts'] )
+			{
+				/* Remove any existing rebuilds */
+				\IPS\Db::i()->delete( 'core_queue', \IPS\Db::i()->in( '`key`', array( 'RebuildLazyLoad', 'RebuildLazyLoadNonContent' ) ) );
+
+				/* Unset task datastore */
+				unset( \IPS\Data\Store::i()->currentLazyLoadRebuild );
+
+				$enableDisable = $values['lazy_load_enabled'] ? TRUE : FALSE;
+				foreach ( \IPS\Content::routedClasses( FALSE, TRUE ) as $class )
+				{
+					if( isset( $class::$databaseColumnMap['content'] ) )
+					{
+						try
+						{
+							\IPS\Task::queue( 'core', 'RebuildLazyLoad', array( 'class' => $class, 'status' => $enableDisable ), 4 );
+						}
+						catch( \OutOfRangeException $ex ) { }
+					}
+				}
+
+				foreach( \IPS\Application::allExtensions( 'core', 'EditorLocations', FALSE, NULL, NULL, TRUE, TRUE ) as $_key => $extension )
+				{
+					if( method_exists( $extension, 'rebuildLazyLoad' ) )
+					{
+						\IPS\Task::queue( 'core', 'RebuildLazyLoadNonContent', array( 'extension' => $_key, 'status' => $enableDisable ), 4 );
+					}
+				}
+			}
+
+			unset( $values['rebuildPosts'] );
+
+			$form->saveAsSettings( $values );			
 			\IPS\Session::i()->log( 'acplogs__advanced_server_edited' );
 			
 			\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=settings&controller=advanced&tab=settings' ), 'saved' );
@@ -475,7 +587,7 @@ class _advanced extends \IPS\Dispatcher\Controller
 		$table->quickSearch = function( $val )
 		{
 			$matches = \IPS\Member::loggedIn()->language()->searchCustom( 'task__', $val, TRUE );
-			if ( count( $matches ) )
+			if ( \count( $matches ) )
 			{
 				return array( '(' . \IPS\Db::i()->in( '`key`', array_keys( $matches ) ) . " OR `key` LIKE '%{$val}%')" );
 			}
@@ -552,7 +664,7 @@ class _advanced extends \IPS\Dispatcher\Controller
 				$return = array( 'unlock' => array(
 					'icon'	=> 'unlock',
 					'title'	=> 'task_manager_unlock',
-					'link'	=> \IPS\Http\Url::internal( "app=core&module=settings&controller=advanced&do=unlockTask&id={$row['id']}" )
+					'link'	=> \IPS\Http\Url::internal( "app=core&module=settings&controller=advanced&do=unlockTask&id={$row['id']}" )->csrf()
 				) );
 			}
 			else
@@ -560,7 +672,7 @@ class _advanced extends \IPS\Dispatcher\Controller
 				$return = array( 'run' => array(
 					'icon'	=> 'play-circle',
 					'title'	=> 'task_manager_run',
-					'link'	=> \IPS\Http\Url::internal( "app=core&module=settings&controller=advanced&do=runTask&id={$row['id']}" )
+					'link'	=> \IPS\Http\Url::internal( "app=core&module=settings&controller=advanced&do=runTask&id={$row['id']}" )->csrf()
 				) );
 			}
 			$return['logs'] = array(
@@ -595,7 +707,7 @@ class _advanced extends \IPS\Dispatcher\Controller
 		\IPS\Dispatcher::i()->checkAcpPermission( 'advanced_manage_tasks' );
 
 		$form = new \IPS\Helpers\Form;
-		$form->add( new \IPS\Helpers\Form\Number( 'prune_log_tasks', \IPS\Settings::i()->prune_log_tasks, FALSE, array( 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('after'), \IPS\Member::loggedIn()->language()->addToStack('days'), 'prune_log_tasks' ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'prune_log_tasks', \IPS\Settings::i()->prune_log_tasks, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::DAYS, 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('after'), NULL, 'prune_log_tasks' ) );
 	
 		if ( $values = $form->values() )
 		{
@@ -616,6 +728,7 @@ class _advanced extends \IPS\Dispatcher\Controller
 	protected function runTask()
 	{
 		\IPS\Dispatcher::i()->checkAcpPermission( 'advanced_manage_tasks' );
+		\IPS\Session::i()->csrfCheck();
 		
 		\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('task_manager');
 		
@@ -635,11 +748,11 @@ class _advanced extends \IPS\Dispatcher\Controller
 			}
 			else
 			{
-				if ( is_array( $output ) )
+				if ( \is_array( $output ) )
 				{
 					$output = implode( "\n", array_map( array( \IPS\Member::loggedIn()->language(), 'addToStack' ), $output ) );
 				}
-				elseif ( !is_string( $output ) and !is_numeric( $output ) )
+				elseif ( !\is_string( $output ) and !\is_numeric( $output ) )
 				{
 					$output = var_export( $output, TRUE );
 				}
@@ -655,6 +768,10 @@ class _advanced extends \IPS\Dispatcher\Controller
 		{
 			\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'advancedsettings' )->taskResult( FALSE, \IPS\Member::loggedIn()->language()->addToStack( $e->getMessage(), FALSE ), $task->id );
 		}
+		catch ( \RuntimeException $e )
+		{
+			\IPS\Output::i()->error( 'task_running_error', '2C124/7', 404, '', array(), \IPS\IPS::getExceptionDetails( $e ) );
+		}
 		catch ( \OutOfRangeException $e )
 		{
 			\IPS\Output::i()->error( 'task_class_not_found', '2C124/1', 404, '' );
@@ -662,7 +779,7 @@ class _advanced extends \IPS\Dispatcher\Controller
 		catch( \Exception $e )
 		{
 			\IPS\Log::log( $e, 'uncaught_exception' );
-			\IPS\Output::i()->error( $e->getMessage(), '4C124/6', 404, '' );
+			\IPS\Output::i()->error( $e->getMessage() ?: 'task_running_error', '4C124/6', 404, '' );
 		}
 	}
 	
@@ -674,6 +791,7 @@ class _advanced extends \IPS\Dispatcher\Controller
 	protected function unlockTask()
 	{
 		\IPS\Dispatcher::i()->checkAcpPermission( 'advanced_manage_tasks' );
+		\IPS\Session::i()->csrfCheck();
 		
 		try
 		{
@@ -716,11 +834,11 @@ class _advanced extends \IPS\Dispatcher\Controller
 			'log'	=> function ( $val, $row )
 			{
 				$val = json_decode( $val );
-				if ( is_array( $val ) )
+				if ( \is_array( $val ) )
 				{
 					$val = implode( "\n", array_map( array( \IPS\Member::loggedIn()->language(), 'addToStack' ), $val ) );
 				}
-				elseif ( !is_string( $val ) and !is_numeric( $val ) )
+				elseif ( !\is_string( $val ) and !\is_numeric( $val ) )
 				{
 					$val = var_export( $val, TRUE );
 				}
@@ -766,7 +884,8 @@ class _advanced extends \IPS\Dispatcher\Controller
 		}
 
 		$definition = \IPS\Http\Url\Friendly::furlDefinition();
-		
+		$customConfiguration = \IPS\Settings::i()->furl_configuration ? json_decode( \IPS\Settings::i()->furl_configuration, TRUE ) : array();
+
 		$table = new \IPS\Helpers\Table\Custom( $definition, \IPS\Http\Url::internal( 'app=core&module=settings&controller=advanced&tab=furl' ) );
 		$table->include = array( 'friendly', 'real' );
 		$table->limit   = 100;
@@ -809,17 +928,17 @@ class _advanced extends \IPS\Dispatcher\Controller
 			)
 		);
 
-		if( \IPS\Settings::i()->furl_configuration AND $config = json_decode( \IPS\Settings::i()->furl_configuration, TRUE ) AND count( $config ) )
+		if( $customConfiguration AND \count( $customConfiguration ) )
 		{
 			$table->rootButtons['revert'] = array(
 				'icon'	=> 'undo',
 				'title'	=> 'furl_revert',
-				'link'	=> \IPS\Http\Url::internal( 'app=core&module=settings&controller=advanced&do=furlRevert' ),
+				'link'	=> \IPS\Http\Url::internal( 'app=core&module=settings&controller=advanced&do=furlRevert' )->csrf(),
 				'data'	=> array( 'confirm' => '' )
 			);
 		}
 
-		$table->rowButtons = function( $row, $k ) use ( $definition )
+		$table->rowButtons = function( $row, $k ) use ( $definition, $customConfiguration )
 		{
 			$return = array(
 				'edit'	=> array(
@@ -830,12 +949,12 @@ class _advanced extends \IPS\Dispatcher\Controller
 				)
 			);
 
-			if( isset( $definition[ $k ]['custom'] ) )
+			if( isset( $definition[ $k ]['custom'] ) OR isset( $customConfiguration[ $k ] ) )
 			{
 				$return['revert'] = array(
 					'icon'	=> 'undo',
 					'title'	=> 'revert',
-					'link'	=> \IPS\Http\Url::internal( "app=core&module=settings&controller=advanced&do=furlDelete&key={$k}" ),
+					'link'	=> \IPS\Http\Url::internal( "app=core&module=settings&controller=advanced&do=furlDelete&key={$k}" )->csrf(),
 					'data'	=> array( 'confirm' => '', 'confirmMessage' => \IPS\Member::loggedIn()->language()->addToStack('revert_confirm') )
 				);
 			}
@@ -882,6 +1001,7 @@ class _advanced extends \IPS\Dispatcher\Controller
 			$appIsDefault = FALSE;
 			$alias = NULL;
 			$verify = NULL;
+			$seoPagination = NULL;
 			$friendly = $values['furl_friendly'];
 			if ( \IPS\Request::i()->key )
 			{
@@ -894,7 +1014,12 @@ class _advanced extends \IPS\Dispatcher\Controller
 				{
 					$verify = $currentDefinition[ \IPS\Request::i()->key ]['verify'];
 				}
-				
+
+				if ( isset( $currentDefinition[ \IPS\Request::i()->key ]['seoPagination'] ) )
+				{
+					$seoPagination = $currentDefinition[ \IPS\Request::i()->key ]['seoPagination'];
+				}
+
 				if ( isset( $currentDefinition[ \IPS\Request::i()->key ]['with_top_level'] ) )
 				{
 					$appIsDefault = TRUE;
@@ -911,8 +1036,8 @@ class _advanced extends \IPS\Dispatcher\Controller
 					}
 				}
 			}
-						
-			$save = \IPS\Http\Url\Friendly::buildFurlDefinition( $friendly, $values['furl_real'], $appTopLevel, $appIsDefault, $alias, TRUE, $verify );
+
+			$save = \IPS\Http\Url\Friendly::buildFurlDefinition( $friendly, $values['furl_real'], $appTopLevel, $appIsDefault, $alias, TRUE, $verify, NULL, $seoPagination );
 															
 			if ( \IPS\Request::i()->key )
 			{
@@ -955,6 +1080,7 @@ class _advanced extends \IPS\Dispatcher\Controller
 	protected function furlDelete()
 	{
 		\IPS\Dispatcher::i()->checkAcpPermission( 'advanced_manage_furls' );
+		\IPS\Session::i()->csrfCheck();
 
 		/* Make sure the user confirmed the deletion */
 		\IPS\Request::i()->confirmedDelete();
@@ -983,6 +1109,7 @@ class _advanced extends \IPS\Dispatcher\Controller
 	protected function furlRevert()
 	{
 		\IPS\Dispatcher::i()->checkAcpPermission( 'advanced_manage_furls' );
+		\IPS\Session::i()->csrfCheck();
 
 		\IPS\Settings::i()->changeValues( array( 'furl_configuration' => NULL ) );
 		unset( \IPS\Data\Store::i()->furl_configuration );

applications/core/modules/admin/settings/contactus.php

@@ -11,7 +11,7 @@
 namespace IPS\core\modules\admin\settings;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -22,6 +22,11 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _contactus extends \IPS\Dispatcher\Controller
 {
+	/**
+	 * @brief	Has been CSRF-protected
+	 */
+	public static $csrfProtected = TRUE;
+	
 	/**
 	 * Execute
 	 *

applications/core/modules/admin/settings/email.php

@@ -11,7 +11,7 @@
 namespace IPS\core\modules\admin\settings;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -22,6 +22,11 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _email extends \IPS\Dispatcher\Controller
 {
+	/**
+	 * @brief	Has been CSRF-protected
+	 */
+	public static $csrfProtected = TRUE;
+	
 	/**
 	 * Execute
 	 *
@@ -55,47 +60,53 @@ class _email extends \IPS\Dispatcher\Controller
 		{
 			$settingsForm->add( new \IPS\Helpers\Form\YesNo( 'our_picks_in_email', \IPS\Settings::i()->our_picks_in_email, FALSE, array(), NULL, NULL, NULL, 'our_picks_in_email' ) );
 		}
-
-		$settingsForm->addHeader( 'advanced_settings' );
-				
-		$method = \IPS\Settings::i()->mail_method;
-		$disabled = array();
-
-		if ( \IPS\Settings::i()->sendgrid_api_key )
+		
+		$settingsForm->add( new \IPS\Helpers\Form\YesNo( 'email_truncate', ( \IPS\Settings::i()->email_truncate ), FALSE, array(), NULL, NULL, NULL, 'email_truncate' ) );
+		$settingsForm->add( new \IPS\Helpers\Form\YesNo( 'email_log_do', ( \IPS\Settings::i()->prune_log_emailstats != 0 ), FALSE, array( 'togglesOn' => array( 'prune_log_emailstats' ) ), NULL, NULL, NULL, 'email_log_do' ) );
+		$settingsForm->add( new \IPS\Helpers\Form\Interval( 'prune_log_emailstats', \IPS\Settings::i()->prune_log_emailstats ?: 60, FALSE, array( 'valueAs' => 'd', 'unlimited' => '-1', 'unlimitedLang' => 'never' ), NULL, NULL, NULL, 'prune_log_emailstats' ) );
+		if ( !\IPS\DEMO_MODE )
 		{
-			if ( \IPS\Settings::i()->sendgrid_use_for == 2 )
+			$settingsForm->addHeader( 'advanced_settings' );
+					
+			$method = \IPS\Settings::i()->mail_method;
+			$disabled = array();
+	
+			if ( \IPS\Settings::i()->sendgrid_api_key )
 			{
-				$method = 'sendgrid';
+				if ( \IPS\Settings::i()->sendgrid_use_for == 2 )
+				{
+					$method = 'sendgrid';
+				}
+			}
+			else
+			{
+				$disabled[] = 'sendgrid';
+			}
+	
+			/* We previously renamed this to 'php' */
+			if( $method == 'mail' )
+			{
+				$method = 'php';
+			}
+	
+			$settingsForm->add( new \IPS\Helpers\Form\Radio( 'mail_method', $method, TRUE, array(
+				'options' 	=> array( 'php' => ( \IPS\CIC ? 'mail_method_cic' : 'mail_method_php' ), 'smtp' => 'mail_method_smtp', 'sendgrid' => 'mail_method_sendgrid' ),
+				'disabled'	=> $disabled,
+				'toggles' => array(
+					'php'		=> array( 'php_mail_extra' ),
+					'smtp'		=> array( 'smtp_host', 'smtp_port', 'smtp_user', 'smtp_pass', 'smtp_helo', 'smtp_protocol' ),
+				)
+			) ) );
+			$options = array( 'plain' => 'smtp_plaintext', 'ssl' => 'smtp_ssl', 'tls' => 'smtp_tls' );
+			$settingsForm->add( new \IPS\Helpers\Form\Text( 'smtp_host', \IPS\Settings::i()->smtp_host, FALSE, array(), NULL, NULL, NULL, 'smtp_host' ) );
+			$settingsForm->add( new \IPS\Helpers\Form\Select( 'smtp_protocol', \IPS\Settings::i()->smtp_protocol, FALSE, array( 'options' => $options ), NULL, NULL, NULL, 'smtp_protocol' ) );
+			$settingsForm->add( new \IPS\Helpers\Form\Number( 'smtp_port', \IPS\Settings::i()->smtp_port, FALSE, array(), NULL, NULL, NULL, 'smtp_port' ) );
+			$settingsForm->add( new \IPS\Helpers\Form\Text( 'smtp_user', \IPS\Settings::i()->smtp_user, FALSE, array(), NULL, NULL, NULL, 'smtp_user' ) );
+			$settingsForm->add( new \IPS\Helpers\Form\Password( 'smtp_pass', \IPS\Settings::i()->smtp_pass, FALSE, array(), NULL, NULL, NULL, 'smtp_pass' ) );
+			if ( !\IPS\CIC )
+			{
+				$settingsForm->add( new \IPS\Helpers\Form\Text( 'php_mail_extra', \IPS\Settings::i()->php_mail_extra, FALSE, array(), NULL, NULL, NULL, 'php_mail_extra' ) );
 			}
-		}
-		else
-		{
-			$disabled[] = 'sendgrid';
-		}
-
-		/* We previously renamed this to 'php' */
-		if( $method == 'mail' )
-		{
-			$method = 'php';
-		}
-
-		$settingsForm->add( new \IPS\Helpers\Form\Radio( 'mail_method', $method, TRUE, array(
-			'options' 	=> array( 'php' => ( \IPS\CIC ? 'mail_method_cic' : 'mail_method_php' ), 'smtp' => 'mail_method_smtp', 'sendgrid' => 'mail_method_sendgrid' ),
-			'disabled'	=> $disabled,
-			'toggles' => array(
-				'php'		=> array( 'php_mail_extra' ),
-				'smtp'		=> array( 'smtp_host', 'smtp_port', 'smtp_user', 'smtp_pass', 'smtp_helo', 'smtp_protocol' ),
-			)
-		) ) );
-		$options = array( 'plain' => 'smtp_plaintext', 'ssl' => 'smtp_ssl', 'tls' => 'smtp_tls' );
-		$settingsForm->add( new \IPS\Helpers\Form\Text( 'smtp_host', \IPS\Settings::i()->smtp_host, FALSE, array(), NULL, NULL, NULL, 'smtp_host' ) );
-		$settingsForm->add( new \IPS\Helpers\Form\Select( 'smtp_protocol', \IPS\Settings::i()->smtp_protocol, FALSE, array( 'options' => $options ), NULL, NULL, NULL, 'smtp_protocol' ) );
-		$settingsForm->add( new \IPS\Helpers\Form\Number( 'smtp_port', \IPS\Settings::i()->smtp_port, FALSE, array(), NULL, NULL, NULL, 'smtp_port' ) );
-		$settingsForm->add( new \IPS\Helpers\Form\Text( 'smtp_user', \IPS\Settings::i()->smtp_user, FALSE, array(), NULL, NULL, NULL, 'smtp_user' ) );
-		$settingsForm->add( new \IPS\Helpers\Form\Password( 'smtp_pass', \IPS\Settings::i()->smtp_pass, FALSE, array(), NULL, NULL, NULL, 'smtp_pass' ) );
-		if ( !\IPS\CIC )
-		{
-			$settingsForm->add( new \IPS\Helpers\Form\Text( 'php_mail_extra', \IPS\Settings::i()->php_mail_extra, FALSE, array(), NULL, NULL, NULL, 'php_mail_extra' ) );
 		}
 		if ( $values = $settingsForm->values() )
 		{
@@ -108,6 +119,13 @@ class _email extends \IPS\Dispatcher\Controller
 					$sendTestEmail = TRUE;
 				}
 			}
+
+			if( !$values['email_log_do'] )
+			{
+				$values['prune_log_emailstats'] = 0;
+			}
+
+			unset( $values['email_log_do'] );
 			
 			if ( $values['mail_method'] != 'sendgrid' and \IPS\Settings::i()->sendgrid_use_for == 2 )
 			{
@@ -134,6 +152,9 @@ class _email extends \IPS\Dispatcher\Controller
 				{
 					$result = $email->_send( \IPS\Member::loggedIn(), array(), array(), \IPS\Settings::i()->email_out );
 					$messageHtml = \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->message( 'email_test_okay_auto', 'success' );
+
+					/* Sent successfully, remove notification */
+					\IPS\core\AdminNotification::remove( 'core', 'ConfigurationError', 'failedMail' );
 				}
 				catch ( \Exception $e )
 				{
@@ -165,11 +186,15 @@ class _email extends \IPS\Dispatcher\Controller
 				{
 					$email = \IPS\Email::buildFromContent( $values['subject'], $values['message'], $values['message'], \IPS\Email::TYPE_TRANSACTIONAL );
 					$result = $email->_send( $values['to'], array(), array(), $values['from'] );
+					
+					/* Sent successfully, remove notification */
+					\IPS\core\AdminNotification::remove( 'core', 'ConfigurationError', 'failedMail' );
+
 					$messageHtml = \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->message( 'email_test_okay', 'success' );
 				}
 				catch ( \Exception $exception )
 				{
-					$messageHtml = \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->message( get_class( $exception ) . ": " . $exception->getMessage() . " (" . $exception->getCode() . ")", 'error' );
+					$messageHtml = \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->message( \get_class( $exception ) . ": " . $exception->getMessage() . " (" . $exception->getCode() . ")", 'error' );
 				}
 			}
 
@@ -202,13 +227,39 @@ class _email extends \IPS\Dispatcher\Controller
 	{
 		\IPS\Dispatcher::i()->checkAcpPermission( 'email_errorlog' );
 		
+		/* Add a button for settings */
+		if ( \IPS\Member::loggedIn()->hasAcpRestriction( 'core', 'settings', 'email_errorlog_prune' ) )
+		{
+			\IPS\Output::i()->sidebar['actions'] = array(
+				'settings'	=> array(
+					'title'		=> 'prunesettings',
+					'icon'		=> 'cog',
+					'link'		=> \IPS\Http\Url::internal( 'app=core&module=settings&controller=email&do=errorLogSettings' ),
+					'data'		=> array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('prunesettings') )
+				),
+			);
+		}
+
+		/* Display */
+		\IPS\Output::i()->title		= \IPS\Member::loggedIn()->language()->addToStack('emailerrorlogs');
+		\IPS\Output::i()->output	= (string) static::emailErrorLogTable( \IPS\Http\Url::internal( 'app=core&module=settings&controller=email&do=errorLog' ) );
+	}
+	
+	/**
+	 * Get email error log table
+	 *
+	 * @param	\IPS\Http\Url	$url	Base URL for table
+	 * @param 	array			$where	Where Array
+	 * @return	\IPS\Helpers\Table\Db
+	 */
+	public static function emailErrorLogTable( \IPS\Http\Url $url, array $where=array() ): \IPS\Helpers\Table\Db
+	{
 		/* Create the table */
-		$table = new \IPS\Helpers\Table\Db( 'core_mail_error_logs', \IPS\Http\Url::internal( 'app=core&module=settings&controller=email&do=errorLog' ) );
+		$table = new \IPS\Helpers\Table\Db( 'core_mail_error_logs', $url, $where );
 		$table->langPrefix = 'emailerrorlogs_';
 		
 		/* Columns we need */
 		$table->include	= array( 'mlog_to', 'mlog_subject', 'mlog_date', 'mlog_msg' );
-		$table->widths	= array( 'mlog_date' => '15', 'mlog_to' => '20', 'mlog_subject' => '20', 'mlog_msg' => '35' );
 		$table->rowClasses = array( 'mlog_subject' => array( 'ipsTable_wrap' ), 'mlog_msg' => array( 'ipsTable_wrap' ) );
 
 		$table->sortBy	= $table->sortBy ?: 'mlog_date';
@@ -275,28 +326,14 @@ class _email extends \IPS\Dispatcher\Controller
 			$return['resend'] = array(
 				'icon'		=> 'refresh',
 				'title'		=> 'resend_email_error',
-				'link'		=> \IPS\Http\Url::internal( 'app=core&module=settings&controller=email&do=errorLogResend&id=' ) . $row['mlog_id'],
+				'link'		=> \IPS\Http\Url::internal( 'app=core&module=settings&controller=email&do=errorLogResend&id=' . $row['mlog_id'] )->csrf(),
 			);
 
 			return $return;
 		};
-
-		/* Add a button for settings */
-		if ( \IPS\Member::loggedIn()->hasAcpRestriction( 'core', 'settings', 'email_errorlog_prune' ) )
-		{
-			\IPS\Output::i()->sidebar['actions'] = array(
-				'settings'	=> array(
-					'title'		=> 'prunesettings',
-					'icon'		=> 'cog',
-					'link'		=> \IPS\Http\Url::internal( 'app=core&module=settings&controller=email&do=errorLogSettings' ),
-					'data'		=> array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('prunesettings') )
-				),
-			);
-		}
-
-		/* Display */
-		\IPS\Output::i()->title		= \IPS\Member::loggedIn()->language()->addToStack('emailerrorlogs');
-		\IPS\Output::i()->output	= (string) $table;
+		
+		/* Return */
+		return $table;
 	}
 
 	/**
@@ -307,6 +344,7 @@ class _email extends \IPS\Dispatcher\Controller
 	public function errorLogResend()
 	{
 		\IPS\Dispatcher::i()->checkAcpPermission( 'email_errorlog' );
+		\IPS\Session::i()->csrfCheck();
 		
 		$id			= (int) \IPS\Request::i()->id;
 		$log		= \IPS\Db::i()->select( '*', 'core_mail_error_logs', array( 'mlog_id=?', $id ) )->first();
@@ -342,6 +380,12 @@ class _email extends \IPS\Dispatcher\Controller
 
 		\IPS\Db::i()->delete( 'core_mail_error_logs', array( 'mlog_id=?', $id ) );
 
+		/* Remove notification since this was re-sent with success and it is below the recent threshold */
+		if( \IPS\Email::countFailedMail( \IPS\DateTime::create()->sub( new \DateInterval( 'P3D' ), FALSE ), TRUE ) <= 3 )
+		{
+			\IPS\core\AdminNotification::remove( 'core', 'ConfigurationError', 'failedMail' );
+		}
+
 		\IPS\Output::i()->redirect( \IPS\Http\Url::internal( "app=core&module=settings&controller=email&do=errorLog" ), 'emailerror_resent' );
 	}
 
@@ -370,7 +414,7 @@ class _email extends \IPS\Dispatcher\Controller
 		\IPS\Dispatcher::i()->checkAcpPermission( 'email_errorlog_prune' );
 		
 		$form = new \IPS\Helpers\Form;
-		$form->add( new \IPS\Helpers\Form\Number( 'prune_log_email_error', \IPS\Settings::i()->prune_log_email_error, FALSE, array( 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('after'), \IPS\Member::loggedIn()->language()->addToStack('days'), 'prune_log_email_error' ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'prune_log_email_error', \IPS\Settings::i()->prune_log_email_error, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::DAYS, 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('after'), NULL, 'prune_log_email_error' ) );
 		
 		if ( $values = $form->values() )
 		{
@@ -382,4 +426,4 @@ class _email extends \IPS\Dispatcher\Controller
 		\IPS\Output::i()->title		= \IPS\Member::loggedIn()->language()->addToStack('emailerrorlogssettings');
 		\IPS\Output::i()->output 	= \IPS\Theme::i()->getTemplate('global')->block( 'emailerrorlogssettings', $form, FALSE );
 	}
-}
+}

applications/core/modules/admin/settings/general.php

@@ -11,7 +11,7 @@
 namespace IPS\core\modules\admin\settings;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -22,6 +22,11 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _general extends \IPS\Dispatcher\Controller
 {
+	/**
+	 * @brief	Has been CSRF-protected
+	 */
+	public static $csrfProtected = TRUE;
+	
 	/**
 	 * Execute
 	 *
@@ -42,6 +47,7 @@ class _general extends \IPS\Dispatcher\Controller
 	{
 		$form = new \IPS\Helpers\Form;
 		$form->add( new \IPS\Helpers\Form\Text( 'board_name', \IPS\Settings::i()->board_name, TRUE ) );
+		
 		$form->add( new \IPS\Helpers\Form\YesNo( 'site_online', \IPS\Settings::i()->site_online, FALSE, array(
 			'togglesOff'	=> array( 'site_offline_message_id' ),
 		) ) );
@@ -50,7 +56,6 @@ class _general extends \IPS\Dispatcher\Controller
 		$form->add( new \IPS\Helpers\Form\Stack( 'site_social_profiles', \IPS\Settings::i()->site_social_profiles ? json_decode( \IPS\Settings::i()->site_social_profiles, true ) : array(), FALSE, array( 'stackFieldType' => '\IPS\core\Form\SocialProfiles', 'maxItems' => 50, 'key' => array( 'placeholder' => 'http://example.com', 'size' => 20 ) ) ) );
 		$form->add( new \IPS\Helpers\Form\Text( 'site_twitter_id', \IPS\Settings::i()->site_twitter_id, FALSE, array( 'placeholder' => \IPS\Member::loggedIn()->language()->addToStack('site_twitter_id_placeholder'), 'size' => 20 ) ) );
 		$form->add( new \IPS\Helpers\Form\Translatable( 'copyright_line', NULL, FALSE, array( 'app' => 'core', 'key' => 'copyright_line_value', 'placeholder' => \IPS\Member::loggedIn()->language()->addToStack('copyright_line_placeholder') ) ) );
-		$form->add( new \IPS\Helpers\Form\Stack( 'upgrade_email', explode( ',', \IPS\Settings::i()->upgrade_email ), FALSE, array( 'stackFieldType' => 'Email', 'maxItems' => 5 ) ) );
 		/* $form->add( new \IPS\Helpers\Form\CheckboxSet( 'diagnostics_reporting', array( 'usage' => ( (bool) \IPS\Settings::i()->usage_reporting ), 'diagnostics' => ( (bool) \IPS\Settings::i()->diagnostics_reporting ) ), FALSE, array( 'options' => array(
 			'usage'			=> 'diagnostics_reporting_usage',
 			'diagnostics'	=> 'diagnostics_reporting_diagnostics',
@@ -69,19 +74,30 @@ class _general extends \IPS\Dispatcher\Controller
 			} ) );
 
 			$values['site_address']			= json_encode( $values['site_address'] );
-
-			$values['upgrade_email']		= implode( ',', $values['upgrade_email'] );
-			
-			// $values['usage_reporting'] = in_array( 'usage', $values['diagnostics_reporting'] );
-			// $values['diagnostics_reporting'] = in_array( 'diagnostics', $values['diagnostics_reporting'] );
-			// \IPS\Db::i()->update( 'core_tasks', array( 'enabled' => intval( $values['usage_reporting'] ) ), array( '`key`=?', 'usagereporting' ) );
 			
+			//$values['usage_reporting'] = \in_array( 'usage', $values['diagnostics_reporting'] );
+			//$values['diagnostics_reporting'] = \in_array( 'diagnostics', $values['diagnostics_reporting'] );
+			//\IPS\Db::i()->update( 'core_tasks', array( 'enabled' => \intval( $values['usage_reporting'] ) ), array( '`key`=?', 'usagereporting' ) );
+						
 			$form->saveAsSettings( $values );
+			
+			if ( $values['site_online'] )
+			{
+				\IPS\core\AdminNotification::remove( 'core', 'ConfigurationError', 'siteOffline' );
+			}
+			else
+			{
+				\IPS\core\AdminNotification::send( 'core', 'ConfigurationError', 'siteOffline', FALSE, NULL, \IPS\Member::loggedIn() );
+			}
 
 			/* Clear guest page caches */
 			\IPS\Data\Cache::i()->clearAll();
 
+			/* Clear manifest and ie browser data stores */
+			unset( \IPS\Data\Store::i()->manifest, \IPS\Data\Store::i()->iebrowserconfig );
+
 			\IPS\Session::i()->log( 'acplogs__general_settings' );
+			\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=settings&controller=general' ), 'saved' );
 		}
 		
 		\IPS\Output::i()->title		= \IPS\Member::loggedIn()->language()->addToStack('menu__core_settings_general');

applications/core/modules/admin/settings/licensekey.php

@@ -11,7 +11,7 @@
 namespace IPS\core\modules\admin\settings;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -22,6 +22,11 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _licensekey extends \IPS\Dispatcher\Controller
 {
+	/**
+	 * @brief	Has been CSRF-protected
+	 */
+	public static $csrfProtected = TRUE;
+	
 	/**
 	 * @brief Data about the license key from the store
 	 */
@@ -59,7 +64,7 @@ class _licensekey extends \IPS\Dispatcher\Controller
 		\IPS\Output::i()->sidebar['actions'] = array(
 			'refresh'	=> array(
 				'icon'	=> 'refresh',
-				'link'	=> \IPS\Http\Url::internal( 'app=core&module=settings&controller=licensekey&do=refresh' ),
+				'link'	=> \IPS\Http\Url::internal( 'app=core&module=settings&controller=licensekey&do=refresh' )->csrf(),
 				'title'	=> 'license_refresh',
 			),
 			'remove'	=> array(
@@ -89,6 +94,8 @@ class _licensekey extends \IPS\Dispatcher\Controller
 	 */
 	protected function refresh()
 	{
+		\IPS\Session::i()->csrfCheck();
+		
 		/* Fetch the license key data and update our local storage */
 		unset( \IPS\Data\Store::i()->license_data );
 
@@ -142,6 +149,8 @@ class _licensekey extends \IPS\Dispatcher\Controller
 
 			/* Refresh the locally stored license info */
 			unset( \IPS\Data\Store::i()->license_data );
+			
+			\IPS\core\AdminNotification::remove( 'core', 'License', 'missing' );
 
 			\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=settings&controller=licensekey' ), 'saved' );
 		}

applications/core/modules/admin/settings/login.php

@@ -11,7 +11,7 @@
 namespace IPS\core\modules\admin\settings;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -22,6 +22,11 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _login extends \IPS\Node\Controller
 {
+	/**
+	 * @brief	Has been CSRF-protected
+	 */
+	public static $csrfProtected = TRUE;
+	
 	/**
 	 * Node Class
 	 */
@@ -129,7 +134,7 @@ class _login extends \IPS\Node\Controller
 				'forcelogout'	=> array(
 					'title'		=> 'force_all_logout',
 					'icon'		=> 'lock',
-					'link'		=> \IPS\Http\Url::internal( 'app=core&module=settings&controller=login&do=forceLogout' ),
+					'link'		=> \IPS\Http\Url::internal( 'app=core&module=settings&controller=login&do=forceLogout' )->csrf(),
 					'data'		=> array( 'confirm' => '' ),
 				),
 			);
@@ -150,7 +155,7 @@ class _login extends \IPS\Node\Controller
 		}
 		else
 		{
-			\IPS\Output::i()->output = new \IPS\Helpers\Wizard( array(
+			\IPS\Output::i()->output = (string) new \IPS\Helpers\Wizard( array(
 				'login_handler'	=> function( $data )
 				{
 					$options = array();
@@ -216,6 +221,8 @@ class _login extends \IPS\Node\Controller
 	 */
 	protected function enableToggle()
 	{
+		\IPS\Session::i()->csrfCheck();
+		
 		$loginMethod = \IPS\Login\Handler::load( \IPS\Request::i()->id );
 		
 		if ( \IPS\Request::i()->status )
@@ -292,17 +299,14 @@ class _login extends \IPS\Node\Controller
 		$form = new \IPS\Helpers\Form();
 		$form->addHeader( 'ipb_bruteforce_attempts' );
 		$form->add( new \IPS\Helpers\Form\Number( 'ipb_bruteforce_attempts', \IPS\Settings::i()->ipb_bruteforce_attempts, FALSE, array( 'min' => 0, 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('after'), \IPS\Member::loggedIn()->language()->addToStack('failed_logins'), 'ipb_bruteforce_attempts' ) );
-		$form->add( new \IPS\Helpers\Form\Number( 'ipb_bruteforce_period', \IPS\Settings::i()->ipb_bruteforce_period, FALSE, array( 'min' => 0, 'max' => 10000, 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('after'), \IPS\Member::loggedIn()->language()->addToStack('minutes'), 'ipb_bruteforce_period' ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'ipb_bruteforce_period', \IPS\Settings::i()->ipb_bruteforce_period, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::MINUTES, 'min' => 0, 'max' => 10000, 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('after'), NULL, 'ipb_bruteforce_period' ) );
 		$form->add( new \IPS\Helpers\Form\YesNo( 'ipb_bruteforce_unlock', \IPS\Settings::i()->ipb_bruteforce_unlock, FALSE, array(), NULL, NULL, NULL, 'ipb_bruteforce_unlock' ) );
 		$form->addHeader( 'login_settings' );
 		$form->add( new \IPS\Helpers\Form\YesNo( 'new_device_email', \IPS\Settings::i()->new_device_email, FALSE ) );
-		$form->add( new \IPS\Helpers\Form\YesNo( 'disable_anonymous', !\IPS\Settings::i()->disable_anonymous, FALSE, array(), NULL, NULL, NULL, 'disable_anonymous' ) );
 		
 		/* Save */
 		if ( $values = $form->values() )
 		{
-			$values['disable_anonymous'] = $values['disable_anonymous'] ? FALSE : TRUE;
-
 			/* unlock all locked members if we have disabled the locking */
 			if ( \IPS\Settings::i()->ipb_bruteforce_attempts > 0 AND $values['ipb_bruteforce_attempts'] == 0 )
 			{
@@ -399,27 +403,23 @@ class _login extends \IPS\Node\Controller
 			'options'	=> array( 'user' => 'reg_auth_type_user', 'admin' => 'reg_auth_type_admin', 'admin_user' => 'reg_auth_type_admin_user', 'none' => 'reg_auth_type_none' ),
 			'toggles'	=> array( 'user' => array( 'validate_day_prune' ), 'admin_user' => array( 'validate_day_prune' ) )
 		), NULL, NULL, NULL, 'reg_auth_type' ) );
-		$form->add( new \IPS\Helpers\Form\Number( 'validate_day_prune', \IPS\Settings::i()->validate_day_prune, FALSE, array( 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('after'), \IPS\Member::loggedIn()->language()->addToStack('days'), 'validate_day_prune' ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'validate_day_prune', \IPS\Settings::i()->validate_day_prune, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::DAYS, 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('after'), NULL, 'validate_day_prune' ) );
 		$form->add( new \IPS\Helpers\Form\Stack( 'allowed_reg_email', explode( ',', \IPS\Settings::i()->allowed_reg_email ), FALSE, array( 'placeholder' => 'mycompany.com' ), function( $value ) {
 			if( isset( $value[0] ) AND mb_stripos( $value[0], '@' ) )
 			{
 				throw new \DomainException( 'allowed_reg_email_email_detected' );
 			}
 		}, NULL, NULL ) );
-		$form->add( new \IPS\Helpers\Form\YesNo( 'new_reg_notify', \IPS\Settings::i()->new_reg_notify, FALSE, array(), NULL, NULL, NULL, 'new_reg_notify' ) );
 		$form->add( new \IPS\Helpers\Form\Radio( 'force_reg_terms', \IPS\Settings::i()->force_reg_terms, FALSE, array( 'options' => array(
 			'0'	=> 'force_reg_terms_0',
 			'1'	=> 'force_reg_terms_1',
 		) ) ) );
-		$form->add( new \IPS\Helpers\Form\Radio( 'updates_consent_default', \IPS\Settings::i()->updates_consent_default, FALSE, array(
-			'options'	=> array( 'enabled' => 'updates_consent_enabled', 'disabled' => 'updates_consent_disabled' ),
-		), NULL, NULL, NULL, 'updates_consent_default' ) );
 
 		/* Save */
 		if ( $values = $form->values() )
 		{
 			/* Save */
-			if ( isset( $values['allowed_reg_email'] ) and is_array( $values['allowed_reg_email'] ) )
+			if ( isset( $values['allowed_reg_email'] ) and \is_array( $values['allowed_reg_email'] ) )
 			{
 				$values['allowed_reg_email'] = implode( ',', $values['allowed_reg_email'] );
 			}
@@ -535,6 +535,8 @@ class _login extends \IPS\Node\Controller
 	 */
 	protected function forceLogout()
 	{
+		\IPS\Session::i()->csrfCheck();
+		
 		\IPS\Db::i()->update( 'core_members_known_devices', array( 'login_key' => NULL ) );
 		\IPS\Db::i()->delete( 'core_sessions' );
 

applications/core/modules/admin/settings/mfa.php

@@ -11,7 +11,7 @@
 namespace IPS\core\modules\admin\settings;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -22,6 +22,11 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _mfa extends \IPS\Dispatcher\Controller
 {
+	/**
+	 * @brief	Has been CSRF-protected
+	 */
+	public static $csrfProtected = TRUE;
+	
 	/**
 	 * Execute
 	 *
@@ -122,6 +127,8 @@ class _mfa extends \IPS\Dispatcher\Controller
 	 */
 	protected function enableToggle()
 	{
+		\IPS\Session::i()->csrfCheck();
+		
 		$key = \IPS\Request::i()->id;
 		$handlers = \IPS\MFA\MFAHandler::handlers();
 		if ( !isset( $handlers[ $key ] ) )
@@ -217,7 +224,7 @@ class _mfa extends \IPS\Dispatcher\Controller
 
 		$form->addHeader('mfa_header_authentication');
 		$form->add( new \IPS\Helpers\Form\CheckboxSet( 'security_questions_areas', \IPS\Settings::i()->security_questions_areas ? explode( ',', \IPS\Settings::i()->security_questions_areas ) : array_keys( \IPS\MFA\MFAHandler::areas() ), FALSE, array( 'options' => \IPS\MFA\MFAHandler::areas() ), NULL, NULL, NULL, 'security_questions_areas' ) );
-		$form->add( new \IPS\Helpers\Form\Number( 'security_questions_timer', \IPS\Settings::i()->security_questions_timer, FALSE, array( 'unlimited' => 0, 'unlimitedLang' => 'security_questions_timer_session' ), NULL, NULL, \IPS\Member::loggedIn()->language()->addToStack('minutes') ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'security_questions_timer', \IPS\Settings::i()->security_questions_timer, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::MINUTES, 'unlimited' => 0, 'unlimitedLang' => 'security_questions_timer_session' ) ) );
 
 		$form->addHeader('mfa_header_recovery');
 		$form->add( new \IPS\Helpers\Form\Number( 'security_questions_tries', \IPS\Settings::i()->security_questions_tries, FALSE, array( 'min' => 1 ) ) );
@@ -231,7 +238,7 @@ class _mfa extends \IPS\Dispatcher\Controller
 				'lock'		=> array( 'mfa_lockout_time' )
 			)
 		) ) );
-		$form->add( new \IPS\Helpers\Form\Number( 'mfa_lockout_time', \IPS\Settings::i()->mfa_lockout_time, FALSE, array( 'min' => 1 ), NULL, NULL, \IPS\Member::loggedIn()->language()->addToStack('minutes'), 'mfa_lockout_time' ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'mfa_lockout_time', \IPS\Settings::i()->mfa_lockout_time, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::MINUTES, 'min' => 1 ), NULL, NULL, NULL, 'mfa_lockout_time' ) );
 		$form->add( new \IPS\Helpers\Form\CheckboxSet( 'mfa_forgot_behaviour', explode( ',', \IPS\Settings::i()->mfa_forgot_behaviour ), FALSE, array(
 			'options' => array(
 				'email'		=> 'mfa_forgot_behaviour_email',

applications/core/modules/admin/settings/posting.php

@@ -11,7 +11,7 @@
 namespace IPS\core\modules\admin\settings;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -22,6 +22,11 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _posting extends \IPS\Dispatcher\Controller
 {
+	/**
+	 * @brief	Has been CSRF-protected
+	 */
+	public static $csrfProtected = TRUE;
+	
 	/**
 	 * Execute
 	 *
@@ -37,7 +42,7 @@ class _posting extends \IPS\Dispatcher\Controller
 		}
 		if( \IPS\Member::loggedIn()->hasAcpRestriction( 'core', 'settings', 'posting_manage_acronym' ) )
 		{
-			$this->tabs['acronymExpansion'] = 'acronym_expansion';
+			$this->tabs['acronymExpansion'] = 'word_expansion';
 		}
 		if( \IPS\Member::loggedIn()->hasAcpRestriction( 'core', 'settings', 'posting_manage_polls' ) )
 		{
@@ -79,7 +84,8 @@ class _posting extends \IPS\Dispatcher\Controller
 	protected function manage()
 	{
 		/* Work out output */
-		$activeTabContents = call_user_func( array( $this, '_manage' . mb_ucfirst( $this->activeTab ) ) );
+		$methodFunction = '_manage' . mb_ucfirst( $this->activeTab );
+		$activeTabContents = $this->$methodFunction();
 		
 		/* If this is an AJAX request, just return it */
 		if( \IPS\Request::i()->isAjax() )
@@ -106,7 +112,6 @@ class _posting extends \IPS\Dispatcher\Controller
 		$form = new \IPS\Helpers\Form;
 		\IPS\Output::i()->jsFiles = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'admin_settings.js', 'core', 'admin' ) );
 		$form->attributes['data-controller'] = 'core.admin.settings.posting';
-		$form->hiddenValues['rebuildImageProxy'] = \IPS\Request::i()->rebuildImageProxy ?: 0;
 		$form->addHeader('posting_attachments');
 		$form->add( new \IPS\Helpers\Form\Radio( 'attach_allowed_types', \IPS\Settings::i()->attach_allowed_types, FALSE, array(
 			'options' 	=> array( 'all' => 'attach_allowed_types_all', 'media' => 'attach_allowed_types_media', 'images' => 'attach_allowed_types_images', 'none' => 'attach_allowed_types_none' ),
@@ -117,16 +122,23 @@ class _posting extends \IPS\Dispatcher\Controller
         $form->add( new \IPS\Helpers\Form\WidthHeight( 'attachment_resample_size', \IPS\Settings::i()->attachment_resample_size ? explode( 'x', \IPS\Settings::i()->attachment_resample_size ) : array( 0, 0 ), FALSE, array( 'resizableDiv' => FALSE, 'unlimited' => array( 0, 0 ) ), NULL, NULL, NULL, 'attachment_resample_size' ) );
 		$current = ( isset( \IPS\Settings::i()->attachment_image_size ) ) ? explode( 'x', \IPS\Settings::i()->attachment_image_size ) : array( 1000, 750 );
 		$form->add( new \IPS\Helpers\Form\WidthHeight( 'attachment_image_size', $current, FALSE, array( 'resizableDiv' => FALSE ), NULL, NULL, NULL, 'attachment_image_size' ) );
-		$form->add( new \IPS\Helpers\Form\YesNo( 'editor_embeds', \IPS\Settings::i()->editor_embeds, FALSE, array( 'togglesOn' => array( 'max_video_width' ) ) ) );
+		$form->add( new \IPS\Helpers\Form\YesNo( 'editor_embeds', \IPS\Settings::i()->editor_embeds, FALSE, array( 'togglesOn' => array( 'max_video_width', 'max_internalembed_width' ) ) ) );
 		$form->add( new \IPS\Helpers\Form\Number( 'max_video_width', \IPS\Settings::i()->max_video_width, FALSE, array( 'unlimited' => 0 ), NULL, NULL, 'px', 'max_video_width' ) );
+		$form->add( new \IPS\Helpers\Form\Number( 'max_internalembed_width', \IPS\Settings::i()->max_internalembed_width, FALSE, array( 'unlimited' => 0 ), NULL, NULL, 'px', 'max_internalembed_width' ) );
+
 		$form->addHeader('remote_images');
-		$form->add( new \IPS\Helpers\Form\YesNo( 'allow_remote_images', \IPS\Settings::i()->allow_remote_images, FALSE, array( 'togglesOn' => array( 'remote_image_proxy' ) ) ) );
-        $form->add( new \IPS\Helpers\Form\YesNo( 'remote_image_proxy', \IPS\Settings::i()->remote_image_proxy, FALSE, array( 'togglesOn' => array( 'remote_image_proxy_cache' ) ), NULL, NULL, NULL, 'remote_image_proxy' ) );
-        $form->add( new \IPS\Helpers\Form\Number( 'image_proxy_cache_period', \IPS\Settings::i()->image_proxy_cache_period, FALSE, array( 'unlimited' => 0, 'unlimitedLang' => 'indefinitely' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('for'), \IPS\Member::loggedIn()->language()->addToStack('days'), 'remote_image_proxy_cache' ) );
+		$form->add( new \IPS\Helpers\Form\YesNo( 'allow_remote_images', \IPS\Settings::i()->allow_remote_images, FALSE, array( 'togglesOn' => array( 'allow_only_https_remote_images' ) ) ) );
+		$form->add( new \IPS\Helpers\Form\YesNo( 'allow_only_https_remote_images', \IPS\Settings::i()->allow_only_https_remote_images, FALSE, array(), NULL, NULL, NULL, 'allow_only_https_remote_images' ) );
+
 		$form->addHeader('posting_content');
+		if ( \IPS\Login::registrationType() != 'disabled' )
+		{
+			$form->add( new \IPS\Helpers\Form\Radio( 'post_before_registering', \IPS\Settings::i()->post_before_registering, FALSE, array( 'options' => array( 1 => 'post_before_registering_on', 0 => 'post_before_registering_off' ) ), NULL, NULL, NULL, 'post_before_registering' ) );
+		}
+		\IPS\Member::loggedIn()->language()->words['post_before_registering_on'] = sprintf( \IPS\Member::loggedIn()->language()->get('post_before_registering_on'), \IPS\Member::loggedIn()->language()->addToStack( 'core_group_' . \IPS\Settings::i()->member_group ) );
 		$form->add( new \IPS\Helpers\Form\Number( 'max_title_length', \IPS\Settings::i()->max_title_length, FALSE, array( 'max' => 255 ), NULL, NULL, \IPS\Member::loggedIn()->language()->addToStack('max_title_length_suffix') ) );
-		$form->add( new \IPS\Helpers\Form\Number( 'merge_concurrent_posts', \IPS\Settings::i()->merge_concurrent_posts, FALSE, array( 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, NULL, \IPS\Member::loggedIn()->language()->addToStack('minutes') ) );
-		$form->add( new \IPS\Helpers\Form\Number( 'flood_control', \IPS\Settings::i()->flood_control, FALSE, array( 'unlimited' => 0, 'unlimitedLang' => 'none' ), NULL, NULL, \IPS\Member::loggedIn()->language()->addToStack('seconds') ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'merge_concurrent_posts', \intval( \IPS\Settings::i()->merge_concurrent_posts ), FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::MINUTES, 'unlimited' => 0, 'unlimitedLang' => 'never' ) ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'flood_control', \IPS\Settings::i()->flood_control, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::SECONDS, 'unlimited' => 0, 'unlimitedLang' => 'none' ) ) );
 		$form->addHeader('edit_log');
 		$form->add( new \IPS\Helpers\Form\Radio( 'edit_log', \IPS\Settings::i()->edit_log, FALSE, array(
 			'options' => array(
@@ -139,10 +151,10 @@ class _posting extends \IPS\Dispatcher\Controller
 			)
 		) ) );
 		$form->add( new \IPS\Helpers\Form\YesNo( 'edit_log_public', \IPS\Settings::i()->edit_log_public, FALSE, array(), NULL, NULL, NULL, 'edit_log_public' ) );
-		$form->add( new \IPS\Helpers\Form\Number( 'edit_log_prune', \IPS\Settings::i()->edit_log_prune, FALSE, array( 'unlimited' => -1, 'unlimitedLang' => 'never' ), function( $value ){ if( $value < 1 AND $value != -1 ) { throw new \InvalidArgumentException('form_required'); } }, NULL, \IPS\Member::loggedIn()->language()->addToStack('days'), 'edit_log_prune' ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'edit_log_prune', \IPS\Settings::i()->edit_log_prune, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::DAYS, 'unlimited' => -1, 'unlimitedLang' => 'never' ), function( $value ){ if( $value < 1 AND $value != -1 ) { throw new \InvalidArgumentException('form_required'); } }, NULL, NULL, 'edit_log_prune' ) );
 		
 		$form->addHeader('posting_items');
-		$form->add( new \IPS\Helpers\Form\Number( 'topic_redirect_prune', \IPS\Settings::i()->topic_redirect_prune, FALSE, array( 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('after'), \IPS\Member::loggedIn()->language()->addToStack('days') ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'topic_redirect_prune', \IPS\Settings::i()->topic_redirect_prune, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::DAYS, 'unlimited' => 0, 'unlimitedLang' => 'never' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('after'), NULL ) );
 		
 		$hasReviewableApps = false;
 		
@@ -172,61 +184,23 @@ class _posting extends \IPS\Dispatcher\Controller
 		
 		$form->add( new \IPS\Helpers\Form\Number( 'dellog_retention_period', \IPS\Settings::i()->dellog_retention_period, FALSE, array( 'unlimited' => 0, 'unlimitedLang' => 'immediately', 'max' => PHP_INT_MAX ), NULL, NULL, \IPS\Member::loggedIn()->language()->addToStack('dellog_days_after_deleted') ) );
 		
-		$form->add( new \IPS\Helpers\Form\Number( 'ip_address_prune', \IPS\Settings::i()->ip_address_prune, FALSE, array( 'unlimited' => 0, 'unlimitedLang' => 'never', 'max' => PHP_INT_MAX ), NULL, NULL, \IPS\Member::loggedIn()->language()->addToStack('days') ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'ip_address_prune', \IPS\Settings::i()->ip_address_prune, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::DAYS, 'unlimited' => 0, 'unlimitedLang' => 'never', 'max' => PHP_INT_MAX ) ) );
 		
 		/* Save values */
 		if ( $values = $form->values() )
-		{
-			\IPS\Db::i()->update( 'core_tasks', array( 'enabled' => (int) $values['allow_remote_images'] ), array( '`key`=?', 'imageproxy' ) );
+		{			
+			\IPS\Db::i()->update( 'core_tasks', array( 'enabled' => (int) $values['post_before_registering'] ), array( '`key`=?', 'postBeforeRegisterFollowup' ) );
 			
 			$clearCss = ( $values['max_video_width'] !== \IPS\Settings::i()->max_video_width );
 			
 			$values['attachment_resample_size'] = implode( 'x', $values['attachment_resample_size'] );	
 			$values['attachment_image_size'] = implode( 'x', $values['attachment_image_size'] );	
-			$values['attach_allowed_extensions'] = is_array( $values['attach_allowed_extensions'] ) ? implode( ',', array_unique( array_map( function( $val )
+			$values['attach_allowed_extensions'] = \is_array( $values['attach_allowed_extensions'] ) ? implode( ',', array_unique( array_map( function( $val )
 			{
 				return ltrim( $val, '.' );
 			}, $values['attach_allowed_extensions'] ) ) ) : '';		
 			$values['max_video_width_css'] = ( $values['max_video_width'] ) ? $values['max_video_width'] . 'px' : 'none';
-
-			/* Run the image proxy rebuild tasks */
-			if( $values['rebuildImageProxy'] )
-			{
-				/* Remove any existing rebuilds */
-				\IPS\Db::i()->delete( 'core_queue', \IPS\Db::i()->in( '`key`', array( 'RebuildImageProxy', 'RebuildImageProxyNonContent', 'DeleteImageProxyFiles' ) ) );
-
-				/* Unset task datastore */
-				unset( \IPS\Data\Store::i()->currentImageProxyRebuild );
-
-				$enableDisable = $values['remote_image_proxy'] ? TRUE : FALSE;
-				foreach ( \IPS\Content::routedClasses( FALSE, TRUE ) as $class )
-				{
-					if( isset( $class::$databaseColumnMap['content'] ) )
-					{
-						try
-						{
-							\IPS\Task::queue( 'core', 'RebuildImageProxy', array( 'class' => $class, 'status' => $enableDisable ), 4 );
-						}
-						catch( \OutOfRangeException $ex ) { }
-					}
-				}
-
-				foreach( \IPS\Application::allExtensions( 'core', 'EditorLocations', FALSE, NULL, NULL, TRUE, TRUE ) as $_key => $extension )
-				{
-					if( method_exists( $extension, 'rebuildImageProxy' ) )
-					{
-						\IPS\Task::queue( 'core', 'RebuildImageProxyNonContent', array( 'extension' => $_key, 'status' => $enableDisable ), 4 );
-					}
-				}
-
-				/* If we're disabling the image proxy, also delete the files */
-				if( !$enableDisable )
-				{
-					\IPS\Task::queue( 'core', 'DeleteImageProxyFiles', array( 'status' => $enableDisable ), 5 );
-				}
-			}
-
-			unset( $values['rebuildImageProxy'] );
+			$values['max_internalembed_width_css'] = ( $values['max_internalembed_width'] ) ? $values['max_internalembed_width'] . 'px' : 'none';
 			
 			$form->saveAsSettings( $values );
 
@@ -261,7 +235,7 @@ class _posting extends \IPS\Dispatcher\Controller
 				
 		/* So people don't set up filters, test with their admin account and think it's not working */
 		$groupsThatBypass = new \IPS\Patterns\ActiveRecordIterator( \IPS\Db::i()->select( '*', 'core_groups', array( 'g_bypass_badwords=1' ) ), 'IPS\Member\Group' );
-		if ( count( $groupsThatBypass ) )
+		if ( \count( $groupsThatBypass ) )
 		{
 			$names = array();
 			foreach ( $groupsThatBypass as $group )
@@ -336,7 +310,18 @@ class _posting extends \IPS\Dispatcher\Controller
 		{
             $values['ipb_url_whitelist'] = implode( ",", $values['ipb_url_whitelist'] );
 			$values['ipb_url_blacklist'] = implode( ",", $values['ipb_url_blacklist'] );
-			$values['posts_add_nofollow_exclude'] = json_encode( $values['posts_add_nofollow_exclude'] );
+
+			$noFollowExclude = array();
+
+			if( \is_array( $values['posts_add_nofollow_exclude'] ) )
+			{
+				foreach( $values['posts_add_nofollow_exclude'] as $url )
+				{
+					$noFollowExclude[] = preg_replace( "/^http(s)?:\/\//", '', $url );
+				}
+			}
+
+			$values['posts_add_nofollow_exclude'] = json_encode( $noFollowExclude );
 			$form->saveAsSettings( $values );
 
 			/* Clear guest page caches */
@@ -351,7 +336,7 @@ class _posting extends \IPS\Dispatcher\Controller
 	}
 	
 	/**
-	 * Acronym expansion
+	 * Word expansion
 	 *
 	 * @return	string	HTML to display
 	 */
@@ -361,7 +346,7 @@ class _posting extends \IPS\Dispatcher\Controller
 		
 		/* Create the table */
 		$table = new \IPS\Helpers\Table\Db( 'core_acronyms', \IPS\Http\Url::internal( 'app=core&module=settings&controller=posting&tab=acronymExpansion' ) );
-		$table->langPrefix = 'acronym_';
+		$table->langPrefix = 'word_';
 		$table->mainColumn = 'a_short';
 		$table->rowClasses = array( 'a_long' => array( 'ipsTable_wrap' ) );
 	
@@ -387,9 +372,9 @@ class _posting extends \IPS\Dispatcher\Controller
 		$table->rootButtons = array(
 				'add'	=> array(
 						'icon'		=> 'plus',
-						'title'		=> 'acronym_add',
+						'title'		=> 'word_add',
 						'link'		=> \IPS\Http\Url::internal( 'app=core&module=settings&controller=posting&do=acronym' ),
-						'data'		=> array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('acronym_add') )
+						'data'		=> array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('word_add') )
 				)
 		);
 	
@@ -433,7 +418,7 @@ class _posting extends \IPS\Dispatcher\Controller
 		$form->add( new \IPS\Helpers\Form\YesNo( 'ipb_poll_only', \IPS\Settings::i()->ipb_poll_only ) );
 		
 		$form->add( new \IPS\Helpers\Form\YesNo( 'allow_poll_creation_after', ( \IPS\Settings::i()->startpoll_cutoff ? TRUE : FALSE ), FALSE, array( 'togglesOn' => array( 'startpoll_cutoff' ) ) ) );
-		$form->add( new \IPS\Helpers\Form\Number( 'startpoll_cutoff', \IPS\Settings::i()->startpoll_cutoff, FALSE, array( 'unlimited' => -1, 'unlimitedLang' => 'always', 'max' => 43800 ), NULL, NULL, \IPS\Member::loggedIn()->language()->addToStack('hours'), 'startpoll_cutoff' ) ); #max is roughly 5 years
+		$form->add( new \IPS\Helpers\Form\Interval( 'startpoll_cutoff', \IPS\Settings::i()->startpoll_cutoff, FALSE, array( 'valueAs' => \IPS\Helpers\Form\Interval::HOURS, 'unlimited' => -1, 'unlimitedLang' => 'always', 'max' => 43800 ), NULL, NULL, NULL, 'startpoll_cutoff' ) ); #max is roughly 5 years
 		
 		$form->addHeader('poll_voting');
 		$form->add( new \IPS\Helpers\Form\YesNo( 'allow_creator_vote', \IPS\Settings::i()->allow_creator_vote ) );
@@ -458,7 +443,7 @@ class _posting extends \IPS\Dispatcher\Controller
 			\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=settings&controller=posting&tab=polls' ), 'saved' );
 		}
 		
-		return \IPS\Theme::i()->getTemplate( 'forms' )->blurb( 'polls_blurb' ) . $form;
+		return \IPS\Theme::i()->getTemplate( 'forms' )->blurb( 'polls_blurb', TRUE, TRUE ) . $form;
 	}
 	
 	/**
@@ -536,7 +521,7 @@ class _posting extends \IPS\Dispatcher\Controller
 				move_uploaded_file( $values['profanity_upload'], $tempFile );
 									
 				/* Initate a redirector */
-				\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=settings&controller=posting&do=importProfanity' )->setQueryString( array( 'file' => $tempFile, 'key' => md5_file( $tempFile ) ) ) );
+				\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=settings&controller=posting&do=importProfanity' )->setQueryString( array( 'file' => $tempFile, 'key' => md5_file( $tempFile ) ) )->csrf() );
 			}
 			
 			/* Normal */
@@ -631,17 +616,19 @@ class _posting extends \IPS\Dispatcher\Controller
 	 */
 	protected function importProfanity()
 	{
+		\IPS\Session::i()->csrfCheck();
+		
 		if ( !file_exists( \IPS\Request::i()->file ) or md5_file( \IPS\Request::i()->file ) !== \IPS\Request::i()->key )
 		{
 			\IPS\Output::i()->error( 'generic_error', '3C256/1', 500, '' );
 		}
 		
-		$url = \IPS\Http\Url::internal( 'app=core&module=settings&controller=posting&do=importProfanity' )->setQueryString( array( 'file' => \IPS\Request::i()->file, 'key' =>  \IPS\Request::i()->key ) );
+		$url = \IPS\Http\Url::internal( 'app=core&module=settings&controller=posting&do=importProfanity' )->setQueryString( array( 'file' => \IPS\Request::i()->file, 'key' =>  \IPS\Request::i()->key ) )->csrf();
 		\IPS\Output::i()->output = new \IPS\Helpers\MultipleRedirect(
 			$url,
 			function( $data )
 			{
-				$data = intval( $data );
+				$data = \intval( $data );
 
 				/* Open XML file */
 				$xml = new \IPS\Xml\XMLReader;
@@ -733,7 +720,7 @@ class _posting extends \IPS\Dispatcher\Controller
 		}
 	
 		/* Display */
-		\IPS\Output::i()->title	 		= \IPS\Member::loggedIn()->language()->addToStack('acronym_a_short');
+		\IPS\Output::i()->title	 		= \IPS\Member::loggedIn()->language()->addToStack('word_expansion');
 		\IPS\Output::i()->breadcrumb[]	= array( NULL, \IPS\Output::i()->title );
 		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global' )->block( \IPS\Output::i()->title, $form, FALSE );
 	}
@@ -787,6 +774,8 @@ class _posting extends \IPS\Dispatcher\Controller
 	 */
 	public function rebuildThumbnails()
 	{
+		\IPS\Session::i()->csrfCheck();
+		
 		\IPS\Task::queue( 'core', 'RebuildAttachmentThumbnails', array(), 4 );
 
 		/* And redirect */

applications/core/modules/admin/settings/securityquestions.php

@@ -11,7 +11,7 @@
 namespace IPS\core\modules\admin\settings;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -22,11 +22,21 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _securityquestions extends \IPS\Node\Controller
 {
+	/**
+	 * @brief	Has been CSRF-protected
+	 */
+	public static $csrfProtected = TRUE;
+	
 	/**
 	 * Node Class
 	 */
 	protected $nodeClass = '\IPS\MFA\SecurityQuestions\Question';
-	
+
+	/**
+	 * Show the "add" button in the page root rather than the table root
+	 */
+	protected $_addButtonInRoot = FALSE;
+
 	/**
 	 * Form
 	 *

applications/core/modules/admin/settings/terms.php

@@ -11,7 +11,7 @@
 namespace IPS\core\modules\admin\settings;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -22,6 +22,11 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _terms extends \IPS\Dispatcher\Controller
 {
+	/**
+	 * @brief	Has been CSRF-protected
+	 */
+	public static $csrfProtected = TRUE;
+	
 	/**
 	 * Execute
 	 *
@@ -41,6 +46,76 @@ class _terms extends \IPS\Dispatcher\Controller
 	protected function manage()
 	{
  		$form = new \IPS\Helpers\Form;
+
+ 		static::buildForm( $form );
+		
+		if ( $values = $form->values() )
+		{
+			/* What were our previous values? */
+			$existingPrivacyPolicy = iterator_to_array( \IPS\Db::i()->select( 'word_custom', 'core_sys_lang_words', array( 'word_key=?', 'privacy_text_value' ) ) );
+			$existingRegistrationTerms = iterator_to_array( \IPS\Db::i()->select( 'word_custom', 'core_sys_lang_words', array( 'word_key=?', 'reg_rules_value' ) ) );
+			
+			/* Save */
+			$values = static::processForm( $values );
+
+			$form->saveAsSettings( $values );
+
+			/* Clear guest page caches */
+			\IPS\Data\Cache::i()->clearAll();
+			
+			/* Log */
+			\IPS\Session::i()->log( 'acplogs__terms_edited' );
+			
+			/* Do we need to ask the admin if they want to ask members to reconfirm? */
+			$changedPrivacyPolicy = $existingPrivacyPolicy != iterator_to_array( \IPS\Db::i()->select( 'word_custom', 'core_sys_lang_words', array( 'word_key=?', 'privacy_text_value' ) ) );
+			$changedRegistrationTerms = $existingRegistrationTerms != iterator_to_array( \IPS\Db::i()->select( 'word_custom', 'core_sys_lang_words', array( 'word_key=?', 'reg_rules_value' ) ) );
+			if ( $changedPrivacyPolicy or $changedRegistrationTerms )
+			{
+				\IPS\Output::i()->redirect( \IPS\Http\Url::internal('app=core&module=settings&controller=terms&do=reconfirm')->setQueryString( array(
+					'privacy'	=> \intval( $changedPrivacyPolicy ),
+					'reg'		=> \intval( $changedRegistrationTerms )
+				) ) );
+			}
+		}
+		
+		\IPS\Output::i()->title		= \IPS\Member::loggedIn()->language()->addToStack('menu__core_settings_terms');
+		\IPS\Output::i()->output	.= \IPS\Theme::i()->getTemplate( 'global' )->block( 'menu__core_settings_terms', $form );
+	}
+
+	/**
+	 * Process the text storage from submitting the form
+	 *
+	 * @param	array	$values		Values from form
+	 * @return	array
+	 */
+	public static function processForm( $values )
+	{
+		foreach ( array( 'gl_guidelines' => 'guidelines_value', 'privacy_text' => 'privacy_text_value', 'reg_rules' => 'reg_rules_value', 'guest_terms_bar_text' => 'guest_terms_bar_text_value' ) as $k => $v )
+		{
+			/* Guest terms bar text has special replacements that need to be swapped to sprintf parameters */
+			if ( $k == 'guest_terms_bar_text' and $values['guest_terms_bar'] )
+			{
+				foreach( $values[ $k ] AS $lang_id => $text )
+				{
+					$values[ $k ][ $lang_id ] = str_replace( array( '{terms}', '{privacy}', '{guidelines}', '{cookies}' ), array( '%1$s', '%2$s', '%3$s', '%4$s' ), $text );
+				}
+			}
+			
+			\IPS\Lang::saveCustom( 'core', $v, $values[ $k ] );
+			unset( $values[ $k ] );
+		}
+
+		return $values;
+	}
+
+	/**
+	 * Build the form
+	 *
+	 * @param	\IPS\Form	$form	Form to add settings to
+	 * @return	void
+	 */
+	public static function buildForm( $form )
+	{
 		$form->addHeader( 'terms_guidelines' );
 		$form->add( new \IPS\Helpers\Form\Radio( 'gl_type', \IPS\Settings::i()->gl_type, FALSE, array(
 				'options' => array(
@@ -82,50 +157,6 @@ class _terms extends \IPS\Dispatcher\Controller
 		$form->addHeader( 'guest_terms_options' );
 		$form->add( new \IPS\Helpers\Form\YesNo( 'guest_terms_bar', \IPS\Settings::i()->guest_terms_bar, FALSE, array( 'togglesOn' => array( 'guest_terms_bar_text' ) ) ) );
 		$form->add( new \IPS\Helpers\Form\Translatable( 'guest_terms_bar_text', NULL, FALSE, array( 'app' => 'core', 'key' => 'guest_terms_bar_text_value', 'sprintf' => array( '{terms}', '{privacy}', '{guidelines}', '{cookies}' ) ), NULL, NULL, NULL, 'guest_terms_bar_text' ) );
-		
-		if ( $values = $form->values() )
-		{
-			/* What were our previous values? */
-			$existingPrivacyPolicy = iterator_to_array( \IPS\Db::i()->select( 'word_custom', 'core_sys_lang_words', array( 'word_key=?', 'privacy_text_value' ) ) );
-			$existingRegistrationTerms = iterator_to_array( \IPS\Db::i()->select( 'word_custom', 'core_sys_lang_words', array( 'word_key=?', 'reg_rules_value' ) ) );
-			
-			/* Save */
-			foreach ( array( 'gl_guidelines' => 'guidelines_value', 'privacy_text' => 'privacy_text_value', 'reg_rules' => 'reg_rules_value', 'guest_terms_bar_text' => 'guest_terms_bar_text_value' ) as $k => $v )
-			{
-				/* Guest terms bar text has special replacements that need to be swapped to sprintf parameters */
-				if ( $k == 'guest_terms_bar_text' and $values['guest_terms_bar'] )
-				{
-					foreach( $values[ $k ] AS $lang_id => $text )
-					{
-						$values[ $k ][ $lang_id ] = str_replace( array( '{terms}', '{privacy}', '{guidelines}', '{cookies}' ), array( '%1$s', '%2$s', '%3$s', '%4$s' ), $text );
-					}
-				}
-				
-				\IPS\Lang::saveCustom( 'core', $v, $values[ $k ] );
-				unset( $values[ $k ] );
-			}
-			$form->saveAsSettings( $values );
-
-			/* Clear guest page caches */
-			\IPS\Data\Cache::i()->clearAll();
-			
-			/* Log */
-			\IPS\Session::i()->log( 'acplogs__terms_edited' );
-			
-			/* Do we need to ask the admin if they want to ask members to reconfirm? */
-			$changedPrivacyPolicy = $existingPrivacyPolicy != iterator_to_array( \IPS\Db::i()->select( 'word_custom', 'core_sys_lang_words', array( 'word_key=?', 'privacy_text_value' ) ) );
-			$changedRegistrationTerms = $existingRegistrationTerms != iterator_to_array( \IPS\Db::i()->select( 'word_custom', 'core_sys_lang_words', array( 'word_key=?', 'reg_rules_value' ) ) );
-			if ( $changedPrivacyPolicy or $changedRegistrationTerms )
-			{
-				\IPS\Output::i()->redirect( \IPS\Http\Url::internal('app=core&module=settings&controller=terms&do=reconfirm')->setQueryString( array(
-					'privacy'	=> intval( $changedPrivacyPolicy ),
-					'reg'		=> intval( $changedRegistrationTerms )
-				) ) );
-			}
-		}
-		
-		\IPS\Output::i()->title		= \IPS\Member::loggedIn()->language()->addToStack('menu__core_settings_terms');
-		\IPS\Output::i()->output	.= \IPS\Theme::i()->getTemplate( 'global' )->block( 'menu__core_settings_terms', $form );
 	}
 	
 	/**