@@ -103,7 +103,12 @@ class ActiveResource { /** * The format requests should use to send data (url or xml). */ - var $request_format = 'url'; + var $request_format = 'xml'; + + /** + * The curl/url handler + */ + private $ch; /** * Constructor method. @@ -204,6 +209,7 @@ class ActiveResource { * Simple recursive function to build an XML response. */ function _build_xml ($k, $v) { + $k = str_replace('_','-',$k); if (is_object ($v) && strtolower (get_class ($v)) == 'simplexmlelement') { return preg_replace ('/<\?xml(.*?)\?>/', '', $v->asXML ()); } @@ -252,11 +258,12 @@ class ActiveResource { * Build the request, call _fetch() and parse the results. */ function _send_and_receive ($url, $method, $data = array ()) { + $params = ''; $el = substr ($this->element_name, 0, -1); if ($this->request_format == 'url') { foreach ($data as $k => $v) { - if ($k != 'id' && $k != 'created-at' && $k != 'updated-at') { + if ($k != 'id' && $k != 'created_at' && $k != 'updated_at') { $params .= '&' . $el . '[' . str_replace ('-', '_', $k) . ']=' . rawurlencode ($v); } } @@ -264,7 +271,7 @@ class ActiveResource { } elseif ($this->request_format == 'xml') { $params = '<?xml version="1.0" encoding="UTF-8"?><' . $el . ">\n"; foreach ($data as $k => $v) { - if ($k != 'id' && $k != 'created-at' && $k != 'updated-at') { + if ($k != 'id' && $k != 'created_at' && $k != 'updated_at') { $params .= $this->_build_xml ($k, $v); } } @@ -274,6 +281,8 @@ class ActiveResource { $this->request_uri = $url; $this->request_method = $method; + + $res = $this->_fetch ($url, $method, $params); list ($headers, $res) = explode ("\r\n\r\n", $res, 2); @@ -330,53 +339,95 @@ class ActiveResource { return $this; } + private function _initialize_http($url, $method, $params){ + if(!extension_loaded('curl')){ + $this->ch = fsockopen(parse_url($url,PHP_URL_HOST),parse_url($url,PHP_URL_PORT)); + if(!$fp) return null; + } else { + $this->ch = curl_init (); + curl_setopt ($this->ch, CURLOPT_URL, $url); + curl_setopt ($this->ch, CURLOPT_MAXREDIRS, 3); + curl_setopt ($this->ch, CURLOPT_FOLLOWLOCATION, 0); + curl_setopt ($this->ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt ($this->ch, CURLOPT_VERBOSE, 0); + curl_setopt ($this->ch, CURLOPT_HEADER, 1); + curl_setopt ($this->ch, CURLOPT_CONNECTTIMEOUT, 10); + curl_setopt ($this->ch, CURLOPT_SSL_VERIFYPEER, 0); + curl_setopt ($this->ch, CURLOPT_SSL_VERIFYHOST, 0); + } + } + + private function _prepare_http_method_and_params($url,$method,$params){ + if(!extension_loaded('curl')){ + fputs($this->ch, $method . " ".parse_url($url, PHP_URL_PATH)." HTTP/1.1\r\n"); + fputs($this->ch,"Host: ".parse_url($url,PHP_URL_HOST)."\n"); + fputs($this->ch,"Accept: application/xml\r\n"); + fputs($this->ch,"Content-type: application/xml\r\n"); + fputs($this->ch,"Content-length: ".strlen($params)."\r\n\r\n"); + fputs($this->ch,"$params\r\n\r\n"); + } else { + switch ($method) { + case 'POST': + curl_setopt ($this->ch, CURLOPT_POST, 1); + curl_setopt ($this->ch, CURLOPT_POSTFIELDS, $params); + break; + case 'DELETE': + curl_setopt ($this->ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); + break; + case 'PUT': + curl_setopt ($this->ch, CURLOPT_CUSTOMREQUEST, 'PUT'); + curl_setopt ($this->ch, CURLOPT_POSTFIELDS, $params); + break; + case 'GET': + default: + break; + } + } + } + + private function _exec_http(){ + if(!extension_loaded('curl')){ + $response = ""; + while(!feof($this->ch)) { + $response .= fgets($this->ch, 1024); + } + return $response; + } else { + return curl_exec($this->ch); + } + } + + private function _close_http(){ + if(!extension_loaded('curl')){ + fclose($this->ch); + } else { + curl_close($this->ch); + } + } + /** * Fetch the specified request via cURL. */ function _fetch ($url, $method, $params) { - if (! extension_loaded ('curl')) { - $this->error = 'cURL extension not loaded.'; - return false; - } - $ch = curl_init (); - curl_setopt ($ch, CURLOPT_URL, $url); - curl_setopt ($ch, CURLOPT_MAXREDIRS, 3); - curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, 0); - curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt ($ch, CURLOPT_VERBOSE, 0); - curl_setopt ($ch, CURLOPT_HEADER, 1); - curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, 10); - curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, 0); - curl_setopt ($ch, CURLOPT_SSL_VERIFYHOST, 0); - if ($this->request_format == 'xml') { - curl_setopt ($ch, CURLOPT_HTTPHEADER, array ("Content-Type: text/xml", "Length: " . strlen ($params))); - } - switch ($method) { - case 'POST': - curl_setopt ($ch, CURLOPT_POST, 1); - curl_setopt ($ch, CURLOPT_POSTFIELDS, $params); - //curl_setopt ($ch, CURLOPT_HTTPHEADER, array ("Content-Type: application/x-www-form-urlencoded\n")); - break; - case 'DELETE': - curl_setopt ($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); - break; - case 'PUT': - curl_setopt ($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); - curl_setopt ($ch, CURLOPT_POSTFIELDS, $params); - //curl_setopt ($ch, CURLOPT_HTTPHEADER, array ("Content-Type: application/x-www-form-urlencoded\n")); - break; - case 'GET': - default: - break; - } - $res = curl_exec ($ch); + + $this->_initialize_http($url, $method, $params); + + #if ($this->request_format == 'xml') { + # curl_setopt ($ch, CURLOPT_HTTPHEADER, array ("Content-Type: text/xml", "Length: " . strlen ($params))); + #} + + $this->_prepare_http_method_and_params($url,$method,$params); + + + $res = $this->_exec_http(); + if (! $res) { $this->errno = curl_errno ($ch); $this->error = curl_error ($ch); - curl_close ($ch); + $this->_close_http(); return false; } - curl_close ($ch); + $this->_close_http(); return $res; } ActiveResource.php e1561bbb110f6827adec72005ee83a0aa2f4b5a2 krewenki krewenki@gmail.com http://github.com/krewenki/phpactiveresource/commit/4550079f24a84dae5c43b7f11e329ffd73b1cf42 4550079f24a84dae5c43b7f11e329ffd73b1cf42 2009-05-29T08:20:24-07:00 2009-05-29T08:20:24-07:00 Added the ability to function without curl, and changed the default format to xml. Ugly and non-dry, will be refactored. 94662857ea21d668093eda8730438bb5d50d7fbe krewenki krewenki@gmail.com