[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kio_mhtml
From:       Spiros Georgaras <sngeorgaras () otenet ! gr>
Date:       2005-07-21 18:56:50
Message-ID: 1121972210.628620.29196.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 437400 by sngeorgaras:

fixxing an infinite loop bug

 M  +19 -13    kmhtmlarchive.cpp  


--- trunk/kdenonbeta/kio_mhtml/kmhtmlarchive.cpp #437399:437400
@@ -1650,7 +1650,8 @@
 	// Subject foreground color
 	ins.append(hTxt);
 	ins.append("\">");
-	ins.append(archive->mSubject.local8Bit());
+	if(archive->mSubject.isNull()) ins.append("No subject");
+	else ins.append(archive->mSubject.local8Bit());
 	ins.append("</font></b>");
 	if(archive->isDOS) ins.append(archive->controlChars[0]);
 	ins.append(archive->controlChars[1]);
@@ -1680,7 +1681,7 @@
 	ins.append("<TD width=\"1%\" align=\"right\" valign=\"top\">");
 	if(archive->isDOS) ins.append(archive->controlChars[0]);
 	ins.append(archive->controlChars[1]);
-	ins.append("<b>From:</b></td>");
+	ins.append("<b><font color=\"Black\">From:</font></b></td>");
 	if(archive->isDOS) ins.append(archive->controlChars[0]);
 	ins.append(archive->controlChars[1]);
 	ins.append("<td>");
@@ -1695,7 +1696,7 @@
 	ins.append("<TD width=\"1%\" align=\"right\" valign=\"top\">");
 	if(archive->isDOS) ins.append(archive->controlChars[0]);
 	ins.append(archive->controlChars[1]);
-	ins.append("<b>To:</b></td>");
+	ins.append("<b><font color=\"Black\">To:</font></b></td>");
 	if(archive->isDOS) ins.append(archive->controlChars[0]);
 	ins.append(archive->controlChars[1]);
 	ins.append("<td>");
@@ -1711,7 +1712,7 @@
 		ins.append("<TD width=\"1%\" align=\"right\" valign=\"top\">");
 		if(archive->isDOS) ins.append(archive->controlChars[0]);
 		ins.append(archive->controlChars[1]);
-		ins.append("<b>CC:</b></td>");
+		ins.append("<b><font color=\"Black\">CC:</font></b></td>");
 		if(archive->isDOS) ins.append(archive->controlChars[0]);
 		ins.append(archive->controlChars[1]);
 		ins.append("<td>");
@@ -1728,7 +1729,7 @@
 		ins.append("<TD width=\"1%\" align=\"right\" valign=\"top\">");
 		if(archive->isDOS) ins.append(archive->controlChars[0]);
 		ins.append(archive->controlChars[1]);
-		ins.append("<b>BCC:</b></td>");
+		ins.append("<b><font color=\"Black\">BCC:</font></b></td>");
 		if(archive->isDOS) ins.append(archive->controlChars[0]);
 		ins.append(archive->controlChars[1]);
 		ins.append("<td>");
@@ -1744,12 +1745,12 @@
 	ins.append("<TD width=\"1%\" align=\"right\" valign=\"top\">");
 	if(archive->isDOS) ins.append(archive->controlChars[0]);
 	ins.append(archive->controlChars[1]);
-	ins.append("<b>Date:</b></td>");
+	ins.append("<b><font color=\"Black\">Date:</font></b></td>");
 	if(archive->isDOS) ins.append(archive->controlChars[0]);
 	ins.append(archive->controlChars[1]);
-	ins.append("<td>");
+	ins.append("<td><font color=\"Black\">");
 	ins.append(archive->mDate);
-	ins.append("</td></tr>");
+	ins.append("</font></td></tr>");
 	if(archive->isDOS) ins.append(archive->controlChars[0]);
 	ins.append(archive->controlChars[1]);
 	ins.append("</TD></TR></table>");
@@ -1768,7 +1769,7 @@
 ================================*/
 QString KmhtmlEntry::createEmlAttachments(){
 	int att=0;
-
+	int curAtt=0;
 	for(int i=0;i<archive->items;i++) \
if(archive->item[i].contentDisposition.lower()=="attachment") att++;  if(att==0) \
return "";  QCString ins;
@@ -1796,6 +1797,7 @@
 	ins.append(archive->controlChars[1]);
 	for(int i=0;i<archive->items;i++){
 		if(archive->item[i].contentDisposition.lower()=="attachment"){
+			curAtt+=1;
 			ins.append("<tr valign=\"top\"><td width=\"10\" \
align=\"left\"><nobr>&#160;&#160;<A href=\"");  \
ins.append(archive->item[i].alias.local8Bit());  //Εντολές RHP.doc
@@ -1812,11 +1814,13 @@
 			//180KB
 			ins.append(" Bytes, type: ");
 			ins.append(archive->item[i].mimeType);
-			//image/gif
+			if(att==curAtt) ins.append("<br><br>");
 			ins.append("</td></tr>");
 		}
 	}
-	ins.append("</tbody></table><br><br><br>");
+	ins.append("</tbody></table>");
+	if(archive->isDOS) ins.append(archive->controlChars[0]);
+	ins.append(archive->controlChars[1]);
 	ins.append("<!-- end of inserted section by kio_mhtml -->");
 	if(archive->isDOS) ins.append(archive->controlChars[0]);
 	ins.append(archive->controlChars[1]);
@@ -1873,13 +1877,15 @@
 	st=encodedText.find("=?");
 	while(st!=-1){
 		en=encodedText.find("?=");
-		while(encodedText.mid(en+2,1)!=" " && en+2<(int)encodedText.length()) \
en=encodedText.find("?=",en+1); +		while(encodedText.mid(en+2,2)!="\" " && \
encodedText.mid(en+2,1)!=" " && en+2<(int)encodedText.length()) \
en=encodedText.find("?=",en+1); +		//while(encodedText.mid(en+2,1)!=" " && \
en+2<(int)encodedText.length()) en=encodedText.find("?=",en+1);  if(en==-1) break;
 		decodedText+=encodedText.left(st);
 		QString tmp=encodedText.mid(st,en-st+2);
 		encodedText=encodedText.mid(en+2);
 		decodedText+=decodeRFC2047String(tmp);
-		st=encodedText.find("=?",st+1);
+		st=encodedText.find("=?");
+		//st=encodedText.find("=?",st+1);
 	}
 	decodedText += encodedText;
 // 	//kdDebug()<<"[KmhtmlArchive::decodeRFC2047Phrase]: decodedText="<< decodedText \
<< endl;


[prev in list] [next in list] [prev in thread] [next in thread]