[SM-CVS] CVS: squirrelmail/include/options folder.php,1.4,1.5

[Marc G. K. <st...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/include/options
In directory usw-pr-cvs1:/tmp/cvs-serv17458

Modified Files:
	folder.php 
Log Message:
sqimap_get_delimiter needs imap_stream


Index: folder.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/include/options/folder.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- folder.php	24 Oct 2002 05:45:48 -0000	1.4
+++ folder.php	24 Oct 2002 09:26:51 -0000	1.5
@@ -29,7 +29,6 @@
     $imapConnection =
         sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
     $boxes = sqimap_mailbox_list($imapConnection);
-    sqimap_logout($imapConnection);
 
     /* Build a simple array into which we will build options. */
     $optgrps = array();
@@ -209,7 +208,7 @@
     $optgrps[SMOPT_GRP_FOLDERSELECT] = _("Folder Selection Options");
     $optvals[SMOPT_GRP_FOLDERSELECT] = array();
 
-    $delim = sqimap_get_delimiter();
+    $delim = sqimap_get_delimiter($imapConnection);
     $optvals[SMOPT_GRP_FOLDERSELECT][] = array(
         'name'    => 'mailbox_select_style',
         'caption' => _("Selection List Style"),
@@ -225,6 +224,7 @@
         'grps' => $optgrps,
         'vals' => $optvals
     );
+    sqimap_logout($imapConnection);
     return ($result);
 }