Merge branch 'master' of git.raylu.net:pathery

1 files changed, 29 insertions, 16 deletions

diff --git a/pages/feedback.php b/pages/feedback.php
index 3831d24..882bc03 100644
--- a/pages/feedback.php
+++ b/pages/feedback.php
@@ -1,23 +1,24 @@
 <?php

 

-if (isset($_POST['regarding']) AND isset($_SESSION['accepted'])) {

-	if (!$accepted)

-		return;

-	$data = $_POST;

-	$data['session'] = print_r($_SESSION, true);

+if (isset($_POST['regarding'])) {

 	

-	$userID = $_SESSION['userID'] * 1;

-	if (!is_int($userID))

-		return;

 	

-	include_once "includes/sqlEmbedded.php";

-	$sql = "SELECT `email` FROM `users` 

-   WHERE `ID` = '$userID'";

-   $result = mysql_query($sql);

+	$data = $_POST;

 	

-   $email = mysql_result($result, 0, 'email');

+	if ($accepted) {

+		$data['session'] = print_r($_SESSION, true);

 	

-	$data['email'] = $email;

+		$userID = $_SESSION['userID'] * 1;

+		if (!is_int($userID))

+			return;

+		

+		include_once "includes/sqlEmbedded.php";

+		$sql = "SELECT `email` FROM `users` 

+		WHERE `ID` = '$userID'";

+		$result = mysql_query($sql);

+		$email = mysql_result($result, 0, 'email');

+		$data['email'] = $email;

+	}

 	

 	EmailError($data, "Pathery Feedback");

 	DoRedirect("<b>Thank you for your feedback!</b> <br />

@@ -36,7 +37,7 @@ htmlHeader(array(), 'Feedback & Contact', 'Send feedback or contact us.');
 <?php

 topbar($headerLinks);

 

-if (!$accepted) {

+/* if (!$accepted) {

 	echo "

 	<div class='wrapper'>

 		Sorry, you must be logged in to use this.

@@ -44,7 +45,7 @@ if (!$accepted) {
 	</div>";

 	htmlFooter();

 	exit;

-}

+} */

 

 

 ?>

@@ -56,6 +57,8 @@ if (!$accepted) {
 

 <p>Thanks so much for taking the time to say hello!

 

+<br />You can email me @ snap@pathery.com if you'd rather.

+

 </p>

 

 <form action="feedback" method="post" name="feedback">

@@ -70,8 +73,18 @@ if (!$accepted) {
 </select>

 <br /><br />

 

+<?

+if (!$accepted) {

+	echo '

+	Email address*: <input type="email" size="25" maxlength="60" value="" name="entered_email" class="forminput" /><br />

+	';

+}

+?>

+

+

 Title: <input type="text" size="25" maxlength="60" value="" name="title" class="forminput" /><br />

 

+

 <textarea name='body' rows="10" cols="30"></textarea><br />

 

 <input type="checkbox" name="emailback" value="yes" /> Please email me back