** -> *

[squirrelmail.git] / functions / imap_mailbox.php

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index a0d3e7b602249bbe679db21e7536480200e48f33..031ccc43f498d9bf689dd688c4a4e5c9fc581047 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -1,18 +1,15 @@
 <?php
 
    /**
-    **  imap_mailbox.php
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.        
-    **
-    **  This impliments all functions that manipulate mailboxes
-    **
-    **  $Id$
-    **/
-
-   if (defined ('imap_mailbox_php'))
-      return;
-   define ('imap_mailbox_php', true);
+    *   imap_mailbox.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   This impliments all functions that manipulate mailboxes
+    *
+    *   $Id$
+    */
 
    /******************************************************************************
     **  Expunges a mailbox 
@@ -40,9 +37,9 @@
    function sqimap_mailbox_select ($imap_stream, $mailbox, $hide=true, $recent=false) {
       global $auto_expunge;
 
-      if( $mailbox == _("None") )
+      if( $mailbox == 'None' )
           return;
-      
+
       fputs ($imap_stream, sqimap_session_id() . " SELECT \"$mailbox\"\r\n");
              $read = sqimap_read_data($imap_stream, sqimap_session_id(), true, $response, $message);
       if ($recent) {
@@ -66,7 +63,7 @@
     ******************************************************************************/
    function sqimap_mailbox_create ($imap_stream, $mailbox, $type) {
       global $delimiter;
-      if (strtolower($type) == "noselect") {
+      if (strtolower($type) == 'noselect') {
          $mailbox = $mailbox.$delimiter;
       }
       fputs ($imap_stream, sqimap_session_id() . " CREATE \"$mailbox\"\r\n");