updated install

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

diff --git a/INSTALL b/INSTALL
index 5eba5aff399666b4725f16fef7b67932539eab0e..20ce4b81eb511347a525b41d1aad9dfaab9b579d 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -11,8 +11,8 @@ overview of how to install SquirrelMail.
 4.  Change the permissons for the "data/" directory so it's writable to
     the web server.  Under Red Hat Linux 6.0, this is done by:
 
-    chown nobody data
-    chgrp nobody data
+    chown -R nobody data
+    chgrp -R nobody data
 
     "nobody" is the user and group for the apache server for this
     example.

diff --git a/functions/smtp.php b/functions/smtp.php
index 20147405c1cea257dfa53e0ced2e6565e6c1698c..06f45dca0d43e4b79f3bced5c4821517e50fa998 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -27,9 +27,9 @@
       $reply_to = getPref($username, "reply_to");
       $from = getPref($username, "full_name");
       if ($from == "")
-         $from = "<$username@$domain>";
+         $from = "<$from_addr>";
       else
-         $from = $from . " <$username@$domain>";
+         $from = $from . " <$from_addr>";
 
 
       $smtpConnection = fsockopen($smtpServerAddress, $smtpPort, $errorNumber, $errorString);
@@ -50,7 +50,7 @@
       errorCheck($tmp);
 
       /** Ok, who is sending the message? */
-      fputs($smtpConnection, "MAIL FROM:$from_addr\n");
+      fputs($smtpConnection, "MAIL FROM:<$from_addr>\n");
       $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024)));
       errorCheck($tmp);