Package: squirrelmail
Version: 1.2.6
Author: Guillem Jover <guillem@hadrons.org>
Status: not-sent
Description:
 Add vhost support.

diff -Naur squirrelmail-1.2.6.orig/functions/db_prefs.php squirrelmail-1.2.6/functions/db_prefs.php
--- squirrelmail-1.2.6.orig/functions/db_prefs.php	2005-01-07 05:31:27.000000000 +0100
+++ squirrelmail-1.2.6/functions/db_prefs.php	2003-04-01 18:32:00.000000000 +0200
@@ -37,7 +37,7 @@
 define('SMDB_PGSQL', 2);
 
 require_once('DB.php');
-require_once('../config/config.php');
+require_once('vhost_config.php');
 
 global $prefs_are_cached, $prefs_cache;
 
diff -Naur squirrelmail-1.2.6.orig/functions/vhost_config.php squirrelmail-1.2.6/functions/vhost_config.php
--- squirrelmail-1.2.6.orig/functions/vhost_config.php	1970-01-01 01:00:00.000000000 +0100
+++ squirrelmail-1.2.6/functions/vhost_config.php	2003-04-01 19:03:00.000000000 +0200
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * vhost_config.php -- virtual config configuration loader
+ *
+ * Copyright (c) 2003, 2005 Guillem Jover <guillem@hadrons.org>
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ */
+
+$virtualdomain = str_replace("webmail.", "", $_SERVER['SERVER_NAME']);
+$global_config = "/srv/$virtualdomain/etc/squirrelmail.conf";
+
+require_once('../config/config.php');
+require_once($global_config);
+
+?>
diff -Naur squirrelmail-1.2.6.orig/src/login.php squirrelmail-1.2.6/src/login.php
--- squirrelmail-1.2.6.orig/src/login.php	2002-04-07 00:44:48.000000000 +0200
+++ squirrelmail-1.2.6/src/login.php	2003-04-01 18:36:00.000000000 +0200
@@ -54,7 +54,7 @@
 }
 
 require_once('../functions/strings.php');
-require_once('../config/config.php');
+require_once('../functions/vhost_config.php');
 require_once('../functions/i18n.php');
 require_once('../functions/plugin.php');
 require_once('../functions/constants.php');
@@ -164,4 +164,4 @@
 do_hook('login_bottom');
 echo "</BODY>\n".
      "</HTML>\n";
-?>
\ No newline at end of file
+?>
diff -Naur squirrelmail-1.2.6.orig/src/printer_friendly_bottom.php squirrelmail-1.2.6/src/printer_friendly_bottom.php
--- squirrelmail-1.2.6.orig/src/printer_friendly_bottom.php	2005-01-07 05:31:27.000000000 +0100
+++ squirrelmail-1.2.6/src/printer_friendly_bottom.php	2005-01-07 05:53:59.000000000 +0100
@@ -16,7 +16,7 @@
 
 require_once('../src/validate.php');
 require_once('../functions/strings.php');
-require_once('../config/config.php');
+require_once('../functions/vhost_config.php');
 require_once('../src/load_prefs.php');
 require_once('../functions/imap.php');
 require_once('../functions/page_header.php');
diff -Naur squirrelmail-1.2.6.orig/src/printer_friendly_top.php squirrelmail-1.2.6/src/printer_friendly_top.php
--- squirrelmail-1.2.6.orig/src/printer_friendly_top.php	2002-04-02 12:05:33.000000000 +0200
+++ squirrelmail-1.2.6/src/printer_friendly_top.php	2003-04-01 18:31:00.000000000 +0200
@@ -14,7 +14,7 @@
 
 require_once('../src/validate.php');
 require_once('../functions/strings.php');
-require_once('../config/config.php');
+require_once('../functions/vhost_config.php');
 require_once('../src/load_prefs.php');
 require_once('../functions/page_header.php');
 
diff -Naur squirrelmail-1.2.6.orig/src/redirect.php squirrelmail-1.2.6/src/redirect.php
--- squirrelmail-1.2.6.orig/src/redirect.php	2002-04-07 00:44:48.000000000 +0200
+++ squirrelmail-1.2.6/src/redirect.php	2003-04-02 07:25:00.000000000 +0200
@@ -14,7 +14,7 @@
 
 require_once('../functions/i18n.php');
 require_once('../functions/strings.php');
-require_once('../config/config.php');
+require_once('../functions/vhost_config.php');
 require_once('../functions/prefs.php');
 require_once('../functions/imap.php');
 require_once('../functions/plugin.php');
@@ -77,6 +77,10 @@
         $login_username = strtolower($login_username);
     }
 
+    if (strpos($login_username, '@') !== false)
+         $login_username = substr($login_username, 0,
+				  strpos($login_username, '@'));
+
     $imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0);
     if (!$imapConnection) {
         $errTitle = _("There was an error contacting the mail server.");
@@ -172,4 +176,4 @@
 }
 
 
-?>
\ No newline at end of file
+?>
diff -Naur squirrelmail-1.2.6.orig/src/validate.php squirrelmail-1.2.6/src/validate.php
--- squirrelmail-1.2.6.orig/src/validate.php	2002-04-08 22:35:29.000000000 +0200
+++ squirrelmail-1.2.6/src/validate.php	2003-04-01 18:30:00.000000000 +0200
@@ -70,7 +70,7 @@
 unset($theme);
 $theme=array();
 
-require_once('../config/config.php');
+require_once('../functions/vhost_config.php');
 require_once('../src/load_prefs.php');
 require_once('../functions/page_header.php');
 require_once('../functions/prefs.php');
diff -Naur squirrelmail-1.2.6.orig/src/webmail.php squirrelmail-1.2.6/src/webmail.php
--- squirrelmail-1.2.6.orig/src/webmail.php	2002-04-07 00:44:48.000000000 +0200
+++ squirrelmail-1.2.6/src/webmail.php	2003-04-01 18:30:00.000000000 +0200
@@ -14,7 +14,7 @@
  */
 
 require_once('../functions/strings.php');
-require_once('../config/config.php');
+require_once('../functions/vhost_config.php');
 require_once('../functions/prefs.php');
 require_once('../functions/imap.php');
 require_once('../functions/plugin.php');