- (Bug Fix) Fixed an issue with the Extra Conditionals not working in the default notification type

- (API) Added new PostmasterHelper class to keep code dry that need to perform misc common functions to validate data

Author: objectivehtml

core/notification_types/DefaultNotificationType.php

@@ -1,6 +1,8 @@
 <?php
 namespace Craft\Plugins\Postmaster\NotificationTypes;
 
+use Craft\PostmasterHelper;
+use Craft\Postmaster_TransportModel;
 use Craft\Plugins\Postmaster\Components\BaseNotificationType;
 
 class DefaultNotificationType extends BaseNotificationType {
@@ -9,6 +11,18 @@ class DefaultNotificationType extends BaseNotificationType {
 
 	public $id = 'default';
 
+	public function onBeforeSend(Postmaster_TransportModel $model)
+	{
+		$this->notification->parse(array());
+
+		if($this->hasExtraConditionals() && !$this->areExtraConditionalsValid())
+		{
+			return false;
+		}
+
+		return true;
+	}
+
 	public function getInputHtml(Array $data = array())
 	{
 		return $this->craft()->templates->render('postmaster/notification_types/default/fields', $data);	
@@ -23,4 +37,15 @@ public function getSettingsModelClassName()
 	{
 		return '\Craft\Postmaster_DefaultNotificationTypeSettingsModel';
 	}
+
+    public function hasExtraConditionals()
+    {
+        return PostmasterHelper::hasExtraConditionals($this->getSetting('extraConditionals'));
+    }
+
+    public function areExtraConditionalsValid()
+    {
+       return PostmasterHelper::validateExtraConditionals($this->getSetting('extraConditionals'));
+    }
+
 }

core/parcel_types/DefaultParcelType.php

@@ -145,19 +145,12 @@ public function areTriggersValid($isNewEntry)
 
     public function hasExtraConditionals()
     {
-        $extra = trim($this->getSetting('extraConditionals'));
-
-        if($extra && !empty($extra))
-        {
-            return true;
-        }
-
-        return false;
+        return PostmasterHelper::hasExtraConditionals($this->getSetting('extraConditionals'));
     }
 
     public function areExtraConditionalsValid()
     {
-       return strtolower($this->settings->extraConditionals) !== 'false' ? true : false;
+       return PostmasterHelper::validateExtraConditionals($this->getSetting('extraConditionals'));
     }
 
     public function areStatusesValid(EntryModel $entry)
@@ -186,22 +179,6 @@ public function areSectionsValid(EntryModel $entry)
         return false;
     }
 
-    /*
-    public function parseExtraConditionals(EntryModel $entry)
-    {
-        if($this->hasExtraConditionals())
-        {
-            $return = craft()->templates->renderString($this->settings->extraConditionals, array(
-                'entry' => $entry
-            ));
-
-            return trim($return);
-        }
-
-        return;
-    }
-    */
-
     public function getEvents()
     {
         if(is_array($this->settings->events) && count($this->settings->events))

helpers/PostmasterHelper.php

@@ -0,0 +1,20 @@
+<?php
+namespace Craft;
+
+class PostmasterHelper
+{
+	public static function hasExtraConditionals($extraConditionals)
+	{
+        if($extraConditionals && !empty($extraConditionals))
+        {
+            return true;
+        }
+
+        return false;
+	}
+
+	public static function validateExtraConditionals($extraConditionals)
+	{
+		return strtolower($extraConditionals) !== 'false';
+	}
+}