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 | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/class/BotAPIGG.php b/class/BotAPIGG.php
index 4bb69a7..630b63e 100644
--- a/class/BotAPIGG.php
+++ b/class/BotAPIGG.php
@@ -6,7 +6,7 @@
function __construct($msg, $httpcode, $content) {
$this->httpcode = $httpcode;
$this->content = $content;
- parent::__construct($msg);
+ parent::__construct($msg.' Błąd '.$httpcode);
}
function __get($name) {
@@ -151,10 +151,10 @@
$tok = $this->httpQuery('https://'.$token['host'].'/setStatus/'.$auth['numer'], array(
CURLOPT_POST => TRUE,
- CURLOPT_POSTFIELDS => array(
+ CURLOPT_POSTFIELDS => http_build_query(array(
'status' => $status,
'desc' => $desc,
- ),
+ ), '', '&'),
));
if( (string)$tok->status != '0') {
@@ -181,22 +181,22 @@
$auth = $this->APIs['Gadu-Gadu'];
$token = $this->getToken();
- $tok = $this->httpQuery('https://'.$token['host'].'/botmaster/setUrl/'.$auth['numer'], array(
+ $tok = $this->httpQuery('https://botapi.gadu-gadu.pl/botmaster/getImage/'.$auth['numer'], array(
CURLOPT_POST => TRUE,
- CURLOPT_POSTFIELDS => array('hash' => $hash),
+ CURLOPT_POSTFIELDS => http_build_query(array('hash' => $hash), '', '&'),
), TRUE, FALSE);
return $tok;
}
- function existsImage() {
+ function existsImage($hash) {
$auth = $this->APIs['Gadu-Gadu'];
$token = $this->getToken();
- $tok = $this->httpQuery('https://'.$token['host'].'/botmaster/setUrl/'.$auth['numer'], array(
+ $tok = $this->httpQuery('https://botapi.gadu-gadu.pl/botmaster/existsImage/'.$auth['numer'], array(
CURLOPT_POST => TRUE,
- CURLOPT_POSTFIELDS => array('hash' => $hash),
- ), TRUE, FALSE);
+ CURLOPT_POSTFIELDS => http_build_query(array('hash' => $hash), '', '&'),
+ ));
if( (string)$tok->status != '0') {
return FALSE;
@@ -206,19 +206,14 @@
}
function putImage($path) {
- $fp = fopen($path, 'r');
- if(!$fp) {
- return FALSE;
- }
-
$auth = $this->APIs['Gadu-Gadu'];
$token = $this->getToken();
- $tok = $this->httpQuery('https://'.$token['host'].'/botmaster/setUrl/'.$auth['numer'], array(
+ $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,
- ), TRUE, FALSE);
+ CURLOPT_POSTFIELDS => file_get_contents($path),
+ ));
if( (string)$tok->status != '0') {
throw new BotAPIGGReplyException('Przesyłanie obrazka do botmastera nie powiodło się.', $tok);
--
Gitblit v1.9.1