[Xerte-dev] Re: the 1.8 trunk merge

[Julian Tenney]

Is this for the zip, or for the trunk? Did you commit it?

-----Original Message-----
From: xerte-dev-bounces at lists.nottingham.ac.uk [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Pat Lockley
Sent: 07 March 2012 17:11
To: For Xerte technical developers
Subject: [Xerte-dev] the 1.8 trunk merge

Just went to look at the feedback page for Oliver - the merge appears
to have killed all the page logic?

New code

-------------------------------------

    <div class="mainbody">

				echo "<p>" . FEEDBACK_RESPONSE . "</p></div></body></html>";

				mail($xerte_toolkits_site->feedback_list, FEEDBACK_EMAIL_TITLE,
FEEDBACK_GIVER . mysql_real_escape_string($_POST['name']) . "<br>" .
FEEDBACK_MESSAGE_INTRO . "<br>" .
mysql_real_escape_string($_POST['feedback']),
$xerte_toolkits_site->headers);

    echo "<p>Thank you for your feedback</p></div></body></html>";

				echo "<div class=\"title\"><p>" . FEEDBACK_PAGE_TITLE .
"</p></div><div style=\"width:45%; float:left; position:relative;
margin-right:20px;\">" . FEEDBACK_DESCRIPTION . "</div><div
style=\"width:50%; float:left; position:relative;\">";

				echo "<form action=\"\" method=\"post\">Name<textarea
name=\"name\" style=\"width:100%;\" rows=\"1\"></textarea>" .
FEEDBACK_TEXTAREA . "<textarea name=\"feedback\" style=\"width:100%;\"
rows=\"25\"></textarea><input type=\"submit\" value=\"" .
FEEDBACK_BUTTON . "\"></form>";

    /**
     *	Else display the page
     */

    echo "<div class=\"title\"><p>Welcome to Xerte on-line Toolkits
Feedback page</p></div><div style=\"width:45%; float:left;
position:relative; margin-right:20px;\">Please leave your feedback
here. All feedback is anonymous, unless you would like a response, and
if you do, please leave your name opposite and some contact details in
the box below. Thank you, the IS Learning Team.</div><div
style=\"width:50%; float:left; position:relative;\">";

    echo "<form action=\"\" method=\"post\">Name<textarea
name=\"name\" style=\"width:100%;\"
rows=\"1\"></textarea>Feedback<textarea name=\"feedback\"
style=\"width:100%;\" rows=\"25\"></textarea><input type=\"submit\"
value=\"Send Feedback\"></form>";

    echo "</div></div></body></html>";

}

?>
    </div>

---------------------------------------

old code (from the zip)
---------------------------------------

<div class="mainbody">

<?PHP     /**
*	If something is posted, send this feedback
 */

if(isset($_POST['feedback'])){

    echo "<p>Thank you for your feedback</p></div></body></html>";

    mail($xerte_toolkits_site->feedback_list, "Xerte Online Feedback",
"Name " . mysql_real_escape_string($_POST['name']) . "<br>Message<br>"
. mysql_real_escape_string($_POST['feedback']),
$xerte_toolkits_site->headers);

}else{

    /**
     *	Else display the page
     */

    echo "<div class=\"title\"><p>Welcome to Xerte on-line Toolkits
Feedback page</p></div><div style=\"width:45%; float:left;
position:relative; margin-right:20px;\">Please leave your feedback
here. All feedback is anonymous, unless you would like a response, and
if you do, please leave your name opposite and some contact details in
the box below. Thank you, the IS Learning Team.</div><div
style=\"width:50%; float:left; position:relative;\">";

    echo "<form action=\"\" method=\"post\">Name<textarea
name=\"name\" style=\"width:100%;\"
rows=\"1\"></textarea>Feedback<textarea name=\"feedback\"
style=\"width:100%;\" rows=\"25\"></textarea><input type=\"submit\"
value=\"Send Feedback\"></form>";

    echo "</div></div></body></html>";

}

?>
    </div>

---------------------------------------

_______________________________________________
Xerte-dev mailing list
Xerte-dev at lists.nottingham.ac.uk
http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev