From 27156012e9742691cafd14a66fc206dbd01acf68 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sun, 12 Aug 2012 14:19:38 +0000
Subject: [PATCH] 1. Poprawienie sposobu wysyłania obrazka przez metodę putImage klasy BotAPIGG. 2. Nie wysyłanie nagłówka przy braku formatowania.

---
 class/BotAPIGG.php |    7 +------
 class/BotMsgGG.php |    8 +++++++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/class/BotAPIGG.php b/class/BotAPIGG.php
index ec70815..630b63e 100644
--- a/class/BotAPIGG.php
+++ b/class/BotAPIGG.php
@@ -206,18 +206,13 @@
 	}
 	
 	function putImage($path) {
-		$fp = fopen($path, 'r');
-		if(!$fp) {
-			return FALSE;
-		}
-		
 		$auth = $this->APIs['Gadu-Gadu'];
 		$token = $this->getToken();
 		
 		$tok = $this->httpQuery('https://botapi.gadu-gadu.pl/botmaster/putImage/'.$auth['numer'], array(
 			CURLOPT_HTTPHEADER => array('Content-Type: image/x-any'),
 			CURLOPT_POST => TRUE,
-			CURLOPT_INFILE => $fp,
+			CURLOPT_POSTFIELDS => file_get_contents($path),
 		));
 		
 		if( (string)$tok->status != '0') {
diff --git a/class/BotMsgGG.php b/class/BotMsgGG.php
index 2c8b0d5..e2cbf47 100644
--- a/class/BotMsgGG.php
+++ b/class/BotMsgGG.php
@@ -115,7 +115,13 @@
 	 * @return string
 	 */
 	function getFormat() {
-		return pack('Cv', 0x02, strlen($this->format)).$this->format;
+		if($this->format == '') {
+			return '';
+		}
+		else
+		{
+			return pack('Cv', 0x02, strlen($this->format)).$this->format;
+		}
 	}
 	
 	/**

--
Gitblit v1.9.1