- (Bug Fix) Fixed a number of bugs in the parsing routine

Author: objectivehtml

core/components/BaseNotificationType.php

@@ -40,11 +40,21 @@ public function parse(Array $data = array())
     		'lastSent' => $this->notification->lastSent()
     	), $data);
 
-        $this->notification->settings->parse($data);
+        $this->notification
+        	->settings
+        	->parse($data);
 
-        $this->settings->parse($data);
+        $this->settings
+        	->parse(array_merge($data, array('notification' => $this->notification)));
 
-        $this->notification->service->settings->parse(array_merge($data, array('settings' => $this->settings)));
+        $this->notification
+        	->getNotificationSchedule()
+        	->settings
+        	->parse(array_merge($data, array('notification' => $this->notification)));
+
+        $this->notification
+        	->service
+        	->settings->parse(array_merge($data, array('notification' => $this->notification)));
     }
 
 	public function getInputHtml(Array $data = array())

core/components/BaseParcelType.php

@@ -20,20 +20,21 @@ public function parse(Array $data = array())
 
         $this->parcel
         	->settings
-        	->parse($data);
-        
+        	->parse($data, false);
+
         $this->settings
-        	->parse($data);
+        	->parse(array_merge($data, array('parcel' => $this->parcel)));
 
         $this->parcel
         	->getParcelSchedule()
         	->settings
-        	->parse(array_merge($data, array('settings' => $this->settings)));
+        	->parse(array_merge($data, array('parcel' => $this->parcel)));
 
         $this->parcel
         	->service
         	->settings
-        	->parse(array_merge($data, array('settings' => $this->settings)));
+        	->parse(array_merge($data, array('parcel' => $this->parcel)));
+
 	}
 
 	public function getInputHtml(Array $data = array())

core/interfaces/TransportInterface.php

@@ -5,6 +5,12 @@
 
 interface TransportInterface {
 
+	public function getData($key = false);
+
+	public function setData($value);
+
+	public function addData($key, $value);
+
 	public function shouldSend();
 
 	public function getSendDate();

models/Postmaster_BaseSettingsModel.php

@@ -5,9 +5,9 @@
 
 class Postmaster_BaseSettingsModel extends BaseModel implements ParseInterface
 {
-    public function parse(Array $data = array())
+    public function parse(Array $data = array(), $recursive = true)
     {
-        $this->setAttributes($this->parseArray($this->getAttributes(), $data));
+        $this->setAttributes($this->parseArray($this->getAttributes(), $data, $recursive));
 
         return $this;
     }
@@ -17,13 +17,13 @@ public function render($value, Array $data = array())
         return craft()->templates->renderString($value, $data);
     }
 
-    public function parseArray($subject, Array $data = array())
+    public function parseArray($subject, Array $data = array(), $recursive = true)
     {
         if(is_string($subject) && !empty($subject))
         {
             $subject = $this->render($subject, $data);
         }
-        else if(is_array($subject) || is_object($subject))
+        else if($recursive && (is_array($subject) || is_object($subject)))
         {
             foreach($subject as $index => $value)
             {   

models/Postmaster_EmailModel.php

@@ -19,8 +19,7 @@ public function parse(Array $data = array())
 	            $this->$attr = craft()->templates->renderString($value, $data);
 			}
 		}
-		
-		
+				
 		$oldPath = craft()->path->getTemplatesPath();
 
 		craft()->path->setTemplatesPath(CRAFT_TEMPLATES_PATH);

models/Postmaster_TransportModel.php

@@ -11,6 +11,34 @@ public function now()
 		return Carbon::now(craft()->getTimezone());
 	}
 
+	public function getData($key = false)
+	{
+		if(!$key)
+		{
+			return $this->data;
+		}
+
+		if(isset($this->data[$key]))
+		{
+			return $this->data[$key];
+		}
+
+		return null;
+	}
+
+	public function setData($value)
+	{
+		$this->data = $value;
+	}
+
+	public function addData($key, $value)
+	{
+		$data = $this->data;
+		$data[$key] = $value;
+
+		$this->data = $data;
+	}
+
 	public function getSendDate()
 	{
 		if(!$this->sendDate || is_string($this->sendDate))