Minor bugfixes and SMTP support

19 years ago · 52c1f289c2
parent d3d42bde2a
commit 52c1f289c2
7 changed files with 29 additions and 1115 deletions
--- a/11
+++ b/11
@ -6,10 +6,11 @@ INSTALLATION
 2. Make shure that the following directories are writable by the webserver
   - /temp
   - /logs
-3. Modify the files in /config to suit your local environment
-4. Create database tables using the queries in file 'SQL/initial.sql'
-   Rename tables if you like, but make shure the names are also changed in /config/db.inc
-5. Done!
+3. Rename the files config/*.inc.php.dist to config/*.inc.php
+4. Modify the files in config/* to suit your local environment
+5. Create database tables using the queries in file 'SQL/*.initial.sql'
+   Rename tables if you like, but make shure the names are also changed in config/db.inc.php
+6. Done!


 REQUIREMENTS
@ -28,5 +29,5 @@ REQUIREMENTS
 CONFIGURATION
 =============

-Change the files in /config/ according your environment and you needs.
+Change the files in config/* according your environment and you needs.
 Details about the config paramaters can be found in the config files.
--- a/18
+++ b/18
@ -9,14 +9,26 @@ message filters. RoundCube Webmail is written in PHP and requires the MySQL
 database. The user interface is fully skinnable using XHTML and CSS 2.

 This project is meant to be a modern webmail solution which is easy to
-install/configure and that runs on a standard PHP plus MySQL or Postgres configuration.
-It includes open-source classes/libraries like PEAR (http://pear.php.net) and the
-IMAP wrapper from IlohaMail (http://www.ilohamail.org).
+install/configure and that runs on a standard PHP plus MySQL or Postgres
+configuration. It includes open-source classes/libraries like PEAR
+(http://pear.php.net) and the IMAP wrapper from IlohaMail
+(http://www.ilohamail.org).

 The current development skin uses icons designed by Stephen Horlander and Kevin 
 Gerich for Mozilla.org.


+How it works:
+-------------
+The main authority for the RoundCube access is the IMAP server. If
+'auto_create_user' is set to TRUE in config/main.inc.php a new record in the
+user table will be created once the IMAP login succeeded. This user record does
+not store a password, it's just used to assign identities, contacts and cache
+records. If you have 'auto_create_user' set to FALSE only IMAP logins which
+already have a corresponding entry in the user's table (username and hostname)
+will be allowed.
+
+
 Installation:
 -------------
 For detailed instructions on how to install SquirrelMail on your server,
--- a/config/db.inc.php.dist
+++ b/config/db.inc.php.dist
@ -6,7 +6,7 @@
 |                                                                       |
 | This file is part of the RoundCube Webmail client                     |
 | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
- | All rights reserved.                                                  |
+ | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+

--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@ -6,7 +6,7 @@
 |                                                                       |
 | This file is part of the RoundCube Webmail client                     |
 | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
- | All rights reserved.                                                  |
+ | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+

--- a/logs/errors
+++ b/logs/errors
--- a/logs/sendmail
+++ b/logs/sendmail
@ -1,8 +0,0 @@
-[30-Sep-2005 23:13:28 +0200] User: 2; Message for Thomas Bruderli <thomas@brotherli.ch>; Subject: Testmail form RoundCube I
-[30-Sep-2005 23:28:29 +0200] User: 2; Message for Thomas Brüderli <thomas@brotherli.ch>; Subject: Testmail form RoundCube II
-[30-Sep-2005 23:33:23 +0200] User: 2; Message for Thomas Brüderli <thomas@brotherli.ch>; Subject: Testmail form RoundCube III
-[30-Sep-2005 23:34:23 +0200] User: 2; Message for Thomas Brüderli <thomas@brotherli.ch>; Subject: Testmail form RoundCube IV
-[30-Sep-2005 23:44:40 +0200] User: 2; Message for Thomas Brüderli <thomas@brotherli.ch>, tb@localhost; Subject: Testmail V
-[30-Sep-2005 23:45:38 +0200] User: 2; Message for Thomas Brüderli <thomas@brotherli.ch>, roundcube@gmail.com; Subject: Testmail VI
-[30-Sep-2005 23:54:05 +0200] User: 2; Message for Thomas Brüderli <thomas@brotherli.ch>; Subject: Testmail VII
-[30-Sep-2005 23:55:08 +0200] User: 2; Message for Thomas Brüderli <thomas@brotherli.ch>; Subject: Testmail VII
--- a/program/include/main.inc
+++ b/program/include/main.inc
@ -303,15 +303,17 @@ function rcmail_create_user($user, $host)

  if ($user_id = $DB->insert_id())
    {
+    $user_email = strstr($user, '@') ? $user : sprintf('%s@%s', $user, $host);
+    $user_name = $user!=$user_email ? $user : '';
+    
    // also create a new identity record
    $DB->query(sprintf("INSERT INTO %s
                        (user_id, `default`, name, email)
-                        VALUES (%d, '1', '%s', '%s@%s')",
+                        VALUES (%d, '1', '%s', '%s')",
                       get_table_name('identities'),
                       $user_id,
-                       $user,
-                       $user,
-                       $host));
+                       $user_name,
+                       $user_email));
                       
    // get existing mailboxes
    $a_mailboxes = $IMAP->list_mailboxes();