Version 4.7.23

applications/core/modules/admin/overview/files.php

@@ -325,6 +325,11 @@ class _files extends \IPS\Dispatcher\Controller
 				{
 					$cicDisabled[ $row['id'] ] = $row['id'];
 				}
+				
+				if ( $row['method'] == 'Amazon' AND \IPS\CIC AND json_decode( $row['configuration'], TRUE )['bucket'] == 'ips-cic-filestore' )
+				{
+					$cicDisabled[ $row['id'] ] = $row['id'];
+				}
 			}
 			
 			$form = new \IPS\Helpers\Form;
@@ -492,6 +497,18 @@ class _files extends \IPS\Dispatcher\Controller
 			
 			$table->rowButtons = function( $row )
 			{
+				$config = json_decode( $row['configuration'], true );
+				if( \IPS\CIC AND ( ( $row['method'] == 'Amazon' AND $config['bucket'] == 'ips-cic-filestore' ) OR $row['method'] == 'Cloud' ) )
+				{
+					return array(
+						'log'	=> array(
+							'icon'		=> 'search',
+							'title'		=> 'file_config_log_title',
+							'link'		=> \IPS\Http\Url::internal( "app=core&module=overview&controller=files&do=configurationLog&id={$row['id']}" )
+						)
+					);
+				}
+				
 				return array(
 					'edit'	=> array(
 						'icon'	=> 'pencil',
@@ -576,6 +593,18 @@ class _files extends \IPS\Dispatcher\Controller
 				$current = \IPS\Db::i()->select( '*', 'core_file_storage', array( 'id=?', \intval( \IPS\Request::i()->id ) ) )->first();
 				$currentHandlerSettings = json_decode( $current['configuration'], TRUE );
 				
+				/* If this is the special S3 handler for Cloud, throw error */
+				if ( \IPS\CIC AND $current['method'] == 'Amazon' AND $currentHandlerSettings['bucket'] == 'ips-cic-filestore' )
+				{
+					throw new \UnderflowException;
+				}
+				
+				/* If this is CiC and is FileSystem, error */
+				if ( \IPS\CIC AND $current['method'] == 'FileSystem' )
+				{
+					throw new \UnderflowException;
+				}
+				
 				if ( \in_array( \intval( \IPS\Request::i()->id ), array_filter( json_decode( \IPS\Settings::i()->upload_settings, TRUE ), function( $key ){ return $key != 'filestorage_move'; }, ARRAY_FILTER_USE_KEY ) ) )
 				{
 					if ( isset( \IPS\Request::i()->delete ) )
@@ -626,6 +655,11 @@ class _files extends \IPS\Dispatcher\Controller
 		$toggles = array();
 		foreach ( \IPS\File::storageHandlers( $current ) as $key => $class )
 		{
+			if ( \IPS\CIC AND $key == 'Cloud' AND !\IPS\Member::loggedIn()->members_bitoptions['is_support_account'] )
+			{
+				continue;
+			}
+			
 			$handlers[ $key ] = 'filehandler__' . $key;
 			foreach ( $class::settings( $currentHandlerSettings ) as $k => $v )
 			{

applications/core/modules/admin/overview/onboard.php

@@ -11,6 +11,9 @@
 namespace IPS\core\modules\admin\overview;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
+
+use IPS\core\modules\admin\moderation\spam;
+
 if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
@@ -205,6 +208,10 @@ class _onboard extends \IPS\Dispatcher\Controller
 			/* Get the htaccess mod_Rewrite setting */
 			$form->addTab( 'onboard_tab_furls' );
 			\IPS\core\modules\admin\promotion\seo::htaccessSetting( $form );
+
+			/* Add captcha. */
+			$form->addTab( 'onboard_tab_spamprevention' );
+			spam::captchaForm( $form );
 		}
 
 		/* Add the terms/privacy policy/etc. */