okay, this is now safer

lib/RequestHandler.php

@@ -87,7 +87,7 @@ class RequestHandler
 		curl_setopt($ch, CURLOPT_HEADER, false);
 		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 		curl_setopt($ch, CURLOPT_POST, true);
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $this->request->getRequestXML());
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $this->request->getRequestXML($method));
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 		
@@ -96,9 +96,6 @@ class RequestHandler
 		
 		curl_close($ch);
 		
-		if($status)
-			return new Response($request, $output);
-		
-		return false;
+		return new Response($output);
 	}
 }
\ No newline at end of file

lib/Response.php

@@ -11,9 +11,10 @@ namespace OUTRAGElib\Payment\STPP;
 
 use \OUTRAGElib\Payment\STPP\Request;
 use \SimpleXMLElement;
+use \Serializable;
 
 
-class Response
+class Response implements Serializable
 {
 	/**
 	 *	Store the XML response somewhere...
@@ -21,34 +22,17 @@ class Response
 	private $feed = null;
 	
 	
-	/**
-	 *	The request?
-	 */
-	private $request = null;
-	
-	
 	/**
 	 *	Called when the response has been constructed.
 	 */
-	public function __construct(Request $request, $response)
+	public function __construct($response)
 	{
 		$this->feed = simplexml_load_string($response);
-		$this->request = $request;
 		
 		return true;
 	}
 	
 	
-	/**
-	 *	Retrieves a cleansed version of the request - where this means
-	 *	all credit card information is removed.
-	 */
-	public function getRequest()
-	{
-		return $this->request;
-	}
-	
-	
 	/**
 	 *	Retrieves the XML object that was sent back from SecureTrading.
 	 */
@@ -144,4 +128,31 @@ class Response
 		
 		return (integer) $this->feed->response->live === 1;
 	}
+	
+	
+	/**
+	 *	Called to serialize an object
+	 */
+	public function serialize()
+	{
+		$vars = get_object_vars($this);
+		$vars["feed"] = $this->feed->asXML();
+		
+		return serialize($vars);
+	}
+	
+	
+	/**
+	 *	Called to unserialize an object
+	 */
+	public function unserialize($input)
+	{
+		$vars = unserialize($input);
+		$vars["feed"] = simplexml_load_string($vars["feed"]);
+		
+		foreach($vars as $key => $value)
+			$this->{$key} = $value;
+		
+		return true;
+	}
 }
\ No newline at end of file