Merge development site hash 557b03e2

1 files changed, 52 insertions, 23 deletions

diff --git a/donate.php b/donate.php
index 24c7931..e2e4436 100644
--- a/donate.php
+++ b/donate.php
@@ -1,5 +1,5 @@
 <?php
-// (c) 2014 Timothy Pearson
+// (c) 2014-2015 Timothy Pearson
 // All Rights Reserved
 
 include("tde-head-and-foot.php");
@@ -9,33 +9,62 @@ doHeader("Support Trinity", "Development", "Donations");
 <h2>The Trinity project needs your support!</h2>
     <p>
     While Trinity is free software, making it is not free.<br>
-    Developing and maintaining Trinity takes an enormous amount of effort, and relies heavily on both a fast 
+    Developing and maintaining Trinity takes an enormous amount of effort, and relies heavily on both a fast
     Internet connection and large, power-hungry computers for the build farm and Web services.
     </p>
     <p>
-    If you can, please help to both assist the Trinity development team and pay for the various resources in 
-    use by donating here: 
-    </p>
-        <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-    <fieldset>
-        <legend>Via PayPal</legend>
-        <input type="hidden" name="cmd" value="_s-xclick">
-        <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----">
-        <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!">
-    </fieldset>
-    </form>
-    <p>
-      <fieldset>
-        <legend>Via BitCoin</legend>
-          <a href="bitcoin:1H1RMzujpGC9wZPSjZ6hWqz4BxQ5dzhHti?amount=0.05&amp;label=Trinity%20Desktop%20Environment%20Donation">Donate 50mBTC to TDE!</a><BR>
-          <B>Pay to:</B> 1H1RMzujpGC9wZPSjZ6hWqz4BxQ5dzhHti<BR>
-          <B>Suggestion:</B> 0.05 BTC<BR>
-          <B>Message:</B> Trinity Desktop Environment Donation
-      </fieldset>
-      <p>
-    Every little bit helps and is much appreciated!
+    If you can, please help to both assist the Trinity development team and pay for the various resources in
+    use by donating here:
     </p>
 
 <?php
+	$donation_complete = false;
+	$donation_aborted = false;
+	if (isset($_GET['action'])) {
+		if ($_GET['action'] == "done") {
+			$donation_complete = true;
+		}
+		else if ($_GET['action'] == "cancel") {
+			$donation_aborted = true;
+		}
+	}
+	if ($donation_complete == true) {
+		echo "	<fieldset>";
+		echo "	<legend>Donation Received</legend>";
+		echo "    <font color=\"green\"><b>Thank you for your donation to the Trinity Desktop project!</b></font><br>&nbsp;<br>Your funding will help to create an even better TDE experience into the future.";
+		echo "	</fieldset>";
+	}
+	else if ($donation_aborted == true) {
+		echo "	<fieldset>";
+		echo "	<legend>Donation Cancelled</legend>";
+		echo "    <font color=\"red\"><b>We're sorry you changed your mind.</b></font><br>&nbsp;<br>However, if you love TDE there are other ways to get involved and help the project!<br>Check out our <a href=\"/helpwanted.php\">Get Involved</a> page for more ideas.";
+		echo "	</fieldset>";
+	}
+	else {
+		echo "	<fieldset>";
+		echo "	<legend>Via PayPal</legend>";
+		echo "	<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target=\"_top\">";
+		echo "	<input type=\"hidden\" name=\"cmd\" value=\"_s-xclick\">";
+		echo "	<input type=\"hidden\" name=\"hosted_button_id\" value=\"HVGH827GE28G2\">";
+		echo "	<input type=\"image\" src=\"https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif\" border=\"0\" name=\"submit\" alt=\"PayPal - The safer, easier way to pay online!\">";
+		echo "	<img alt=\"\" border=\"0\" src=\"https://www.paypalobjects.com/en_US/i/scr/pixel.gif\" width=\"1\" height=\"1\">";
+		echo "	</form>";
+		echo "	</fieldset>";
+		echo "	</form>";
+		echo "	<p>";
+		echo "	<fieldset>";
+		echo "	<legend>Via BitCoin</legend>";
+		echo "		<a href=\"bitcoin:1H1RMzujpGC9wZPSjZ6hWqz4BxQ5dzhHti?amount=0.05&amp;label=Trinity%20Desktop%20Environment%20Donation\">Donate 50mBTC to TDE!</a><BR>";
+		echo "		<B>Pay to:</B> 1H1RMzujpGC9wZPSjZ6hWqz4BxQ5dzhHti<BR>";
+		echo "		<B>Suggestion:</B> 0.05 BTC<BR>";
+		echo "		<B>Message:</B> Trinity Desktop Environment Donation";
+		echo "	</fieldset>";
+		echo "	<p>";
+		echo "    Every little bit helps and is much appreciated!";
+		echo "  </p>";
+	}
+?>
+
+<?php
 	doFooter();
 ?>