Version 4.1.19

applications/core/modules/front/system/warnings.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Member Warnings
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @since		18 Jul 2013
  * @version		SVN_VERSION_NUMBER
  */
@@ -172,6 +172,8 @@ class _warnings extends \IPS\Content\Controller
 	 */
 	protected function acknowledge()
 	{
+		\IPS\Session::i()->csrfCheck();
+		
 		/* Load the member */
 		$member = \IPS\Member::load( \IPS\Request::i()->id );
 		if ( !$member->member_id )
@@ -197,21 +199,21 @@ class _warnings extends \IPS\Content\Controller
 		/* Acknowledge it */
 		$warning->acknowledged = TRUE;
 		$warning->save();
-		$member->members_bitoptions['unacknowledged_warnings'] = (bool) \IPS\Db::i()->select( 'COUNT(*)', 'core_members_warn_logs', array( "wl_member=? AND wl_acknowledged=0", $member->member_id ) )->first();
+		$member->members_bitoptions['unacknowledged_warnings'] = (bool) \IPS\Db::i()->select( 'COUNT(*)', 'core_members_warn_logs', array( "wl_member=? AND wl_acknowledged=0", $member->member_id ), NULL, NULL, NULL, NULL, \IPS\Db::SELECT_FROM_WRITE_SERVER )->first();
 		$member->save();
 		
 		/* Redirect */
 		if ( isset( $_SERVER['HTTP_REFERER'] ) )
 		{
-			$url = new \IPS\Http\Url( $_SERVER['HTTP_REFERER'] );
-			if ( $url->isInternal )
+			$url = \IPS\Http\Url\Friendly::createFromString( $_SERVER['HTTP_REFERER'] );
+			if ( $url instanceof \IPS\Http\Url\Internal )
 			{
 				\IPS\Output::i()->redirect( $url );
 				return;
 			}
 		}
-		\IPS\Output::i()->redirect( $warning->url() );		
-		
+
+		\IPS\Output::i()->redirect( $warning->url() );
 	}
 	
 	/**
@@ -275,6 +277,7 @@ class _warnings extends \IPS\Content\Controller
 				'points_override'	=> TRUE,
 				'remove'			=> $remove,
 				'remove_override'	=> TRUE,
+				'notes'				=> NULL,
 			)	);
 		}
 		
@@ -307,6 +310,7 @@ class _warnings extends \IPS\Content\Controller
 				'points_override'	=> $reason->points_override,
 				'remove'			=> $remove,
 				'remove_override'	=> $reason->remove_override,
+				'notes'				=> $reason->notes,
 			)	);
 		}
 		
@@ -317,6 +321,7 @@ class _warnings extends \IPS\Content\Controller
 				'points_override'	=> FALSE,
 				'remove'			=> $remove,
 				'remove_override'	=> FALSE,
+				'notes'				=> NULL,
 			)	);
 		}
 	}