Merge pull request #81 from bitpopulous/mak_dev

- Populous User API Ammended
bitpopulous · Oct 18, 2021 · 54b48a3 · 54b48a3
2 parents e4e82b1 + 5712663
commit 54b48a3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/src/Api/Populous.php b/src/Api/Populous.php
@@ -31,14 +31,7 @@ private function _call(string $url, array $params = [])
 		$ch = curl_init();
 
 		$_d = $params;
-		// $_d['_data'] = $params;
-
 		$postFields = http_build_query($_d);
-		// $postFields = $_d;
-
-		// $this->log->debug('Postfields : ' . $postFields);
-		// log_message('debug', 'Streamer => Postfields : ' . $postFields);
-
 		$ch = curl_init();
 
 		curl_setopt($ch, CURLOPT_URL, $url);
@@ -48,13 +41,12 @@ private function _call(string $url, array $params = [])
 
 		$headers = array();
 		$headers[] = 'Content-Type: application/x-www-form-urlencoded';
-		$headers[] = 'api_key: ' . $this->apiKey;
-		$headers[] = 'secret_key: ' . $this->secretKey;
-		$headers[] = 'internal_call: populous';
+		$headers[] = HEADER_KEY_API_KEY . ': ' . $this->apiKey;
+		$headers[] = HEADER_KEY_SECRET_KEY . ': ' . $this->secretKey;
+		$headers[] = HEADER_KEY_INTERNAL_CALL . ': ' . HEADER_VAL_INTERNAL_CALL;
 		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 
 		$result = curl_exec($ch);
-		log_message('debug', $result);
 		if (curl_errno($ch)) {
 			echo 'Error:' . curl_error($ch);
 		}
@@ -96,12 +88,12 @@ public function getStatus()
 	public function order(array $formData = [])
 	{
 
-		return $this->_call($this->endpoint . '/userapi/order', $formData);
+		return $this->_call($this->endpoint . '/UserApi/order', $formData);
 	}
 
 	public function cancel(array $formData = [])
 	{
-		return $this->_call($this->endpoint . '/userapi/cancel', $formData);
+		return $this->_call($this->endpoint . '/UserApi/cancel', $formData);
 	}
 
 

diff --git a/src/Trade/Buy.php b/src/Trade/Buy.php
@@ -11,9 +11,9 @@ class Buy extends Trade
 
     private $executedSellerOrders = [];
 
-    public function __construct($isInternal = false)
+    public function __construct($isBroadcasterRequired = false)
     {
-        parent::__construct(!$isInternal);
+        parent::__construct($isBroadcasterRequired);
     }
 
     /**

diff --git a/src/Trade/Sell.php b/src/Trade/Sell.php
@@ -11,9 +11,9 @@ class Sell extends Trade
     private $executedBuyerOrders = [];
 
 
-    public function __construct($isInternal = false)
+    public function __construct($isBroadcasterRequired = false)
     {
-        parent::__construct(!$isInternal);
+        parent::__construct($isBroadcasterRequired);
     }
 
     private function _do_sell_trade($selltrade, $buytrade)

diff --git a/src/Trade/Trade.php b/src/Trade/Trade.php
@@ -35,8 +35,6 @@ public function __construct($isBroadcasterRequired = true)
 
         $this->broadcasterRequired = $isBroadcasterRequired;
 
-        // $this->wss_server = new ServerHandler();
-
         $this->CI->load->model([
             'WsServer_model',
         ]);