SF.net SVN: squirrelmail:[13399] trunk/squirrelmail

Revision: 13399
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13399&view=rev
Author:   pdontthink
Date:     2009-02-01 02:24:32 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
Add compatibility with Dovecot's bigint UIDs

Modified Paths:
--------------
    trunk/squirrelmail/ChangeLog
    trunk/squirrelmail/functions/imap_messages.php
    trunk/squirrelmail/functions/mailbox_display.php
    trunk/squirrelmail/plugins/message_details/message_details_bottom.php
    trunk/squirrelmail/plugins/message_details/message_details_main.php
    trunk/squirrelmail/plugins/message_details/message_details_top.php
    trunk/squirrelmail/plugins/spamcop/functions.php
    trunk/squirrelmail/plugins/spamcop/spamcop.php
    trunk/squirrelmail/src/compose.php
    trunk/squirrelmail/src/download.php
    trunk/squirrelmail/src/image.php
    trunk/squirrelmail/src/read_body.php
    trunk/squirrelmail/src/vcard.php
    trunk/squirrelmail/src/view_header.php
    trunk/squirrelmail/src/view_html.php
    trunk/squirrelmail/src/view_text.php

Modified: trunk/squirrelmail/ChangeLog
===================================================================

SF.net SVN: squirrelmail:[13400] branches/SM-1_4-STABLE/squirrelmail/ functions/auth.php

Revision: 13400
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13400&view=rev
Author:   pdontthink
Date:     2009-02-01 19:10:10 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
Correct documentation

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

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/auth.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/auth.php	2009-02-01 02:24:32 UTC (rev 13399)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/auth.php	2009-02-01 19:10:10 UTC (rev 13400)
 <at>  <at>  -33,8 +33,8  <at>  <at> 
  * Check if user has previously logged in to the SquirrelMail session.  If user
  * has not logged in, execution will stop inside this function.
  *
- *  <at> return int A positive value is returned if user has previously logged in
- * successfully.
+ *  <at> return void This function returns ONLY if user has previously logged in
+ * successfully (otherwise, execution terminates herein).
  */
 function is_logged_in() {

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

SF.net SVN: squirrelmail:[13401] branches/SM-1_4-STABLE/squirrelmail

Revision: 13401
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13401&view=rev
Author:   avel
Date:     2009-02-09 09:19:29 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
If there were addressbook nicknames with the : character, they could not be
operated upon. Devel tree is not affected. Note that default addressbook backend
add() method doesn't allow the : character in nickname, but some other plugin,
a 3rd party addressbook backend or previously imported addresses might result in
entries _with_ ':' character in nickname. And it's a trivial fix. 

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

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2009-02-01 19:10:10 UTC (rev 13400)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2009-02-09 09:19:29 UTC (rev 13401)
 <at>  <at>  -22,6 +22,7  <at>  <at> 
   - Migrated some fetch handling code from dev branch in plans to
     update some core functionality to allow reusability of code.
   - Make address book file permissions 0600 - same as preference files.
+  - Fix for address book nicknames that contain the : character.

 Version 1.4.17 - 03 December 2008
 ---------------------------------

Cant Log in

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H

-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@...
List info (subscribe/unsubscribe/change options): https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn

Re: Cant Log in

> I have 2 email address that i use. Yesterday and today i cant get into the
> system. I put in my user name and password and it wont accept it. The email
> address are paul@... and
info@... it just keeps
> going back to the log in page. Any ideas whats wrong?

Please contact your system administrator or help desk.  We have no
relationship to whomever that may be.  For more info, please see:

http://squirrelmail.org/support/enduser.php

Good luck

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@...
List info (subscribe/unsubscribe/change options): https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn

SF.net SVN: squirrelmail:[13402] branches/SM-1_4-STABLE/squirrelmail

Revision: 13402
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13402&view=rev
Author:   pdontthink
Date:     2009-02-14 07:30:40 +0000 (Sat, 14 Feb 2009)

Log Message:
-----------
Ensure that hash directory computation is the same on both 32 and 64 bit architectures (#2596879) (Thanks
to Mike Sweetser)

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

Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2009-02-09 09:19:29 UTC (rev 13401)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog	2009-02-14 07:30:40 UTC (rev 13402)
 <at>  <at>  -23,6 +23,8  <at>  <at> 
     update some core functionality to allow reusability of code.
   - Make address book file permissions 0600 - same as preference files.
   - Fix for address book nicknames that contain the : character.
+  - Ensure that hash directory computation is the same on both 32 and
+    64 bit architectures (#2596879).

 Version 1.4.17 - 03 December 2008
 ---------------------------------

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/prefs.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/prefs.php	2009-02-09 09:19:29 UTC (rev 13401)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/prefs.php	2009-02-14 07:30:40 UTC (rev 13402)
 <at>  <at>  -144,8 +144,15  <at>  <at> 
  *  <at> return array a list of hash dirs for this username
  */
 function computeHashDirs($username) {
-    /* Compute the hash for this user and extract the hash directories. */
-    $hash = base_convert(crc32($username), 10, 16);
+    /* Compute the hash for this user and extract the hash directories.  */
+    /* Note that the crc32() function result will be different on 32 and */
+    /* 64 bit systems, thus the hack below.                              */
+    $crc = crc32($username);
+    if ($crc & 0x80000000) {
+        $crc ^= 0xffffffff;
+        $crc += 1;
+    }
+    $hash = base_convert($crc, 10, 16);
     $hash_dirs = array();
     for ($h = 0; $h < 4; ++ $h) {
         $hash_dirs[] = substr($hash, $h, 1);

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

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@...
List info (subscribe/unsubscribe/change options): https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn

SF.net SVN: squirrelmail:[13403] trunk/squirrelmail

Revision: 13403
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13403&view=rev
Author:   pdontthink
Date:     2009-02-14 07:32:38 +0000 (Sat, 14 Feb 2009)

Log Message:
-----------
Ensure that hash directory computation is the same on both 32 and 64 bit architectures (#2596879) (Thanks
to Mike Sweetser)

Modified Paths:
--------------
    trunk/squirrelmail/ChangeLog
    trunk/squirrelmail/functions/prefs.php

Modified: trunk/squirrelmail/ChangeLog
===================================================================
--- trunk/squirrelmail/ChangeLog	2009-02-14 07:30:40 UTC (rev 13402)
+++ trunk/squirrelmail/ChangeLog	2009-02-14 07:32:38 UTC (rev 13403)
 <at>  <at>  -270,6 +270,8  <at>  <at> 
   - Make all submit button names unique on compose screen
   - Make address book file permissions 0600 - same as preference files
   - Added compatibility with Dovecot's bigint UIDs
+  - Ensure that hash directory computation is the same on both 32 and
+    64 bit architectures (#2596879).

 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

Modified: trunk/squirrelmail/functions/prefs.php
===================================================================
--- trunk/squirrelmail/functions/prefs.php	2009-02-14 07:30:40 UTC (rev 13402)
+++ trunk/squirrelmail/functions/prefs.php	2009-02-14 07:32:38 UTC (rev 13403)
 <at>  <at>  -117,8 +117,15  <at>  <at> 
  *  <at> since 1.2.0
  */
 function computeHashDirs($username) {
-    /* Compute the hash for this user and extract the hash directories. */
-    $hash = base_convert(crc32($username), 10, 16);
+    /* Compute the hash for this user and extract the hash directories.  */ 
+    /* Note that the crc32() function result will be different on 32 and */ 
+    /* 64 bit systems, thus the hack below.                              */
+    $crc = crc32($username);
+    if ($crc & 0x80000000) {
+        $crc ^= 0xffffffff;
+        $crc += 1;
+    }
+    $hash = base_convert($crc, 10, 16);
     $hash_dirs = array();
     for ($h = 0; $h < 4; ++ $h) {
         $hash_dirs[] = substr($hash, $h, 1);

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

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@...
List info (subscribe/unsubscribe/change options): https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn

SF.net SVN: squirrelmail:[13404] trunk/squirrelmail/functions/plugin.php

Revision: 13404
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13404&view=rev
Author:   pdontthink
Date:     2009-02-19 22:24:48 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Allow version numbers to omit trailing zeros

Modified Paths:
--------------
    trunk/squirrelmail/functions/plugin.php

Modified: trunk/squirrelmail/functions/plugin.php
===================================================================
--- trunk/squirrelmail/functions/plugin.php	2009-02-14 07:32:38 UTC (rev 13403)
+++ trunk/squirrelmail/functions/plugin.php	2009-02-19 22:24:48 UTC (rev 13404)
 <at>  <at>  -1003,8 +1003,10  <at>  <at> 
       //
       $version = explode('.', $depend_requirements['version'], 3);
       $version[0] = intval($version[0]);
-      $version[1] = intval($version[1]);
-      $version[2] = intval($version[2]);
+      if (isset($version[1])) $version[1] = intval($version[1]);
+      else $version[1] = 0;
+      if (isset($version[2])) $version[2] = intval($version[2]);
+      else $version[2] = 0;

       $force_dependency_inclusion = !$depend_requirements['activate'];

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

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@...
List info (subscribe/unsubscribe/change options): https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn

SF.net SVN: squirrelmail:[13405] trunk/squirrelmail/functions/plugin.php

Revision: 13405
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13405&view=rev
Author:   pdontthink
Date:     2009-02-19 22:32:50 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
More of the same

Modified Paths:
--------------
    trunk/squirrelmail/functions/plugin.php

Modified: trunk/squirrelmail/functions/plugin.php
===================================================================
--- trunk/squirrelmail/functions/plugin.php	2009-02-19 22:24:48 UTC (rev 13404)
+++ trunk/squirrelmail/functions/plugin.php	2009-02-19 22:32:50 UTC (rev 13405)
 <at>  <at>  -975,8 +975,10  <at>  <at> 
          {
             $version = explode('.', substr($depend_requirements['version'],
strpos($depend_requirements['version'], ':') + 1), 3);
             $version[0] = intval($version[0]);
-            $version[1] = intval($version[1]);
-            $version[2] = intval($version[2]);
+            if (isset($version[1])) $version[1] = intval($version[1]);
+            else $version[1] = 0;
+            if (isset($version[2])) $version[2] = intval($version[2]);
+            else $version[2] = 0;

             if (!check_sm_version($version[0], $version[1], $version[2]))
                $missing_or_bad[$depend_name] = $depend_requirements;

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

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@...
List info (subscribe/unsubscribe/change options): https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn

SF.net SVN: squirrelmail:[13406] branches/SM-1_4-STABLE/squirrelmail/ functions/addressbook.php

Revision: 13406
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13406&view=rev
Author:   pdontthink
Date:     2009-02-19 23:33:54 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Allow multiple addresses in one abook entry (separate with commas), although we HIGHLY DISCOURAGE
grouping in this manner - note amongst other issues that can come up, sizing for large groups will be a problem

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

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php	2009-02-19 22:32:50 UTC (rev 13405)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/addressbook.php	2009-02-19 23:33:54 UTC (rev 13406)
 <at>  <at>  -352,12 +352,26  <at>  <at> 
     function full_address($row) {
         global $data_dir, $username;
         $addrsrch_fullname = getPref($data_dir, $username, 'addrsrch_fullname', 'fullname');
-        if ($addrsrch_fullname == 'fullname')
-            return '"' . $row['name'] . '" <' . trim($row['email']) . '>';
-        else if ($addrsrch_fullname == 'nickname')
-            return '"' . $row['nickname'] . '" <' . trim($row['email']) . '>';
-        else // "noprefix"
-            return trim($row['email']);
+
+        // allow multiple addresses in one row (poor person's grouping - bah)
+        // (separate with commas)
+        //
+        $return = '';
+        $addresses = explode(',', $row['email']);
+        foreach ($addresses as $address) {
+
+            if (!empty($return)) $return .= ', ';
+
+            if ($addrsrch_fullname == 'fullname')
+                $return .= '"' . $row['name'] . '" <' . trim($address) . '>';
+            else if ($addrsrch_fullname == 'nickname')
+                $return .= '"' . $row['nickname'] . '" <' . trim($address) . '>';
+            else // "noprefix"
+                $return .= trim($address);
+
+        }
+
+        return $return;
     }

     /*

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

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@...
List info (subscribe/unsubscribe/change options): https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn