Better format for text version of emails

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index ecd1d123856415e13f30c72ce64fb7158e6c2194..b6a8c34392fd3c0d62cb1ee40bcb0daac7fe676d 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -938,7 +938,12 @@ function forum_cron () {
                     }
                     $posttext .= "---------------------------------------------------------------------\n";
                     $posttext .= get_string("postmailinfo", "forum", $course->shortname)."\n";
-                    $posttext .= "$CFG->wwwroot/mod/forum/post.php?reply=$post->id";
+                    $posttext .= "$CFG->wwwroot/mod/forum/post.php?reply=$post->id\n";
+                    if ($canunsubscribe) {
+                        $posttext .= "\n---------------------------------------------------------------------\n";
+                        $posttext .= get_string("unsubscribe", "forum");
+                        $posttext .= ": $CFG->wwwroot/mod/forum/subscribe.php?id=$forum->id\n";
+                    }
   
                     if ($userto->mailformat == 1) {  // HTML
                         $posthtml = "<P><FONT FACE=sans-serif>".
@@ -953,7 +958,7 @@ function forum_cron () {
                         $posthtml .= forum_make_mail_post($post, $userfrom, $userto, $course, false, true, false, false);
 
                         if ($canunsubscribe) {
-                            $posthtml .= "\n<BR><HR SIZE=1 NOSHADE><FONT SIZE=1><A HREF=\"$CFG->wwwroot/mod/forum/subscribe.php?id=$forum->id\">".get_string("unsubscribe", "forum")."</A></FONT>";
+                            $posthtml .= "\n<BR><HR SIZE=1 NOSHADE><P ALIGN=RIGHT><FONT SIZE=1><A HREF=\"$CFG->wwwroot/mod/forum/subscribe.php?id=$forum->id\">".get_string("unsubscribe", "forum")."</A></FONT></P>";
                         }
 
                     } else {