Reverted back to old donation process
Signed-off-by: Edouard Poitras <edouard@eclipse.org>
diff --git a/ajaxBugzilla.php b/ajaxBugzilla.php
index a00d9eb..acf1eb2 100644
--- a/ajaxBugzilla.php
+++ b/ajaxBugzilla.php
@@ -1,21 +1,10 @@
<?php
-/*******************************************************************************
- * Copyright (c) 2014 Eclipse Foundation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Christopher Guindon (Eclipse Foundation) - Initial implementation
- * Edouard Poitras (Eclipse Foundation) - Some modifications
- *******************************************************************************/
require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); $App = new App();
require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/friends/friend.class.php");
if (!isset($_GET['v2'])) {
// delete this once site_login is updated
- $bugzillaLogin = filter_var($_GET['bugzillaLogin'], FILTER_SANITIZE_EMAIL);
+ $bugzillaLogin = $_GET['bugzillaLogin'];
$friend = new Friend();
$bugzillaID = $friend->getBugzillaIDFromEmail($bugzillaLogin);
if ($bugzillaID != 0)
@@ -27,7 +16,7 @@
$valid = TRUE;
if (isset($_POST['email']) && !empty($_POST['email'])) {
$valid = FALSE;
- $id = filter_var($_POST['email'], FILTER_SANITIZE_EMAIL);
+ $id = $_POST['email'];
$friend = new Friend();
$bugzilla_id = $friend->getBugzillaIDFromEmail($id);
if ($bugzilla_id != 0) {
diff --git a/content/en_index.php b/content/en_index.php
index 8fa2b0e..34dc3a4 100644
--- a/content/en_index.php
+++ b/content/en_index.php
@@ -8,228 +8,154 @@
*
* Contributors:
* Christopher Guindon (Eclipse Foundation) - Initial implementation
- * Edouard Poitras (Eclipse Foundation) - Some modifications
*******************************************************************************/
?>
-<div id="content">
- <div class="row">
- <div class="col-md-18">
- <h1><?php print $pageTitle; ?></h1>
- <p>Participate in our success. Together we can make Eclipse even better! Each donation supports the Eclipse community.</p>
+<div id="fullcolumn">
+ <div id="midcolumn">
+ <h1><?php print $pageTitle; ?></h1>
+ <p>Support Eclipse and help the Eclipse Foundation provide services
+ for the Eclipse community, such as*:</p>
+
+ <ul>
+ <li>Providing more bandwidth for users and committers</li>
+ <li>Purchasing additional servers to host Eclipse projects</li>
+ <li>Sending students to EclipseCon</li>
+ <li>Sponsoring Eclipse community events</li>
+ </ul>
+
+ <p>
+ Feel free to donate any amount you'd like. Donations of $35 or more
+ will receive special Friends of Eclipse benefits (described below).
+ We have made it easy to use a credit card through <img
+ src="images/paypal.gif" align="absbottom" alt="PayPal">. Please
+ note, the Eclipse Foundation is a not-for-profit organization, not a
+ charitable organization, so we are unable to provide charitable tax
+ receipts.
+ </p>
+ <span style="display:block;margin-top:2em;"><?php print $App->getFacebookLikeButtonHTML();?></span>
+ <h3>Donate</h3>
+ <p class="required">Required*</p>
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="POST" name="donateForm" id="donateForm" class="form-horizontal">
+
+ <input type="hidden" name="business" value="donate@eclipse.org"/>
+ <input type="hidden" name="item_name" value="Donation"/>
+ <input type="hidden" name="no_shipping" value="1"/>
+ <input type="hidden" name="on0" value="Comment"/>
+ <input type="hidden" name="on1" value="Anonymity"/>
+ <input TYPE="hidden" name="lc" value="US"/>
+ <input TYPE="hidden" name="cmd" value="_xclick"/>
+ <input type="hidden" name="currency_code" value="USD"/>
+
+ <div class="form-group">
+ <label for="first_name" class="col-sm-6 control-label">First Name<span class="required">*</span></label>
+ <div class="col-sm-18">
+ <input type="text" name="first_name" size="30" id="first_name" maxlength="64" class="form-control"/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="last_name" class="col-sm-6 control-label">Last Name<span class="required">*</span></label>
+ <div class="col-sm-18">
+ <input type="text" name="last_name" size="30" id="last_name" maxlength="64" class="form-control"/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="amount" class="col-sm-6 control-label">Donation Amount<span class="required">*</span></label>
+ <div class="col-sm-8">
+ <input type="text" name="amount" id="amount" size="10" class="form-control"/>
+ </div>
+ <div class="col-sm-6" style="padding-left:0;padding-top:6px;">
+ US$
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="os0" class="col-sm-6 control-label">Message (200 Characters)</label>
+ <div class="col-sm-18">
+ <textarea id="os0" name="os0" maxlength="200" class="form-control"/></textarea>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="os1" class="col-sm-6 control-label">Visibility</label>
+ <div class="col-sm-18">
+ <label class="checkbox-inline">
+ <input type="radio" id="os1" name="os1" value="Public" checked="checked"> List My Name
+ </label>
+
+ <label class="checkbox-inline">
+ <input type="radio" id="os1" name="os1" value="Anonymous"> List Anonymously
+ </label>
+ </div>
+ </div>
+
+
+ <h3 style="margin-top:2em;">Friend Of Eclipse Login</h3>
+
+ <p>When you donate US$35 or more you will have access to the Friends
+ of Eclipse Mirror Site. You will need an Eclipse.org account to
+ gain you access to this mirror. If you need an account
+ <a href="https://dev.eclipse.org/site_login/createaccount.php" target="_blank">click here</a> to launch the registration page in a new window.</p>
+
+ <div class="form-group">
+ <label for="item_number" class="col-sm-6 control-label">Eclipse.org login <span class="required">*</span></label>
+ <div class="col-sm-18">
+ <input class="form-control" type="text" name="item_number" id="item_number" size="30">
+ <p style="margin-top:2em;"><input type="submit" class="btn btn-primary" value="Donate" />
+ <img src="images/paypal.gif" align="absbottom" alt="PayPal" style="padding:0 10px;"></p>
+ </div>
+ </div>
+ </form>
+
+
+ <h2 style="margin-top:2em;">Friend of Eclipse Benefits</h2>
+
+ <p>Donate US$35 or more and you will be identified as a Friend of
+ Eclipse for 1 year. Benefits include:</p>
+
+
+ <ul>
+ <li><span class="friend">Friends of Eclipse Mirror Site</span> -
+ This will allow you to download new versions of Eclipse faster**.</li>
+ <li><span class="friend">"Friend of Eclipse" logo***</span></li>
+ </ul>
+
+
+ <p align="center">
+ <img src="images/friendslogo.png" width="275" style="padding:2em 0 3em 0;"/>
+ </p>
+
+
+ <p class="small">*Eclipse Foundation Inc. is a not-for-profit, member supported
+ corporation. Please note that contributions or gifts to the Eclipse
+ Foundation Inc. are not tax deductible as charitable contributions.
+ Contributions will not be restricted to the activities described,
+ but will be put into a general operating fund.</p>
+ <p class="small">**Eclipse Foundation Inc. cannot guarantee that the Friends mirror
+ will be faster than its other mirrors, however it will give users of
+ this mirror priority. This Friends Mirror is only available for
+ downloads through our website.</p>
+ <p class="small">***The Friends of Eclipse program is for individuals, so the logo
+ should not be used on an organization web site.</p>
+
</div>
- <div class="col-md-6">
- <img src="images/friendslogo.png" class="friends-logo-top" />
- </div>
- </div>
- <div class="row boxes">
- <div class="col-md-5-eclipse donation-box">
- <div>
- <p class="donation-amount"><sup>$</sup>5</p>
- <h2>Acquaintance</h2>
- <form action="<?php print $Paypal->get_paypal_url(); ?>" method="POST">
- <input type="hidden" name="business" value="<?php print $Paypal->get_donation_email(); ?>"/>
- <input type="hidden" name="item_name" value="Donation"/>
- <input type="hidden" name="no_shipping" value="1"/>
- <input type="hidden" name="lc" value="US"/>
- <input type="hidden" name="cmd" value="<?php print PAYPAL_PURCHASE_CMD; ?>"/>
- <input type="hidden" name="currency_code" value="USD"/>
- <input type="hidden" name="amount" value="5"/>
- <input type="submit" class="btn btn-warning donation-button" value="Donate" />
- </form>
- </div>
- <div class="background-purple">
- <p>
- Contributes to our ongoing success and we are grateful!
- </p>
- </div>
- </div>
- <div class="col-md-5-eclipse donation-box">
- <div>
- <p class="donation-amount"><sup>$</sup>10</p>
- <h2>Supporter</h2>
- <form action="<?php print $Paypal->get_paypal_url(); ?>" method="POST">
- <input type="hidden" name="business" value="<?php print $Paypal->get_donation_email(); ?>"/>
- <input type="hidden" name="item_name" value="Donation"/>
- <input type="hidden" name="no_shipping" value="1"/>
- <input type="hidden" name="lc" value="US"/>
- <input type="hidden" name="cmd" value="<?php print PAYPAL_PURCHASE_CMD; ?>"/>
- <input type="hidden" name="currency_code" value="USD"/>
- <input type="hidden" name="amount" value="10"/>
- <input type="submit" class="btn btn-warning donation-button" value="Donate" />
- </form>
- </div>
- <div class="background-purple">
- <p>
- Keeps the Eclipse Community vibrant and amazing!
- </p>
- </div>
- </div>
- <div class="col-md-5-eclipse donation-box">
- <div>
- <p class="donation-amount"><sup>$</sup>35</p>
- <h2>Friend</h2>
- <form action="<?php print $Paypal->get_paypal_url(); ?>" method="POST">
- <input type="hidden" name="business" value="<?php print $Paypal->get_donation_email(); ?>"/>
- <input type="hidden" name="item_name" value="Donation"/>
- <input type="hidden" name="no_shipping" value="1"/>
- <input type="hidden" name="lc" value="US"/>
- <input type="hidden" name="cmd" value="<?php print PAYPAL_PURCHASE_CMD; ?>"/>
- <input type="hidden" name="currency_code" value="USD"/>
- <input type="hidden" name="amount" value="35"/>
- <input type="submit" class="btn btn-warning donation-button" value="Donate" />
- </form>
- </div>
- <div class="background-purple">
- <h5 class="you-get-label">You Get:</h5>
- <ul class="donation-benefits">
- <li>Eclipse Mirror Site</li>
- <li>Friends of Eclipse Logo</li>
- <li>40% off prints and 50% off ebooks at oreilly.com</li>
- </ul>
- </div>
- </div>
- <div class="col-md-5-eclipse donation-box">
- <div>
- <p class="donation-amount"><sup>$</sup>100</p>
- <h2>Best Friend</h2>
- <form action="<?php print $Paypal->get_paypal_url(); ?>" method="POST">
- <input type="hidden" name="business" value="<?php print $Paypal->get_donation_email(); ?>"/>
- <input type="hidden" name="item_name" value="Donation"/>
- <input type="hidden" name="no_shipping" value="1"/>
- <input type="hidden" name="lc" value="US"/>
- <input type="hidden" name="cmd" value="<?php print PAYPAL_PURCHASE_CMD; ?>"/>
- <input type="hidden" name="currency_code" value="USD"/>
- <input type="hidden" name="amount" value="100"/>
- <input type="submit" class="btn btn-warning donation-button" value="Donate" />
- </form>
- </div>
- <div class="background-purple">
- <h5 class="you-get-label">You Get:</h5>
- <ul class="donation-benefits">
- <li>Friend Benefits</li>
- <li>Eclipse T-Shirt</li>
- <li>EclipseCon Discount</li>
- </ul>
- </div>
- </div>
- <div class="col-md-5-eclipse donation-box">
- <div>
- <p class="donation-amount"><sup>$</sup>250</p>
- <h2>Webmaster BFF</h2>
- <form action="<?php print $Paypal->get_paypal_url(); ?>" method="POST">
- <input type="hidden" name="business" value="<?php print $Paypal->get_donation_email(); ?>"/>
- <input type="hidden" name="item_name" value="Donation"/>
- <input type="hidden" name="no_shipping" value="1"/>
- <input type="hidden" name="lc" value="US"/>
- <input type="hidden" name="cmd" value="<?php print PAYPAL_PURCHASE_CMD; ?>"/>
- <input type="hidden" name="currency_code" value="USD"/>
- <input type="hidden" name="amount" value="250"/>
- <input type="submit" class="btn btn-warning donation-button" value="Donate" />
- </form>
- </div>
- <div class="background-purple">
- <h5 class="you-get-label">You Get:</h5>
- <ul class="donation-benefits">
- <li>Best Friend benefits</li>
- <li>Eternal Gratitude of the Eclipse Webmasters</li>
- </ul>
- </div>
- </div>
- </div>
- <div id="custom-donation" class="row">
- <div class="col-md-24">
- <form action="<?php print $Paypal->get_paypal_url(); ?>" method="POST">
- <input type="hidden" name="business" value="<?php print $Paypal->get_donation_email(); ?>"/>
- <input type="hidden" name="item_name" value="Donation"/>
- <input type="hidden" name="no_shipping" value="1"/>
- <input type="hidden" name="lc" value="US"/>
- <input type="hidden" name="cmd" value="<?php print PAYPAL_PURCHASE_CMD; ?>"/>
- <input type="hidden" name="currency_code" value="USD"/>
- <div class="col-md-offset-8 col-md-4 col-sm-offset-4 col-sm-8 col-xs-12">
- <input type="text" name="amount" id="donation-amount" placeholder="Or enter amount..." value=""/>
- </div>
- <div class="col-md-4 col-sm-8 col-xs-12">
- <input type="submit" id="custom-donation-button" class="btn btn-warning" value="Donate" />
- </div>
- </form>
- </div>
- </div>
- <div class="row donation-footer">
- <div id="friends-benefits" class="col-md-8">
- <h2>Friend of Eclipse Benefits</h2>
- <p>Donate between US$35 and US$99.99 and you will be identified as a Friend of Eclipse for 1 year. Benefits include:</p>
- <ul class="friends-list fa-ul">
- <li><i class="fa fa-li fa-chevron-circle-right orange"></i>
- Friend of Eclipse Mirror Site - This will allow you to download new
- versions of Eclipse faster**
- </li>
- <li><i class="fa fa-li fa-chevron-circle-right orange"></i>
- "Friend of Eclipse" logo*** <img src="images/friendslogo.png" class="friends-logo-bot" />
- </li>
- <li><i class="fa fa-li fa-chevron-circle-right orange"></i>
- 40% off prints and 50% off ebooks at oreilly.com
- </li>
- </ul>
- </div>
- <div id="best-friends-benefits" class="col-md-8">
- <h2>Best Friend of Eclipse Benefits</h2>
- <p>Donate more than US$100 and you will be identified as a Best Friend of Eclipse for 1 year. Benefits include:</p>
- <ul class="friends-list fa-ul">
- <li><i class="fa fa-li fa-chevron-circle-right orange"></i>
- Friend of Eclipse Benefits (described above)
- </li>
- <li><i class="fa fa-li fa-chevron-circle-right orange"></i>
- Eclipse T-Shirt
- </li>
- <li><i class="fa fa-li fa-chevron-circle-right orange"></i>
- EclipseCon Friend of Eclipse discount****
- </li>
- </ul>
- <a href="/donate/faq.php">More Information</a>
- </div>
- <div id="recent-donations" class="col-md-8">
- <h2>Recent Donations</h2>
- <?php print donorListTable(6); ?>
- <a href="/donate/donorlist.php">Donor List</a>
- </div>
- <!--<div id="related-links" class="col-md-8">
- <h2>Related Links</h2>
- <ul class="friends-list fa-ul">
- <li><i class="fa fa-li fa-chevron-circle-right orange"></i>
- <a href="//www.eclipse.org/donate/faq.php">FAQ</a>
- </li>
- <li><i class="fa fa-li fa-chevron-circle-right orange"></i>
- <a href="//dev.eclipse.org/site_login">Friends of Eclipse Login</a>
- </li>
- </ul>
- </div>-->
- </div>
- <div class="donation-fine-print">
- <div id="fine-print" class="col-md-24">
- <p class="small">
- *Eclipse Foundation Inc. is a not-for-profit, member supported
- corporation. Please note that contributions or gifts to the Eclipse
- Foundation Inc. are not tax deductible as charitable contributions.
- Contributions will not be restricted to the activities described, but
- will be put into a general operating fund.
- <br /><br />
- **Eclipse Foundation Inc. cannot guarantee that the Friends mirror will
- be faster than its other mirrors, however it will give users of this
- mirror priority. This Friends Mirror is only available for downloads
- through our website.<br />
- When you donate US$35 or more you will have access to the Friends of Eclipse Mirror Site.
- You will need an Eclipse.org account to gain access to this mirror.
- If you need an account <a href="https://dev.eclipse.org/site_login/createaccount.php" target="_blank">click here</a> to launch the registration page is a new window.
- <br /><br />
- ***The Friends of Eclipse program is for individuals, so the logo
- should not be used on an organization web site.
- <br /><br />
- ****The discount is valid for a year and can be used for all three
- EclipseCon events. The discount amount varies for each individual
- conference and will be identified on their respective registration
- pages at eclipsecon.org. The friend discount cannot be combined with
- other EclipseCon discounts such as alumni, member, etc.
- </p>
- </div>
- </div>
-</div>
+ </div>
+ <div id="rightcolumn">
+ <div class="sideitem">
+ <h6>Related Links</h6>
+ <ul>
+ <li><a href="faq.php">FAQ</a></li>
+ <li><a href="http://dev.eclipse.org/site_login">Friends of Eclipse Login</a></li>
+ </ul>
+ </div>
+ <div class="sideitem">
+ <h6>Recent Donations</h6>
+ <ul class="fa-ul">
+ <? sideDonorList(10); ?>
+ </ul>
+ <p class="small">*Amounts are in USD</p>
+
+ </div>
+
+ </div>
diff --git a/donorlist.php b/donorlist.php
index 6d88b90..6f7a4a3 100644
--- a/donorlist.php
+++ b/donorlist.php
@@ -1,15 +1,16 @@
<?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop'
-/*******************************************************************************
- * Copyright (c) 2014 Eclipse Foundation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Nathan Gervais (Eclipse Foundation) - Initial implementation (2007-11-07)
- * Edouard Poitras (Eclipse Foundation) - Further modifications
- *******************************************************************************/
+ #*****************************************************************************
+ #
+ # donorlist.php (/friends)
+ #
+ # Author: Nathan Gervais
+ # Date: 2007-11-07
+ #
+ # Description: Type your page comments here - these are not sent to the browser
+ #
+ #
+ #****************************************************************************
+
#
# Begin: page-specific settings. Change these.
$pageTitle = "Donor List";
@@ -85,7 +86,7 @@
$name = "Anonymous";
$benefit = $friend->getIsBenefit();
if ($benefit != 0)
- $benefit = " <img width='25' src=\"images/stars.png\">";
+ $benefit = " <img src=\"images/star.jpg\">";
else
$benefit = "";
$amount = $contribution->getAmount();
@@ -125,6 +126,9 @@
<br/><br/>
</div>
<div id="rightcolumn">
+ <div style="text-align:center">
+ <a href="/donate/"><img src="/donate/images/donate.jpg" alt="Donate to Eclipse"/></a><br/><br/>
+ </div>
<div class="sideitem">
<h6>Total Donations</h6>
<div style="text-align:center;font-size:24px;padding:5px 0px;"><?=$pageCount;?></div>
@@ -132,7 +136,7 @@
<div class="sideitem">
<h6>Legend</h6>
<p align="center">
- <img width='25' src="images/stars.png" align="absbottom">Friend of Eclipse
+ <img src="images/star.jpg" align="absbottom">Friend of Eclipse
</p>
</div>
</div>
@@ -141,7 +145,7 @@
$html = ob_get_clean();
// $html = mb_convert_encoding($html, "HTML-ENTITIES", "UTF-8");
$Nav->addCustomNav("Donate to Eclipse", "index.php", "_self", 1);
- $Nav->addCustomNav("Friends Login", "http://dev.eclipse.org/site_login", "_self", 1);
+ $Nav->addCustomNav("Friends of Eclipse Login", "http://dev.eclipse.org/site_login", "_self", 1);
$Nav->addCustomNav("Donation FAQ", "faq.php", "_self", 1);
# Generate the web page
$App->generatePage("solstice", $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
diff --git a/donorlist2.php b/donorlist2.php
new file mode 100644
index 0000000..4264669
--- /dev/null
+++ b/donorlist2.php
@@ -0,0 +1,126 @@
+<?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop'
+
+ #*****************************************************************************
+ #
+ # donorlist.php (/friends)
+ #
+ # Author: Nathan Gervais
+ # Date: 2007-11-07
+ #
+ # Description: Type your page comments here - these are not sent to the browser
+ #
+ #
+ #****************************************************************************
+
+ #
+ # Begin: page-specific settings. Change these.
+ $pageTitle = "Donor List";
+ $pageKeywords = "friends of eclipse, donation, contribution";
+ $pageAuthor = "Nathan Gervais";
+ header("Cache-control: no-cache");
+ require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/smartconnection.class.php");
+ require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/friends/friendsContributionsList.class.php");
+ require_once("functions.php");
+ ob_start();
+ $start = $_GET['start'];
+ $pageValue = 200;
+ if ( (!$start) | (!preg_match('/^[0-9]+$/', $start)))
+ $start = 0;
+ $totalContributionCount = new FriendsContributionsList();
+ $totalContributionCount->selectFriendsContributionsList();
+ $pageCount = $totalContributionCount->getCount();
+ $totalContributionCount = NULL;
+ ?>
+ <link rel="stylesheet" type="text/css" href="style.css" media="screen" />
+ <div id="midcolumn">
+ <h1><?=$pageTitle;?></h1>
+ <?=displayPager($start, $pageValue, $pageCount);?>
+ <table class="donorList" cellspacing=0>
+ <tr class="donorHeader">
+ <td colspan="2" width="60%">Name and Message</td>
+ <td width="20%">Date</td>
+ <td width="20%" align="right">Amount</td>
+ </tr>
+ <?
+ // Get total number of items so we can know whether to page or not.
+
+
+ $friendsContributionsList = new FriendsContributionsList();
+ $friendsContributionsList->selectFriendsContributionsList($start, $pageValue);
+
+ $friend = new Friend();
+ $contribution = new Contribution();
+ $fcObject = new FriendsContributions();
+ $count = $friendsContributionsList->getCount();
+ for ($i=0; $i < $count; $i++)
+ {
+ $fcObject = $friendsContributionsList->getItemAt($i);
+ $friend = $fcObject->getFriendObject();
+ $bugzillaID = $friend->getBugzillaID();
+ $contribution = $fcObject->getContributionObject();
+ $anonymous = $friend->getIsAnonymous();
+ $name = $friend->getFirstName() . " " . $friend->getLastName() . "(" . $bugzillaID . ")";
+ $benefit = $friend->getIsBenefit();
+ if ($benefit != 0)
+ $benefit = " <img src=\"images/star.jpg\">";
+ else
+ $benefit = "";
+ $amount = $contribution->getAmount();
+ if (strpos($amount, ".") == 0)
+ {
+ $amount = $amount . ".00";
+ }
+ $comment = strip_tags($contribution->getMessage());
+ if (strlen($comment) > 80)
+ if (strpos($comment, ' ') == 0 )
+ {
+ $commentArray = str_split($comment, 80);
+ $comment = 0;
+ foreach ($commentArray as $value)
+ {
+ $comment .= $value . " ";
+ }
+ }
+ $date = $friend->getDateJoined();
+ ?>
+ <tr class="donorRecord">
+ <td width="25"><?=$benefit;?></td>
+ <td width="59%"><b><?=$name;?></b><br/><?=$comment;?></td>
+ <td><?=$date;?></td>
+ <td align="right">$<?=$amount;?> USD</td>
+ </tr>
+ <?} ?>
+ </table>
+ <?=displayPager($start, $pageValue, $pageCount);?>
+ <br/><br/>
+ </div>
+ <div id="rightcolumn">
+ <div align="middle"><br/><br/>
+ <a href="/donate/"><img src="/donate/images/donate.jpg" alt="Donate to Eclipse"/></a>
+ </div>
+ <div class="sideitem">
+ <h6>Donations Receieved</h6>
+ <div align="center" style="font-size:24px;"><?=$pageCount;?></div>
+ </div>
+ <div class="sideitem">
+
+ <h6>Related Links</h6>
+ <ul>
+ <li><a href="index.php">Donate to Eclipse</a></li>
+ <li><a href="http://dev.eclipse.org/site_login">Friends of Eclipse Login</a></li>
+ <li><a href="faq.php">Donation FAQ</a></li>
+ </ul>
+ </div>
+ <div class="sideitem">
+ <h6>Legend</h6>
+ <p align="center">
+ <img src="images/star.jpg" align="absbottom">Friend of Eclipse
+ </p>
+ </div>
+ </div>
+ <?
+ $html = ob_get_clean();
+ # Generate the web page
+ $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
+
\ No newline at end of file
diff --git a/faq.php b/faq.php
index 0a96eff..af225d4 100644
--- a/faq.php
+++ b/faq.php
@@ -4,10 +4,10 @@
#
# faq.php (/friends)
#
- # Author: Roxanne Joncas
- # Date: 2014-09-13
+ # Author: Nathan Gervais
+ # Date: 2007-11-21
#
- # Description: Original page was created by Nathan in 2007.
+ # Description: Type your page comments here - these are not sent to the browser
#
#
#****************************************************************************
@@ -26,24 +26,24 @@
<h3>Frequently Asked Questions</h3>
<ul>
<br/><li><b>Do I get a charitable tax receipt for my donation? </b><br/><br/>
- No. The Eclipse Foundation is a not-for-profit organization, not a charitable organization, so we are unable to provide charitable tax receipts.<br/><br/></li>
+ No. The Eclipse Foundation is a not-for-profit organization,
+ not a charitable organization, so we are unable to provide charitable tax receipts.<br/><br/></li>
<li><b>What methods of payment do you accept for contributions?</b><br/><br/>
We are using PayPal to process your donation. PayPal enables you to use a credit card or a PayPal account.<br/><br/></li>
<li><b>What if I want to pay by cheque or direct deposit?</b><br/><br/>
- At this time, we are only set up to accept contributions through PayPal. It is free to
+ At this time, we are only set up to accept contributions through credit cards and PayPal. It is free to
sign up for an account at www.paypal.com.<br/><br/></li>
<li><b>What is the difference between contributing money to Eclipse and becoming a Friend of Eclipse?</b><br/><br/>
- Individuals can contribute any amount of money they want to the Eclipse Foundation. However, those that give US$35 (but less than US$100)
- qualify for "Friend" status. "Friend" status lasts for a period of 12 months and provides access to a Friends of Eclipse mirror and use
- of the "Friend" logo. Individuals that give US$100 or more qualify for the "Best Friend" status. "Best Friend" status lasts for a period
- of 12 months and provides access to the "Friend" benefits, an Eclipse t-shirt and a discount for EclipseCon events.<br/><br/></li>
+ Individuals can contribute any amount of money they want to the Eclipse Foundation. However, those
+ that give US$35 or more qualify for "Friend" status. "Friend" status lasts for a period of 12
+ months and provides access to a Friends of Eclipse mirror and use of the "Friend" logo.<br/><br/></li>
<li><b>What amounts may I contribute?</b><br/><br/>
- You may contribute any amount you like. A contribution between US$35 and US$99.99 gives you access to the "Friend of Eclipse"
- benefits and a contribution US$100 or more qualifies you for the “Best Friend” benefits.<br/><br/></li>
+ You may contribute any amount you like. If you contribute US$35 or more, you also qualify for the
+ Friend of Eclipse benefits.<br/><br/></li>
<li><b>What do you plan to do with the money?</b><br/><br/>
We plan to use these donations to increase the services provided by the Eclipse Foundation. Examples
@@ -64,7 +64,6 @@
The Eclipse download site's performance varies from day to day, depending on new project releases.
Although Friends' downloads get priority bandwidth, the Eclipse Foundation will add bandwidth as
required to ensure an adequate level of performance from our main download site.<br/><br/></li>
-
<li><b>How do I get access to the Friends of Eclipse mirror?</b><br/><br/>
Everyone that donates US$35 or more to the Eclipse Foundation will automatically be flagged as a
Friend of Eclipse. This gives them access to the Friends of Eclipse Mirror for 12 months.
@@ -75,10 +74,6 @@
Any individual that has donated more than US$35 to the Eclipse Foundation may use the Friend of
Eclipse logo on a personal blog or web site. The Friends of Eclipse program is for individuals, so
the logo should not be used on an organization web site. <br/><br/></li>
-
- <li><b>What does the t-shirt, included in the "Best Friend" package look like?</b><br/><br/>
- Add picture*<br/><br/></li>
- <br/><br/></li>
</ul>
</div>
</div>
diff --git a/functions.js b/functions.js
index 3bb9266..379d651 100644
--- a/functions.js
+++ b/functions.js
@@ -1,12 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Eclipse Foundation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://eclipse.org/legal/epl-v10.html
- *
- * Edouard Poitras (Eclipse Foundation) - Some modifications
- *******************************************************************************/
var ajaxObject = AjaxObject();
function AjaxObject () {
@@ -14,9 +5,9 @@
return new XMLHttpRequest();
else if (window.ActiveXObject)
return new ActiveXObject('Microsoft.XMLHTTP');
- else
+ else
alert ("Error Creating AjaxObject");
- return false;
+ return false;
}
function whatsThisToggle(i) {
@@ -26,10 +17,10 @@
else { t = t.replace(/visible/gi, 'invisible'); }
e.className = t;
}
-
+
function amountCheck() {
var a = document.getElementById("amount");
- var b = document.getElementById("bugzilla");
+ var b = document.getElementById("bugzilla");
if (a.value >=35)
{
b.disabled=false;
@@ -41,15 +32,42 @@
}
}
function validateForm() {
- var retVal = true;
+ var retVal = true;
var fn = document.getElementById("first_name");
var ln = document.getElementById("last_name");
var a = document.getElementById("amount");
var b = document.getElementById("bugzilla");
var v = document.getElementById("verify");
var anon = document.getElementById("os1");
-
+
+ if (fn.value.length == 0)
+ {
+ alert("Please specify a first name.");
+ return false;
+ }
+ if (ln.value.length == 0)
+ {
+ alert("Please specify a last name.");
+ return false;
+ }
+ if (a.value < 2)
+ {
+ alert("Amount must be greater then $2.");
+ return false;
+ }
+ if (isNumeric(a.value) == false)
+ {
+ alert("Amount must contain numbers only.");
+ return false;
+ }
+ if (a.value.length == 0)
+ {
+ alert("Please specify an amount.");
+ return false;
+ }
if (parseInt(a.value) >= 35) {
+ if (anon.checked == true) {
+
if (b.value.length !=0) {
if (v.innerHTML.length == 0) {
alert("Please verify your Eclipse.org login to continue");
@@ -57,14 +75,20 @@
}
if (v.innerHTML != "Verified!") {
alert ("Your Eclipse.org ID could not be verified." + '\n' + "For donations of $35 dollars or more we require you to provide a valid ID. If you do not wish to provide your Eclipse.org ID please list your name Anonymously.");
- return false;
+ return false;
}
}
+ else {
+ alert("For donations of $35 dollars or more we require you to provide your Eclipse.org account ID. If you do not wish to provide it, please list your name Anonymously.");
+ return false;
+ }
+
+ }
}
return retVal;
}
-
-
+
+
function isNumeric(input)
{
var numbers = "01234567890.-";
@@ -96,12 +120,12 @@
bugzillaLogin.value = "";
bugzillaLogin.removeAttribute("style");
}
-
+
var url = "ajaxBugzilla.php?bugzillaLogin=" + bugzillaLogin.value.replace('+', '%2B');
ajaxObject.open("GET", url, true);
ajaxObject.onreadystatechange = updatePage;
ajaxObject.send(null);
-
+
}
function updatePage()
@@ -113,9 +137,9 @@
response = ajaxObject.responseText;
if (response == "Verified!" || b.value.length == 0 || anon.checked == false)
{
- if (response == "Verified!")
+ if (response == "Verified!")
{
- v.innerHTML = response;
+ v.innerHTML = response;
v.setAttribute("class", "green");
b.setAttribute("style","border:2px solid green;");
}
@@ -123,10 +147,10 @@
document.donateForm.submit();
}
else {
- v.innerHTML = response;
+ v.innerHTML = response;
v.setAttribute("class", "red");
b.setAttribute("style","border:2px solid #FF0000;");
validateForm();
}
}
-}
+}
\ No newline at end of file
diff --git a/functions.php b/functions.php
index ecb06e5..7fd5bef 100644
--- a/functions.php
+++ b/functions.php
@@ -1,13 +1,4 @@
<?php
-/*******************************************************************************
- * Copyright (c) 2014 Eclipse Foundation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://eclipse.org/legal/epl-v10.html
- *
- * Edouard Poitras (Eclipse Foundation) - Some modifications
- *******************************************************************************/
function sideDonorList($_numrows) {
require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/smartconnection.class.php");
@@ -49,41 +40,6 @@
echo "<div class=\"more\"><a href=\"donorlist.php\">Donor List</a></div>";
}
-function donorListTable($_numrows, $chevron=TRUE, $striped=TRUE) {
- require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/smartconnection.class.php");
- require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/friends/friendsContributionsList.class.php");
- $return_html = "";
- if ($striped) $return_html .= "<table class='table table-striped'>";
- else $return_html .= "<table class='table'>";
- $chevron_html = '<i class="fa fa-li fa-chevron-circle-right orange" style="position: relative; left: 0px; width: 0px;"></i> ';
-
- $friendsContributionsList = new FriendsContributionsList();
- $friendsContributionsList->selectFriendsContributionsList(0, $_numrows);
-
- $friend = new Friend();
- $contribution = new Contribution();
- $fcObject = new FriendsContributions();
-
- $count = $friendsContributionsList->getCount();
- for ($i=0; $i < $count; $i++) {
- $fcObject = $friendsContributionsList->getItemAt($i);
- $friend = $fcObject->getFriendObject();
- $contribution = $fcObject->getContributionObject();
- $anonymous = $friend->getIsAnonymous();
- if ($anonymous != 1) {
- $name = $friend->getFirstName() . " " . $friend->getLastName();
- $name = htmlentities($name);
- } else {
- $name = "Anonymous";
- }
- $amount = $contribution->getAmount();
- if ($chevron) $return_html .= "<tr><td>$chevron_html</td><td>$name-\$$amount</td></tr>";
- else $return_html .= "<tr><td>$name-\$$amount</td></tr>";
- }
- $return_html .= "</table>";
- return $return_html;
-}
-
function displayPager($_start, $_pageValue, $_pageCount, $_showAll = NULL)
{
$showAll = "";
@@ -114,4 +70,4 @@
<?
return ob_get_clean();
}
-?>
+?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 24ea4db..a0c2b89 100644
--- a/index.php
+++ b/index.php
@@ -7,34 +7,30 @@
* http://eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Edouard Poitras (Eclipse Foundation) - Initial implementation
+ * Christopher Guindon (Eclipse Foundation) - Initial implementation
*******************************************************************************/
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/friends/paypal.class.php");
+ require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
+ require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
+ require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php");
-$App = new App();
-$Nav = new Nav();
-$Menu = new Menu();
-$Paypal = new Paypal();
-//$Paypal->set_debug_mode(TRUE);
-//$Paypal->set_sandbox_mode(TRUE);
-//$Paypal->set_show_all(TRUE);
+ $App = new App();
+ $Nav = new Nav();
+ $Menu = new Menu();
-# Begin: page-specific settings. Change these.
-$pageTitle = "Support Eclipse";
-$pageKeywords = "friends of eclipse, donation, contribution";
-$pageAuthor = "Christopher Guindon";
+ # Begin: page-specific settings. Change these.
+ $pageTitle = "Support Eclipse";
+ $pageKeywords = "friends of eclipse, donation, contribution";
+ $pageAuthor = "Christopher Guindon";
-include ("functions.php");
+ include ("functions.php");
-// Place your html content in a file called content/en_pagename.php
-ob_start();
-include("content/en_" . $App->getScriptName());
-$html = ob_get_clean();
+ // Place your html content in a file called content/en_pagename.php
+ ob_start();
+ include("content/en_" . $App->getScriptName());
+ $html = ob_get_clean();
-# Generate the web page
-$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="style.css" media="screen" />');
-$App->generatePage("solstice", $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
+ # Generate the web page
+ //$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="style.css" media="screen" />');
+ $App->AddExtraJSFooter('<script type="text/javascript" src="js/validate-donation.js"></script>');
+ $App->generatePage("solstice", $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
diff --git a/indexNova.php b/indexNova.php
index a0c0b6f..977ce03 100644
--- a/indexNova.php
+++ b/indexNova.php
@@ -1,16 +1,17 @@
<?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop'
-/*******************************************************************************
- * Copyright (c) 2014 Eclipse Foundation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Nathan Gervais (Eclipse Foundation) - Initial implementation (2007-11-07)
- * Edouard Poitras (Eclipse Foundation) - Further modifications
- *******************************************************************************/
+ #*****************************************************************************
+ #
+ # index.php (/donate)
+ #
+ # Author: Nathan Gervais
+ # Date: 2007-11-07
+ #
+ # Description: Type your page comments here - these are not sent to the browser
+ #
+ #
+ #****************************************************************************
+
#
# Begin: page-specific settings. Change these.
$pageTitle = "Support Eclipse";
diff --git a/ipnProcess.php b/ipnProcess.php
new file mode 100644
index 0000000..1a22406
--- /dev/null
+++ b/ipnProcess.php
@@ -0,0 +1,154 @@
+<?php
+ require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); $App = new App();
+ require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/friends/friend.class.php");
+ require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/friends/contribution.class.php");
+
+ // read the post from PayPal system and add 'cmd'
+ $req = 'cmd=_notify-validate';
+
+ foreach ($_POST as $key => $value) {
+ $value = urlencode(stripslashes($value));
+ $req .= "&$key=$value";
+ }
+
+ // post back to PayPal system to validate
+ $header .= "POST /cgi-bin/webscr HTTP/1.1\r\n";
+ $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
+ $header .= "Content-Length: " . strlen($req) . "\r\n\r\n";
+ $fp = fsockopen ('www.paypal.com', 80, $errno, $errstr, 30);
+
+ if (!$fp) {
+ // HTTP ERROR
+ } else {
+ fputs ($fp, $header . $req);
+ while (!feof($fp)) {
+ $res = fgets ($fp, 1024);
+ if (strcmp ($res, "VERIFIED") == 0) {
+ // check the payment_status is Completed
+ // check that txn_id has not been previously processed
+ // check that receiver_email is your Primary PayPal email
+ // check that payment_amount/payment_currency are correct
+ // process payment
+
+
+ // echo the response
+ echo "The response from IPN was: <b>" .$res ."</b><br><br>";
+
+ //loop through the $_POST array and print all vars to the screen.
+
+ foreach($_POST as $key => $value){
+ // echo $key." = ". $value."<br>";
+ }
+
+ // check the payment_status is Completed
+ // check that txn_id has not been previously processed
+ // check that receiver_email is your Primary PayPal email
+ // check that payment_amount/payment_currency are correct
+ // process payment
+
+ $firstname = $_POST['first_name'];
+ $lastname = $_POST['last_name'];
+ $itemname = $_POST['item_name'];
+ $amount = $_POST['payment_gross'];
+ $bugzillaEmail = $_POST['item_number'];
+
+ $anonymous = $_POST['option_selection2'];
+ $comment = strip_tags($_POST['option_selection1']);
+ $transactionID = $_POST['txn_id'];
+ $paymentStatus = $_POST['payment_status'];
+
+ if ($anonymous == "Public")
+ {
+ $anonymousValue = 0;
+ }
+ else
+ {
+ $anonymousValue = 1;
+ }
+ if ($amount >= 35)
+ {
+ $benefit = 1;
+ }
+ if (strpos($amount, ".") == 0)
+ {
+ $amount = $amount . ".00";
+ }
+
+ if ($paymentStatus == "Completed")
+ {
+
+ // Check to see if this transaction has already been processed.
+ $checkContribution = new Contribution();
+ $checkTrans = $checkContribution->selectContributionExists($transactionID);
+ echo "$transactionID - $checkTrans";
+ if ($checkTrans == FALSE)
+ {
+ //Check to see if user already exists in friends
+ $checkFriends = new Friend();
+ $bugzillaID = $checkFriends->getBugzillaIDFromEmail($bugzillaEmail);
+ $friendID = $checkFriends->selectFriendID("bugzilla_id", $bugzillaID);
+ if ($friendID != 0)
+ {
+ // Lets Update the Friend Information
+ $newFriend = new Friend();
+ $newFriend->setFirstName($firstname);
+ $newFriend->setLastName($lastname);
+ $newFriend->setBugzillaID($bugzillaID);
+ $newFriend->setIsAnonymous($anonymousValue);
+ $newFriend->setIsBenefit($benefit);
+ $newFriend->setFriendID($friendID);
+ $newFriendID = $newFriend->insertUpdateFriend();
+
+ // FriendID does not equal 0 so we have an existing user. We need to add a new contribution
+
+ $insertContribution = new Contribution();
+ $insertContribution->setFriendID($friendID);
+ $insertContribution->setAmount($amount);
+ $insertContribution->setMessage($comment);
+ $insertContribution->setTransactionID($transactionID);
+ $insertContribution->insertContribution();
+ //Record Inserted
+ }
+ else {
+ // No friendID found so add a new friend record then add the contribution record.
+ $newFriend = new Friend();
+ $newFriend->setFirstName($firstname);
+ $newFriend->setLastName($lastname);
+ $newFriend->setBugzillaID($bugzillaID);
+ $newFriend->setIsAnonymous($anonymousValue);
+ $newFriend->setIsBenefit($benefit);
+ $newFriendID = $newFriend->insertUpdateFriend();
+
+ $insertContribution = new Contribution();
+ $insertContribution->setFriendID($newFriendID);
+ $insertContribution->setAmount($amount);
+ $insertContribution->setMessage($comment);
+ $insertContribution->setTransactionID($transactionID);
+ $insertContribution->insertContribution();
+ }
+ }
+ else {
+ echo "Transaction Check Failed<br/>";
+ }
+ }
+
+ }
+ else if (strcmp ($res, "INVALID") == 0) {
+ // log for manual investigation
+
+ // echo the response
+ echo "The response from IPN was: <b>" .$res ."</b>";
+
+ }
+
+ }
+ fclose ($fp);
+ }
+
+
+
+ $html = ob_get_clean();
+ echo $html;
+?>
+
+
diff --git a/style.css b/style.css
index b1577ba..e543c91 100644
--- a/style.css
+++ b/style.css
@@ -1,142 +1,56 @@
-/* Donor List Table */
+.footNote {
+ font-size:smaller;
+}
+.pager {
+ width:100%;
+ padding:0px;
+ margin:0px;
+}
+
.donorList {
- width:100%;
- padding:0px;
- margin:0px;
- border:1px solid #888;
+ width:100%;
+ padding:0px;
+ margin:0px;
+ border:1px solid #888;
}
.donorList .donorHeader td {
- background-image:url(/images/bar.jpg);
- font-weight:bold;
- height:25px;
- border-bottom:1px solid #888;
- padding: 0 3px 0 3px;
+ background-image:url(/images/bar.jpg);
+ font-weight:bold;
+ height:25px;
+ border-bottom:1px solid #888;
+ padding: 0 3px 0 3px;
}
.donorList .donorRecord td {
- border-bottom:1px solid #ccc;
- padding: 3px;
+ border-bottom:1px solid #ccc;
+ padding: 3px;
}
.donorListMessage {
- max-width:600px;
+ max-width:600px;
}
-
-.eclipse-login {
- padding-top: 5px;
+.paddedList {
+ padding-left:20px;
}
-.eclipse-login-label {
- padding-top: 3px;
- padding-right: 5px;
- font-weight: bold;
- float: left;
+.friend {
+ font-weight:bold;
}
-.save-button {
- margin-top: 10px;
+.required {
+ color:red;
+ text-align:right;
}
-.sideitem > table > tbody > tr > td {
- border: none;
- padding-left: 12px;
- padding-right: 12px;
+#WhatsThis {
+ font-size:80%;
}
-.sideitem > table {
- padding-bottom: 0;
- margin-bottom: 0;
-}
-
-.sideitem > a {
- margin: 12px;
-}
-
-div.donation-box div.background-purple {
- height: 12em;
-}
-
-.donation-box h2 {
- font-weight: bold;
- color: grey;
-}
-
-.you-get-label {
- text-align: left;
- font-weight: bold;
- margin-top: 0;
- padding-top: 2em;
- padding-left: 2.5em;
-}
-
-.donation-benefits {
- width: 95%;
- height: 80%;
- padding-left: 2.5em;
- text-align: left;
-}
-
-#best-friends-benefits {
- border-width: 0.1em;
- border-style: none solid none solid;
- border-color: #EFEFEF;
-}
-
-#related-links {
- padding-left: 2em;
-}
-
-.donation-footer h2 {
- font-size: 1.7em;
- font-weight: bold;
- color: grey;
-}
-
-.friends-logo-top {
- width: 18.5em;
-}
-
-.friends-logo-bot {
- width: 60px;
- height: 20px;
-}
-
-.friends-list {
- padding-top: 1em;
-}
-
-.friends-list li {
- padding-bottom: 2em;
-}
-
-#content div.row {
- margin-bottom: 2em;
-}
-
-#custom-donation {
- background-color: #FAFAFA;
- padding-top: 2em;
- padding-bottom: 1em;
-}
-
-#donation-amount {
- float: left;
- padding: 0.7em;
- width: 11em;
-}
-
-.donation-amount {
- color: #41337C;
-}
-
-#custom-donation-button {
- width: 10em;
- padding-left: none;
- padding-right: none;
- padding-top: 0.75em;
- padding-bottom: 0.75em;
+#verify{
+ font-size:80%;
+ display:inline;
}
.green {
@@ -156,7 +70,7 @@
}
.disabled{
- background-color:#eee;
+ background-color:#eee;
}
.enabled {
background-color:none;
@@ -193,5 +107,5 @@
.error {
color: #D8000C;
background-color: #FFBABA;
-
-}
+
+}
\ No newline at end of file
diff --git a/style.php b/style.php
new file mode 100644
index 0000000..d4d6bf7
--- /dev/null
+++ b/style.php
@@ -0,0 +1,38 @@
+<?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); # All on the same line to unclutter the user's desktop'
+
+ #*****************************************************************************
+ #
+ # index.php
+ #
+ # Author: Nathan Gervais
+ # Date: 2008-05-16
+ #
+ # Description: Ganymede Spotting Submission Form
+ #
+ #****************************************************************************
+
+ # Add page-specific Nav bars here
+ # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank)
+ # $Nav->addCustomNav("My Link", "mypage.php", "_self");
+ # $Nav->addCustomNav("Google", "http://www.google.com/", "_blank");
+ $pageTitle = "Ganymede Around the World";
+ $pageKeywords = "eclipse ganymede, ganymede, ganymede around the world";
+ $pageAuthor = "Nathan Gervais";
+ # End: page-specific settings
+ #
+
+ extract($_GET);
+
+ # Place your html content in a file called content/en_pagename.php
+ require_once("/home/data/httpd/eclipse-php-classes/system/dbconnection_rw.class.php");
+ $dbc = new DBConnectionRW();
+ $dbh = $dbc->connect();
+
+ if (isset($id) && ($id != ""))
+ {
+ $query = "DELETE FROM ganymede_spots WHERE id = $id";
+ mysql_query ($query);
+ }
+ # Generate the web page
+ $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/thankyou.php b/thankyou.php
index f1bdb92..cd32174 100644
--- a/thankyou.php
+++ b/thankyou.php
@@ -1,182 +1,218 @@
-<?php
+<?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop'
-/*******************************************************************************
- * Copyright (c) 2014 Eclipse Foundation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-* Edouard Poitras (Eclipse Foundation) - Minor Modifications
-*******************************************************************************/
+ #*****************************************************************************
+ #
+ # index.php (/friends)
+ #
+ # Author: Nathan Gervais
+ # Date: 2007-11-07
+ #
+ # Description: Type your page comments here - these are not sent to the browser
+ #
+ #
+ #****************************************************************************
+ error_reporting(E_ALL);
+ #
+ # Begin: page-specific settings. Change these.
+ $pageTitle = "Thank You";
+ $pageKeywords = "friends of eclipse, donation, contribution";
+ $pageAuthor = "Nathan Gervais";
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/session.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/friends/paypal.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/friends/friend.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/smartconnection.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/friends/contribution.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/friends/friendsContributionsList.class.php");
-require_once("emails.php");
-$App = new App();
-$Nav = new Nav();
-$Menu = new Menu();
+ require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/friends/friend.class.php");
+ require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/friends/contribution.class.php");
+ require_once("/home/data/httpd/eclipse-php-classes/system/authcode.php");
+
+ ob_start();
+ // read the post from PayPal system and add 'cmd'
+ $req = 'cmd=_notify-synch';
+
+ $tx_token = $_GET['tx'];
+ $req .= "&tx=$tx_token&at=$auth_token";
+
+
+ // post back to PayPal system to validate
+ $header .= "POST /cgi-bin/webscr HTTP/1.0\r\n";
+ $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
+ $header .= "Content-Length: " . strlen($req) . "\r\n\r\n";
+ $fp = fsockopen ('www.paypal.com', 80, $errno, $errstr, 30);
+ // If possible, securely post back to paypal using HTTPS
+ // Your PHP server will need to be SSL enabled
+ // $fp = fsockopen ('ssl://www.paypal.com', 443, $errno, $errstr, 30);
+
+ if (!$fp) {
+ echo "FsockOpen seems to have failed. <br/>";
+ }
+ else {
+ fputs ($fp, $header . $req);
+ // read the body data
+ $res = '';
+ $headerdone = false;
+ while (!feof($fp)) {
+ $line = fgets ($fp, 1024);
+ if (strcmp($line, "\r\n") == 0) {
+ // read the header
+ $headerdone = true;
+ }
+ else if ($headerdone)
+ {
+ // header has been read. now read the contents
+ $res .= $line;
+ }
+ }
+ // parse the data
+ $lines = explode("\n", $res);
+ $keyarray = array();
+ if (strcmp ($lines[0], "SUCCESS") == 0) {
+ for ($i=1; $i<count($lines);$i++){
+ list($key,$val) = explode("=", $lines[$i]);
+ $keyarray[urldecode($key)] = urldecode($val);
+ }
+ // check the payment_status is Completed
+ // check that txn_id has not been previously processed
+ // check that receiver_email is your Primary PayPal email
+ // check that payment_amount/payment_currency are correct
+ // process payment
-include($App->getProjectCommon());
+ $firstname = $keyarray['first_name'];
+ $lastname = $keyarray['last_name'];
+ $itemname = $keyarray['item_name'];
+ $amount = $keyarray['payment_gross'];
+ $bugzillaEmail = $keyarray['item_number'];
+
+ $anonymous = $keyarray['option_selection2'];
+ $comment = strip_tags($keyarray['option_selection1']);
+ $transactionID = $keyarray['txn_id'];
+ $paymentStatus = $keyarray['payment_status'];
-// Set up Paypal
-$Paypal = new Paypal();
-//$Paypal->set_debug_mode(TRUE);
-//$Paypal->set_sandbox_mode(TRUE);
-//$Paypal->set_show_all(TRUE);
-// Confirm Donation
-$success = $Paypal->confirm_donation();
-if ($success) {
- // Make sure user stops getting bothered by donation banner
- setcookie ("thankyou_page[donation]", TRUE, time() + (3600 * 24 * 279), '/', '.eclipse.org');
- // A/B Testing
- if (isset($_GET['cm']) && ($_GET['cm'] === 'A' || $_GET['cm'] === 'B')) { // Custom Variable (A or B)
- $data = $Paypal->get_transaction_data();
- $amount = $App->sqlSanitize($data['amount']);
- $test = $App->sqlSanitize($_GET['cm']);
- if (is_numeric($amount)) {
- $sql = "INSERT INTO thankyou_a_b VALUES (NOW(), '$test', $amount)";
- $App->eclipse_sql($sql);
- }
- }
-}
-// Handle Logged in User Session
-$Session = new Session();
-$friend = $Session->getFriend();
-// Handle User Updating Information (anonymity, comments, etc)
-$Paypal->set_comment($App->sqlSanitize($_POST['comment']));
-if (isset($_POST['bugzilla'])) { // Eclipse.org ID submitted by user
- $_POST['bugzilla'] = filter_var($_POST['bugzilla'], FILTER_SANITIZE_EMAIL);
- $_POST['bugzilla'] = $App->sqlSanitize($_POST['bugzilla']);
- $Paypal->set_bugzilla_email($_POST['bugzilla']);
-} else if ($friend->getEmail()) { // User session information used otherwise
- $Paypal->set_bugzilla_email($friend->getEmail());
-}
-if ($friend->getFirstName()) $Paypal->set_first_name($friend->getFirstName());
-if ($friend->getLastName()) $Paypal->set_last_name($friend->getLastName());
-// Anonymity
-if (isset($_POST['save'])) { // On Save/POST
- $Paypal->set_anonymous($_POST['os1'] === 'Private');
-} else { // First time always anonymous
- $Paypal->set_anonymous(TRUE);
-}
-// Ready Transaction Data
-$data = $Paypal->get_transaction_data();
+ if ($anonymous == "Public")
+ {
+ $anonymousValue = 0;
+ }
+ else
+ {
+ $anonymousValue = 1;
+ }
+ if ($amount >= 35)
+ {
+ $benefit = 1;
+ }
+ if (strpos($amount, ".") == 0)
+ {
+ $amount = $amount . ".00";
+ }
+
+ if ($paymentStatus == "Completed")
+ {
-if ($data['benefit']) {
- // Send Email
- $transaction_id = $data['transaction_id'];
- if ($data['bugzilla_email'] != "" && !isset($_COOKIE['email_sent' . $transaction_id])) {
- $check_friend = new Friend();
- if (!isset($data['bugzilla_id'])) {
- $data['bugzilla_id'] = $check_friend->getBugzillaIDFromEmail($data['bugzilla_email']);
- }
- send_email($data);
- // Ensure we don't keep sending emails after user updates
- setcookie("email_sent" . $data['transaction_id'], "1", time()+600);
- }
- // Check to see if this transaction has already been processed.
- $check_contribution = new Contribution();
- $check_transaction = $check_contribution->selectContributionExists($data['transaction_id']);
- if ($check_transaction == FALSE) { // Contribution Doesn't Already Exist
- //Check to see if user already exists in friends
- $check_friends = new Friend();
- $bugzilla_id = $check_friends->getBugzillaIDFromEmail($data['bugzilla_email']);
- $friend_id = $check_friends->selectFriendID("bugzilla_id", $bugzilla_id);
- if ($friend_id != 0) { // User Doesn't Already Exist
- // Lets Update the Friend Information
- $new_friend = new Friend();
- $new_friend->setFirstName($data['firstname']);
- $new_friend->setLastName($data['lastname']);
- $new_friend->setBugzillaID($bugzilla_id);
- $new_friend->setIsAnonymous($data['anonymous']);
- $new_friend->setIsBenefit($data['benefit']);
- $new_friend->setFriendID($friend_id);
- $new_friend_id = $new_friend->insertUpdateFriend();
- // Friend_id does not equal 0 so we have an existing user. We need to add a new contribution
- $insert_contribution = new Contribution();
- $insert_contribution->setFriendID($friend_id);
- $insert_contribution->setAmount($data['amount']);
- $insert_contribution->setMessage($data['comment']);
- $insert_contribution->setTransactionID($data['transaction_id']);
- $insert_contribution->insertContribution();
- //Record Inserted
- } else {
- // No friend_id found so add a new friend record then add the contribution record.
- $new_friend = new Friend();
- $new_friend->setFirstName($data['firstname']);
- $new_friend->setLastName($data['lastname']);
- $new_friend->setBugzillaID($bugzilla_id);
- $new_friend->setIsAnonymous($data['anonymous']);
- $new_friend->setIsBenefit($data['benefit']);
- $new_friend_id = $new_friend->insertUpdateFriend();
- $insert_contribution = new Contribution();
- $insert_contribution->setFriendID($new_friend_id);
- $insert_contribution->setAmount($data['amount']);
- $insert_contribution->setMessage($data['comment']);
- $insert_contribution->setTransactionID($data['transaction_id']);
- $insert_contribution->insertContribution();
- }
- }
- if (isset($_POST['bugzilla'])) {
- // Need to reload friend incase we're dealing with a non-logged in user
- // Update Anonymity
- $check_contribution->selectContributionWithTransaction($data['transaction_id']);
- $anon_friend = new Friend();
- $anon_friend->selectFriend($check_contribution->getFriendID());
- $anon_friend->setIsAnonymous($data['anonymous']);
- // Update Name
- $check_friends = new Friend();
- $bugzilla_id = $check_friends->getBugzillaIDFromEmail($_POST['bugzilla']);
- $friend_id = $check_friends->selectFriendID("bugzilla_id", $bugzilla_id);
- $existing_friend = new Friend();
- if (!$friend_id) { // If no friend_id found, create the friend based on bugzilla information
- $sql = "SELECT userid, realname FROM profiles WHERE login_name = " . $App->returnQuotedString($_POST['bugzilla']);
- $result = $App->bugzilla_sql($sql);
- $values = mysql_fetch_array($result);
- $name = explode(' ', $values['realname']);
- $firstname = $name[0];
- $lastname = $name[1];
- $existing_friend->setBugzillaID($bugzilla_id);
- $existing_friend->setFirstName($firstname);
- $existing_friend->setLastName($lastname);
- $existing_friend->setIsAnonymous(1);
- $existing_friend->setIsBenefit(1);
- $existing_friend->setEmail($_POST['bugzilla']);
- $existing_friend->insertUpdateFriend();
- } else {
- $existing_friend->selectFriend($friend_id);
- }
- $anon_friend->setFirstName($existing_friend->getFirstName());
- $anon_friend->setLastName($existing_friend->getLastName());
- $data['firstname'] = $existing_friend->getFirstName();
- $data['lastname'] = $existing_friend->getLastName();
- $anon_friend->insertUpdateFriend();
- }
-}
+
+ // Check to see if this transaction has already been processed.
+ $checkContribution = new Contribution();
+ $checkTrans = $checkContribution->selectContributionExists($transactionID);
+ if ($checkTrans == FALSE)
+ {
+ //Check to see if user already exists in friends
+ $checkFriends = new Friend();
+ $bugzillaID = $checkFriends->getBugzillaIDFromEmail($bugzillaEmail);
+ $friendID = $checkFriends->selectFriendID("bugzilla_id", $bugzillaID);
+ if ($friendID != 0)
+ {
+ // Lets Update the Friend Information
+ $newFriend = new Friend();
+ $newFriend->setFirstName($firstname);
+ $newFriend->setLastName($lastname);
+ $newFriend->setBugzillaID($bugzillaID);
+ $newFriend->setIsAnonymous($anonymousValue);
+ $newFriend->setIsBenefit($benefit);
+ $newFriend->setFriendID($friendID);
+ $newFriendID = $newFriend->insertUpdateFriend();
+
+ // FriendID does not equal 0 so we have an existing user. We need to add a new contribution
-$pageTitle = "Thank You";
-$pageKeywords = "friends of eclipse, donation, contribution";
-$pageAuthor = "Christopher Guindon";
-
-ob_start();
-include('content/en_thankyou.php');
-$html = ob_get_clean();
-
-# Generate the web page
-$App->AddExtraHtmlHeader('<script type="text/javascript" src="/donate/functions.js"></script>');
-$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/donate/style.css" media="screen" />');
-// Don't generate the page for PayPal IPN
-if (!isset($_GET['IPN'])) {
- $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-}
+ $insertContribution = new Contribution();
+ $insertContribution->setFriendID($friendID);
+ $insertContribution->setAmount($amount);
+ $insertContribution->setMessage($comment);
+ $insertContribution->setTransactionID($transactionID);
+ $insertContribution->insertContribution();
+ //Record Inserted
+ }
+ else {
+ // No friendID found so add a new friend record then add the contribution record.
+ $newFriend = new Friend();
+ $newFriend->setFirstName($firstname);
+ $newFriend->setLastName($lastname);
+ $newFriend->setBugzillaID($bugzillaID);
+ $newFriend->setIsAnonymous($anonymousValue);
+ $newFriend->setIsBenefit($benefit);
+ $newFriendID = $newFriend->insertUpdateFriend();
+
+ $insertContribution = new Contribution();
+ $insertContribution->setFriendID($newFriendID);
+ $insertContribution->setAmount($amount);
+ $insertContribution->setMessage($comment);
+ $insertContribution->setTransactionID($transactionID);
+ $insertContribution->insertContribution();
+ }
+ }
+ }
+ ?>
+
+
+ <div id="midcolumn">
+ <p><h1>Thank you for your donation!</h1></p>
+ <p>Your transaction has been completed and a receipt for your purchase has been emailed to you.<br/>
+ <div class="homeitem">
+ <h3><b>Donation Details</b></h3>
+ <ul>
+ <li>Name: <?=$firstname;?> <?=$lastname;?></li>
+ <?if ($bugzillaEmail != "") { ?><li>Bugzilla Login: <?=$bugzillaEmail;?></li> <? } ?>
+ <li>Amount: <?=$amount;?></li>
+ <li>Anonymity: <?=$anonymous;?></li>
+ <li>Comment: <?=$comment;?></li>
+ </ul>
+ <br/><br/><div align="middle"><b style="font-size:120%">View our <a href="http://www.eclipse.org/donate/donorlist.php">Donor List</a></b></div>
+ </div>
+ <? if ($benefit == 1) { ?>
+ <div class="homeitem">
+ <h3>Friends of Eclipse</h3>
+ <div style="padding-left:5px;">
+ <p><h2>Login</h2>
+ Visit <a href="http://dev.eclipse.org/site_login">http://dev.eclipse.org/site_login</a> to get access to the Friends of Eclipse Mirror</p>
+ <br/>
+ <p><h2>Logo</h2>If you wish to link to the Friends of Eclipse Logo on your website or blog please use of the codes below</p>
+ <table width="100%">
+ <tr>
+ <td><img src="http://www.eclipse.org/donate/images/friendslogo.jpg"/></td>
+ <td align="right"><textarea><img src="http://www.eclipse.org/donate/images/friendslogo.jpg"/></textarea></td>
+ </tr>
+ <tr>
+ <td><img src="http://www.eclipse.org/donate/images/friendslogo200.jpg"></td>
+ <td align="right"><textarea><img src="http://www.eclipse.org/donate/images/friendslogo200.jpg"></textarea></td>
+ </tr>
+ <tr>
+ <td><img src="http://www.eclipse.org/donate/images/friendslogo160.jpg"></td>
+ <td align="right"><textarea><img src="http://www.eclipse.org/donate/images/friendslogo160.jpg"></textarea></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ <? } ?>
+ <div class="clearer"></div>
+ </div>
+ <?
+ }
+ else if (strcmp ($lines[0], "FAIL") == 0) {
+ ?><p>There was an error in processing your transaction. Please contact <a href="mailto:friends@eclipse.org">friends@eclipse.org</a> with the transaction information from PayPal.</p><?
+ }
+ }
+
+ fclose ($fp);
?>
+
+
+<? $html = ob_get_clean();
+ # Generate the web page
+ $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
+
