SquirrelMail

Revision: 12824
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12824&view=rev
Author:   kink
Date:     2007-12-16 07:25:34 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
give an error when trying to enable a nonexistent plugin
through the conf.pl commandline, thanks Tomas Kuliavas.

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/config/conf.pl

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2007-12-16 15:24:23 UTC (rev 12823)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2007-12-16 15:25:34 UTC (rev 12824)
@@ -5,6 +5,7 @@
 Version 1.4.14 - SVN
 --------------------
   - Added support for Macedonian.
+  - Don't allow invalid plugin names in conf.pl --install-plugin
 
 Version 1.4.13 - 14 December 2007
 ---------------------------------

Modified: branches/SM-1_4-STABLE/squirrelmail/config/conf.pl
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/config/conf.pl	2007-12-16 15:24:23 UTC (rev 12823)
+++ branches/SM-1_4-STABLE/squirrelmail/config/conf.pl	2007-12-16 15:25:34 UTC (rev 12824)
@@ -354,9 +354,14 @@
 
 if ( $ARGV[0] eq '--install-plugin' ) {
     print "Activating plugin " . $ARGV[1] . "\n";
-    push @plugins, $ARGV[1];
-    save_data();
-    exit(0);
+    if ( -d "../plugins/" . $ARGV[1]) {
+        push @plugins, $ARGV[1];
+        save_data();
+        exit(0);
+    } else {
+        print "No such plugin.\n";
+        exit(1);
+    }
 } elsif ( $ARGV[0] eq '--remove-plugin' ) {
     print "Removing plugin " . $ARGV[1] . "\n";
     foreach $plugin (@plugins) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12825
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12825&view=rev
Author:   kink
Date:     2007-12-16 07:58:45 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
Fix warning in Printer Friendly due to missing include (#1849101).

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/functions/mime.php
    branches/SM-1_4-STABLE/squirrelmail/functions/url_parser.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2007-12-16 15:25:34 UTC (rev 12824)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2007-12-16 15:58:45 UTC (rev 12825)
@@ -6,6 +6,7 @@
 --------------------
   - Added support for Macedonian.
   - Don't allow invalid plugin names in conf.pl --install-plugin
+  - Fix warning in Printer Friendly due to missing include (#1849101).
 
 Version 1.4.13 - 14 December 2007
 ---------------------------------

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php	2007-12-16 15:25:34 UTC (rev 12824)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php	2007-12-16 15:58:45 UTC (rev 12825)
@@ -2190,7 +2190,7 @@
  */
 function magicHTML($body, $id, $message, $mailbox = 'INBOX', $take_mailto_links =true) {
 
-    // require_once(SM_PATH . 'functions/url_parser.php');  // for $MailTo_PReg_Match
+    require_once(SM_PATH . 'functions/url_parser.php');  // for $MailTo_PReg_Match
 
     global $attachment_common_show_images, $view_unsafe_images,
            $has_unsafe_images;
@@ -2511,4 +2511,3 @@
 
 }  // end fn SendDownloadHeaders
 
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/url_parser.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/url_parser.php	2007-12-16 15:25:34 UTC (rev 12824)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/url_parser.php	2007-12-16 15:58:45 UTC (rev 12825)
@@ -242,4 +242,3 @@
     }
     return $ret;
 }
-?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12827
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12827&view=rev
Author:   kink
Date:     2007-12-16 08:37:21 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
Let configtest.php use optional PEAR dynamic extension loading,
patch by Walter Huijbers (#1833123).

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/src/configtest.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2007-12-16 16:34:55 UTC (rev 12826)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2007-12-16 16:37:21 UTC (rev 12827)
@@ -7,6 +7,8 @@
   - Added support for Macedonian.
   - Don't allow invalid plugin names in conf.pl --install-plugin
   - Fix warning in Printer Friendly due to missing include (#1849101).
+  - Let configtest.php use optional PEAR dynamic extension loading,
+    patch by Walter Huijbers (#1833123).
 
 Version 1.4.13 - 14 December 2007
 ---------------------------------

Modified: branches/SM-1_4-STABLE/squirrelmail/src/configtest.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/configtest.php	2007-12-16 16:34:55 UTC (rev 12826)
+++ branches/SM-1_4-STABLE/squirrelmail/src/configtest.php	2007-12-16 16:37:21 UTC (rev 12827)
@@ -157,8 +157,15 @@
     do_err('Required PHP extensions missing: '.implode(', ',$diff) );
 }
 
-echo $IND . "PHP extensions OK.<br />\n";
+echo $IND . "PHP extensions OK. Dynamic loading is ";
 
+if (!(bool)ini_get('enable_dl') || (bool)ini_get('safe_mode')) {
+    echo "disabled.<br />\n";
+} else {
+    echo "enabled.<br />\n";
+}
+
+
 /* dangerous php settings */
 /** mbstring.func_overload<>0 fix. See cvs HEAD comments. */
 if (function_exists('mb_internal_encoding') &&
@@ -520,22 +527,28 @@
         foreach($dsns as $type => $dsn) {
             $aDsn = explode(':', $dsn);
             $dbtype = array_shift($aDsn);
+
             if(isset($db_functions[$dbtype]) && function_exists($db_functions[$dbtype])) {
                 echo "$IND$dbtype database support present.<br />\n";
+            } elseif(!(bool)ini_get('enable_dl') || (bool)ini_get('safe_mode')) {
+                do_err($dbtype.' database support not present!');
+            } else {
+                // Non-fatal error
+                do_err($dbtype.' database support not present or not configured!
+                    Trying to dynamically load '.$dbtype.' extension.
+                    Please note that it is advisable to not rely on dynamic loading of extensions.', FALSE);
+            }
 
-                // now, test this interface:
 
-                $dbh = DB::connect($dsn, true);
-                if (DB::isError($dbh)) {
-                    do_err('Database error: '. htmlspecialchars(DB::errorMessage($dbh)) .
-                            ' in ' .$type .' DSN.');
-                }
-                $dbh->disconnect();
-                echo "$IND$type database connect successful.<br />\n";
+            // now, test this interface:
 
-            } else {
-                do_err($dbtype.' database support not present!');
+            $dbh = DB::connect($dsn, true);
+            if (DB::isError($dbh)) {
+                do_err('Database error: '. htmlspecialchars(DB::errorMessage($dbh)) .
+                        ' in ' .$type .' DSN.');
             }
+            $dbh->disconnect();
+            echo "$IND$type database connect successful.<br />\n";
         }
     } else {
         $db_error='Required PHP PEAR DB support is not available.'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12830
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12830&view=rev
Author:   pdontthink
Date:     2007-12-19 00:23:46 -0800 (Wed, 19 Dec 2007)

Log Message:
-----------
Refactor how IMAP messages are "sent"

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php
    branches/SM-1_4-STABLE/squirrelmail/src/compose.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2007-12-17 15:58:12 UTC (rev 12829)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2007-12-19 08:23:46 UTC (rev 12830)
@@ -9,6 +9,7 @@
   - Fix warning in Printer Friendly due to missing include (#1849101).
   - Let configtest.php use optional PEAR dynamic extension loading,
     patch by Walter Huijbers (#1833123).
+  - Fix for IMAP servers that were having problems saving sent messages
 
 Version 1.4.13 - 14 December 2007
 ---------------------------------

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2007-12-17 15:58:12 UTC (rev 12829)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2007-12-19 08:23:46 UTC (rev 12830)
@@ -33,6 +33,11 @@
      *
      * @param Message  $message      Message object to send
      * @param resource $stream       Handle to the SMTP stream
+     *                               (when FALSE, nothing will be
+     *                               written to the stream; this can
+     *                               be used to determine the actual
+     *                               number of bytes that will be 
+     *                               written to the stream)
      * @param string   $reply_id     Identifies message being replied to
      *                               (OPTIONAL; caller should ONLY specify
      *                               a value for this when the message
@@ -42,10 +47,17 @@
      *                               message inside another (OPTIONAL; caller
      *                               should ONLY specify a value for this 
      *                               when the message being sent is a reply)
+     * @param mixed    $extra        Any implementation-specific variables
+     *                               can be passed in here and used in
+     *                               an overloaded version of this method
+     *                               if needed.
      *
-     * @return integer $raw_length
+     * @return integer $raw_length The number of bytes written (or that would 
+     *                             have been written) to the output stream
      */
-    function mail($message, $stream=false, $reply_id=0, $reply_ent_id=0) {
+    function mail($message, $stream=false, $reply_id=0, $reply_ent_id=0, 
+                  $extra=NULL) {
+
         $rfc822_header = $message->rfc822_header;
         if (count($message->entities)) {
             $boundary = $this->mimeBoundary();
@@ -61,7 +73,8 @@
         if ($reply_id) {
             global $imapConnection, $username, $key, $imapServerAddress, 
                    $imapPort, $mailbox;
-            if (!$imapConnection)
+
+            if (!is_resource($imapConnection))
                 $imapConnection = sqimap_login($username, $key, 
                                                $imapServerAddress, $imapPort, 0);
 
@@ -89,12 +102,43 @@
                              ? $message->reply_rfc822_header : '');
         $header = $this->prepareRFC822_Header($rfc822_header, $reply_rfc822_header, $raw_length);
 
+        $this->send_mail($message, $header, $boundary, $stream, $raw_length, $extra);
+
+        return $raw_length;
+    }
+
+    /**
+     * function send_mail - send the message parts to the IMAP stream
+     *
+     * @param Message  $message      Message object to send
+     * @param string   $header       Headers ready to send
+     * @param string   $boundary     Message parts boundary
+     * @param resource $stream       Handle to the SMTP stream
+     *                               (when FALSE, nothing will be
+     *                               written to the stream; this can
+     *                               be used to determine the actual
+     *                               number of bytes that will be
+     *                               written to the stream)
+     * @param int     &$raw_length   The number of bytes written (or that
+     *                               would have been written) to the 
+     *                               output stream - NOTE that this is
+     *                               passed by reference
+     * @param mixed    $extra        Any implementation-specific variables
+     *                               can be passed in here and used in
+     *                               an overloaded version of this method
+     *                               if needed.
+     *
+     * @return void
+     *
+     */
+    function send_mail($message, $header, $boundary, $stream=false, 
+                       &$raw_length, $extra=NULL) {
+
         if ($stream) {
             $this->preWriteToStream($header);
             $this->writeToStream($stream, $header);
         }
         $this->writeBody($message, $stream, $raw_length, $boundary);
-        return $raw_length;
     }
 
     /**
@@ -105,6 +149,11 @@
      *
      * @param Message   $message      Message object to transform
      * @param resource  $stream       SMTP output stream
+     *                                (when FALSE, nothing will be
+     *                                written to the stream; this can
+     *                                be used to determine the actual
+     *                                number of bytes that will be 
+     *                                written to the stream)
      * @param integer  &$length_raw   raw length of the message (part)
      *                                as returned by mail fn
      * @param string    $boundary     custom boundary to call, usually for subparts
@@ -163,6 +212,11 @@
      *
      * @param Message   $message      Message object to transform
      * @param resource  $stream       SMTP output stream
+     *                                (when FALSE, nothing will be
+     *                                written to the stream; this can
+     *                                be used to determine the actual
+     *                                number of bytes that will be 
+     *                                written to the stream)
      * @param integer  &$length       length of the message part
      *                                as returned by mail fn
      *
@@ -853,4 +907,3 @@
     }
 }
 
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php	2007-12-17 15:58:12 UTC (rev 12829)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_IMAP.class.php	2007-12-19 08:23:46 UTC (rev 12830)
@@ -25,8 +25,59 @@
        return true;
     }
 
+    /**
+     * function send_mail - send the message parts to the IMAP stream
+     *
+     * Overridden from parent class so that we can insert some 
+     * IMAP APPEND commands before and after the message is 
+     * sent on the IMAP stream.
+     *
+     * @param Message  $message      Message object to send
+     * @param string   $header       Headers ready to send
+     * @param string   $boundary     Message parts boundary
+     * @param resource $stream       Handle to the SMTP stream
+     *                               (when FALSE, nothing will be
+     *                               written to the stream; this can
+     *                               be used to determine the actual
+     *                               number of bytes that will be
+     *                               written to the stream)
+     * @param int     &$raw_length   The number of bytes written (or that
+     *                               would have been written) to the 
+     *                               output stream - NOTE that this is
+     *                               passed by reference
+     * @param string   $folder       The IMAP folder to which the 
+     *                               message is being sent
+     *
+     * @return void
+     *
+     */
+    function send_mail($message, $header, $boundary, $stream=false, 
+                       &$raw_length, $folder) {
+
+        // write the body without providing a stream so we
+        // can calculate the final length - after this call,
+        // $final_length will be our correct final length value
+        //
+        $final_length = $raw_length;
+        $this->writeBody($message, 0, $final_length, $boundary);
+
+
+        // now if we have a real live stream, send the message
+        //
+        if ($stream) {
+            sqimap_append ($stream, $folder, $final_length);
+
+            $this->preWriteToStream($header);
+            $this->writeToStream($stream, $header);
+            $this->writeBody($message, $stream, $raw_length, $boundary);
+
+            sqimap_append_done ($stream, $folder);
+        }
+
+    }
+
+
     /* to do: finishing the imap-class so the initStream function can call the
        imap-class */
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/src/compose.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2007-12-17 15:58:12 UTC (rev 12829)
+++ branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2007-12-19 08:23:46 UTC (rev 12830)
@@ -1577,16 +1577,12 @@
         $stream = $deliver->initStream($composeMessage,$sendmail_path);
     } elseif ($draft) {
         global $draft_folder;
-        require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
         $imap_stream = sqimap_login($username, $key, $imapServerAddress,
                 $imapPort, 0);
         if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) {
             require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
             $imap_deliver = new Deliver_IMAP();
-            $length = $imap_deliver->mail($composeMessage, 0, $reply_id, $reply_ent_id);
-            sqimap_append ($imap_stream, $draft_folder, $length);
-            $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id);
-            sqimap_append_done ($imap_stream, $draft_folder);
+            $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $draft_folder);
             sqimap_logout($imap_stream);
             unset ($imap_deliver);
             $composeMessage->purgeAttachments();
@@ -1644,11 +1640,9 @@
         }
 
         if (($fld_sent && $svr_allow_sent && !$lcl_allow_sent) || ($fld_sent && $lcl_allow_sent)) {
-            sqimap_append ($imap_stream, $sent_folder, $length);
             require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
             $imap_deliver = new Deliver_IMAP();
-            $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id);
-            sqimap_append_done ($imap_stream, $sent_folder);
+            $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $sent_folder);
             unset ($imap_deliver);
         }
         $composeMessage->purgeAttachments();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12909
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12909&view=rev
Author:   pdontthink
Date:     2008-01-30 12:08:23 -0800 (Wed, 30 Jan 2008)

Log Message:
-----------
Add "alreadyFocused" functionality to login page

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/forms.php
    branches/SM-1_4-STABLE/squirrelmail/src/login.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/forms.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/forms.php	2008-01-30 08:42:31 UTC (rev 12908)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/forms.php	2008-01-30 20:08:23 UTC (rev 12909)
@@ -31,8 +31,8 @@
 /**
  * Password input field
  */
-function addPwField($name , $value = null) {
-    return addInputField('password', $name , $value);
+function addPwField($name , $value = null, $extra_attributes='') {
+    return addInputField('password', $name , $value, $extra_attributes);
 }
 
 
@@ -62,17 +62,16 @@
 /**
  * An input textbox.
  */
-function addInput($name, $value = '', $size = 0, $maxlength = 0) {
+function addInput($name, $value = '', $size = 0, $maxlength = 0, $extra_attributes='') {
 
-    $attr = '';
     if ($size) {
-        $attr.= ' size="'.(int)$size.'"';
+        $extra_attributes .= ' size="'.(int)$size.'"';
     }
     if ($maxlength) {
-        $attr.= ' maxlength="'.(int)$maxlength .'"';
+        $extra_attributes .= ' maxlength="'.(int)$maxlength .'"';
     }
 
-    return addInputField('text', $name, $value, $attr);
+    return addInputField('text', $name, $value, $extra_attributes);
 }
 
 
@@ -148,4 +147,4 @@
         $enctype . $name . $charset . ">\n";
 }
 
-?>
\ No newline at end of file
+?>

Modified: branches/SM-1_4-STABLE/squirrelmail/src/login.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/login.php	2008-01-30 08:42:31 UTC (rev 12908)
+++ branches/SM-1_4-STABLE/squirrelmail/src/login.php	2008-01-30 20:08:23 UTC (rev 12909)
@@ -122,8 +122,10 @@
 
 $header = "<script language=\"JavaScript\" type=\"text/javascript\">\n" .
           "<!--\n".
+          "  var alreadyFocused = false;\n".
           "  function squirrelmail_loginpage_onload() {\n".
           "    document.forms[0].js_autodetect_results.value = '" . SMPREF_JS_ON . "';\n".
+          "    if (alreadyFocused) return;\n".
           "    var textElements = 0;\n".
           "    for (i = 0; i < document.forms[0].elements.length; i++) {\n".
           "      if (document.forms[0].elements[i].type == \"text\" || document.forms[0].elements[i].type == \"password\") {\n".
@@ -210,7 +212,7 @@
                                     _("Name:") ,
                                 'right', '', 'width="30%"' ) .
                                 html_tag( 'td',
-				    addInput($username_form_name, $loginname_value),
+				    addInput($username_form_name, $loginname_value, 0, 0, ' onfocus="alreadyFocused=true;"'),
                                 'left', '', 'width="70%"' )
                                 ) . "\n" .
                             html_tag( 'tr',
@@ -218,7 +220,7 @@
                                     _("Password:") ,
                                 'right', '', 'width="30%"' ) .
                                 html_tag( 'td',
-				    addPwField($password_form_name).
+				    addPwField($password_form_name, null, ' onfocus="alreadyFocused=true;"').
 				    addHidden('js_autodetect_results', SMPREF_JS_OFF).
                     $mailtofield . 
 				    addHidden('just_logged_in', '1'),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12920
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12920&view=rev
Author:   pdontthink
Date:     2008-02-06 00:13:41 -0800 (Wed, 06 Feb 2008)

Log Message:
-----------
Make message ID available after message is sent.  Not the best solution, but it's smallish and SM design doesn't suit very well

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
    branches/SM-1_4-STABLE/squirrelmail/src/compose.php

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2008-02-06 08:13:33 UTC (rev 12919)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2008-02-06 08:13:41 UTC (rev 12920)
@@ -29,6 +29,13 @@
 class Deliver {
 
     /**
+     * Most recently calculated Message-ID
+     * External code should NEVER access this directly!
+     * @var string
+     */
+    var $message_id;
+
+    /**
      * function mail - send the message parts to the SMTP stream
      *
      * @param Message  $message      Message object to send
@@ -52,8 +59,12 @@
      *                               an overloaded version of this method
      *                               if needed.
      *
-     * @return integer $raw_length The number of bytes written (or that would 
-     *                             have been written) to the output stream
+     * @return array An array containing at least these elements in this order:
+     *                  - The number of bytes written (or that would have been
+     *                    written) to the output stream
+     *                  - The message ID (WARNING: if $stream is FALSE, this
+     *                    may not be supplied, or may not be accurate)
+     *
      */
     function mail($message, $stream=false, $reply_id=0, $reply_ent_id=0, 
                   $extra=NULL) {
@@ -104,7 +115,7 @@
 
         $this->send_mail($message, $header, $boundary, $stream, $raw_length, $extra);
 
-        return $raw_length;
+        return array($raw_length, $this->message_id);
     }
 
     /**
@@ -503,6 +514,8 @@
             $message_id.= $REMOTE_ADDR;
         }
         $message_id .= '.' . time() . '.squirrel@' . $SERVER_NAME .'>';
+        $this->message_id = $message_id;
+
         /* Make an RFC822 Received: line */
         if (isset($REMOTE_HOST)) {
             $received_from = "$REMOTE_HOST ([$REMOTE_ADDR])";

Modified: branches/SM-1_4-STABLE/squirrelmail/src/compose.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2008-02-06 08:13:33 UTC (rev 12919)
+++ branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2008-02-06 08:13:41 UTC (rev 12920)
@@ -1431,12 +1431,16 @@
  * In the future the responsible backend should be automaticly loaded
  * and conf.pl should show a list of available backends.
  * The message also should be constructed by the message class.
+ *
+ * @return boolean FALSE if delivery failed, or some non-FALSE value
+ *                 upon success.
+ *
  */
 function deliverMessage($composeMessage, $draft=false) {
     global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body,
         $username, $popuser, $usernamedata, $identity, $idents, $data_dir,
         $request_mdn, $request_dr, $default_charset, $color, $useSendmail,
-        $domain, $action, $default_move_to_sent, $move_to_sent;
+        $domain, $action, $default_move_to_sent, $move_to_sent, $message_id;
     global $imapServerAddress, $imapPort, $sent_folder, $key;
 
     $rfc822_header = $composeMessage->rfc822_header;
@@ -1582,11 +1586,11 @@
         if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) {
             require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
             $imap_deliver = new Deliver_IMAP();
-            $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $draft_folder);
+            list($succes, $ignore) = $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $draft_folder);
             sqimap_logout($imap_stream);
             unset ($imap_deliver);
             $composeMessage->purgeAttachments();
-            return $length;
+            return $succes;
         } else {
             $msg  = '<br />'.sprintf(_("Error: Draft folder %s does not exist."),
                 htmlspecialchars($draft_folder));
@@ -1596,7 +1600,7 @@
     }
     $succes = false;
     if ($stream) {
-        $length = $deliver->mail($composeMessage, $stream, $reply_id, $reply_ent_id);
+        list($ignore, $message_id) = $deliver->mail($composeMessage, $stream, $reply_id, $reply_ent_id);
         $succes = $deliver->finalizeStream($stream);
     }
     if (!$succes) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12931
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12931&view=rev
Author:   kink
Date:     2008-02-10 08:40:50 -0800 (Sun, 10 Feb 2008)

Log Message:
-----------
et token when another < is detected, to ensure that HTML tags between
style tags do not break finding the end tag. Thanks Roalt Zijlstra.

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/functions/mime.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-02-10 16:38:47 UTC (rev 12930)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-02-10 16:40:50 UTC (rev 12931)
@@ -5,11 +5,13 @@
 Version 1.4.14 - SVN
 --------------------
   - Added support for Macedonian.
-  - Don't allow invalid plugin names in conf.pl --install-plugin
+  - Don't allow invalid plugin names in conf.pl --install-plugin.
   - Fix warning in Printer Friendly due to missing include (#1849101).
   - Let configtest.php use optional PEAR dynamic extension loading,
     patch by Walter Huijbers (#1833123).
-  - Fix for IMAP servers that were having problems saving sent messages
+  - Fix for IMAP servers that were having problems saving sent messages.
+  - Fix broken <style> tag parsing for some HTML messages, thanks
+    Roalt Zijlstra.
 
 Version 1.4.13 - 14 December 2007
 ---------------------------------

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php	2008-02-10 16:38:47 UTC (rev 12930)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php	2008-02-10 16:40:50 UTC (rev 12931)
@@ -1778,7 +1778,7 @@
         $char = $body{$i};
         switch ($char) {
             case '<':
-                $sToken .= $char;
+                $sToken = $char;
                 break;
             case '/':
                  if ($sToken == '<') {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12932
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12932&view=rev
Author:   kink
Date:     2008-02-10 08:49:47 -0800 (Sun, 10 Feb 2008)

Log Message:
-----------
drop closing '?>' from end of included files, rather than to keep policing
whether there's not some secret whitespace added after it.

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php
    branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php
    branches/SM-1_4-STABLE/squirrelmail/class/html.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/index.php
    branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php
    branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php
    branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php
    branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php
    branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php
    branches/SM-1_4-STABLE/squirrelmail/functions/constants.php
    branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_4.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_5.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_6.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_7.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_8.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_9.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_ir_111.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_r.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_u.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/ns_4551_1.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/tis_620.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/us_ascii.php
    branches/SM-1_4-STABLE/squirrelmail/functions/decode/utf_8.php
    branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1251.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1255.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1256.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/index.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_1.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_15.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_2.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_7.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_9.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_r.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_u.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/tis_620.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/us_ascii.php
    branches/SM-1_4-STABLE/squirrelmail/functions/encode/utf_8.php
    branches/SM-1_4-STABLE/squirrelmail/functions/file_prefs.php
    branches/SM-1_4-STABLE/squirrelmail/functions/forms.php
    branches/SM-1_4-STABLE/squirrelmail/functions/gettext.php
    branches/SM-1_4-STABLE/squirrelmail/functions/html.php
    branches/SM-1_4-STABLE/squirrelmail/functions/identity.php
    branches/SM-1_4-STABLE/squirrelmail/functions/imap.php
    branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php
    branches/SM-1_4-STABLE/squirrelmail/functions/imap_search.php
    branches/SM-1_4-STABLE/squirrelmail/functions/imap_utf7_local.php
    branches/SM-1_4-STABLE/squirrelmail/functions/index.php
    branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php
    branches/SM-1_4-STABLE/squirrelmail/functions/options.php
    branches/SM-1_4-STABLE/squirrelmail/functions/plugin.php
    branches/SM-1_4-STABLE/squirrelmail/functions/strings.php
    branches/SM-1_4-STABLE/squirrelmail/functions/tree.php
    branches/SM-1_4-STABLE/squirrelmail/include/index.php
    branches/SM-1_4-STABLE/squirrelmail/include/options/display.php
    branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php
    branches/SM-1_4-STABLE/squirrelmail/include/options/index.php
    branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php
    branches/SM-1_4-STABLE/squirrelmail/include/validate.php

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -352,4 +352,3 @@
     }
 }
 
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -156,4 +156,3 @@
 
 
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/index.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -15,4 +15,3 @@
 
 header('Location: ../index.php');
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/helper/VCard.class.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -41,4 +41,3 @@
     }
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/helper/index.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -15,4 +15,3 @@
 
 header('Location: ../index.php');
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/class/html.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/html.class.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/html.class.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -171,4 +171,3 @@
     }
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/class/index.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/index.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/index.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -15,4 +15,3 @@
 
 header('Location: ../index.php');
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -99,4 +99,3 @@
     }
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Disposition.class.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -46,4 +46,3 @@
     }
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Language.class.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -37,4 +37,3 @@
     }
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/mime/MessageHeader.class.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -97,4 +97,3 @@
     }
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/mime/SMimeMessage.class.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -24,4 +24,3 @@
 
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/mime/index.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -16,4 +16,3 @@
 
 header('Location: ../index.php');
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/class/mime.class.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -25,4 +25,3 @@
 require_once(SM_PATH . 'class/mime/Language.class.php');
 require_once(SM_PATH . 'class/mime/ContentType.class.php');
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/abook_ldap_server.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -376,4 +376,3 @@
          // return $this->search('*');
      }
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -695,4 +695,3 @@
  * @since 1.5.1 and 1.4.5
  */
 do_hook('abook_add_class');
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/attachment_common.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -217,4 +217,3 @@
     }
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/constants.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/constants.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/constants.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -55,4 +55,3 @@
 
 do_hook('loading_constants');
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -396,5 +396,3 @@
     return getPref($data_dir, $username, $key);
 }
 
-// vim: et ts=4
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1250.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -169,4 +169,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1251.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -169,4 +169,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1252.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -170,4 +170,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1253.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -169,4 +169,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1254.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -169,4 +169,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1255.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -169,4 +169,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1256.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -169,4 +169,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1257.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -157,4 +157,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp1258.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -169,4 +169,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/cp855.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -169,4 +169,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/index.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -16,4 +16,3 @@
 
 header('Location: ../index.php');
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_1.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -32,4 +32,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_10.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -154,4 +154,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_11.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -146,4 +146,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_13.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -154,4 +154,3 @@
     return $string;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_14.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -154,4 +154,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_15.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -154,4 +154,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_16.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -153,4 +153,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_2.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -153,4 +153,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_3.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -146,4 +146,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_4.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_4.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_4.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -153,4 +153,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_5.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_5.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_5.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -153,4 +153,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_6.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_6.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_6.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -108,4 +108,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_7.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_7.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_7.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -147,4 +147,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_8.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_8.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_8.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -117,4 +117,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_9.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_9.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_8859_9.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -153,4 +153,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_ir_111.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_ir_111.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/iso_ir_111.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -157,4 +157,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_r.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_r.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_r.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -184,4 +184,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_u.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_u.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/koi8_u.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -188,4 +188,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/ns_4551_1.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/ns_4551_1.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/ns_4551_1.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -32,4 +32,3 @@
      */
     return strtr ($string, "[\\]{|}", "\xC6\xD8\xC5\xE6\xF8\xE5");
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/tis_620.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/tis_620.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/tis_620.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -151,4 +151,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/us_ascii.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/us_ascii.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/us_ascii.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -34,4 +34,3 @@
     $string = preg_replace("/([\241-\377])/e","'?'",$string);
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/decode/utf_8.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/decode/utf_8.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/decode/utf_8.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -92,4 +92,3 @@
 
     return $string;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -170,5 +170,3 @@
 
     $optpage_save_error=array_merge($optpage_save_error,array($message));
 }
-// vim: et ts=4
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1251.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1251.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1251.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -176,4 +176,3 @@
     }
     return $ret;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1255.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1255.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1255.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -154,4 +154,3 @@
     }
     return $ret;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1256.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1256.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/cp1256.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -177,4 +177,3 @@
     }
     return $ret;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/index.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/index.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/index.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -16,4 +16,3 @@
 
 header('Location: ../index.php');
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_1.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_1.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_1.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -48,4 +48,3 @@
     }
     return $ret;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_15.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_15.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_15.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -145,4 +145,3 @@
     }
     return $ret;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_2.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_2.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_2.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -146,4 +146,3 @@
     }
     return $ret;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_7.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_7.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_7.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -140,4 +140,3 @@
     }
     return $ret;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_9.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_9.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/iso_8859_9.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -146,4 +146,3 @@
     }
     return $ret;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_r.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_r.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_r.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -177,4 +177,3 @@
     }
     return $ret;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_u.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_u.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/koi8_u.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -177,4 +177,3 @@
     }
     return $ret;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/tis_620.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/tis_620.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/tis_620.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -136,4 +136,3 @@
     }
     return $ret;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/us_ascii.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/us_ascii.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/us_ascii.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -48,4 +48,3 @@
     }
     return $ret;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/encode/utf_8.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/encode/utf_8.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/encode/utf_8.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -118,4 +118,3 @@
     }
     return $ret;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/file_prefs.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/file_prefs.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/file_prefs.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -267,5 +267,3 @@
     return $sig;
 }
 
-// vim: et ts=4
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/forms.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/forms.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/forms.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -147,4 +147,3 @@
         $enctype . $name . $charset . ">\n";
 }
 
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/gettext.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/gettext.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/gettext.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -249,4 +249,3 @@
 
     return $gettext_php_domain;
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/html.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/html.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/html.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -183,4 +183,3 @@
             echo $format_ar[$frm_last];
         }
     }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/identity.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/identity.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/identity.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -213,4 +213,3 @@
     }
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -19,4 +19,3 @@
 require_once(SM_PATH . 'functions/imap_general.php');
 require_once(SM_PATH . 'functions/imap_search.php');
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -960,4 +960,3 @@
    return chop(substr($yp, strlen($username)+1));
 }
 
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_search.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap_search.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_search.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -125,4 +125,3 @@
 
 
 
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_utf7_local.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap_utf7_local.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_utf7_local.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -220,4 +220,3 @@
     return $d;
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/index.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/index.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/index.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -15,4 +15,3 @@
 
 header('Location: ../index.php');
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -1327,5 +1327,3 @@
     return $handleAsSent_result;
 }
 
-// vim: et ts=4
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/options.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/options.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/options.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -504,5 +504,3 @@
                 ) . "\n";
 }
 
-// vim: et ts=4
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/plugin.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/plugin.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/plugin.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -208,4 +208,3 @@
     }
 }
 
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/strings.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/strings.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/strings.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -881,4 +881,3 @@
 
 
 $PHP_SELF = php_self();
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/tree.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/tree.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/tree.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -179,4 +179,3 @@
         echo $tree[$index]['value'] . '<br />';
     }
 }
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/include/index.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/include/index.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/include/index.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -15,4 +15,3 @@
 
 header('Location: ../index.php');
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/include/options/display.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/include/options/display.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/include/options/display.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -435,4 +435,3 @@
 
 }
 
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -309,4 +309,3 @@
     }
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/include/options/index.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/include/options/index.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/include/options/index.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -15,4 +15,3 @@
 
 header('Location: ../index.php');
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/include/options/personal.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -233,4 +233,3 @@
     setSig($data_dir, $username, 'g', $option->new_value);
 }
 
-?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/include/validate.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/include/validate.php	2008-02-10 16:40:50 UTC (rev 12931)
+++ branches/SM-1_4-STABLE/squirrelmail/include/validate.php	2008-02-10 16:49:47 UTC (rev 12932)
@@ -77,4 +77,3 @@
     putenv("TZ=".$timeZone);
 }
 
-?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12941
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12941&view=rev
Author:   pdontthink
Date:     2008-02-12 20:14:07 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
Change approach for making things like Message-ID available after sending.  Tracker #1322898 inspired me to do what I was originally thinking, even though this shows SM's design weaknesses.  I also now guarantee that the Message-ID and Date headers will be the same between that sent to the recipient and that stored in the Sent folder.

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
    branches/SM-1_4-STABLE/squirrelmail/src/compose.php

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2008-02-13 03:56:19 UTC (rev 12940)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2008-02-13 04:14:07 UTC (rev 12941)
@@ -29,17 +29,15 @@
 class Deliver {
 
     /**
-     * Most recently calculated Message-ID
-     * External code should NEVER access this directly!
-     * @var string
-     */
-    var $message_id;
-
-    /**
      * function mail - send the message parts to the SMTP stream
      *
      * @param Message  $message      Message object to send
-     * @param resource $stream       Handle to the SMTP stream
+     *                               NOTE that this is passed by
+     *                               reference and will be modified
+     *                               upon return with updated
+     *                               fields such as Message ID, References,
+     *                               In-Reply-To and Date headers.
+     * @param resource $stream       Handle to the outgoing stream
      *                               (when FALSE, nothing will be
      *                               written to the stream; this can
      *                               be used to determine the actual
@@ -59,17 +57,15 @@
      *                               an overloaded version of this method
      *                               if needed.
      *
-     * @return array An array containing at least these elements in this order:
-     *                  - The number of bytes written (or that would have been
-     *                    written) to the output stream
-     *                  - The message ID (WARNING: if $stream is FALSE, this
-     *                    may not be supplied, or may not be accurate)
+     * @return integer The number of bytes written (or that would have been
+     *                 written) to the output stream.
      *
      */
-    function mail($message, $stream=false, $reply_id=0, $reply_ent_id=0, 
+    function mail(&$message, $stream=false, $reply_id=0, $reply_ent_id=0, 
                   $extra=NULL) {
 
-        $rfc822_header = $message->rfc822_header;
+        $rfc822_header = &$message->rfc822_header;
+
         if (count($message->entities)) {
             $boundary = $this->mimeBoundary();
             $rfc822_header->content_type->properties['boundary']='"'.$boundary.'"';
@@ -115,7 +111,7 @@
 
         $this->send_mail($message, $header, $boundary, $stream, $raw_length, $extra);
 
-        return array($raw_length, $this->message_id);
+        return $raw_length;
     }
 
     /**
@@ -484,7 +480,7 @@
      *
      * @return string $header
      */
-    function prepareRFC822_Header($rfc822_header, $reply_rfc822_header, &$raw_length) {
+    function prepareRFC822_Header(&$rfc822_header, $reply_rfc822_header, &$raw_length) {
         global $domain, $version, $username, $encode_header_key, $edit_identity, $hide_auth_header;
 
         if (! isset($hide_auth_header)) $hide_auth_header=false;
@@ -504,17 +500,20 @@
 
         /* This creates an RFC 822 date */
         $date = date('D, j M Y H:i:s ', time()) . $this->timezone();
+
         /* Create a message-id */
-        $message_id = '<' . (!empty($REMOTE_PORT) ? $REMOTE_PORT . '.' : '');
+        $message_id = 'MESSAGE ID GENERATION ERROR! PLEASE CONTACT SQUIRRELMAIL DEVELOPERS';
+        if (empty($rfc822_header->message_id)) {
+            $message_id = '<' . (!empty($REMOTE_PORT) ? $REMOTE_PORT . '.' : '');
 //FIXME: if $REMOTE_ADDR is missing, should we skip this if/else block?  or perhaps try to generate it with some different kind of info?
-        if (isset($encode_header_key) && trim($encode_header_key)!='') {
-            // use encrypted form of remote address
-            $message_id.= OneTimePadEncrypt($this->ip2hex($REMOTE_ADDR),base64_encode($encode_header_key));
-        } else {
-            $message_id.= $REMOTE_ADDR;
+            if (isset($encode_header_key) && trim($encode_header_key)!='') {
+                // use encrypted form of remote address
+                $message_id.= OneTimePadEncrypt($this->ip2hex($REMOTE_ADDR),base64_encode($encode_header_key));
+            } else {
+                $message_id.= $REMOTE_ADDR;
+            }
+            $message_id .= '.' . time() . '.squirrel@' . $SERVER_NAME .'>';
         }
-        $message_id .= '.' . time() . '.squirrel@' . $SERVER_NAME .'>';
-        $this->message_id = $message_id;
 
         /* Make an RFC822 Received: line */
         if (isset($REMOTE_HOST)) {
@@ -539,6 +538,7 @@
          * webmail installation does not prevent changes in user's email address.
          * See SquirrelMail bug tracker #847107 for more details about it.
          */
+        // FIXME: The following headers may generate slightly differently between the message sent to the destination and that stored in the Sent folder because this code will be called before both actions.  This is not necessarily a big problem, but other headers such as Message-ID and Date are preserved between both actions
         if (isset($encode_header_key) &&
             trim($encode_header_key)!='') {
             // use encoded headers, if encryption key is set and not empty
@@ -556,18 +556,33 @@
         }
 
         /* Insert the rest of the header fields */
-        $header[] = 'Message-ID: '. $message_id . $rn;
+
+        if (!empty($rfc822_header->message_id)) {
+            $header[] = 'Message-ID: '. $rfc822_header->message_id . $rn;
+        } else {
+            $header[] = 'Message-ID: '. $message_id . $rn;
+            $rfc822_header->message_id = $message_id;
+        }
+
         if (is_object($reply_rfc822_header) &&
             isset($reply_rfc822_header->message_id) &&
             $reply_rfc822_header->message_id) {
             //if ($reply_rfc822_header->message_id) {
             $rep_message_id = $reply_rfc822_header->message_id;
-        //        $this->strip_crlf($message_id);
             $header[] = 'In-Reply-To: '.$rep_message_id . $rn;
+            $rfc822_header->in_reply_to = $rep_message_id;
             $references = $this->calculate_references($reply_rfc822_header);
             $header[] = 'References: '.$references . $rn;
+            $rfc822_header->references = $references;
         }
-        $header[] = "Date: $date" . $rn;
+
+        if (!empty($rfc822_header->date) && $rfc822_header->date != -1) {
+            $header[] = 'Date: '. $rfc822_header->date . $rn;
+        } else {
+            $header[] = "Date: $date" . $rn;
+            $rfc822_header->date = $date;
+        }
+
         $header[] = 'Subject: '.encodeHeader($rfc822_header->subject) . $rn;
 
         // folding address list [From|To|Cc|Bcc] happens by using ",$rn<space>"

Modified: branches/SM-1_4-STABLE/squirrelmail/src/compose.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2008-02-13 03:56:19 UTC (rev 12940)
+++ branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2008-02-13 04:14:07 UTC (rev 12941)
@@ -1432,15 +1432,21 @@
  * and conf.pl should show a list of available backends.
  * The message also should be constructed by the message class.
  *
+ * @param object $composeMessage The message being sent.  Please note
+ *                               that it is passed by reference and
+ *                               will be returned modified, with additional
+ *                               headers, such as Message-ID, Date, In-Reply-To,
+ *                               References, and so forth.
+ *
  * @return boolean FALSE if delivery failed, or some non-FALSE value
  *                 upon success.
  *
  */
-function deliverMessage($composeMessage, $draft=false) {
+function deliverMessage(&$composeMessage, $draft=false) {
     global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body,
         $username, $popuser, $usernamedata, $identity, $idents, $data_dir,
         $request_mdn, $request_dr, $default_charset, $color, $useSendmail,
-        $domain, $action, $default_move_to_sent, $move_to_sent, $message_id;
+        $domain, $action, $default_move_to_sent, $move_to_sent;
     global $imapServerAddress, $imapPort, $sent_folder, $key;
 
     $rfc822_header = $composeMessage->rfc822_header;
@@ -1586,7 +1592,7 @@
         if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) {
             require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
             $imap_deliver = new Deliver_IMAP();
-            list($succes, $ignore) = $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $draft_folder);
+            $succes = $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $draft_folder);
             sqimap_logout($imap_stream);
             unset ($imap_deliver);
             $composeMessage->purgeAttachments();
@@ -1600,7 +1606,7 @@
     }
     $succes = false;
     if ($stream) {
-        list($ignore, $message_id) = $deliver->mail($composeMessage, $stream, $reply_id, $reply_ent_id);
+        $deliver->mail($composeMessage, $stream, $reply_id, $reply_ent_id);
         $succes = $deliver->finalizeStream($stream);
     }
     if (!$succes) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12954
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12954&view=rev
Author:   pdontthink
Date:     2008-02-20 13:01:38 -0800 (Wed, 20 Feb 2008)

Log Message:
-----------
Fixed broken MDN functionality

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/src/read_body.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-02-20 20:45:58 UTC (rev 12953)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-02-20 21:01:38 UTC (rev 12954)
@@ -13,6 +13,7 @@
   - Fix broken <style> tag parsing for some HTML messages, thanks
     Roalt Zijlstra.
   - Re-added support for Vietnamese.
+  - Fixed broken MDN functionality (send read confirmation).
 
 Version 1.4.13 - 14 December 2007
 ---------------------------------

Modified: branches/SM-1_4-STABLE/squirrelmail/src/read_body.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/read_body.php	2008-02-20 20:45:58 UTC (rev 12953)
+++ branches/SM-1_4-STABLE/squirrelmail/src/read_body.php	2008-02-20 21:01:38 UTC (rev 12954)
@@ -157,10 +157,10 @@
 }
 
 function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
-    global $username, $attachment_dir, $color,
+    global $username, $attachment_dir, $color, $default_move_to_sent,
            $version, $attachments, $squirrelmail_language, $default_charset,
            $languages, $useSendmail, $domain, $sent_folder,
-           $popuser, $data_dir, $username;
+           $popuser, $data_dir;
 
     sqgetGlobalVar('SERVER_NAME', $SERVER_NAME, SQ_SERVER);
 
@@ -309,16 +309,20 @@
         require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
         $deliver = new Deliver_SMTP();
         global $smtpServerAddress, $smtpPort, $pop_before_smtp;
+
+        $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
+
         $user = '';
         $pass = '';
-        $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
+
         get_smtp_user($user, $pass);
+
         $stream = $deliver->initStream($composeMessage,$domain,0,
-                                       $smtpServerAddress, $smtpPort, $user, $pass, $authPop);
+                $smtpServerAddress, $smtpPort, $user, $pass, $authPop);
     }
     $success = false;
     if ($stream) {
-        $length  = $deliver->mail($composeMessage, $stream);
+        $deliver->mail($composeMessage, $stream);
         $success = $deliver->finalizeStream($stream);
     }
     if (!$success) {
@@ -330,12 +334,32 @@
         plain_error_message($msg, $color);
     } else {
         unset ($deliver);
-        if (sqimap_mailbox_exists ($imapConnection, $sent_folder)) {
-            sqimap_append ($imapConnection, $sent_folder, $length);
+
+        // copy message to sent folder
+        $move_to_sent = getPref($data_dir,$username,'move_to_sent');
+        if (isset($default_move_to_sent) && ($default_move_to_sent != 0)) {
+            $svr_allow_sent = true;
+        } else {
+            $svr_allow_sent = false;
+        }
+
+        if (isset($sent_folder) && (($sent_folder != '') || ($sent_folder != 'none'))
+                && sqimap_mailbox_exists( $imapConnection, $sent_folder)) {
+            $fld_sent = true;
+        } else {
+            $fld_sent = false;
+        }
+
+        if ((isset($move_to_sent) && ($move_to_sent != 0)) || (!isset($move_to_sent))) {
+            $lcl_allow_sent = true;
+        } else {
+            $lcl_allow_sent = false;
+        }
+
+        if (($fld_sent && $svr_allow_sent && !$lcl_allow_sent) || ($fld_sent && $lcl_allow_sent)) {
             require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
             $imap_deliver = new Deliver_IMAP();
-            $imap_deliver->mail($composeMessage, $imapConnection);
-            sqimap_append_done ($imapConnection);
+            $imap_deliver->mail($composeMessage, $imapConnection, 0, 0, $sent_folder);
             unset ($imap_deliver);
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12988
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12988&view=rev
Author:   kink
Date:     2008-03-03 06:06:36 -0800 (Mon, 03 Mar 2008)

Log Message:
-----------
get_magic_quotes_* functions deprecated in PHP 5.3.x. Check for
existance and ignore deprecation warnings.

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/functions/global.php
    branches/SM-1_4-STABLE/squirrelmail/src/configtest.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-03-03 14:03:22 UTC (rev 12987)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-03-03 14:06:36 UTC (rev 12988)
@@ -16,6 +16,7 @@
   - Fixed broken MDN functionality (send read confirmation).
   - Converted Norwegian Bokm\xE5l (nb_NO) to UTF-8.
   - Converted traditional Chinese (zh_TW) to UTF-8.
+  - Avoid deprecation notices on get_magic_quotes_* functions.
 
 Version 1.4.13 - 14 December 2007
 ---------------------------------

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/global.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/global.php	2008-03-03 14:03:22 UTC (rev 12987)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/global.php	2008-03-03 14:06:36 UTC (rev 12988)
@@ -115,7 +115,7 @@
 /* if running with magic_quotes_gpc then strip the slashes
    from POST and GET global arrays */
 
-if (get_magic_quotes_gpc()) {
+if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc()) {
     sqstripslashes($_GET);
     sqstripslashes($_POST);
 }

Modified: branches/SM-1_4-STABLE/squirrelmail/src/configtest.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/configtest.php	2008-03-03 14:03:22 UTC (rev 12987)
+++ branches/SM-1_4-STABLE/squirrelmail/src/configtest.php	2008-03-03 14:06:36 UTC (rev 12988)
@@ -195,7 +195,8 @@
 /**
  * Do not use SquirrelMail with magic_quotes_* on.
  */
-if ( get_magic_quotes_runtime() || get_magic_quotes_gpc() ||
+if ( (function_exists('get_magic_quotes_runtime') &&  @get_magic_quotes_runtime()) ||
+     (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc()) ||
     ( (bool) ini_get('magic_quotes_sybase') && ini_get('magic_quotes_sybase') != 'off' )
     ) {
     $magic_quotes_warning='You have enabled any one of <tt>magic_quotes_runtime</tt>, '


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12992
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12992&view=rev
Author:   kink
Date:     2008-03-04 02:01:16 -0800 (Tue, 04 Mar 2008)

Log Message:
-----------
Backport improved message-ID generation code from DEVEL
(less complex, reduces problems with any of the fields missing
or containing message-ID-invalid data)

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-03-04 08:44:34 UTC (rev 12991)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-03-04 10:01:16 UTC (rev 12992)
@@ -17,6 +17,7 @@
   - Converted Norwegian Bokm\xE5l (nb_NO) to UTF-8.
   - Converted traditional Chinese (zh_TW) to UTF-8.
   - Avoid deprecation notices on get_magic_quotes_* functions.
+  - Improved Message-ID generation code.
 
 Version 1.4.13 - 14 December 2007
 ---------------------------------

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2008-03-04 08:44:34 UTC (rev 12991)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2008-03-04 10:01:16 UTC (rev 12992)
@@ -504,15 +504,15 @@
         /* Create a message-id */
         $message_id = 'MESSAGE ID GENERATION ERROR! PLEASE CONTACT SQUIRRELMAIL DEVELOPERS';
         if (empty($rfc822_header->message_id)) {
-            $message_id = '<' . (!empty($REMOTE_PORT) ? $REMOTE_PORT . '.' : '');
-//FIXME: if $REMOTE_ADDR is missing, should we skip this if/else block?  or perhaps try to generate it with some different kind of info?
-            if (isset($encode_header_key) && trim($encode_header_key)!='') {
-                // use encrypted form of remote address
-                $message_id.= OneTimePadEncrypt($this->ip2hex($REMOTE_ADDR),base64_encode($encode_header_key));
-            } else {
-                $message_id.= $REMOTE_ADDR;
-            }
-            $message_id .= '.' . time() . '.squirrel@' . $SERVER_NAME .'>';
+            $message_id = '<';
+            /* user-specifc data to decrease collision chance */
+            $seed_data = $username . '.';
+            $seed_data .= (!empty($REMOTE_PORT) ? $REMOTE_PORT . '.' : '');
+            $seed_data .= (!empty($REMOTE_ADDR) ? $REMOTE_ADDR . '.' : '');
+            /* add the current time in milliseconds and randomness */
+            $seed_data .= uniqid(mt_rand(),true);
+            /* put it through one-way hash and add it to the ID */
+            $message_id .= md5($seed_data) . '.squirrel@' . $SERVER_NAME .'>';
         }
 
         /* Make an RFC822 Received: line */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13014
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13014&view=rev
Author:   jangliss
Date:     2008-03-06 01:16:14 -0800 (Thu, 06 Mar 2008)

Log Message:
-----------
House cleaning... Cleaned up a TODO item to remove majority code from setup.php for fortune cookie.  Also removed depreciated (per docs) method of adding options to the options page.

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/setup.php

Added Paths:
-----------
    branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/fortune_functions.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-03-06 03:50:56 UTC (rev 13013)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-03-06 09:16:14 UTC (rev 13014)
@@ -22,6 +22,7 @@
     list and multiple-select string list option widget types,
     as well as support for the "trailing_text" widget attribute.
   - Boolean option widgets are henceforth presented as checkboxes.
+  - Tidied up fortune plugin to be inline with specifications for plugins.
 
 Version 1.4.13 - 14 December 2007
 ---------------------------------

Added: branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/fortune_functions.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/fortune_functions.php	                        (rev 0)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/fortune_functions.php	2008-03-06 09:16:14 UTC (rev 13014)
@@ -0,0 +1,65 @@
+<?php
+/**
+ * plugins/fortune/fortune_functions.php
+ *
+ * Original code contributed by paulm@...
+ *
+ * Simple SquirrelMail WebMail Plugin that displays the output of
+ * fortune above the message listing.
+ *
+ * @copyright (c) 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage fortune
+ *
+ */
+
+
+/**
+ * Function to show fortune
+ * @access private
+ */
+function fortune_show() {
+    global $color;
+    
+    $fortune_location = '/usr/bin/fortune';
+    $exist = is_executable($fortune_location);
+    
+    if (!$exist) {
+        $sMsg = sprintf(_("%s is not found."),$fortune_location);
+    } else {
+        $sMsg = htmlspecialchars(shell_exec($fortune_location . ' -s'));
+    }
+    
+    
+    echo "<center><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" bgcolor=\"$color[10]\">\n".
+        "<tr><td><table width=\"100%\" cellpadding=\"2\" cellspacing=\"1\" border=\"0\" bgcolor=\"$color[5]\">\n".
+        "<tr><td align=\"center\">\n";
+    echo '<table><tr><td>';
+    echo '<center><em>' . _("Today's Fortune") . '</em></center><br /><pre>' .
+        $sMsg .
+        '</pre>';
+
+    echo '</td></tr></table></td></tr></table></td></tr></table></center>';
+}
+
+
+function fortune_show_options() {
+    global $optpage_data;
+    
+    $optgrp = _("Fortunes");
+    $optvals = array();
+    
+    $optvals[] = array(
+                'name' => 'fortune_visible',
+                'caption' => _("Show fortunes at top of mailbox"),
+                'type' => SMOPT_TYPE_BOOLEAN,
+                'refresh' => SMOPT_REFRESH_NONE                
+            );
+
+     $optpage_data['grps']['fortune'] = $optgrp;
+     $optpage_data['vals']['fortune'] = $optvals;
+}
+
+?>
\ No newline at end of file

Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/setup.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/setup.php	2008-03-06 03:50:56 UTC (rev 13013)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/setup.php	2008-03-06 09:16:14 UTC (rev 13014)
@@ -14,9 +14,6 @@
  * @package plugins
  * @subpackage fortune
  *
- * FIXME
- * There should be no code in setup.php, just hook registrations. Create functions.php
- * and move the code there.
  */
 
 /**
@@ -27,8 +24,7 @@
   global $squirrelmail_plugin_hooks;
 
   $squirrelmail_plugin_hooks['mailbox_index_before']['fortune'] = 'fortune';
-  $squirrelmail_plugin_hooks['options_display_inside']['fortune'] = 'fortune_options';
-  $squirrelmail_plugin_hooks['options_display_save']['fortune'] = 'fortune_save';
+  $squirrelmail_plugin_hooks['optpage_loadhook_display']['fortune'] = 'fortune_optpage_loadhook_display';
   $squirrelmail_plugin_hooks['loading_prefs']['fortune'] = 'fortune_load';
 }
 
@@ -39,27 +35,13 @@
 function fortune() {
     global $fortune_visible, $color;
 
-    if (!$fortune_visible) {
+    // Don't show fortune if not set, or not enabled //
+    if (!isset($fortune_visible) || !$fortune_visible) {
         return;
     }
 
-    $fortune_location = '/usr/games/fortune';
-    $exist = is_file($fortune_location);
-    echo "<center><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" bgcolor=\"$color[10]\">\n".
-        "<tr><td><table width=\"100%\" cellpadding=\"2\" cellspacing=\"1\" border=\"0\" bgcolor=\"$color[5]\">\n".
-        "<tr><td align=\"center\">\n";
-    echo '<table><tr><td>';
-    if (!$exist) {
-        printf(_("%s is not found."),$fortune_location);
-    } else {
-        // display only short fortune cookies
-        $fortune_command = $fortune_location . ' -s';
-        echo '<center><em>' . _("Today's Fortune") . '</em></center><br /><pre>' .
-            htmlspecialchars(shell_exec($fortune_command)) .
-            '</pre>';
-    }
-
-    echo '</td></tr></table></td></tr></table></td></tr></table></center>';
+    include_once(SM_PATH . 'plugins/fortune/fortune_functions.php');
+    fortune_show();
 }
 
 /**
@@ -76,28 +58,9 @@
  * Add fortune options
  * @access private
  */
-function fortune_options() {
-    global $fortune_visible;
-
-    echo "<tr>" . html_tag('td',_("Fortunes:"),'right','','nowrap') . "\n";
-    echo '<td><input name="fortune_fortune_visible" type="checkbox"';
-    if ($fortune_visible)
-        echo ' checked="checked"';
-    echo " /> " . _("Show fortunes at top of mailbox") . "</td></tr>\n";
+function fortune_optpage_loadhook_display() {
+    include_once(SM_PATH . 'plugins/fortune/fortune_functions.php');
+    fortune_show_options();
 }
 
-/**
- * Save fortune prefs
- * @access private
- */
-function fortune_save() {
-    global $username,$data_dir;
-
-    if (sqgetGlobalVar('fortune_fortune_visible',$fortune_fortune_visible,SQ_POST)) {
-        setPref($data_dir, $username, 'fortune_visible', '1');
-    } else {
-        setPref($data_dir, $username, 'fortune_visible', '');
-    }
-}
-
 ?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Den To, 2008-03-06, 10:16 skrev jangliss@...:
> Revision: 13014
> http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13014&view=rev
> Author:   jangliss
> Date:     2008-03-06 01:16:14 -0800 (Thu, 06 Mar 2008)
>
> Log Message:
> -----------
> House cleaning... Cleaned up a TODO item to remove majority code from
> setup.php for fortune cookie.  Also removed depreciated (per docs) method
> of adding options to the options page.
>
> Modified Paths:
> --------------
> branches/SM-1_4-STABLE/squirrelmail/ChangeLog
> branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/setup.php
>
> Added Paths:
> -----------
> branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/fortune_functions.php

Thank you, Jonathan. Is this a backport from DEVEL or do the two branches
differ much now?

Sincerely,
Fredrik

Fredrik Jervfors wrote:
> Den To, 2008-03-06, 10:16 skrev jangliss@...:
>   
>> Revision: 13014
>> http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13014&view=rev
>> Author:   jangliss
>> Date:     2008-03-06 01:16:14 -0800 (Thu, 06 Mar 2008)
>>
>> Log Message:
>> -----------
>> House cleaning... Cleaned up a TODO item to remove majority code from
>> setup.php for fortune cookie.  Also removed depreciated (per docs) method
>> of adding options to the options page.
>>
>> Modified Paths:
>> --------------
>> branches/SM-1_4-STABLE/squirrelmail/ChangeLog
>> branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/setup.php
>>
>> Added Paths:
>> -----------
>> branches/SM-1_4-STABLE/squirrelmail/plugins/fortune/fortune_functions.php
>>     
>
> Thank you, Jonathan. Is this a backport from DEVEL or do the two branches
> differ much now?

I actually did it independently, not realizing dev had already been 
done.  But, they're almost the same, with the exception of the dev 
branch using templates. I was going to do dev too, until I found it had 
already been done :)

-- 
Jon Angliss
<jon@...>

Revision: 13065
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13065&view=rev
Author:   pdontthink
Date:     2008-04-25 15:01:46 -0700 (Fri, 25 Apr 2008)

Log Message:
-----------
Don't open multiple IMAP connections when building reply headers during send

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
    branches/SM-1_4-STABLE/squirrelmail/src/compose.php

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2008-04-25 21:59:00 UTC (rev 13064)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2008-04-25 22:01:46 UTC (rev 13065)
@@ -56,13 +56,24 @@
      *                               can be passed in here and used in
      *                               an overloaded version of this method
      *                               if needed.
+     * @param resource $imap_stream  If there is an open IMAP stream in 
+     *                               the caller's context, it should be
+     *                               passed in here.  This is OPTIONAL,
+     *                               as one will be created if not given,
+     *                               but as some IMAP servers may baulk
+     *                               at opening more than one connection
+     *                               at a time, the caller should always
+     *                               abide if possible.  Currently, this
+     *                               stream is only used when $reply_id
+     *                               is also non-zero, but that is subject
+     *                               to change.
      *
      * @return integer The number of bytes written (or that would have been
      *                 written) to the output stream.
      *
      */
     function mail(&$message, $stream=false, $reply_id=0, $reply_ent_id=0, 
-                  $extra=NULL) {
+                  $extra=NULL, $imap_stream=NULL) {
 
         $rfc822_header = &$message->rfc822_header;
 
@@ -81,13 +92,28 @@
             global $imapConnection, $username, $key, $imapServerAddress, 
                    $imapPort, $mailbox;
 
-            if (!is_resource($imapConnection))
-                $imapConnection = sqimap_login($username, $key, 
+            // try our best to use an existing IMAP handle
+            //
+            $close_imap_stream = FALSE;
+            if (is_resource($imap_stream)) {
+                $my_imap_stream = $imap_stream;
+
+            } else if (is_resource($imapConnection)) {
+                $my_imap_stream = $imapConnection;
+
+            } else {
+                $close_imap_stream = TRUE;
+                $my_imap_stream = sqimap_login($username, $key,
                                                $imapServerAddress, $imapPort, 0);
+            } 
 
-            sqimap_mailbox_select($imapConnection, $mailbox);
-            $reply_message = sqimap_get_message($imapConnection, $reply_id, $mailbox);
+            sqimap_mailbox_select($my_imap_stream, $mailbox);
+            $reply_message = sqimap_get_message($my_imap_stream, $reply_id, $mailbox);
 
+            if ($close_imap_stream) {
+                sqimap_logout($my_imap_stream);
+            }
+
             if ($reply_ent_id) {
                 /* redefine the messsage in case of message/rfc822 */
                 $reply_message = $message->getEntity($reply_ent_id);

Modified: branches/SM-1_4-STABLE/squirrelmail/src/compose.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2008-04-25 21:59:00 UTC (rev 13064)
+++ branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2008-04-25 22:01:46 UTC (rev 13065)
@@ -1652,7 +1652,7 @@
         if (($fld_sent && $svr_allow_sent && !$lcl_allow_sent) || ($fld_sent && $lcl_allow_sent)) {
             require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
             $imap_deliver = new Deliver_IMAP();
-            $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $sent_folder);
+            $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $sent_folder, $imap_stream);
             unset ($imap_deliver);
         }
         $composeMessage->purgeAttachments();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13066
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13066&view=rev
Author:   pdontthink
Date:     2008-04-27 19:18:58 -0700 (Sun, 27 Apr 2008)

Log Message:
-----------
Change order of arguments

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
    branches/SM-1_4-STABLE/squirrelmail/src/compose.php

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2008-04-25 22:01:46 UTC (rev 13065)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2008-04-28 02:18:58 UTC (rev 13066)
@@ -52,10 +52,6 @@
      *                               message inside another (OPTIONAL; caller
      *                               should ONLY specify a value for this 
      *                               when the message being sent is a reply)
-     * @param mixed    $extra        Any implementation-specific variables
-     *                               can be passed in here and used in
-     *                               an overloaded version of this method
-     *                               if needed.
      * @param resource $imap_stream  If there is an open IMAP stream in 
      *                               the caller's context, it should be
      *                               passed in here.  This is OPTIONAL,
@@ -67,13 +63,17 @@
      *                               stream is only used when $reply_id
      *                               is also non-zero, but that is subject
      *                               to change.
+     * @param mixed    $extra        Any implementation-specific variables
+     *                               can be passed in here and used in
+     *                               an overloaded version of this method
+     *                               if needed.
      *
      * @return integer The number of bytes written (or that would have been
      *                 written) to the output stream.
      *
      */
     function mail(&$message, $stream=false, $reply_id=0, $reply_ent_id=0, 
-                  $extra=NULL, $imap_stream=NULL) {
+                  $imap_stream=NULL, $extra=NULL) {
 
         $rfc822_header = &$message->rfc822_header;
 

Modified: branches/SM-1_4-STABLE/squirrelmail/src/compose.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2008-04-25 22:01:46 UTC (rev 13065)
+++ branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2008-04-28 02:18:58 UTC (rev 13066)
@@ -1652,7 +1652,7 @@
         if (($fld_sent && $svr_allow_sent && !$lcl_allow_sent) || ($fld_sent && $lcl_allow_sent)) {
             require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
             $imap_deliver = new Deliver_IMAP();
-            $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $sent_folder, $imap_stream);
+            $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $imap_stream, $sent_folder);
             unset ($imap_deliver);
         }
         $composeMessage->purgeAttachments();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13083
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13083&view=rev
Author:   kink
Date:     2008-05-05 11:34:07 -0700 (Mon, 05 May 2008)

Log Message:
-----------
bump stable version number one, thanks to spammers

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/functions/strings.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-05-03 22:38:59 UTC (rev 13082)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-05-05 18:34:07 UTC (rev 13083)
@@ -2,7 +2,7 @@
 *** SquirrelMail Stable Series 1.4 ***
 **************************************
 
-Version 1.4.14 - SVN
+Version 1.4.15 - SVN
 --------------------
   - Added support for Macedonian.
   - Don't allow invalid plugin names in conf.pl --install-plugin.
@@ -28,6 +28,8 @@
     added hook for plugins that can filter address book listings.
     Complements RisuMail team (risumail.jp).
 
+Version 1.4.14 - Skipped; version number abused by spammers.
+
 Version 1.4.13 - 14 December 2007
 ---------------------------------
   - Include compatibility plugin files if available.

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/strings.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/strings.php	2008-05-03 22:38:59 UTC (rev 13082)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/strings.php	2008-05-05 18:34:07 UTC (rev 13083)
@@ -16,14 +16,14 @@
  * SquirrelMail version number -- DO NOT CHANGE
  */
 global $version;
-$version = '1.4.14 [SVN]';
+$version = '1.4.15 [SVN]';
 
 /**
  * SquirrelMail internal version number -- DO NOT CHANGE
  * $sm_internal_version = array (release, major, minor)
  */
 global $SQM_INTERNAL_VERSION;
-$SQM_INTERNAL_VERSION = array(1,4,14);
+$SQM_INTERNAL_VERSION = array(1,4,15);
 
 /**
  * There can be a circular issue with includes, where the $version string is


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13125
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13125&view=rev
Author:   kink
Date:     2008-05-12 11:19:31 -0700 (Mon, 12 May 2008)

Log Message:
-----------
prepare for 1.4.15 release candidate 1

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/ReleaseNotes
    branches/SM-1_4-STABLE/squirrelmail/functions/strings.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-05-10 12:27:45 UTC (rev 13124)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-05-12 18:19:31 UTC (rev 13125)
@@ -2,8 +2,8 @@
 *** SquirrelMail Stable Series 1.4 ***
 **************************************
 
-Version 1.4.15 - SVN
---------------------
+Version 1.4.15 Release Candidate 1 - 12 May 2008
+------------------------------------------------
   - Added support for Macedonian.
   - Don't allow invalid plugin names in conf.pl --install-plugin.
   - Fix warning in Printer Friendly due to missing include (#1849101).

Modified: branches/SM-1_4-STABLE/squirrelmail/ReleaseNotes
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ReleaseNotes	2008-05-10 12:27:45 UTC (rev 13124)
+++ branches/SM-1_4-STABLE/squirrelmail/ReleaseNotes	2008-05-12 18:19:31 UTC (rev 13125)
@@ -1,7 +1,7 @@
 /*****************************************************************
- * Release Notes: SquirrelMail 1.4.13                            *
- * The "Hope and a Step" Release                                 *
- * 14 December 2007                                              *
+ * Release Notes: SquirrelMail 1.4.15 rc 1                       *
+ * The "Just Checking" Release                                   *
+ * 12 May 2008                                                   *
  *****************************************************************/
 
 In this edition of SquirrelMail Release Notes:
@@ -16,21 +16,14 @@
 All about this release
 ======================
 
-This version, 1.4.13 is a security release, addressing
-the following problems since 1.4.12:
-- 1.4.12 Package Compromise [CVE-2007-6348]
-(see ChangeLog for a full list)
+This is a release candidate, which means it's not officially declared stable
+yet, although we do believe it to be ready. As such we're releasing this
+candidate for people to test, before we release the actual 1.4.15 version.
 
+Version number 1.4.14 was skipped, because some spammer decided to use this
+version number in a phishing attempt.
 
-PHP requirement raised to 4.1.0
-===============================
 
-The minimum PHP requirement raised from 4.0.6 to 4.1.0.
-SquirrelMail has been broken for a while with 4.0.x without anyone
-noticing, this move merely reflects reality.
-
-PHP 4.1.0 has been released more than 5 years ago.
-
 Locales / Translations / Charsets
 =================================
 
@@ -84,7 +77,7 @@
 
 We constantly aim to make SquirrelMail even better. So we need you to
 submit any bug you come across! Also, please mention that the bug is
-in this 1.4.9a release, and list your IMAP server and webserver details.
+in this release, and list your IMAP server and webserver details.
 
    http://www.squirrelmail.org/bugs
 

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/strings.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/strings.php	2008-05-10 12:27:45 UTC (rev 13124)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/strings.php	2008-05-12 18:19:31 UTC (rev 13125)
@@ -16,7 +16,7 @@
  * SquirrelMail version number -- DO NOT CHANGE
  */
 global $version;
-$version = '1.4.15 [SVN]';
+$version = '1.4.15-rc1';
 
 /**
  * SquirrelMail internal version number -- DO NOT CHANGE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13129
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13129&view=rev
Author:   kink
Date:     2008-05-12 11:27:02 -0700 (Mon, 12 May 2008)

Log Message:
-----------
reopen for development

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/functions/strings.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-05-12 18:24:19 UTC (rev 13128)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-05-12 18:27:02 UTC (rev 13129)
@@ -2,6 +2,10 @@
 *** SquirrelMail Stable Series 1.4 ***
 **************************************
 
+Version 1.4.15 - SVN
+--------------------
+
+
 Version 1.4.15 Release Candidate 1 - 12 May 2008
 ------------------------------------------------
   - Added support for Macedonian.

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/strings.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/strings.php	2008-05-12 18:24:19 UTC (rev 13128)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/strings.php	2008-05-12 18:27:02 UTC (rev 13129)
@@ -16,7 +16,7 @@
  * SquirrelMail version number -- DO NOT CHANGE
  */
 global $version;
-$version = '1.4.15-rc1';
+$version = '1.4.15 [SVN]';
 
 /**
  * SquirrelMail internal version number -- DO NOT CHANGE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13133
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13133&view=rev
Author:   kink
Date:     2008-05-13 02:38:58 -0700 (Tue, 13 May 2008)

Log Message:
-----------
fix saving of read receipts to Sent folder

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/src/read_body.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-05-13 09:38:21 UTC (rev 13132)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-05-13 09:38:58 UTC (rev 13133)
@@ -4,8 +4,8 @@
 
 Version 1.4.15 - SVN
 --------------------
+ - Fix saving of Read Receipts to Sent folder.
 
-
 Version 1.4.15 Release Candidate 1 - 12 May 2008
 ------------------------------------------------
   - Added support for Macedonian.

Modified: branches/SM-1_4-STABLE/squirrelmail/src/read_body.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/read_body.php	2008-05-13 09:38:21 UTC (rev 13132)
+++ branches/SM-1_4-STABLE/squirrelmail/src/read_body.php	2008-05-13 09:38:58 UTC (rev 13133)
@@ -367,7 +367,7 @@
         if (($fld_sent && $svr_allow_sent && !$lcl_allow_sent) || ($fld_sent && $lcl_allow_sent)) {
             require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
             $imap_deliver = new Deliver_IMAP();
-            $imap_deliver->mail($composeMessage, $imapConnection, 0, 0, $sent_folder);
+            $imap_deliver->mail($composeMessage, $imapConnection, 0, 0, $imapConnection, $sent_folder);
             unset ($imap_deliver);
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13164
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13164&view=rev
Author:   kink
Date:     2008-05-23 10:31:51 -0700 (Fri, 23 May 2008)

Log Message:
-----------
prepare for release

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/ReleaseNotes
    branches/SM-1_4-STABLE/squirrelmail/functions/strings.php

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-05-23 09:58:03 UTC (rev 13163)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-05-23 17:31:51 UTC (rev 13164)
@@ -2,8 +2,8 @@
 *** SquirrelMail Stable Series 1.4 ***
 **************************************
 
-Version 1.4.15 - SVN
---------------------
+Version 1.4.15 - 23 May 2008
+----------------------------
   - Fix saving of Read Receipts to Sent folder.
   - Converted Romanian (ro_RO) to UTF-8.
   - Converted Slovak (sk_SK) to UTF-8.

Modified: branches/SM-1_4-STABLE/squirrelmail/ReleaseNotes
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ReleaseNotes	2008-05-23 09:58:03 UTC (rev 13163)
+++ branches/SM-1_4-STABLE/squirrelmail/ReleaseNotes	2008-05-23 17:31:51 UTC (rev 13164)
@@ -1,7 +1,7 @@
 /*****************************************************************
- * Release Notes: SquirrelMail 1.4.15 rc 1                       *
- * The "Just Checking" Release                                   *
- * 12 May 2008                                                   *
+ * Release Notes: SquirrelMail 1.4.15                            *
+ * The "Plain Old Regular" Release                               *
+ * 22 May 2008                                                   *
  *****************************************************************/
 
 In this edition of SquirrelMail Release Notes:
@@ -16,9 +16,8 @@
 All about this release
 ======================
 
-This is a release candidate, which means it's not officially declared stable
-yet, although we do believe it to be ready. As such we're releasing this
-candidate for people to test, before we release the actual 1.4.15 version.
+This release is a bugfix release for a number of issues identified since
+1.4.13 was released.
 
 Version number 1.4.14 was skipped, because some spammer decided to use this
 version number in a phishing attempt.

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/strings.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/strings.php	2008-05-23 09:58:03 UTC (rev 13163)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/strings.php	2008-05-23 17:31:51 UTC (rev 13164)
@@ -16,7 +16,7 @@
  * SquirrelMail version number -- DO NOT CHANGE
  */
 global $version;
-$version = '1.4.15 [SVN]';
+$version = '1.4.15';
 
 /**
  * SquirrelMail internal version number -- DO NOT CHANGE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13166
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13166&view=rev
Author:   kink
Date:     2008-05-23 10:49:33 -0700 (Fri, 23 May 2008)

Log Message:
-----------
release for further development

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/functions/strings.php

Added Paths:
-----------
    branches/SM-1_4-STABLE/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.15.txt

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-05-23 17:32:22 UTC (rev 13165)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-05-23 17:49:33 UTC (rev 13166)
@@ -2,6 +2,9 @@
 *** SquirrelMail Stable Series 1.4 ***
 **************************************
 
+Version 1.4.16 - SVN
+--------------------
+
 Version 1.4.15 - 23 May 2008
 ----------------------------
   - Fix saving of Read Receipts to Sent folder.

Copied: branches/SM-1_4-STABLE/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.15.txt (from rev 13164, branches/SM-1_4-STABLE/squirrelmail/ReleaseNotes)
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.15.txt	                        (rev 0)
+++ branches/SM-1_4-STABLE/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.15.txt	2008-05-23 17:49:33 UTC (rev 13166)
@@ -0,0 +1,103 @@
+/*****************************************************************
+ * Release Notes: SquirrelMail 1.4.15                            *
+ * The "Plain Old Regular" Release                               *
+ * 22 May 2008                                                   *
+ *****************************************************************/
+
+In this edition of SquirrelMail Release Notes:
+   * All about this Release!
+   * Locales / Translations / Charsets
+   * Security issues
+   * Major updates
+   * A note on plugins
+   * Reporting my favorite SquirrelMail 1.4 bug
+
+
+All about this release
+======================
+
+This release is a bugfix release for a number of issues identified since
+1.4.13 was released.
+
+Version number 1.4.14 was skipped, because some spammer decided to use this
+version number in a phishing attempt.
+
+
+Locales / Translations / Charsets
+=================================
+
+Since the release of 1.4.4, the the translations for SquirrelMail are
+no longer part of the main package but have to be downloaded separately;
+either in one large file or an individual language. You can find these
+packages through our homepage. They also contain instructions on how
+to install.
+
+That release also introduced a backport of the new Character set
+decoding functions from the development branch, vastly increasing the
+number of supported character sets and decoding performance.
+
+
+
+Major updates in 1.4
+====================
+
+The 1.4.x series (as a result of 1.3 developent series) brings:
+
+* A complete rewrite of the way we send mail (Deliver-class),
+  and of the way we parse mail (MIME-bodystructure parsing).
+  This makes SquirrelMail more reliable and more efficient
+  at the same time!
+* Support for IMAP UID which makes SquirrelMail more reliable.
+* Optimizations to code and the number of IMAP calls; SquirrelMail
+  is now a very scalable webmail solution.
+* Support for a wider range of authentication mechanisms.
+* Lots of bugfixes, some new features and a couple of UI-tweaks.
+
+
+A note on plugins
+=================
+
+There have been major plugin architecture improvements since 1.2.x. Lots
+of plugins have not yet been adapted to this. Plugins which are
+distributed with this release (eg. in the same .tar.gz file) should work.
+Plugin authors will need some time to adapt their plugins, so quite a few
+plugins that did work with 1.2.x might not work with 1.4.x.
+
+So if you have ANY problem at all, first try turning off all plugins.
+If one plugin seems to be the culprit, contact the author to see if
+a 1.4.x version is underway.
+
+Plugins that worked with previous 1.4.x versions should continue to work
+without changes with this version.
+
+
+Reporting my favorite SquirrelMail 1.4 bug
+==========================================
+
+We constantly aim to make SquirrelMail even better. So we need you to
+submit any bug you come across! Also, please mention that the bug is
+in this release, and list your IMAP server and webserver details.
+
+   http://www.squirrelmail.org/bugs
+
+Thanks for your cooperation with this. That helps us to make
+sure nothing slips through the cracks. Also, it would help if
+people would check existing tracker items for a bug before reporting
+it again. This would help to eliminate duplicate reports, and
+increase the time we can spend CODING by DECREASING the time we
+spend sorting through bug reports. And remember, check not only OPEN
+bug reports, but also closed ones as a bug that you report MAY have
+been fixed in our source code repository already.
+
+Any questions about installing or using SquirrelMail can be directed
+to our user support list:
+
+    squirrelmail-users@...
+
+If you want to join us in coding SquirrelMail, or have other
+things to share with the developers, join the development mailinglist:
+
+   squirrelmail-devel@...
+
+                  Happy SquirrelMailing!
+                    - The SquirrelMail Project Team

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/strings.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/strings.php	2008-05-23 17:32:22 UTC (rev 13165)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/strings.php	2008-05-23 17:49:33 UTC (rev 13166)
@@ -16,14 +16,14 @@
  * SquirrelMail version number -- DO NOT CHANGE
  */
 global $version;
-$version = '1.4.15';
+$version = '1.4.16 [SVN]';
 
 /**
  * SquirrelMail internal version number -- DO NOT CHANGE
  * $sm_internal_version = array (release, major, minor)
  */
 global $SQM_INTERNAL_VERSION;
-$SQM_INTERNAL_VERSION = array(1,4,15);
+$SQM_INTERNAL_VERSION = array(1,4,16);
 
 /**
  * There can be a circular issue with includes, where the $version string is


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13236
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13236&view=rev
Author:   pdontthink
Date:     2008-07-12 11:05:48 -0700 (Sat, 12 Jul 2008)

Log Message:
-----------
Remove abook_take; see the Add Address plugin (third party)

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/ChangeLog

Removed Paths:
-------------
    branches/SM-1_4-STABLE/squirrelmail/plugins/abook_take/

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-07-12 18:03:47 UTC (rev 13235)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2008-07-12 18:05:48 UTC (rev 13236)
@@ -9,6 +9,8 @@
   - Allow address book lookups by fields other than nickname/alias
   - Include hooks in databased-based preference backend that have
     long been in the file-based preference backend
+  - Removed the Address Take (abook_take) plugin; please see the Add
+    Address (third party) plugin.
 
 Version 1.4.15 - 23 May 2008
 ----------------------------


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.