Version 4.5.0

applications/nexus/extensions/core/MemberHistory/Nexus.php

@@ -12,7 +12,7 @@
 namespace IPS\nexus\extensions\core\MemberHistory;
 
 /* 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;
@@ -47,7 +47,8 @@ class _Nexus
 			'support',
 			'custom',
 			'billingagreement',
-			'note'
+			'note',
+			'subscription'
 		);
 	}
 
@@ -328,7 +329,14 @@ class _Nexus
 						return \IPS\Member::loggedIn()->language()->addToStack( 'history_purchase_transfer_to', FALSE, array( 'htmlsprintf' => array( $purchase, $from, $byStaff ) ) );
 
 					case 'cancel':
-						return \IPS\Member::loggedIn()->language()->addToStack( 'history_purchase_canceled', FALSE, array( 'htmlsprintf' => array( $purchase, $byStaff ) ) );
+						if( isset( $val['by'] ) AND $val['by'] == 'api' )
+						{
+							return \IPS\Member::loggedIn()->language()->addToStack( 'history_purchase_canceled_api', FALSE, array( 'htmlsprintf' => array( $purchase, $byStaff ) ) );
+						}
+						else
+						{
+							return \IPS\Member::loggedIn()->language()->addToStack( 'history_purchase_canceled', FALSE, array( 'htmlsprintf' => array( $purchase, $byStaff ) ) );
+						}
 					case 'uncancel':
 						return \IPS\Member::loggedIn()->language()->addToStack( 'history_purchase_reactivated', FALSE, array( 'htmlsprintf' => array( $purchase, $byStaff ) ) );
 
@@ -447,7 +455,7 @@ class _Nexus
 
 				if ( isset( $val['name'] ) )
 				{
-					$name = is_array( $val['name'] ) ? implode( ' ', array_values( $val['name'] ) ) : $val['name'];
+					$name = \is_array( $val['name'] ) ? implode( ' ', array_values( $val['name'] ) ) : $val['name'];
 					$changes[] =  \IPS\Member::loggedIn()->language()->addToStack('history_name_changed_from', FALSE, array( 'sprintf' => array( $name ) ) );
 				}
 
@@ -456,7 +464,7 @@ class _Nexus
 					foreach ( $val['other'] as $change )
 					{
 						/* Older versions may not have stored the display value, so we need to account for that */
-						if( mb_strpos( $change['name'], 'nexus_ccfield_' ) !== FALSE AND is_array( $change['value'] ) )
+						if( mb_strpos( $change['name'], 'nexus_ccfield_' ) !== FALSE AND \is_array( $change['value'] ) )
 						{
 							try
 							{
@@ -479,7 +487,7 @@ class _Nexus
 								/* We will just loop and implode so we have a string */
 								foreach( $change['value'] as $k => $v )
 								{
-									if( is_array( $v ) )
+									if( \is_array( $v ) )
 									{
 										foreach( $v as $_k => $_v )
 										{