Home / Browse / SquirrelMail / Mail / Archive

SquirrelMail

Email Archive: squirrelmail-cvs (read-only)

2000:	_Jan	_Feb	_Mar	_Apr (4)	_May (5)	_Jun (73)	_Jul (155)	_Aug (142)	_Sep (50)	_Oct (89)	_Nov (39)	_Dec (59)
2001:	_Jan (239)	_Feb (293)	_Mar (90)	_Apr (149)	_May (117)	_Jun (52)	_Jul (67)	_Aug (15)	_Sep (97)	_Oct (304)	_Nov (295)	_Dec (372)
2002:	_Jan (357)	_Feb (272)	_Mar (153)	_Apr (158)	_May (170)	_Jun (139)	_Jul (226)	_Aug (401)	_Sep (314)	_Oct (343)	_Nov (270)	_Dec (231)
2003:	_Jan (201)	_Feb (112)	_Mar (146)	_Apr (103)	_May (148)	_Jun (287)	_Jul (302)	_Aug (139)	_Sep (206)	_Oct (281)	_Nov (116)	_Dec (191)
2004:	_Jan (82)	_Feb (223)	_Mar (175)	_Apr (280)	_May (260)	_Jun (206)	_Jul (107)	_Aug (207)	_Sep (108)	_Oct (171)	_Nov (186)	_Dec (180)
2005:	_Jan (144)	_Feb (226)	_Mar (200)	_Apr (286)	_May (120)	_Jun (144)	_Jul (125)	_Aug (111)	_Sep (221)	_Oct (51)	_Nov (275)	_Dec (73)
2006:	_Jan (178)	_Feb (313)	_Mar (87)	_Apr (104)	_May (145)	_Jun (74)	_Jul (197)	_Aug (229)	_Sep (118)	_Oct (298)	_Nov (39)	_Dec (170)
2007:	_Jan (251)	_Feb (109)	_Mar (82)	_Apr (5)	_May (80)	_Jun (63)	_Jul (98)	_Aug (103)	_Sep (61)	_Oct (41)	_Nov (50)	_Dec (47)
2008:	_Jan (74)	_Feb (71)	_Mar (102)	_Apr (31)	_May (117)	_Jun (33)	_Jul (61)	_Aug (12)	_Sep (22)	_Oct (25)	_Nov (21)	_Dec (52)
2009:	_Jan (13)	_Feb (16)	_Mar (79)	_Apr (181)	_May (164)	_Jun (10)	_Jul (23)	_Aug (30)	_Sep (19)	_Oct (18)	_Nov (7)	_Dec (5)
2010:	_Jan (23)	_Feb (17)	_Mar (15)	_Apr (2)	_May (4)	_Jun (23)	_Jul (89)	_Aug (8)	_Sep (13)	_Oct (6)	_Nov (4)	_Dec (6)
2011:	_Jan (4)	_Feb (1)	_Mar (5)	_Apr (13)	_May (9)	_Jun	_Jul (23)	_Aug (1)	_Sep (9)	_Oct (1)	_Nov (11)	_Dec (89)
2012:	_Jan (19)	_Feb (16)	_Mar (17)	_Apr (24)	_May (2)	_Jun (2)	_Jul (8)	_Aug (5)	_Sep (4)	_Oct	_Nov	_Dec (2)
2013:	_Jan (2)	_Feb	_Mar (9)	_Apr	_May (3)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec


S	M	T	W	T	F	S
	1	2	3	4	5	6
	(2)		(3)	(12)	(35)	(6)
7	8	9	10	11	12	13
(1)	(8)	(9)	(3)		(8)
14	15	16	17	18	19	20
(12)	(1)				(4)	(1)
21	22	23	24	25	26	27
(6)	(12)	(1)	(2)	(18)	(2)
28	29	30	31
(7)	(20)	(24)	(29)

[SM-CVS] CVS: squirrelmail/class html.class,1.4,1.5

From: Wouter Teepe <teepe@us...> - 2002-07-14 17:04

Update of /cvsroot/squirrelmail/squirrelmail/class
In directory usw-pr-cvs1:/tmp/cvs-serv17392

Modified Files:
	html.class 
Log Message:
fixed indentation of close tags

Index: html.class
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/class/html.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- html.class	14 Jul 2002 16:08:56 -0000	1.4
+++ html.class	14 Jul 2002 17:04:31 -0000	1.5
@@ -131,43 +131,38 @@
        echo ' '.$js;
     }
     if ($tag) echo '>';
-    if ($text) {
-       if ($style && !$usecss) { /* if use css then fallback to stylesheet for layout */
+
+    $openstyles = '';
+    $closestyles = '';
+    if ($style && !$usecss) {
           foreach ($style as $k => $v) {
-            echo '<'.$k.'>';
+          $openstyles .= '<'.$k.'>';
 	  }
-	  echo $text;
-          foreach ($style as $k => $v) { /* if value of key value = true close the tag */
+       foreach ($style as $k => $v) {
+          /* if value of key value = true close the tag */
 	    if ($v) {
-               echo '</'.$k.'>';
+             $closestyles .= '</'.$k.'>';
 	    }   
 	  }
-       } else {
-         echo $text;
        }
+    echo $openstyles;
+
+    if ($text) {
+       echo $text;
     }
+
     $cnt = count($this->html_el);
     if ($cnt) {
-       if ($style && !$usecss) {
-          foreach ($style as $k => $v) {
-            echo '<'.$k.'>';
-	  }
-       }
        echo "\n";
        for($i = 0;$i<$cnt;$i++) {
           $el = $this->html_el[$i];
 	  $el->echoHtml($usecss,$indentmore);
        }
-       if ($style && !$usecss) {       
-          foreach ($style as $k => $v) { /* if value of key value = true close the tag */
-	    if ($v) {
-               echo '</'.$k.'>';
-	    }   
-	  }
-       }
+       echo $indent;
     }
+    echo $closestyles;
     if ($tag) {
-       echo $indent . '</'.$tag.'>'."\n";
+       echo '</'.$tag.'>'."\n";
     } else {
        echo "\n";
     }

[SM-CVS] CVS: squirrelmail/class html.class,1.3,1.4

From: Wouter Teepe <teepe@us...> - 2002-07-14 16:09

Update of /cvsroot/squirrelmail/squirrelmail/class
In directory usw-pr-cvs1:/tmp/cvs-serv3880/class

Modified Files:
	html.class 
Log Message:
make indentation start at '' indentation. (Code elegancy not yet 100% :-( )

Index: html.class
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/class/html.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- html.class	14 Jul 2002 15:09:22 -0000	1.3
+++ html.class	14 Jul 2002 16:08:56 -0000	1.4
@@ -80,7 +80,12 @@
      $this->htmlAdd($el);
   }
   
-  function echoHtml( $usecss=false, $indent='') {
+  function echoHtml( $usecss=false, $indent='x') {
+    if ($indent == 'x') {
+      $indent = ''; $indentmore = '';
+    } else {
+      $indentmore = $indent . '  ';
+    }
     $tag = $this->tag;
     $text = $this->text;
     $class = $this->class;
@@ -149,7 +154,6 @@
 	  }
        }
        echo "\n";
-       $indentmore = $indent . '  ';
        for($i = 0;$i<$cnt;$i++) {
           $el = $this->html_el[$i];
 	  $el->echoHtml($usecss,$indentmore);
@@ -163,7 +167,7 @@
        }
     }
     if ($tag) {
-       echo '</'.$tag.'>'."\n";
+       echo $indent . '</'.$tag.'>'."\n";
     } else {
        echo "\n";
     }

[SM-CVS] CVS: squirrelmail/src read_body.php,1.201,1.202

From: Wouter Teepe <teepe@us...> - 2002-07-14 16:06

Update of /cvsroot/squirrelmail/squirrelmail/src
In directory usw-pr-cvs1:/tmp/cvs-serv3289/src

Modified Files:
	read_body.php 
Log Message:
<HTML> tag placement fix

Index: read_body.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/read_body.php,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -w -r1.201 -r1.202
--- read_body.php	14 Jul 2002 15:24:30 -0000	1.201
+++ read_body.php	14 Jul 2002 16:06:36 -0000	1.202
@@ -1039,8 +1039,8 @@
 $body->htmlAdd($rb_tools_table);
 $body->htmlAdd($rb_message_table);
 
-$page->html_el[0]->htmlAdd($head);
-$page->html_el[0]->htmlAdd($body);
+$page->html_el[1]->htmlAdd($head);
+$page->html_el[1]->htmlAdd($body);
 
 $page->echoHtml();

[SM-CVS] CVS: squirrelmail/functions page_header.php,1.121,1.122

From: Wouter Teepe <teepe@us...> - 2002-07-14 16:03

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory usw-pr-cvs1:/tmp/cvs-serv791/functions

Modified Files:
	page_header.php 
Log Message:
this is better,
<!DOCTYPE... is  no longer a style, but more a textual prefix, which it also is...
<HTML> tag incorporated truly



Index: page_header.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/page_header.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -w -r1.121 -r1.122
--- page_header.php	14 Jul 2002 15:28:55 -0000	1.121
+++ page_header.php	14 Jul 2002 16:03:13 -0000	1.122
@@ -299,10 +299,8 @@
 
     global $theme_css, $custom_css, $base_uri;
     $page = new html();
-    $page->addChild('','',array('!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"' => false),'','','');
-    $html = new html('html');
-    $html->addChild('HTML');
-/* shouldn't the last two lines be just this line?    $page->addChild('HTML'); */
+    $page->addChild('','<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">');
+    $page->addChild('HTML');
     return $page;
 }

[SM-CVS] CVS: squirrelmail/functions page_header.php,1.120,1.121

From: Wouter Teepe <teepe@us...> - 2002-07-14 15:28

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory usw-pr-cvs1:/tmp/cvs-serv25568/functions

Modified Files:
	page_header.php 
Log Message:
Since <!DOCTYPE may _not_ be closed, it is a style parameter
(when talking in the language of html.class)

With this change, there is no </!DOCTYPE tag, which is not only more elegant, but also allows the pages to validate :-)

Marc, Could you look into my comments on the addChild('HTML') issue?
I assume you want the doc to look like this, right?

<!DOCTYPE blah>
  <html>
    <head>
      blah
    </head>
    <body>
      blah
    </body>
  </html>




Index: page_header.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/page_header.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -w -r1.120 -r1.121
--- page_header.php	14 Jul 2002 13:34:56 -0000	1.120
+++ page_header.php	14 Jul 2002 15:28:55 -0000	1.121
@@ -299,10 +299,10 @@
 
     global $theme_css, $custom_css, $base_uri;
     $page = new html();
-    $page->addChild('!DOCTYPE','','','','',
-       array('HTML','PUBLIC', '"-//W3C//DTD HTML 4.0 Transitional//EN"'));
+    $page->addChild('','',array('!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"' => false),'','','');
     $html = new html('html');
     $html->addChild('HTML');
+/* shouldn't the last two lines be just this line?    $page->addChild('HTML'); */
     return $page;
 }

[SM-CVS] CVS: squirrelmail/src read_body.php,1.200,1.201

From: Wouter Teepe <teepe@us...> - 2002-07-14 15:24

Update of /cvsroot/squirrelmail/squirrelmail/src
In directory usw-pr-cvs1:/tmp/cvs-serv25234/src

Modified Files:
	read_body.php 
Log Message:
small html errors. The page now passes the html validator at w3.org



Index: read_body.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/read_body.php,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -w -r1.200 -r1.201
--- read_body.php	14 Jul 2002 14:05:10 -0000	1.200
+++ read_body.php	14 Jul 2002 15:24:30 -0000	1.201
@@ -973,10 +973,9 @@
 //$envtable->echoHtml($use_css);
 
 $rb_tools_table = new html('table','','','rb_tools','',$ar_table);
-$row = new html('tr','','','rb_rt','',array('width'=> '100%',
-                                            'valign'=> 'top',
-                                            'align'=> 'right',					    
-					    'nowrap'));
+$row = new html('tr','','','rb_rt','',array('valign'=> 'top',
+                                            'align'=> 'right'));
+
 /* view header */
 $viewheader_url = $base_uri . 'src/read_body.php?mailbox=' . $urlMailbox . 
                   '&amp;passed_id='. $passed_id. '&amp;';
@@ -990,7 +989,7 @@
 
 $link = new html('a',_("View Full Header") .' | ','','','',array (
             'href' => $viewheader_url));
-$col = new html('td','',array('small'=>true),'rb_ht','rb_vht');
+$col = new html('td','',array('small'=>true),'rb_ht','rb_vht',array('nowrap'));
 $col->htmlAdd($link);
 
 /* Output the printer friendly link if we are in subtle mode. */
@@ -1017,13 +1016,13 @@
 
 $rb_message_table =  new html('table','','','rb_body','',$ar_table);
 $row_body = new html('tr','','','rb_bd','rb_bdr');
-$col_body = new html('td',$messagebody,array('br'=>false),'rb_bd','rb_bdr',$ar_row);
+$col_body = new html('td',$messagebody,array('br'=>false),'rb_bd','',$ar_row);
 $row_body->htmlAdd($col_body);
 $rb_message_table->htmlAdd($row_body);
 
-$row_body = new html('tr','','','rb_bd','rb_bdr');
+$row_body = new html('tr','','','rb_bd','');
 $attachements = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
-$col_body = new html('td',$attachements,array('br'=>false),'rb_bd','rb_bdr',$ar_row);
+$col_body = new html('td',$attachements,array('br'=>false),'rb_bd','',$ar_row);
 $row_body->htmlAdd($col_body);
 $rb_message_table->htmlAdd($row_body);

[SM-CVS] CVS: squirrelmail/class html.class,1.2,1.3

From: Wouter Teepe <teepe@us...> - 2002-07-14 15:09

Update of /cvsroot/squirrelmail/squirrelmail/class
In directory usw-pr-cvs1:/tmp/cvs-serv22302/class

Modified Files:
	html.class 
Log Message:
* fix style closing tags (</1> should be </b> etc.)
* prevent ' style="Array"' from the html output



Index: html.class
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/class/html.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- html.class	12 Jul 2002 15:50:57 -0000	1.2
+++ html.class	14 Jul 2002 15:09:22 -0000	1.3
@@ -118,7 +118,8 @@
     if ($xtr_prop) {
        echo ' '.$prop;
     }
-    if ($style && !$usecss) {
+    if ($style && !$usecss && !is_array($style)) {
+       /* last premisse is to prevent 'style="Array"' in the output */
        echo ' style="'.$style.'"';  
     }
     if ($javascript) {
@@ -133,7 +134,7 @@
 	  echo $text;
           foreach ($style as $k => $v) { /* if value of key value = true close the tag */
 	    if ($v) {
-               echo '</'.$v.'>';
+               echo '</'.$k.'>';
 	    }   
 	  }
        } else {
@@ -148,15 +149,15 @@
 	  }
        }
        echo "\n";
-       $indent.='  ';
+       $indentmore = $indent . '  ';
        for($i = 0;$i<$cnt;$i++) {
           $el = $this->html_el[$i];
-	  $el->echoHtml($usecss,$indent);
+	  $el->echoHtml($usecss,$indentmore);
        }
        if ($style && !$usecss) {       
           foreach ($style as $k => $v) { /* if value of key value = true close the tag */
 	    if ($v) {
-               echo '</'.$v.'>';
+               echo '</'.$k.'>';
 	    }   
 	  }
        }

[SM-CVS] CVS: squirrelmail/src read_body.php,1.199,1.200

From: Wouter Teepe <teepe@us...> - 2002-07-14 14:05

Update of /cvsroot/squirrelmail/squirrelmail/src
In directory usw-pr-cvs1:/tmp/cvs-serv5233

Modified Files:
	read_body.php 
Log Message:
small formatting fixes

Index: read_body.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/read_body.php,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -w -r1.199 -r1.200
--- read_body.php	14 Jul 2002 11:27:16 -0000	1.199
+++ read_body.php	14 Jul 2002 14:05:10 -0000	1.200
@@ -674,7 +674,7 @@
 } else {
    $table_ar = array( 'width' => '100%', 'cellpadding' => 3 ,
                       'cellspacing'=> 0,'align'=> 'center', 
-		      'bgcolor' => $color[9]);
+                      'border' => 0, 'bgcolor' => $color[9]);
 }
 		      
 $topbar = new html('table','','','rb_tb','',$table_ar);
@@ -845,6 +845,7 @@
    $ar_table = array( 'width' => '100%',
                       'cellpadding' => '0',
 		      'cellspacing' => '0',
+                      'border' => '0',
 		      'align' =>'center');
 } else {
    $ar_key = '';
@@ -1073,5 +1074,4 @@
 //do_hook('html_bottom');
 sqimap_logout($imapConnection);
 ?>
-</body>
-</html>
+

[SM-CVS] CVS: squirrelmail/functions page_header.php,1.119,1.120

From: Wouter Teepe <teepe@us...> - 2002-07-14 13:35

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory usw-pr-cvs1:/tmp/cvs-serv27696/functions

Modified Files:
	page_header.php 
Log Message:
&nbsp -> &nbsp;

Index: page_header.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/page_header.php,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -w -r1.119 -r1.120
--- page_header.php	12 Jul 2002 16:02:21 -0000	1.119
+++ page_header.php	14 Jul 2002 13:34:56 -0000	1.120
@@ -401,7 +401,7 @@
    if ( $shortBoxName <> '' && strtolower( $shortBoxName ) <> 'none' ) {
         $row->addChild('td',_("Current Folder") .':','','tp_c','tp_mbx_k', 
 	                array('align' => $lft));
-	$row->addChild('td',$shortBoxName .'&nbsp',array('b'=>true),'tp_c',
+	$row->addChild('td',$shortBoxName .'&nbsp;',array('b'=>true),'tp_c',
 	               'tp_mbx_v',array('align' => $lft));
    }
    $col = new html('td','','','tp_c','tp_so',array('align' => $rgt));

[SM-CVS] CVS: squirrelmail/src read_body.php,1.198,1.199

From: Wouter Teepe <teepe@us...> - 2002-07-14 11:27

Update of /cvsroot/squirrelmail/squirrelmail/src
In directory usw-pr-cvs1:/tmp/cvs-serv2181

Modified Files:
	read_body.php 
Log Message:
small formatting fix

Index: read_body.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/read_body.php,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -w -r1.198 -r1.199
--- read_body.php	12 Jul 2002 16:27:31 -0000	1.198
+++ read_body.php	14 Jul 2002 11:27:16 -0000	1.199
@@ -1016,15 +1016,14 @@
 
 $rb_message_table =  new html('table','','','rb_body','',$ar_table);
 $row_body = new html('tr','','','rb_bd','rb_bdr');
-$col_body = new html('tb',$messagebody,array('br'=>false),'rb_bd','rb_bdr',$ar_row);
-
-$attachements = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
-
+$col_body = new html('td',$messagebody,array('br'=>false),'rb_bd','rb_bdr',$ar_row);
 $row_body->htmlAdd($col_body);
+$rb_message_table->htmlAdd($row_body);
 
-$col_body = new html('tb',$attachements,array('br'=>false),'rb_bd','rb_bdr',$ar_row);
+$row_body = new html('tr','','','rb_bd','rb_bdr');
+$attachements = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
+$col_body = new html('td',$attachements,array('br'=>false),'rb_bd','rb_bdr',$ar_row);
 $row_body->htmlAdd($col_body);
-
 $rb_message_table->htmlAdd($row_body);
 
 if ($use_css) {

[SM-CVS] CVS: squirrelmail/functions imap_general.php,1.108,1.109

From: Jason Munro <jmunro@us...> - 2002-07-14 02:02

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory usw-pr-cvs1:/tmp/cvs-serv16191/functions

Modified Files:
	imap_general.php 
Log Message:
rewrite of sqimap_read_data_list() see this for more info:

http://sourceforge.net/mailarchive/forum.php?thread_id=884872&forum_id=7139




Index: imap_general.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/imap_general.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -w -r1.108 -r1.109
--- imap_general.php	5 Jul 2002 13:07:32 -0000	1.108
+++ imap_general.php	14 Jul 2002 02:02:10 -0000	1.109
@@ -46,115 +46,74 @@
 
 
 /*
+ * custom fgets function. gets a line from IMAP
+ * no matter how big it may be
+ */
+
+function sqimap_fgets($imap_stream) {
+    $read = '';
+    $buffer = 4096;
+    $results = '';
+    while (strpos($read, "\n") === false) {
+        if (!($read = fgets($imap_stream, $buffer))) {
+            break;
+        }
+        $results .= $read;
+    }
+    return $results;
+}
+
+/*
  * Reads the output from the IMAP stream.  If handle_errors is set to true,
  * this will also handle all errors that are received.  If it is not set,
  * the errors will be sent back through $response and $message
  */
+
 function sqimap_read_data_list ($imap_stream, $pre, $handle_errors, &$response, &$message, $query = '') {
     global $color, $squirrelmail_language;
-
     $read = '';
-    $bufsize = 9096;
-    $resultlist = array();
     $pre_a = explode(' ',trim($pre));
     $pre = $pre_a[0];
-    $more_msgs = true;
-    while ($more_msgs) {
+    $resultlist = array();
         $data = array();
-        $total_size = 0;
-
-        while (strpos($read, "\n") === false) {
-            if(!($read .= fgets($imap_stream, $bufsize))) {
-                break;
-            }
-        }
-        if (preg_match('/^\* [0-9]+ FETCH.*\{([0-9]+)\}/', $read, $regs)) {
-           $size = $regs[1];
-        } else if (preg_match('/^\* [0-9]+ FETCH/', $read, $regs)) {
-            /* Sizeless response, probably single-line */
-            $size = -1;
-            $data[] = $read;
-            $read = fgets($imap_stream, $bufsize);
-        } else {
-            $size = -1;
-        }
+    $read = sqimap_fgets($imap_stream);
         while (1) {
-            while (strpos($read, "\n") === false) {
-                if(!($read .= fgets($imap_stream, $bufsize))) {
-                    break;
-                }
-            }
-            /* If we know the size, no need to look at the end parameters */
-	    /* In case of a totalsize > size we do have to look at the end
-	       parameters because there can exists literals inside bodystructures.
-	    */  
-            if ($size > 0) {
-                if ($total_size == $size) {
-                    /* We've reached the end of this 'message', switch to the next one. */
-                    $data[] = $read;
-                    break;
-                } else if ($total_size > $size) {
-		    $size = -1; /* switch to end parameters in case of literals inside a bodystructure */
-                    $difference = $total_size - $size;
-                    $total_size = $total_size - strlen($read);
-                    $data[] = substr ($read, 0, strlen($read)-$difference);
-                    $read = substr ($read, strlen($read)-$difference, strlen($read));
-                } else {
-                    $data[] = $read;
-                    $read = fgets($imap_stream, $bufsize);
-                    while (strpos($read, "\n") === false) {
-                      $read .= fgets($imap_stream, $bufsize);
-                    }
-                }
-                $total_size += strlen($read);
-            } else {
-                if (preg_match("/^$pre (OK|BAD|NO)(.*)/", $read, $regs) ||
-                    (($size == -1) && preg_match('/^\* [0-9]+ FETCH.*/', $read, $regs))) {
-                    break;
-                } else if ( preg_match('/^\* OK \[PARSE.*/', $read, $regs ) ) {
-                    /*
-                     * This block has been added in order to avoid the problem
-                     * caused by the * OK [PARSE] Missing parameter answer
-                     * Please, replace it with a better parsing if you know how.
-                     * This block has been updated by
-                     * Seth E. Randall <sethr@...>.  Once we see
-                     * one OK [PARSE line, we just go through and keep
-                     * tossing them out until we get something different.
-                     */
-                    while ( preg_match('/^\* OK \[PARSE.*/', $read, $regs ) ) {
-                        $read = fgets($imap_stream, $bufsize);
-                    }
-                    $data[] = $read;
-                    $read = fgets ($imap_stream, $bufsize);
-                } else if (preg_match('/^\* BYE \[ALERT\](.*)/', $read, $regs)) {
-                    /*
-                     * It seems that the IMAP server has coughed up a lung
-                     * and hung up the connection.  Print any info we have
-                     * and abort.
-                     */
-                    echo _("Please contact your system administrator and report the following error:") . "<br>\n";
-                    echo $regs[1];
-                    exit;
-                } else {
+        switch (true) { 
+            case preg_match("/^$pre (OK|BAD|NO)(.*)$/", $read, $regs):
+            case preg_match('/^\* (BYE \[ALERT\])(.*)$/', $read, $regs):
+                $response = $regs[1];
+                $message = trim($regs[2]);
+                break 2;
+            case preg_match("/^\* (OK \[PARSE\])(.*)$/", $read):
+                $read = sqimap_fgets($imap_stream);
+                break 1;
+            case preg_match('/^\* [0-9]+ FETCH.*/', $read):
+                $fetch_data = array();
+                $fetch_data[] = $read;
+                $read = sqimap_fgets($imap_stream);
+                while (!preg_match('/^\* [0-9]+ FETCH.*/', $read) && 
+                       !preg_match("/^$pre (OK|BAD|NO)(.*)$/", $read)) {
+                    $fetch_data[] = $read;
+                    $read = sqimap_fgets($imap_stream);
+                }
+                $resultlist[] = $fetch_data;
+                break 1;
+            default:
                     $data[] = $read;
-                    $read = fgets ($imap_stream, $bufsize);
+                $read = sqimap_fgets($imap_stream);
+                break 1;
                 }
             }
-        }
-
-        while (($more_msgs = !preg_match("/^$pre (OK|BAD|NO)(.*)$/", $read, $regs)) &&
-            !preg_match("/^\* [0-9]+ FETCH.*/", $read, $regs)) {
-            $read = fgets($imap_stream, $bufsize);
-        }
+    if (!empty($data)) {
         $resultlist[] = $data;
     }
-
-    $response = $regs[1];
-    $message = trim($regs[2]);
-
+    elseif (empty($resultlist)) {
+        $resultlist[] = array(); 
+    }
     if ($handle_errors == false) {
         return( $resultlist );
-    } else if ($response == 'NO') {
+    } 
+    elseif ($response == 'NO') {
         /* ignore this error from M$ exchange, it is not fatal (aka bug) */
         if (strstr($message, 'command resulted in') === false) {
             set_up_language($squirrelmail_language);
@@ -167,7 +126,8 @@
                  $message . "</font><br>\n";
             exit;
         }
-    } else if ($response == 'BAD') {
+    } 
+    elseif ($response == 'BAD') {
         set_up_language($squirrelmail_language);
         echo "<br><b><font color=$color[2]>\n" .
              _("ERROR : Bad or malformed request.") .
@@ -177,7 +137,8 @@
              _("Server responded: ") .
              $message . "</font><br>\n";
         exit;
-    } else {
+    } 
+    else {
         return $resultlist;
     }
 }

[SM-CVS] CVS: squirrelmail/functions imap_parse.php,1.2,1.3

From: Jason Munro <jmunro@us...> - 2002-07-14 01:49

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory usw-pr-cvs1:/tmp/cvs-serv14195/functions

Modified Files:
	imap_parse.php 
Log Message:
E_ALL warning fix 


Index: imap_parse.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/imap_parse.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- imap_parse.php	5 Jul 2002 13:15:55 -0000	1.2
+++ imap_parse.php	14 Jul 2002 01:48:59 -0000	1.3
@@ -204,7 +204,7 @@
         if (strlen(trim($hdr->subject)) == 0) {
            $hdr->subject = _("(no subject)");
         }
-        if (strlen(trim($hdr->from)) == 0) {
+        if (!is_object($hdr->from) && strlen(trim($hdr->from)) == 0) {
            $hdr->from = _("(unknown sender)");
         }
         if (strlen(trim($hdr->date)) == 0) {