Updates

Author: objectivehtml

core/services/HttpRequestService.php

@@ -67,26 +67,36 @@ public function send(Postmaster_TransportModel $model)
 				$response = (string) $e->getResponse()->getBody();
 				$json = json_decode($response);
 
+				$model->addData('responseString', $response);
+
 				if(is_object($json) && isset($json->errors))
 				{
 					if(!is_array($json->errors))
 					{
 						$json->errors = (array) $json->errors;
 					}
 
+					$model->addData('responseJson', $json);
+
 					return $this->failed($model, 400, $json->errors);
 				}
 				else
 				{
+					$model->addData('responseJson', array($response));
+
 					return $this->failed($model, 400, array($response));
 				}
 
 			}
 			catch(\Exception $e)
 			{
 				$error = $e->getMessage();
+				$json = !is_array($error) ? array('title' => $error) : $error;
+
+				$model->addData('responseString', $error);
+				$model->addData('responseJson', $json);
 
-				return $this->failed($model, 400, !is_array($error) ? array($error) : $error);
+				return $this->failed($model, 400, $json);
 			}
 		}
 

models/Postmaster_BaseSettingsModel.php

@@ -23,13 +23,23 @@ public function parseArray($subject, Array $data = array(), $recursive = true)
         {
             $subject = $this->render($subject, $data);
         }
-        else if($recursive && (is_array($subject) || is_object($subject)))
+        else if($recursive && is_array($subject) || is_object($subject))
         {
             foreach($subject as $index => $value)
             {   
                 $subject[$index] = $this->parseArray($value, $data);
             }
         }
+        else if(!$recursive && is_array($subject) || is_object($subject))
+        {
+            foreach($subject as $index => $value)
+            {   
+                if(is_string($value) && !empty($value))
+                {
+                    $subject[$index] = $this->render($value, $data);
+                }
+            }
+        }
 
         return $subject;
     }

models/Postmaster_HttpRequestServiceSettingsModel.php

@@ -26,8 +26,8 @@ public function parse(Array $data = array())
 		}
 
 		$this->files = $parsedFiles;
-		
-		parent::parse($data);
+
+        $this->setAttributes($this->parseArray($this->getAttributes(), $data, false));
 
         return $this;
 	}