From 7350889b45590aee831ba1150ee94efb95b03992 Mon Sep 17 00:00:00 2001
From: philippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 26 Nov 2001 19:33:28 +0000
Subject: [PATCH] ** -> *

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1808 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/abook_database.php    | 56 ++++++++++++------------
 functions/abook_global_file.php | 34 +++++++--------
 functions/abook_ldap_server.php | 50 +++++++++++-----------
 functions/abook_local_file.php  | 38 ++++++++---------
 functions/addressbook.php       | 18 ++++----
 functions/array.php             | 21 ++++-----
 functions/attachment_common.php | 21 ++++-----
 functions/auth.php              | 20 ++++-----
 functions/constants.php         | 22 +++++-----
 functions/date.php              | 25 +++++------
 functions/db_prefs.php          | 60 +++++++++++++-------------
 functions/display_messages.php  | 20 ++++-----
 functions/gettext.php           | 26 +++++------
 functions/i18n.php              | 28 ++++++------
 functions/imap.php              | 20 ++++-----
 functions/imap_general.php      | 76 +++++++++++++--------------------
 functions/imap_mailbox.php      | 22 ++++------
 functions/imap_messages.php     | 19 +++++----
 functions/imap_search.php       | 18 ++++----
 functions/index.php             | 27 ++++++------
 functions/mailbox_display.php   | 20 ++++-----
 functions/mime.php              | 21 ++++-----
 functions/options.php           | 18 ++++----
 functions/page_header.php       | 19 +++++----
 functions/plugin.php            | 22 +++++-----
 functions/prefs.php             | 18 ++++----
 functions/smtp.php              | 23 +++++-----
 functions/strings.php           | 19 +++++----
 functions/tree.php              | 27 +++++++-----
 functions/url_parser.php        | 20 ++++-----
 30 files changed, 412 insertions(+), 416 deletions(-)

diff --git a/functions/abook_database.php b/functions/abook_database.php
index 3788bfe5..b5b2e001 100644
--- a/functions/abook_database.php
+++ b/functions/abook_database.php
@@ -1,34 +1,34 @@
 <?php {
    
    /**
-    **  abook_database.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Backend for personal addressbook stored in a database,
-    **  accessed using the DB-classes in PEAR.
-    **
-    **  IMPORTANT:  The PEAR modules must be in the include path
-    **  for this class to work.
-    **
-    **  An array with the following elements must be passed to
-    **  the class constructor (elements marked ? are optional):
-    **
-    **     dsn       => database DNS (see PEAR for syntax)
-    **     table     => table to store addresses in (must exist)
-    **     owner     => current user (owner of address data)
-    **   ? writeable => set writeable flag (true/false)
-    **
-    ** The table used should have the following columns:
-    **  owner, nickname, firstname, lastname, email, label
-    ** The pair (owner,nickname) should be unique (primary key).
-    **
-    **  NOTE. This class should not be used directly. Use the
-    **        "AddressBook" class instead.
-    **
-    ** $Id$
-    **/
+    *   abook_database.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   Backend for personal addressbook stored in a database,
+    *   accessed using the DB-classes in PEAR.
+    *
+    *   IMPORTANT:  The PEAR modules must be in the include path
+    *   for this class to work.
+    *
+    *   An array with the following elements must be passed to
+    *   the class constructor (elements marked ? are optional):
+    *
+    *      dsn       => database DNS (see PEAR for syntax)
+    *      table     => table to store addresses in (must exist)
+    *      owner     => current user (owner of address data)
+    *    ? writeable => set writeable flag (true/false)
+    *
+    *  The table used should have the following columns:
+    *   owner, nickname, firstname, lastname, email, label
+    *  The pair (owner,nickname) should be unique (primary key).
+    *
+    *   NOTE. This class should not be used directly. Use the
+    *         "AddressBook" class instead.
+    *
+    *  $Id$
+    */
    
    require_once('DB.php');
    
diff --git a/functions/abook_global_file.php b/functions/abook_global_file.php
index 2317948f..f1805425 100644
--- a/functions/abook_global_file.php
+++ b/functions/abook_global_file.php
@@ -1,23 +1,23 @@
 <?php
 
    /**
-    **  abook_local_file.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Backend for addressbook as a pipe separated file
-    **
-    **  An array with the following elements must be passed to
-    **  the class constructor (elements marked ? are optional):
-    **
-    **  NOTE. This class should not be used directly. Use the
-    **        "AddressBook" class instead.
-    **
-    **  Make sure you configure this before using it!
-    **
-    ** $Id$
-    **/
+    *   abook_local_file.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   Backend for addressbook as a pipe separated file
+    *
+    *   An array with the following elements must be passed to
+    *   the class constructor (elements marked ? are optional):
+    *
+    *   NOTE. This class should not be used directly. Use the
+    *         "AddressBook" class instead.
+    *
+    *   Make sure you configure this before using it!
+    *
+    *  $Id$
+    */
 
    class abook_global_file extends addressbook_backend {
      var $btype = 'local';
diff --git a/functions/abook_ldap_server.php b/functions/abook_ldap_server.php
index 33dee156..043f7336 100644
--- a/functions/abook_ldap_server.php
+++ b/functions/abook_ldap_server.php
@@ -1,31 +1,31 @@
 <?php
 
    /**
-    **  abook_ldap_server.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Address book backend for LDAP server
-    **
-    **  An array with the following elements must be passed to
-    **  the class constructor (elements marked ? are optional):
-    **
-    **     host      => LDAP server hostname/IP-address
-    **     base      => LDAP server root (base dn). Empty string allowed.
-    **   ? port      => LDAP server TCP port number (default: 389)
-    **   ? charset   => LDAP server charset (default: utf-8)
-    **   ? name      => Name for LDAP server (default "LDAP: hostname")
-    **                  Used to tag the result data
-    **   ? maxrows   => Maximum # of rows in search result
-    **   ? timeout   => Timeout for LDAP operations (in seconds, default: 30)
-    **                  Might not work for all LDAP libraries or servers.
-    **
-    **  NOTE. This class should not be used directly. Use the
-    **        "AddressBook" class instead.
-    **
-    ** $Id$
-    **/
+    *   abook_ldap_server.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   Address book backend for LDAP server
+    *
+    *   An array with the following elements must be passed to
+    *   the class constructor (elements marked ? are optional):
+    *
+    *      host      => LDAP server hostname/IP-address
+    *      base      => LDAP server root (base dn). Empty string allowed.
+    *    ? port      => LDAP server TCP port number (default: 389)
+    *    ? charset   => LDAP server charset (default: utf-8)
+    *    ? name      => Name for LDAP server (default "LDAP: hostname")
+    *                   Used to tag the result data
+    *    ? maxrows   => Maximum # of rows in search result
+    *    ? timeout   => Timeout for LDAP operations (in seconds, default: 30)
+    *                   Might not work for all LDAP libraries or servers.
+    *
+    *   NOTE. This class should not be used directly. Use the
+    *         "AddressBook" class instead.
+    *
+    *  $Id$
+    */
 
    class abook_ldap_server extends addressbook_backend {
      var $btype = 'remote';
diff --git a/functions/abook_local_file.php b/functions/abook_local_file.php
index b5c7c8d7..5dd93948 100644
--- a/functions/abook_local_file.php
+++ b/functions/abook_local_file.php
@@ -1,25 +1,25 @@
 <?php
 
    /**
-    **  abook_local_file.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Backend for addressbook as a pipe separated file
-    **
-    **  An array with the following elements must be passed to
-    **  the class constructor (elements marked ? are optional):
-    **
-    **     filename  => path to addressbook file
-    **   ? create    => if true: file is created if it does not exist.
-    **   ? umask     => umask set before opening file.
-    **
-    **  NOTE. This class should not be used directly. Use the
-    **        "AddressBook" class instead.
-    **
-    ** $Id$
-    **/
+    *   abook_local_file.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   Backend for addressbook as a pipe separated file
+    *
+    *   An array with the following elements must be passed to
+    *   the class constructor (elements marked ? are optional):
+    *
+    *      filename  => path to addressbook file
+    *    ? create    => if true: file is created if it does not exist.
+    *    ? umask     => umask set before opening file.
+    *
+    *   NOTE. This class should not be used directly. Use the
+    *         "AddressBook" class instead.
+    *
+    *  $Id$
+    */
 
    class abook_local_file extends addressbook_backend {
      var $btype = 'local';
diff --git a/functions/addressbook.php b/functions/addressbook.php
index 08246cd6..a2991d43 100644
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -1,15 +1,15 @@
 <?php
 
    /**
-    **  addressbook.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Functions and classes for the addressbook system.
-    **
-    **  $Id$
-    **/
+    *   addressbook.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   Functions and classes for the addressbook system.
+    *
+    *   $Id$
+    */
 
 
    // This is the path to the global site-wide addressbook.
diff --git a/functions/array.php b/functions/array.php
index ead0d55f..f65b8f86 100644
--- a/functions/array.php
+++ b/functions/array.php
@@ -1,15 +1,16 @@
 <?php
+
    /**
-    ** array.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    ** This contains functions that work with array manipulation.  They
-    ** will help sort, and do other types of things with arrays
-    **
-    **  $Id$
-    **/
+    *  array.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *  This contains functions that work with array manipulation.  They
+    *  will help sort, and do other types of things with arrays
+    *
+    *   $Id$
+    */
 
 
    function ary_sort($ary,$col, $dir = 1){
diff --git a/functions/attachment_common.php b/functions/attachment_common.php
index 5f99e301..b6b1dbf6 100644
--- a/functions/attachment_common.php
+++ b/functions/attachment_common.php
@@ -1,14 +1,15 @@
 <?php
-    /**
-    ** attachment_common.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    ** This file provides the handling of often-used attachment types.
-    **
-    ** $Id$
-    **/
+
+   /**
+    *  attachment_common.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *  This file provides the handling of often-used attachment types.
+    *
+    *  $Id$
+    */
 
   global $attachment_common_show_images_list;
   $attachment_common_show_images_list = array();
diff --git a/functions/auth.php b/functions/auth.php
index 5b3f31e5..47e6c04c 100644
--- a/functions/auth.php
+++ b/functions/auth.php
@@ -1,15 +1,15 @@
 <?php
 
-    /**
-    ** auth.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    ** Contains functions used to do authentication.
-    **
-    ** $Id$
-    **/
+   /**
+    *  auth.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *  Contains functions used to do authentication.
+    *
+    *  $Id$
+    */
 
     require_once( '../functions/page_header.php' );
 
diff --git a/functions/constants.php b/functions/constants.php
index 2a3620f8..e223c464 100644
--- a/functions/constants.php
+++ b/functions/constants.php
@@ -1,17 +1,17 @@
 <?php
 
     /**
-     ** constants.php
-     **
-     ** Copyright (c) 1999-2001 The SquirrelMail Development Team
-     ** Licensed under the GNU GPL. For full terms see the file COPYING.
-     **
-     ** Loads constants used by the rest of the Squirrelmail source.
-     ** This file is include by src/login.php, src/redirect.php and
-     ** src/load_prefs.php.
-     **
-     ** $Id$
-     **/
+     *  constants.php
+     *
+     *  Copyright (c) 1999-2001 The SquirrelMail Development Team
+     *  Licensed under the GNU GPL. For full terms see the file COPYING.
+     *
+     *  Loads constants used by the rest of the Squirrelmail source.
+     *  This file is include by src/login.php, src/redirect.php and
+     *  src/load_prefs.php.
+     *
+     *  $Id$
+     */
 
     /**************************************************************/
     /* Set values for constants used by Squirrelmail preferences. */
diff --git a/functions/date.php b/functions/date.php
index 4ed0426a..82e2ee65 100644
--- a/functions/date.php
+++ b/functions/date.php
@@ -1,17 +1,18 @@
 <?php
+
    /**
-    **  date.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Takes a date and parses it into a usable format.  The form that a
-    **  date SHOULD arrive in is:
-    **        <Tue,> 29 Jun 1999 09:52:11 -0500 (EDT)
-    **  (as specified in RFC 822) -- 'Tue' is optional
-    **
-    **  $Id$
-    **/
+    *   date.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   Takes a date and parses it into a usable format.  The form that a
+    *   date SHOULD arrive in is:
+    *         <Tue,> 29 Jun 1999 09:52:11 -0500 (EDT)
+    *   (as specified in RFC 822) -- 'Tue' is optional
+    *
+    *   $Id$
+    */
 
    // corrects a time stamp to be the local time
    function getGMTSeconds($stamp, $gmt) {
diff --git a/functions/db_prefs.php b/functions/db_prefs.php
index b4f07f5d..5243649f 100644
--- a/functions/db_prefs.php
+++ b/functions/db_prefs.php
@@ -1,35 +1,35 @@
 <?php
    /**
-    **  db_prefs.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  This contains functions for manipulating user preferences
-    **  stored in a database, accessed though the Pear DB layer.
-    **
-    **  To use this instead of the regular prefs.php, create a 
-    **  database as described below, and replace prefs.php
-    **  with this file.
-    **
-    **  Database:
-    **  ---------
-    **
-    **  The preferences table should have tree columns:
-    **     username   char  \  primary
-    **     prefkey    char  /  key
-    **     prefval    blob
-    **
-    **    CREATE TABLE userprefs (user CHAR(32) NOT NULL DEFAULT '', 
-    **                            prefkey CHAR(64) NOT NULL DEFAULT '', 
-    **                            prefval BLOB NOT NULL DEFAULT '', 
-    **                            primary key (user,prefkey));
-    **
-    **  Configuration of databasename, username and password is done
-    **  by changing $DSN below.
-    **
-    **  $Id$
-    **/
+    *   db_prefs.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   This contains functions for manipulating user preferences
+    *   stored in a database, accessed though the Pear DB layer.
+    *
+    *   To use this instead of the regular prefs.php, create a
+    *   database as described below, and replace prefs.php
+    *   with this file.
+    *
+    *   Database:
+    *   ---------
+    *
+    *   The preferences table should have tree columns:
+    *      username   char  \  primary
+    *      prefkey    char  /  key
+    *      prefval    blob
+    *
+    *     CREATE TABLE userprefs (user CHAR(32) NOT NULL DEFAULT '',
+    *                             prefkey CHAR(64) NOT NULL DEFAULT '',
+    *                             prefval BLOB NOT NULL DEFAULT '',
+    *                             primary key (user,prefkey));
+    *
+    *   Configuration of databasename, username and password is done
+    *   by changing $DSN below.
+    *
+    *   $Id$
+    */
 
    require_once('DB.php');
 
diff --git a/functions/display_messages.php b/functions/display_messages.php
index e59a3c46..06e35287 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -1,16 +1,16 @@
 <?php
 
    /**
-    **  display_messages.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  This contains all messages, including information, error, and just
-    **  about any other message you can think of.
-    **
-    ** $Id$
-    **/
+    *   display_messages.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   This contains all messages, including information, error, and just
+    *   about any other message you can think of.
+    *
+    *  $Id$
+    */
 
     function error_username_password_incorrect($color) {
 
diff --git a/functions/gettext.php b/functions/gettext.php
index 48fec079..6d18d8e5 100644
--- a/functions/gettext.php
+++ b/functions/gettext.php
@@ -1,19 +1,19 @@
 <?PHP
 
    /**
-    **  gettext.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Alternate to the system's built-in gettext.
-    **  relies on .po files (can't read .mo easily).
-    **  Uses the session for caching (speed increase)
-    **  Possible use in other PHP scripts?  The only SM-specific thing is
-    **    $sm_language, I think
-    **
-    ** $Id$
-    **/
+    *   gettext.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   Alternate to the system's built-in gettext.
+    *   relies on .po files (can't read .mo easily).
+    *   Uses the session for caching (speed increase)
+    *   Possible use in other PHP scripts?  The only SM-specific thing is
+    *     $sm_language, I think
+    *
+    *  $Id$
+    */
 
    global $gettext_php_domain, $gettext_php_dir, $gettext_php_loaded,
       $gettext_php_translateStrings, $gettext_php_loaded_language,
diff --git a/functions/i18n.php b/functions/i18n.php
index aa1fe21d..2ce457b1 100644
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -1,19 +1,19 @@
 <?php
 
-    /**
-    ** i18n.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    ** This file contains variuos functions that are needed to do
-    ** internationalization of SquirrelMail.
-    **
-    ** Internally the output character set is used. Other characters are
-    ** encoded using Unicode entities according to HTML 4.0.
-    **
-    ** $Id$
-    **/
+   /**
+    *  i18n.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *  This file contains variuos functions that are needed to do
+    *  internationalization of SquirrelMail.
+    *
+    *  Internally the output character set is used. Other characters are
+    *  encoded using Unicode entities according to HTML 4.0.
+    *
+    *  $Id$
+    */
 
    global $squirrelmail_language, $languages;
    if (! isset($squirrelmail_language)) { $squirrelmail_language = ''; }
diff --git a/functions/imap.php b/functions/imap.php
index 9a3a41d2..7930cf6e 100644
--- a/functions/imap.php
+++ b/functions/imap.php
@@ -1,16 +1,16 @@
 <?php
 
    /**
-    **  imap.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  This just includes the different sections of the imap functions.
-    **  They have been organized into these sections for simplicity sake.
-    **
-    **  $Id$
-    **/
+    *   imap.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   This just includes the different sections of the imap functions.
+    *   They have been organized into these sections for simplicity sake.
+    *
+    *   $Id$
+    */
 
    $imap_backend = 'imap';
 
diff --git a/functions/imap_general.php b/functions/imap_general.php
index b5576283..1826d912 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -1,33 +1,34 @@
 <?php
 
    /**
-    **  imap.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.    
-    **
-    **  This implements all functions that do general imap functions.
-    **
-    **  $Id$
-    **/
-
-global $imap_general_debug;
-$imap_general_debug = false;
-
-   /******************************************************************************
-    **  Sets an unique session id in order to avoid simultanous sessions crash.
-    ******************************************************************************/
-
-   function sqimap_session_id() {
-      if (session_id() != '')
-         return substr(session_id(), -4);
-	 
-      global $RememberedSessionID;
-      
-      if (! isset($RememberedSessionID))
-         $RememberedSessionID = GenerateRandomString(4, '', 7);
-	 
-      return $RememberedSessionID;
+    *   imap.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   This implements all functions that do general imap functions.
+    *
+    *   $Id$
+    */
+
+    /**
+    * Unique SessionId
+    *
+    * Sets an unique session id in order to avoid simultanous sessions crash.
+    *
+    * @return	string	a 4 chars unique string
+    */
+    function sqimap_session_id() {
+
+        if (session_id() == '')
+            global $RememberedSessionID;
+
+            if (! isset($RememberedSessionID))
+                $RememberedSessionID = GenerateRandomString(4, '', 7);
+        else
+            $RememberedSessionID = substr(session_id(), -4);
+
+        return( $RememberedSessionID );
    }
 
 
@@ -40,11 +41,10 @@ $imap_general_debug = false;
    function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,
                                    &$response, &$message) {
       global $color, $squirrelmail_language;
-      global $imap_general_debug;
 
       $read = '';
       $resultlist = array();
-      
+
       $more_msgs = true;
       while ($more_msgs) {
          $data = array();
@@ -57,13 +57,6 @@ $imap_general_debug = false;
             $size = $regs[1];
          } else if (ereg("^\\* [0-9]+ FETCH", $read, $regs)) {
             // Sizeless response, probably single-line
-
-            // For debugging purposes
-            if ($imap_general_debug) {
-                echo "<small><tt><font color=\"#CC0000\">$read</font></tt></small><br>\n";
-                flush();
-            }
-
             $size = -1;
             $data[] = $read;
             $read = fgets($imap_stream, 9096);
@@ -74,13 +67,6 @@ $imap_general_debug = false;
             while (strpos($read, "\n") === false) {
                $read .= fgets($imap_stream, 9096);
             }
-
-            // For debugging purposes
-            if ($imap_general_debug) {
-                echo "<small><tt><font color=\"#CC0000\">$read</font></tt></small><br>\n";
-                flush();
-            }
-
             // If we know the size, no need to look at the end parameters
             if ($size > 0) {
                if ($total_size == $size) {
@@ -121,7 +107,6 @@ $imap_general_debug = false;
       $response = $regs[1];
       $message = trim($regs[2]);
       
-      if ($imap_general_debug) { echo '--<br>'; }
       if ($handle_errors == false) { return $resultlist; }
      
       if ($response == 'NO') {
@@ -263,7 +248,6 @@ $imap_general_debug = false;
 
    function sqimap_capability($imap_stream, $capability) {
         global $sqimap_capabilities;
-global $imap_general_debug;
 
         if (!is_array($sqimap_capabilities)) {
             fputs ($imap_stream, sqimap_session_id() . " CAPABILITY\r\n");
@@ -287,7 +271,7 @@ global $imap_general_debug;
     **  Returns the delimeter between mailboxes:  INBOX/Test, or INBOX.Test... 
     ******************************************************************************/
    function sqimap_get_delimiter ($imap_stream = false) {
-global $imap_general_debug;
+
       global $sqimap_delimiter;
       global $optional_delimiter;
 
diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 5d8db156..031ccc43 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -1,19 +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 
diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 59e948a5..d31f6272 100755
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -1,14 +1,15 @@
 <?php
+
    /**
-    **  imap_messages.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  This implements functions that manipulate messages
-    **
-    **  $Id$
-    **/
+    *   imap_messages.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   This implements functions that manipulate messages
+    *
+    *   $Id$
+    */
 
    /******************************************************************************
     **  Copies specified messages to specified folder
diff --git a/functions/imap_search.php b/functions/imap_search.php
index e7b432f4..d22f80dc 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -1,15 +1,15 @@
 <?php
 
    /**
-    **  imap_search.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  IMAP search routines
-    **
-    ** $Id$
-    **/
+    *   imap_search.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   IMAP search routines
+    *
+    *  $Id$
+    */
 
 
     require_once('../functions/imap.php');
diff --git a/functions/index.php b/functions/index.php
index ac36ecda..28bb0695 100644
--- a/functions/index.php
+++ b/functions/index.php
@@ -1,17 +1,18 @@
 <?php
-    /**
-    ** index.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  This file simply takes any attempt to view source files
-    **  and sends those people to the login screen. At this
-    **  point no attempt is made to see if the person is logged
-    **  or not.
-    **
-    **  $Id$
-    **/
+
+   /**
+    *  index.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   This file simply takes any attempt to view source files
+    *   and sends those people to the login screen. At this
+    *   point no attempt is made to see if the person is logged
+    *   or not.
+    *
+    *   $Id$
+    */
 
     header("Location:../index.php");
 
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index a819fa1b..4c681914 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -1,16 +1,16 @@
 <?php
 
    /**
-    **  mailbox_display.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  This contains functions that display mailbox information, such as the
-    **  table row that has sender, date, subject, etc...
-    **
-    **  $Id$
-    **/
+    *   mailbox_display.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   This contains functions that display mailbox information, such as the
+    *   table row that has sender, date, subject, etc...
+    *
+    *   $Id$
+    */
 
    define('PG_SEL_MAX', 10);  /* Default value for page_selector_max. */
 
diff --git a/functions/mime.php b/functions/mime.php
index c8dcda3e..05a340ab 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -1,15 +1,16 @@
 <?php
 
-   /** mime.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    ** This contains the functions necessary to detect and decode MIME
-    ** messages.
-    **
-    ** $Id$
-    **/
+   /**
+    *  mime.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *  This contains the functions necessary to detect and decode MIME
+    *  messages.
+    *
+    *  $Id$
+    */
 
    require_once('../functions/imap.php');
    require_once('../functions/attachment_common.php');
diff --git a/functions/options.php b/functions/options.php
index e1de4e73..3ee2b624 100644
--- a/functions/options.php
+++ b/functions/options.php
@@ -1,15 +1,15 @@
 <?php
 
     /**
-     ** options.php
-     **
-     ** Copyright (c) 1999-2001 The Squirrelmail Development Team
-     ** Licensed under the GNU GPL. For full terms see the file COPYING.
-     **
-     ** Functions needed to display the options pages.
-     **
-     ** $Id$
-     **/
+     *  options.php
+     *
+     *  Copyright (c) 1999-2001 The Squirrelmail Development Team
+     *  Licensed under the GNU GPL. For full terms see the file COPYING.
+     *
+     *  Functions needed to display the options pages.
+     *
+     *  $Id$
+     */
 
 /**********************************************/
 /* Define constants used in the options code. */
diff --git a/functions/page_header.php b/functions/page_header.php
index c6a1f4b0..189eff2c 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -1,14 +1,15 @@
 <?php
+
    /**
-    **  page_header.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Prints the page header (duh)
-    **
-    **  $Id$
-    **/
+    *   page_header.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   Prints the page header (duh)
+    *
+    *   $Id$
+    */
 
    // Always set up the language before calling these functions
 
diff --git a/functions/plugin.php b/functions/plugin.php
index bb77c068..59e8d2e9 100644
--- a/functions/plugin.php
+++ b/functions/plugin.php
@@ -1,17 +1,17 @@
 <?php
 
    /**
-    **  plugin.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  This file provides the framework for a plugin architecture.
-    **
-    **  Documentation on how to write plugins might show up some time.
-    **
-    **  $Id$
-    **/
+    *   plugin.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   This file provides the framework for a plugin architecture.
+    *
+    *   Documentation on how to write plugins might show up some time.
+    *
+    *   $Id$
+    */
 
     global $squirrelmail_plugin_hooks;
 
diff --git a/functions/prefs.php b/functions/prefs.php
index 1b70943c..5ecf530f 100644
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -1,15 +1,15 @@
 <?php
 
    /**
-    **  prefs.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  This contains functions for manipulating user preferences
-    **
-    **  $Id$
-    **/
+    *   prefs.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   This contains functions for manipulating user preferences
+    *
+    *   $Id$
+    */
 
    global $prefs_are_cached, $prefs_cache;
    if (!session_is_registered('prefs_are_cached')) {
diff --git a/functions/smtp.php b/functions/smtp.php
index 221ae0ec..78b983cd 100644
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -1,15 +1,16 @@
 <?php
 
-   /** smtp.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    ** This contains all the functions needed to send messages through
-    ** an smtp server or sendmail.
-    **
-    ** $Id$
-    **/
+   /**
+    *   smtp.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *  This contains all the functions needed to send messages through
+    *  an smtp server or sendmail.
+    *
+    *  $Id$
+    */
 
    require_once('../functions/addressbook.php');
    require_once('../functions/plugin.php');
@@ -20,7 +21,7 @@
    if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) {
       $popuser = $usernamedata[1];
       $domain  = $usernamedata[2];
-	  unset($usernamedata);
+      unset($usernamedata);
    } else {
       $popuser = $username;
    }
diff --git a/functions/strings.php b/functions/strings.php
index a9d8c063..291c52ed 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -1,14 +1,15 @@
 <?php
+
    /**
-    **  strings.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  This code provides various string manipulation functions that are
-    **  used by the rest of the Squirrelmail code.
-    **
-    **  $Id$
+    *   strings.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   This code provides various string manipulation functions that are
+    *   used by the rest of the Squirrelmail code.
+    *
+    *   $Id$
     */
 
    /**
diff --git a/functions/tree.php b/functions/tree.php
index 6265e15f..d785fef7 100644
--- a/functions/tree.php
+++ b/functions/tree.php
@@ -1,20 +1,27 @@
 <?php
 
    /**
-    **  tree.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  This code provides various string manipulation functions that are
-    **  used by the rest of the Squirrelmail code.
-    **
-    **  $Id$
+    *   tree.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   This code provides various string manipulation functions that are
+    *   used by the rest of the Squirrelmail code.
+    *
+    *   $Id$
     */
 
    require_once('../functions/imap.php');
 
-   // Recursive function to find the correct parent for a new node
+    /**
+    * findParentForChild
+    *
+    * Recursive function to find the correct parent for a new node
+    *
+    * @copyright    1999-2001 The Squirrelmail Development Team
+    */
+
    function findParentForChild($value, $treeIndexToStart, $tree) {
       // is $value in $tree[$treeIndexToStart]['value']
       if ((isset($tree[$treeIndexToStart])) && (strstr($value, $tree[$treeIndexToStart]['value']))) {
diff --git a/functions/url_parser.php b/functions/url_parser.php
index 4a832a2d..c9ee4862 100644
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -1,16 +1,16 @@
 <?php
 
    /**
-    **  url_parser.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  This code provides various string manipulation functions that are
-    **  used by the rest of the Squirrelmail code.
-    **
-    **  $Id$
-    **/
+    *  url_parser.php
+    *
+    *  Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *  Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *  This code provides various string manipulation functions that are
+    *  used by the rest of the Squirrelmail code.
+    *
+    *  $Id$
+    */
 
    function replaceBlock (&$in, $replace, $start, $end) {
       $begin = substr($in,0,$start);
-- 
2.25.1