1 files changed, 48 insertions, 27 deletions

diff --git a/app/Core/HttpClient.php b/app/Core/HttpClient.php
index 0803ec7a..2f280a1e 100644
--- a/app/Core/HttpClient.php
+++ b/app/Core/HttpClient.php
@@ -2,22 +2,20 @@
 
 namespace Core;
 
-use Pimple\Container;
-
 /**
  * HTTP client
  *
  * @package  core
  * @author   Frederic Guillot
  */
-class HttpClient
+class HttpClient extends Base
 {
     /**
      * HTTP connection timeout in seconds
      *
      * @var integer
      */
-    const HTTP_TIMEOUT = 2;
+    const HTTP_TIMEOUT = 5;
 
     /**
      * Number of maximum redirections for the HTTP client
@@ -31,46 +29,60 @@ class HttpClient
      *
      * @var string
      */
-    const HTTP_USER_AGENT = 'Kanboard Webhook';
+    const HTTP_USER_AGENT = 'Kanboard';
 
     /**
-     * Container instance
+     * Send a POST HTTP request encoded in JSON
      *
-     * @access protected
-     * @var \Pimple\Container
+     * @access public
+     * @param  string  $url
+     * @param  array   $data
+     * @param  array   $headers
+     * @return string
      */
-    protected $container;
+    public function postJson($url, array $data, array $headers = array())
+    {
+        return $this->doRequest(
+            $url,
+            json_encode($data),
+            array_merge(array('Content-type: application/json'), $headers)
+        );
+    }
 
     /**
-     * Constructor
+     * Send a POST HTTP request encoded in www-form-urlencoded
      *
      * @access public
-     * @param  \Pimple\Container   $container
+     * @param  string  $url
+     * @param  array   $data
+     * @param  array   $headers
+     * @return string
      */
-    public function __construct(Container $container)
+    public function postForm($url, array $data, array $headers = array())
     {
-        $this->container = $container;
+        return $this->doRequest(
+            $url,
+            http_build_query($data),
+            array_merge(array('Content-type: application/x-www-form-urlencoded'), $headers)
+        );
     }
 
     /**
-     * Send a POST HTTP request
+     * Make the HTTP request
      *
-     * @access public
+     * @access private
      * @param  string  $url
-     * @param  array   $data
+     * @param  array   $content
+     * @param  array   $headers
      * @return string
      */
-    public function post($url, array $data)
+    private function doRequest($url, $content, array $headers)
     {
         if (empty($url)) {
             return '';
         }
 
-        $headers = array(
-            'User-Agent: '.self::HTTP_USER_AGENT,
-            'Content-Type: application/json',
-            'Connection: close',
-        );
+        $headers = array_merge(array('User-Agent: '.self::HTTP_USER_AGENT, 'Connection: close'), $headers);
 
         $context = stream_context_create(array(
             'http' => array(
@@ -79,16 +91,25 @@ class HttpClient
                 'timeout' => self::HTTP_TIMEOUT,
                 'max_redirects' => self::HTTP_MAX_REDIRECTS,
                 'header' => implode("\r\n", $headers),
-                'content' => json_encode($data)
+                'content' => $content
             )
         ));
 
-        $response = @file_get_contents(trim($url), false, $context);
+        $stream = @fopen(trim($url), 'r', false, $context);
+        $response = '';
+
+        if (is_resource($stream)) {
+            $response = stream_get_contents($stream);
+        }
+        else {
+            $this->container['logger']->error('HttpClient: request failed');
+        }
 
         if (DEBUG) {
-            $this->container['logger']->debug($url);
-            $this->container['logger']->debug(var_export($data, true));
-            $this->container['logger']->debug($response);
+            $this->container['logger']->debug('HttpClient: url='.$url);
+            $this->container['logger']->debug('HttpClient: payload='.$content);
+            $this->container['logger']->debug('HttpClient: metadata='.var_export(@stream_get_meta_data($stream), true));
+            $this->container['logger']->debug('HttpClient: response='.$response);
         }
 
         return $response;