Add MemberEventMessages error codes to all filters

symphonycms · Nov 1, 2017 · 02aac90 · 02aac90
1 parent 0e376e1
commit 02aac90
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/extension.driver.php b/extension.driver.php
@@ -1238,11 +1238,21 @@ public function checkEventPermissions(array &$context){
 				$success = $role->canProcessEvent($event_handle, $action, $required_level) ? true : false;
 			}
 
-			$context['messages'][] = array(
-				'permission',
-				$success,
-				($success === false) ? __('You are not authorised to perform this action.') : null
-			);
+			if ($success === true) {
+				$context['messages'][] = array(
+					'permission',
+					true
+				);
+			} else {
+				$context['messages'][] = array(
+					'permission',
+					false,
+					__('You are not authorised to perform this action.'),
+					array(
+						'message-id' => MemberEventMessages::UNAUTHORIZED
+					)
+				);
+			}
 
 			// Process the Filters for this event.
 			$this->__processEventFilters($context);

diff --git a/lib/class.membersevent.php b/lib/class.membersevent.php
@@ -186,12 +186,14 @@ class MemberEventMessages extends EventMessages
 {
     const MEMBER_ERRORS = 104;
     const MEMBER_INVALID = 105;
+    const UNAUTHORIZED = 106;
 
     const SECTION_INVALID = 201;
 
     const ACTIVATION_PRE_COMPLETED = 303;
     const ACTIVATION_CODE_INVALID = 304;
     const RECOVERY_CODE_INVALID = 305;
+    const AUTHENTICATION_INVALID = 306;
 
     const ALREADY_LOGGED_IN = 501;
 }
diff --git a/lib/member.symphony.php b/lib/member.symphony.php
@@ -386,7 +386,10 @@ public function filter_ValidatePassword(array &$context) {
 				$context['messages'][] = array(
 					'member-validate-password',
 					false,
-					__('Member not found.')
+					__('Member not found.'),
+					array(
+						'message-id' => MemberEventMessages::MEMBER_INVALID
+					)
 				);
 
 				return;
@@ -396,7 +399,10 @@ public function filter_ValidatePassword(array &$context) {
 				$context['messages'][] = array(
 					'member-validate-password',
 					false,
-					__('No Authentication field found.')
+					__('No Authentication field found.'),
+					array(
+						'message-id' => MemberEventMessages::MEMBER_ERRORS
+					)
 				);
 
 				return;
@@ -431,7 +437,10 @@ public function filter_ValidatePassword(array &$context) {
 				$context['messages'][] = array(
 					'member-validate-password',
 					false,
-					__('No valid password has been provided.')
+					__('No valid password has been provided.'),
+					array(
+						'message-id' => MemberEventMessages::AUTHENTICATION_INVALID
+					)
 				);
 			}
 		}