Version 4.5.0

applications/nexus/modules/admin/subscriptions/subscribers.php

@@ -12,7 +12,7 @@
 namespace IPS\nexus\modules\admin\subscriptions;
 
 /* 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;
@@ -23,6 +23,11 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _subscribers extends \IPS\Dispatcher\Controller
 {	
+	/**
+	 * @brief	Has been CSRF-protected
+	 */
+	public static $csrfProtected = TRUE;
+	
 	/**
 	 * Execute
 	 *
@@ -82,8 +87,8 @@ class _subscribers extends \IPS\Dispatcher\Controller
 			'sub_start'	=> function( $val ) {
 				return \IPS\DateTime::ts( $val );
 			},
-			'sub_expire'	=> function( $val ) {
-				return $val ? \IPS\DateTime::ts( $val ) : '';
+			'sub_expire'	=> function( $val, $row ) {
+				return $val ? \IPS\nexus\Subscription::constructFromData( $row )->_expire : '';
 			},
 			'sub_active'    => function( $val ) {
 				return \IPS\Theme::i()->getTemplate('subscription', 'nexus')->status( $val );
@@ -147,6 +152,8 @@ class _subscribers extends \IPS\Dispatcher\Controller
 	 */
 	protected function remove()
 	{
+		\IPS\Session::i()->csrfCheck();
+		
 		try
 		{
 			$sub = \IPS\nexus\Subscription::load( \IPS\Request::i()->id );