did a few bugfixes in imap functions,

applied patches from list

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@717 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 45140632a843563947c92938696f3db45dc6176e..cd62dc0e9f8c06a10da3596bd55186db54ddffd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Version 0.5pre2 -- DEVELOPMENT
 ------------------------------
+- Using encryption for passwords
 - Added a patch from Bill Thousand to allow easier virtual domains
 - Security updates with attachments
 - Added more hooks for plugins, updated plugin.txt

diff --git a/config/config_default.php b/config/config_default.php
index e20914ccacbc1e078921175546adad40f54f2ed5..b1413531b598a685a5fb851139e12e975661fbcd 100644 (file)
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -215,6 +215,9 @@
     $theme[11]["PATH"] = "../themes/high_contrast_theme.php";
     $theme[11]["NAME"] = "High Contrast";
 
+    $theme[11]["PATH"] = "../themes/black_bean_burrito_theme.php";
+    $theme[11]["NAME"] = "Black Bean Burrito";
+
 //  LDAP server(s)
 //
 //    Array of arrays with LDAP server parameters. See

diff --git a/functions/url_parser.php b/functions/url_parser.php
index 9d44543acb3ee0b2b869c3845ffec05985c69e5f..6d76750695d2039b488d1f77b098acf771bb55b1 100644 (file)
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -27,7 +27,7 @@
          $body = eregi_replace ("([a-z]|[0-9]|_|\.|-)+\@([a-z]|[0-9]|_|-)+(\.([a-z]|[0-9]|_|-)+)*", "<a href=\"../src/compose.php?send_to=\\0\">\\0</a>", $body);
       }
       */
-      $body = eregi_replace ("([a-z]|[0-9]|_|\.|-)+\@([a-z]|[0-9]|_|-)+(\.([a-z]|[0-9]|_|-)+)*", "<a href=\"../src/compose.php?send_to=\\0\">\\0</a>", $body);
+      $body = eregi_replace ("([a-z]|[0-9]|_|\.|-)+\@([a-z]|[0-9]|_|-)+\.(\.|[a-z]|[0-9]|_|-)+", "<a href=\"../src/compose.php?send_to=\\0\">\\0</a>", $body); 
       return $body;
    }
 

diff --git a/src/help.php b/src/help.php
index 884b8fdda06e0ad013ff1b4e433be6cace883dc0..dbc577b690df6d32b4585584fa69f04b82b6a861 100644 (file)
--- a/src/help.php
+++ b/src/help.php
@@ -114,6 +114,9 @@
          $context = "search"; 
    }
    
+   if (!$squirrelmail_language)
+      $squirrelmail_language = "en";
+
    if (file_exists("../help/$squirrelmail_language")) {
       $help_exists = true;
       $user_language = $squirrelmail_language;