FSFE/fsfe-website
25
31
Fork 91
Code Issues 64 Pull Requests 5 Wiki Activity

Bugfixin

Browse Source 
svn path=/trunk/; revision=24144
This commit is contained in:
otto 2012-08-30 13:15:21 +00:00
parent a0d3081fe0
commit 08274c9f44
8 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
support/confirm.php
View File

@ -51,7 +51,15 @@ while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
}
$lang = $row['lang'];
?>
<html lang="<?php echo $row['lang']; ?>">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="refresh" content="3;URL='http://fsfe.org/support/portal?<?php echo $row['secret']; ?>'">
</head>
<body>
<?php
if (file_exists('template-confirm-done.'. $lang .'.inc')) {
require('template-confirm-done.'. $lang .'.inc');
} else {
@ -70,6 +78,9 @@ while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
} catch( err ) {}
</script><noscript><p><img src="http://piwik.fsfe.org/piwik.php?idsite=4" style="border:0" alt=""></p></noscript>
</body>
</html>
<?php
}

11
support/portal-backend.php
View File

@ -22,7 +22,16 @@ catch(PDOException $e) {
try {
// check data
$query = $db->prepare("SELECT * FROM t1 where secret='". sqlite_escape_string($secret) ."'");
$query = $db->prepare("SELECT
confirmed,
country_code,
email,
firstname,
lastname,
lang,
zip,
city
FROM t1 where secret='". sqlite_escape_string($secret) ."'");
$query->execute();
}
catch(PDOException $e) {

26
support/portal.en.xhtml
View File

@ -2,7 +2,7 @@
<html>
<head>
<title>Support - FSFE</title>
<title>Support portal - FSFE</title>
</head>
<body>
@ -15,20 +15,20 @@
<p>Your address <email/> was confirmed on <confirmed/>.</p>
<p>Thank you for your support to the <a href="http://fsfe.org/">FSFE</a>!</p>
<h2>Contribute more?</h2>
<div id="support_form">
<h2>Contribute more?</h2>
<p>If you want to contribute more than just signing up as a supporter, you may also:</p>
<ul>
<li><a href="http://fsfe.org/news/newsletter">Subscribe to the FSFE newsletter</a></li>
<li><a href="http://fsfe.org/contact/community">Join interesting mailing lists</a></li>
<li><a href="http://fsfe.org/uk/">Meet your country team</a></li>
<li><a href="http://fellowship.fsfe.org/">Join the Fellowship</a></li>
<li><a href="http://fsfe.org/donate/">Donate to the FSFE</a></li>
</ul>
<p>If you want to contribute more than just signing up as a supporter, you may also:</p>
<ul>
<li><a href="http://fsfe.org/news/newsletter">Subscribe to the FSFE newsletter</a></li>
<li><a href="http://fsfe.org/contact/community">Join interesting mailing lists</a></li>
<li><a href="http://fsfe.org/uk/">Meet your country team</a></li>
<li><a href="http://fellowship.fsfe.org/">Join the Fellowship</a></li>
<li><a href="http://fsfe.org/donate/">Donate to the FSFE</a></li>
</ul>
<p><a href="http://fsfe.org/contribute/">View all options to contribute</a></p>
<p><a href="http://fsfe.org/contribute/">View all options to contribute</a></p>
<div id="support_form">
<form method="post" action="" class="support">
<p>
@ -67,7 +67,7 @@
<input type="hidden" name="lang" value="en" />
</form>
<p><em>Our privacy policy is simple: We will never share your data with anyone outside FSFE. Period.</em></p>
<p><em>Our privacy policy is simple: We will never share your data with anyone outside FSFE. Period.</em></p>
</div>

2
support/support.php
View File

@ -35,6 +35,8 @@ catch(PDOException $e) {
// save as comment in case some day need to add new field
//$query = $db->query("alter table t1 add column lang TEXT");
$query = $db->query("alter table t1 add column zip TEXT");
$query = $db->query("alter table t1 add column city TEXT");
// check if e-mail address already in database

14
support/template-confirm-done.en.inc
View File

@ -1,20 +1,12 @@
<?php
// This is the contents of the web page shown to a signup who
// clicked the confirm link in their e-mail.
echo '
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="refresh" content="3;URL=\'http://fsfe.org/support/portal#'.$row['secret'].'\'">
</head>
<body>
<h1>Hello '.$row['firstname'].' '.$row['lastname'].'</h1>
<p>Your address '.$row['email'].' was confirmed on '.$row['confirmed'].'.</p>
<p>You will be redirected to <a href="http://fsfe.org/support/portal#'.$row['secret'].'">your personal supporter page</a> in 3 seconds.</p>
</body>
</html>
<p>You will be redirected to <a href="http://fsfe.org/support/portal?'.$row['secret'].'">your personal supporter page</a> in 3 seconds.</p>
';
?>

2
support/template-email-confirm.en.inc
View File

@ -1,4 +1,6 @@
<?php
// This is the contents of the e-mail sent to a new signup
$subject = 'Confirm your e-mail address';
$message = '

5
support/template-email-exists.en.inc
View File

@ -1,4 +1,7 @@
<?php
// This is the contents of the e-mail sent to a signup where the e-mail was
// already found in the supporter database.
$subject = 'Thanks for supporting the FSFE';
$message = '
@ -7,7 +10,7 @@ Thank you for showing your support to the FSFE!
However, this e-mail address was already signed up earlier.
Please see details by opening the page
http://fsfe.org/support/portal#'. $secret_from_db .'
http://fsfe.org/support/portal?'. $secret_from_db .'
Note that this URL is personal. You can use it to access
your supporter details whenever you want, and there is

1
support/template-thankyou.en.inc
View File

@ -1,4 +1,5 @@
<?php
// This is the HTML contents shown after user submitted the support form
echo '
<p>Thank you for showing your support to the FSFE!</p>