From 2b808e5e489a5af8683511ac953d149d1274272f Mon Sep 17 00:00:00 2001
From: james <james>
Date: Wed, 2 Mar 2011 05:23:38 +0000
Subject: [PATCH] Make school feedback work

---
 schoolfeedback.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/schoolfeedback.php b/schoolfeedback.php
index 9df9b6de..dc896080 100644
--- a/schoolfeedback.php
+++ b/schoolfeedback.php
@@ -14,16 +14,22 @@ $school=mysql_fetch_object($q);
 
 // send the e-mail if we're receiving a post
 if(array_key_exists('feedbacktext', $_POST)){
+	$sh=user_load($_SESSION['users_id']);
+	$sha=account_load($_SESSION['accounts_id']);
 	$body="";
 	$body.=date("r")."\n";
 	$body.=$_SERVER['REMOTE_ADDR']." (".$_SERVER['REMOTE_HOST'].")\n";
 	$body.="School ID: $school->id\n";
 	$body.="School Name: $school->school\n";
-	if($sh['name']) $body.="Science Teacher: {$sh['name']}\n";
-	if($sh['phonework']) $body.="Science Teacher Phone: {$sh['phonework']}\n";
-	if($sh_email) $body.="Science Teacher Email: $sh_email\n";
+	if($sh['name']) $body.="Name: {$sh['firstname']} {$sh['lastname']}\n";
+	if($sh['phonework']) $body.="Phone (Work): {$sh['phonework']}\n";
+	if($sha['username']) $body.="Username: {$sha['username']}\n";
+	if($sha['email']) $body.="Email Address: {$sha['email']}\n";
 	$body.="\nFeedback:\n".stripslashes($_POST['feedbacktext'])."\n";
-	$returnEmailAddress = $sh_email;
+	if($sha['email'])
+		$returnEmailAddress = $sh_email;
+	else
+		$returnEmailAddress = $config['fairmanageremail'];
 	mail($config['fairmanageremail'],"School Feedback",$body,"From: ". $returnEmailAddress."\nReply-To: ".$returnEmailAddress."\nReturn-Path: ".$returnEmailAddress);
 	echo happy_("Your feedback has been sent");
 }