From 0493a8d937329a655ce2a95d3210ecdd13dc1c1c Mon Sep 17 00:00:00 2001
From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 21 Aug 2000 15:56:33 +0000
Subject: [PATCH] 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
---
 ChangeLog                 | 1 +
 config/config_default.php | 3 +++
 functions/url_parser.php  | 2 +-
 src/help.php              | 3 +++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 45140632..cd62dc0e 100644
--- 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 e20914cc..b1413531 100644
--- 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 9d44543a..6d767506 100644
--- 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 884b8fdd..dbc577b6 100644
--- 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;
-- 
2.25.1