From bf675d963ac9a34110d02d6d68259167396a4288 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Wed, 29 Aug 2012 12:22:54 +0000
Subject: [PATCH] Poprawka związana z brakiem nowej linii na końcu skróconej listy poleceń.

---
 class/BotMsgGG.php |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/class/BotMsgGG.php b/class/BotMsgGG.php
index 6b0ff53..1203924 100644
--- a/class/BotMsgGG.php
+++ b/class/BotMsgGG.php
@@ -21,10 +21,6 @@
 	const FORMAT_COLOR =	0x08;
 	const FORMAT_IMAGE =	0x80;
 	
-	const COLOR_RED =	0x00010000;
-	const COLOR_GREEN =	0x00000100;
-	const COLOR_BLUE =	0x00000001;
-	
 	/**
 	 * @param BotMsg $msg Wiadomość do przekonwertowania
 	 */
@@ -62,14 +58,21 @@
 				foreach($this->images as $data) {
 					$push->putImage($image[3]);
 				}
-				
-				$image = $last;
 			}
 			
 			$image = $last[2].file_get_contents($last[3]);
 		}
 		else
 		{
+			if(count($this->images) > 0) {
+				$push = new BotAPIGG();
+				foreach($this->images as $image) {
+					if(!$push->existsImage($image[2])) {
+						$push->putImage($image[3]);
+					}
+				}
+			}
+			
 			$image = '';
 		}
 		
@@ -108,7 +111,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;
+		}
 	}
 	
 	/**
@@ -116,11 +125,7 @@
 	 */
 	function sendPullResponse() {
 		header('Content-Type: application/x-gadu-gadu; charset=utf-8');
-		echo $this;
-	}
-	
-	private function rewriteOne($node, $saveto) {
-		
+		echo $this->getGG();
 	}
 	
 	private function rewrite($dom, $saveto, $top = TRUE) {
@@ -328,6 +333,7 @@
 			
 			$this->format .= pack('vC', mb_strlen($this->old), self::FORMAT_IMAGE)
 					.pack('CCVV', 0x09, 0x01, $size, hexdec($crc));
+			$this->f_old = '';
 		}
 	}
 	

--
Gitblit v1.9.1