--- uieforum/reportpost.php 2008-03-09 18:15:51.000000000 +0100 +++ uieforum-org/reportpost.php 2007-12-13 21:49:16.000000000 +0100 @@ -17,7 +17,7 @@ $post_header [0]['data'] = t('Report Post'); $referer = false; - $refererText = t('the parent forum'); + $refererText = 'the parent forum'; $refererLinkage = uieforum_get_module_menu_name(); if($_POST['ReportPostReferer']) { $referer = true; @@ -26,9 +26,9 @@ elseif($_SERVER['HTTP_REFERER']) { $referer = true; $refererLinkage = $_SERVER['HTTP_REFERER']; - $refererText = t('where you came from'); + $refererText = 'where you came from'; } - $returnText = t('Click here to return to ').$refererText; + $returnText = t('Click here to return to '.$refererText); $returnToForum = l($returnText, $refererLinkage, null, $referer ? null : 'fid='.uie_id('fid')); if($_POST['confirm']) @@ -37,21 +37,20 @@ $reportEmail = variable_get('forum_report_post_email', ''); if($reportEmail) { - $subject = t('** Post Reported for @sitename - PostID: @postid', array('@sitename' => $site_name, '@postid'=>uie_id('PostID'))); + $subject = '** '.t('Post Reported').' - '.uie_id('PostID'); // echo "
";
         $userby = user_load(array('uid'=>$CurrentPost->Poster));
-        $message  = $user->name . t(" has reported a post.\n\n");
-        $message .= t("Posted By: ").$userby->name."\n";
-        $human_readable_date = date("d-m-Y \@ H:i:s",$CurrentPost->Posted); //$CurrentPost->Posted is an unix timestamp not human readable date
-        $message .= t("Posted Time: ").$human_readable_date."\n";
-        $message .= t("PostID: ").$CurrentPost->PostID."\n";
-        $message .= t("ThreadID: ").l($CurrentPost->ThreadID, uieforum_get_module_menu_name(), null, "c=showthread&ThreadID=".$CurrentPost->ThreadID."#".$CurrentPost->PostID, null, true, true)."\n";
-        $message .= $_POST['ReportPostMessage'] ? t('Reason: ').$_POST['ReportPostMessage']."\n\n" : null;
-        $message .= t("Message Content Follows:\n\n").$CurrentPost->Content;
+        $message  = $user->name . " has reported a post.\n\n";
+        $message .= "Posted By: ".$userby->name."\n";
+        $message .= "Posted Time: ".$CurrentPost->Posted."\n";
+        $message .= "PostID: ".$CurrentPost->PostID."\n";
+        $message .= "ThreadID: ".l($CurrentPost->ThreadID, uieforum_get_module_menu_name(), null, "c=showthread&ThreadID=".$CurrentPost->ThreadID."#".$CurrentPost->PostID, null, true, true)."\n";
+        $message .= $_POST['ReportPostMessage'] ? 'Reason: '.$_POST['ReportPostMessage']."\n\n" : null;
+        $message .= "Message Content Follows:\n\n".$CurrentPost->Content;
 //        echo $message;
 //        die();
 
-        $header  = $user->mail;
+        $header  = "From: ".$user->name." <".$user->mail.">\n";
 //        $header .= "Cc: thing@thing.com\n";
         drupal_mail('uieforum_reportpost', $reportEmail, $subject, $message, $header);