Skip to content
Browse files

Merge pull request #18 from montyphy/master

HTML fixes, and improve code readability and consistency
  • Loading branch information...
2 parents d5e57d0 + 075ea95 commit 95aa8bf03964c2e2db42ec1adf225b5d8b1cfee2 @russss russss committed
View
43 london.hackspace.org.uk/donate.php
@@ -4,31 +4,46 @@
?>
<h2>Donate</h2>
-<p>Here's how to donate to London Hackspace. We prefer bank transfer, as we don't have to pay commission.
- Since we're not a registered charity yet, you unfortunately can't claim Gift Aid back on donations to us.</p>
+<p>Here's how to donate to London Hackspace. We prefer bank transfer, as we don't have to pay commission. Since we're not a registered charity yet, you unfortunately can't claim Gift Aid back on donations to us.</p>
+
<h3>Bank Transfer</h3>
<? if ($user) { ?>
<p>Our bank details are as follows:</p>
+
<table>
- <tr><th>Bank</th><td>Barclays</td></tr>
- <tr><th>Payee</th><td>London Hackspace Ltd.</td></tr>
- <tr><th>Sort Code</th><td>20-32-06</td></tr>
- <tr><th>Account Number</th><td>53413292</td></tr>
+ <tr>
+ <th>Bank</th>
+ <td>Barclays</td>
+ </tr>
+ <tr>
+ <th>Payee</th>
+ <td>London Hackspace Ltd.</td>
+ </tr>
+ <tr>
+ <th>Sort Code</th>
+ <td>20-32-06</td>
+ </tr>
+ <tr>
+ <th>Account Number</th>
+ <td>53413292</td>
+ </tr>
</table>
<? } else { ?>
<p>Due to direct debit fraud, we require you to <a href="/login.php">log in</a> before you can see our bank details.</p>
<? } ?>
+
<h3>Paypal</h3>
-<p>
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick">
-<input type="hidden" name="hosted_button_id" value="3741369">
-<input type="image" src="https://www.paypal.com/en_GB/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online.">
-<img alt="" border="0" src="https://www.paypal.com/en_GB/i/scr/pixel.gif" width="1" height="1">
-</form>
-</p>
+<div>
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <input type="hidden" name="cmd" value="_s-xclick" />
+ <input type="hidden" name="hosted_button_id" value="3741369" />
+ <input type="image" src="https://www.paypal.com/en_GB/i/btn/btn_donateCC_LG.gif" style="border:0;" name="submit" alt="PayPal - The safer, easier way to pay online." />
+ <img alt="" style="border:0;" src="https://www.paypal.com/en_GB/i/scr/pixel.gif" width="1" height="1" />
+ </form>
+</div>
+
<h3>Bitcoin</h3>
<p>Our Bitcoin address is <strong>1aiBPLdHEW8wu9WpufdBT7kpJRCkGR9P1</strong>.</p>
View
3 london.hackspace.org.uk/events/index.php
@@ -7,7 +7,8 @@
<iframe src="http://www.google.com/calendar/embed?showCalendars=0&amp;showTitle=0&amp;showNav=0&amp;showPrint=0&amp;showTabs=0&amp;height=600&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=gc1bopmh3c5n0ogvlo6ceujlkc%40group.calendar.google.com&amp;color=%235229A3&amp;ctz=Europe%2FLondon" style=" border-width:0 " width="576" height="400" frameborder="0" scrolling="no"></iframe>
-<br><br>
+<br /><br />
+
<p>You can add <a href="http://www.google.com/calendar/ical/gc1bopmh3c5n0ogvlo6ceujlkc%40group.calendar.google.com/public/basic.ics">add the iCal feed to your calendar</a>.</p>
<? require('../footer.php'); ?>
View
5 london.hackspace.org.uk/footer.php
@@ -1,10 +1,11 @@
- </div>
</div>
</div>
+ </div>
+
<div id="ft">
Copyright &copy; <?=date('Y')?> London Hackspace Ltd.
</div>
-</div>
+</div>
<script type="text/javascript">
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
View
21 london.hackspace.org.uk/index.php
@@ -5,21 +5,24 @@
<p class="blurb"><strong>The London Hackspace is a non-profit, community-run <a href="http://en.wikipedia.org/wiki/Hackerspace">hacker space</a> in central London. We provide a space where people who make things can come to share tools and knowledge.</strong></p>
-<p>We have a <a href="http://wiki.hackspace.org.uk/wiki/Laboratory_24">great space</a> in Shoreditch, right next to Hoxton station, which is open to our members 24 hours a day, and we hold regular
-free <a href="/events">hack evenings and workshops</a> which are open to everyone.</p>
+<p>We have a <a href="http://wiki.hackspace.org.uk/wiki/Laboratory_24">great space</a> in Shoreditch, right next to Hoxton station, which is open to our members 24 hours a day, and we hold regular free <a href="/events">hack evenings and workshops</a> which are open to everyone.</p>
+
+<p>
+ <a href="http://wiki.hackspace.org.uk">
+ <img src="/images/electronics.jpg" alt="Oscilloscopes and power supply" />
+ <img src="/images/drawers.jpg" alt="Electronic components" />
+ </a>
+</p>
-<p><a href="http://wiki.hackspace.org.uk"><img src="/images/electronics.jpg" /><img src="/images/drawers.jpg" /></a>
<div style="margin-left:10px">
-<script type="text/javascript" src="badge.php"></script>
+ <script type="text/javascript" src="badge.php"></script>
</div>
-</p>
+
<p><strong>Learn more about the London Hackspace on <a href="http://wiki.hackspace.org.uk">our wiki</a>.</strong></p>
-<p>To get involved, join the <a href="http://webchat.freenode.net/?channels=london-hack-space">IRC channel</a>,
- <a href="http://groups.google.com/group/london-hack-space">mailing list</a>,
-or <a href="http://twitter.com/londonhackspace">follow us on twitter</a>.</p>
+<p>To get involved, join the <a href="http://webchat.freenode.net/?channels=london-hack-space">IRC channel</a>, <a href="http://groups.google.com/group/london-hack-space">mailing list</a>, or <a href="http://twitter.com/londonhackspace">follow us on twitter</a>.</p><br />
+
-<br>
<h2>Join us!</h2>
<p>If you want to use our space regularly you should <a href="/signup.php">become a member</a>, however attending
our <a href="/events">events</a> is free!</p>
View
1 london.hackspace.org.uk/login.php
@@ -75,5 +75,6 @@
</table>
</fieldset>
</form>
+
<p>Forgotten your password? <a href="passwordreset.php">Reset it here</a>.</p>
<? require('footer.php'); ?>
View
21 london.hackspace.org.uk/members/addcard.php
@@ -25,23 +25,26 @@
trigger_error($e);
}
}
-
?>
+
<h2>Add card</h2>
<?
if($user->isMember()) {
?>
-
<form method="POST">
-<input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
-<table>
-<tr><td><label for="uid">Card ID: </label></td><td><input type="text" name="uid" value=""/></td></tr>
-<tr><td colspan="2"><input type="submit" name="submit" value="Add" /></td></tr>
-</table>
+ <input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
+ <table>
+ <tr>
+ <td><label for="uid">Card ID: </label></td>
+ <td><input type="text" name="uid" value="" /></td>
+ </tr>
+ <tr>
+ <td colspan="2"><input type="submit" name="submit" value="Add" /></td>
+ </tr>
+ </table>
</form>
-
<? } else { ?>
- <p>You must be a member to use this page.</p>
+<p>You must be a member to use this page.</p>
<?php }
require('../footer.php'); ?>
View
65 london.hackspace.org.uk/members/cards.php
@@ -43,47 +43,56 @@
trigger_error($e);
}
}
-
?>
+
<h2>Card access</h2>
<?
if($user->isMember()) {
?>
-
<h3>Your Authorised Cards</h3>
-<p>As a member, you may authorise your RFID card for 24/7 access to the space and equipment. You can also set a nickname to be announced to the space instead of your full name.
+
+<p>As a member, you may authorise your RFID card for 24/7 access to the space and equipment. You can also set a nickname to be announced to the space instead of your full name.</p>
+
<p>Any 13.56 MHz device will work, including Oyster cards. The system will only read the unique identifier from it.</p>
<form method="POST">
-<input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
-<input type="hidden" name="update_card" value="" />
-<table>
- <tr><th>Date added</th><th style="text-align: center">Card ID</th><th>Enabled</th></tr>
-<? foreach($user->buildCards() as $card): ?>
- <tr>
- <td><?=$card->getAddedDate()?></td>
- <td><?=$card->getUid()?></td>
- <td style="text-align: center">
- <? if ($card->getActive()): ?>
- <input type="submit" name="disable_<?=$card->getUid()?>" value="Yes"/>
- <? else: ?>
- <input type="submit" name="enable_<?=$card->getUid()?>" value="No"/>
- <? endif; ?>
- </td>
- </tr>
-<? endforeach ?>
-</table>
+ <input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
+ <input type="hidden" name="update_card" value="" />
+ <table>
+ <tr>
+ <th>Date added</th>
+ <th style="text-align: center">Card ID</th>
+ <th>Enabled</th>
+ </tr>
+ <? foreach($user->buildCards() as $card): ?>
+ <tr>
+ <td><?=$card->getAddedDate()?></td>
+ <td><?=$card->getUid()?></td>
+ <td style="text-align: center">
+ <? if ($card->getActive()): ?>
+ <input type="submit" name="disable_<?=$card->getUid()?>" value="Yes" />
+ <? else: ?>
+ <input type="submit" name="enable_<?=$card->getUid()?>" value="No" />
+ <? endif; ?>
+ </td>
+ </tr>
+ <? endforeach ?>
+ </table>
</form>
-
<form method="POST">
-<input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
-<input type="hidden" name="update_nick" value="" />
-<table>
-<tr><td><label for="nickname">Nickname: </label></td><td><input type="text" id="nickname" name="nickname" value="<?php echo $user->getNickname() ?>"/></td></tr>
-<tr><td colspan="2"><input type="submit" name="submit" value="Save" /></td></tr>
-</table>
+ <input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
+ <input type="hidden" name="update_nick" value="" />
+ <table>
+ <tr>
+ <td><label for="nickname">Nickname:</label></td>
+ <td><input type="text" id="nickname" name="nickname" value="<?php echo $user->getNickname() ?>" /></td>
+ </tr>
+ <tr>
+ <td colspan="2"><input type="submit" name="submit" value="Save" /></td>
+ </tr>
+ </table>
</form>
<? if (isset($_GET['saved'])) {
View
53 london.hackspace.org.uk/members/edit.php
@@ -52,22 +52,47 @@
<h2>Edit Your Membership Details</h2>
<p><a href="http://www.legislation.gov.uk/ukpga/2006/46/part/8/chapter/2/crossheading/general">UK law</a> requires us to
store the full name and address of all our members. If you don't provide these details, you won't receive membership privileges.</p>
+
<p>We also ask if you live in Hackney for grant/funding purposes.</p>
+
<p>If you prefer to pay for a longer period of time, you can change your membership period here. You must pay at least £5/month.</p>
+
<form method="post">
-<input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
-<fieldset>
-<table id="edittable">
-<tr><td><label for="email">Email</label></td><td><input type="text" id="email" name="email" value="<?=$user->getEmail()?>"/></td></tr>
-<tr><td><label for="fullname">Full Name</label></td><td><input type="text" id="fullname" name="fullname" value="<?=$user->getFullName()?>"/></td></tr>
-<tr><td><label for="address">Address</label></td><td><textarea id="address" name="address" cols="30" rows="5"><?=$user->getAddress()?></textarea></td></tr>
-<tr><td><label for="hackney">I live in the London Borough of Hackney</label></td><td><input type="checkbox" id="hackney" name="hackney"
- <? if ($user->getHackney() == 1) { ?>checked="checked"<? } ?>/></td></tr>
-<tr><td><label for="length">Subscription Length (months)</label></td><td><input id="length" name="length" value="<?=$user->getSubscriptionPeriod()?>"/></td></tr>
-<tr><td><label for="newpassword">New Password (optional)</label></td><td><input type="password" id="newpassword" name="newpassword" /></td></tr>
-<tr><td><label for="newpasswordconfirm">Confirm New Password</label></td><td><input type="password" id="newpasswordconfirm" name="newpasswordconfirm" /></td></tr>
-<tr><td colspan="2"><input type="submit" name="submit" value="Submit" /></td></tr>
-</table>
-</fieldset>
+ <input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
+ <fieldset>
+ <table id="edittable">
+ <tr>
+ <td><label for="email">Email</label></td>
+ <td><input type="text" id="email" name="email" value="<?=$user->getEmail()?>" /></td>
+ </tr>
+ <tr>
+ <td><label for="fullname">Full Name</label></td>
+ <td><input type="text" id="fullname" name="fullname" value="<?=$user->getFullName()?>" /></td>
+ </tr>
+ <tr>
+ <td><label for="address">Address</label></td>
+ <td><textarea id="address" name="address" cols="30" rows="5"><?=$user->getAddress()?></textarea></td>
+ </tr>
+ <tr>
+ <td><label for="hackney">I live in the London Borough of Hackney</label></td>
+ <td><input type="checkbox" id="hackney" name="hackney" <? if ($user->getHackney() == 1) { ?>checked="checked"<? } ?> /></td>
+ </tr>
+ <tr>
+ <td><label for="length">Subscription Length (months)</label></td>
+ <td><input id="length" name="length" value="<?=$user->getSubscriptionPeriod()?>" /></td>
+ </tr>
+ <tr>
+ <td><label for="newpassword">New Password (optional)</label></td>
+ <td><input type="password" id="newpassword" name="newpassword" /></td>
+ </tr>
+ <tr>
+ <td><label for="newpasswordconfirm">Confirm New Password</label></td>
+ <td><input type="password" id="newpasswordconfirm" name="newpasswordconfirm" /></td>
+ </tr>
+ <tr>
+ <td colspan="2"><input type="submit" name="submit" value="Submit" /></td>
+ </tr>
+ </table>
+ </fieldset>
</form>
<? require('../footer.php'); ?>
View
54 london.hackspace.org.uk/members/index.php
@@ -10,18 +10,26 @@
<? if ($user->getAddress() == '') {?>
<h4>More Details Required</h4>
+
<p>UK Law requires that we store our members' real name and address. Since you haven't provided
- these details you will be unable to gain membership privileges until you do.</p>
+ these details you will be unable to gain membership privileges until you do.</p>
+
<p>Please <a href="/members/edit.php">provide your details</a> to continue.</p>
<?} else if ($user->isMember()) { ?>
<p>You're currently a member of London Hackspace Ltd., thanks for your support!</p>
<h3>Your Recent Payments</h3>
<table>
- <tr><th>Date</th><th>Amount</th></tr>
-<? foreach($user->buildTransactions() as $transaction) {?>
- <tr><td><?=$transaction->getTimestamp()?></td><td<?=$transaction->getAmount()?></td></tr>
-<? } ?>
+ <tr>
+ <th>Date</th>
+ <th>Amount</th>
+ </tr>
+ <? foreach($user->buildTransactions() as $transaction) {?>
+ <tr>
+ <td><?=$transaction->getTimestamp()?></td>
+ <td<?=$transaction->getAmount()?></td>
+ </tr>
+ <? } ?>
</table>
<h3>Reference Number</h3>
@@ -30,29 +38,43 @@
<? } else { ?>
<p>You're not currently a member of London Hackspace Ltd. To become a member, we ask that you pay what you
think the space is worth to you. Running an organisation like this in London isn't cheap, so please be as
- generous as you can. The minimum subscription is £5/month.
-</p>
+ generous as you can. The minimum subscription is £5/month.</p>
<h3>Standing Order</h3>
<p>Set up a monthly standing order with your bank (most banks let you do this online),
using the following details. Please make sure you enter the reference provided in the
- reference field of your payment, or your subscription will not be recognised.</p>
+ reference field of your payment, or your subscription will not be recognised.</p>
<table>
- <tr><th>Bank</th><td>Barclays</td></tr>
- <tr><th>Payee</th><td>London Hackspace Ltd.</td></tr>
- <tr><th>Sort Code</th><td>20-32-06</td></tr>
- <tr><th>Account Number</th><td>53413292</td></tr>
- <tr><th>Reference</th><td><?=$user->getMemberNumber()?></td></tr>
+ <tr>
+ <th>Bank</th>
+ <td>Barclays</td>
+ </tr>
+ <tr>
+ <th>Payee</th>
+ <td>London Hackspace Ltd.</td>
+ </tr>
+ <tr>
+ <th>Sort Code</th>
+ <td>20-32-06</td>
+ </tr>
+ <tr>
+ <th>Account Number</th>
+ <td>53413292</td>
+ </tr>
+ <tr>
+ <th>Reference</th>
+ <td><?=$user->getMemberNumber()?></td>
+ </tr>
</table>
<p>Once your payment is set up, the site should reflect it once we reconcile
- our statements &mdash; this happens approximately daily.</p>
+ our statements &mdash; this happens approximately daily.</p>
<h3>Can't do Standing Order?</h3>
<p>In our experience standing order is an almost universal payment method in the UK.
- It's the only method which is completely free for both you and us. Consequently, we don't accept
- payment for membership by any other method.</p>
+ It's the only method which is completely free for both you and us. Consequently, we don't accept
+ payment for membership by any other method.</p>
<p> If you genuinely aren't able to use a standing
order to pay, please drop <a href="mailto:russ@hackspace.org.uk">Russ</a> an email to let us
View
38 london.hackspace.org.uk/members/members.php
@@ -6,32 +6,32 @@
fURL::redirect('/login.php?forward=/members/members.php');
}
?>
+
<h2>Members list</h2>
<?
-
if($user->isMember()) {
-
-?>
- <p>This is a list of all members, up to date as of the last accounts reconciliation.</p>
- <table>
- <thead>
- <tr>
- <th>Full name</th>
- </tr>
- </thead>
- <tbody>
-<?php
-$users = $db->translatedQuery( 'SELECT full_name FROM users WHERE subscribed=1 ORDER BY lower(full_name)' );
-foreach( $users as $row ):
?>
- <tr>
- <td><?php echo htmlspecialchars( $row['full_name'] ) ?></td>
- </tr>
-<?php endforeach; ?>
- </tbody>
+ <p>This is a list of all members, up to date as of the last accounts reconciliation.</p>
+
+ <table>
+ <thead>
+ <tr><th>Full name</th></tr>
+ </thead>
+ <tbody>
+ <?php
+ $users = $db->translatedQuery( 'SELECT full_name FROM users WHERE subscribed=1 ORDER BY lower(full_name)' );
+ foreach( $users as $row ):
+ ?>
+ <tr>
+ <td><?php echo htmlspecialchars( $row['full_name'] ) ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
</table>
+
<?php $count = $db->translatedQuery( 'SELECT count(*) FROM users WHERE subscribed=1' )->fetchRow(); ?>
<p><strong>Total:</strong> <?php echo $count['count(*)'] ?></p>
+
<p><a href="index.php">Return to membership home</a></p>
<? } else { ?>
<p>You must be a member to use this page.</p>
View
4 london.hackspace.org.uk/members/night.php
@@ -10,9 +10,13 @@
?>
<h2>Night access</h2>
+
<p>Access to Cremer Business Centre between 19:00 and 07:00 will soon be restricted by keycode access, the key you need is listed below.</p>
+
<p>Please treat this as confidential and do not pass it on to non-members or visitors, if in doubt please direct them to this page.</p>
+
<p><a onclick="document.getElementById('access-code').style.display = 'block';">Show access code</a></p>
+
<p id="access-code" style="display:none;font-weight:bold;font-size:x-large;">
<?php echo file_get_contents( '../../var/code.txt' ); ?>
</p>
View
28 london.hackspace.org.uk/members/webcams.php
@@ -22,30 +22,32 @@
<p><strong>You're not a member, so you're seeing a delayed snapshot of our webcams.</strong></p>
<? } ?>
<div>
-<b>Switch Camera:</b>
-<a href="/members/webcams.php?camera=1">Main</a> |
-<a href="/members/webcams.php?camera=2">Quiet/Social</a> |
-<a href="/members/webcams.php?camera=4">Workshop</a> |
-<a href="/members/webcams.php?camera=3">Door</a>
+ <b>Switch Camera:</b>
+ <a href="/members/webcams.php?camera=1">Main</a> |
+ <a href="/members/webcams.php?camera=2">Quiet/Social</a> |
+ <a href="/members/webcams.php?camera=4">Workshop</a> |
+ <a href="/members/webcams.php?camera=3">Door</a>
</div>
+
<div style="padding-top:10px">
<? if ($live) { ?>
- <img src="camera.php?id=<?=$camera?>">
+ <img src="camera.php?id=<?=$camera?>" alt="Hackspace webcam feed" />
<? if ($camera == 4 or $camera == 2) {
if ($camera == 4) { $file = 'camcontrol2.php'; } else { $file = 'camcontrol.php'; }
?>
<small>
- <a href="http://hack.rs/<?=$file?>?cmd=left" target="camcontrol">Left</a> |
- <a href="http://hack.rs/<?=$file?>?cmd=right" target="camcontrol">Right</a> |
- <a href="http://hack.rs/<?=$file?>?cmd=up" target="camcontrol">Up</a> |
- <a href="http://hack.rs/<?=$file?>?cmd=down" target="camcontrol">Down</a><br>
- <a href="http://hack.rs/<?=$file?>?cmd=panscan" target="camcontrol">Pan Scan</a> |
- <a href="http://hack.rs/<?=$file?>?cmd=tiltscan" target="camcontrol">Tilt Scan</a>
+ <a href="http://hack.rs/<?=$file?>?cmd=left" target="camcontrol">Left</a> |
+ <a href="http://hack.rs/<?=$file?>?cmd=right" target="camcontrol">Right</a> |
+ <a href="http://hack.rs/<?=$file?>?cmd=up" target="camcontrol">Up</a> |
+ <a href="http://hack.rs/<?=$file?>?cmd=down" target="camcontrol">Down</a><br>
+ <a href="http://hack.rs/<?=$file?>?cmd=panscan" target="camcontrol">Pan Scan</a> |
+ <a href="http://hack.rs/<?=$file?>?cmd=tiltscan" target="camcontrol">Tilt Scan</a>
</small>
+
<iframe name='camcontrol' frameBorder="0" width="0" height="0"></iframe>
<? } ?>
<? } else { ?>
- <img src="/cam_snapshots/<?=$camera?>.jpg">
+ <img src="/cam_snapshots/<?=$camera?>.jpg" alt="Hackspace webcam feed" />
<? } ?>
</div>
<? require('../footer.php'); ?>
View
20 london.hackspace.org.uk/members/wiki.php
@@ -82,7 +82,9 @@
);
}
?>
+
<p>As a member of London Hackspace Ltd. you are entitled to administrator rights on <a href="http://wiki.hackspace.org.uk">our wiki</a>.</p>
+
<?php if( count( $accounts ) > 0 ): ?>
<p>These wiki accounts have the same confirmed e-mail address as your membership account:</p>
<table>
@@ -101,8 +103,8 @@
<td>
<form method="POST" style="margin: 0;">
<input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
- <input type="hidden" name="wikiuser" value="<?php echo $id ?>">
- <input type="submit" name="<?php echo $details['linked'] ? 'unlink' : 'link' ?>" value="<?php echo $details['linked'] ? 'Unlink' : 'Link' ?>">
+ <input type="hidden" name="wikiuser" value="<?php echo $id ?>" />
+ <input type="submit" name="<?php echo $details['linked'] ? 'unlink' : 'link' ?>" value="<?php echo $details['linked'] ? 'Unlink' : 'Link' ?>" />
</form>
</td>
</tr>
@@ -111,29 +113,31 @@
</table>
<?php else: ?>
<p>No account currently exists on the wiki with the same confirmed e-mail address as your London Hackspace Ltd. account. If you already have an account on the wiki you should set or update your e-mail address there, otherwise use the form below to create a wiki account now.</p>
- <hr>
+
+ <hr />
+
<?php if( isset( $error ) ) echo $error; ?>
<form method="POST">
<input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
<table>
<tr>
<td><label for="username">Wiki username</label></td>
- <td><input type="text" name="username" value="<?php if( array_key_exists( 'username', $_POST ) ) echo $_POST['username'] ?>"></td>
+ <td><input type="text" name="username" value="<?php if( array_key_exists( 'username', $_POST ) ) echo $_POST['username'] ?>" /></td>
</tr>
<tr>
<td><label for="password">Wiki password</label></td>
- <td><input type="password" name="password"></td>
+ <td><input type="password" name="password" /></td>
</tr>
<tr>
<td><label for="passwordconfirm">Confirm wiki password</label></td>
- <td><input type="password" name="passwordconfirm"></td>
+ <td><input type="password" name="passwordconfirm" /></td>
</tr>
<tr>
- <td colspan="2"><input type="submit" name="create" value="Create"></td>
+ <td colspan="2"><input type="submit" name="create" value="Create" /></td>
</tr>
</table>
</form>
- <p></p>
+ <br />
<?php endif; ?>
<p><a href="index.php">Return to membership home</a></p>
<? } else { ?>
View
47 london.hackspace.org.uk/passwordreset.php
@@ -75,29 +75,44 @@
} elseif (isset($_GET['token'])) {
?>
<p>OK, now enter your new password:</p>
+
<form method="post">
-<fieldset>
-<input type="hidden" name="resettoken" value="<?=htmlentities($_GET['token'])?>" />
-<input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
-<table id="resettable">
-<tr><td><label for="password">Password</label></td><td><input type="password" id="password" name="password" /></td></tr>
-<tr><td><label for="passwordconfirm">Confirm Password</label></td><td><input type="password" id="passwordconfirm" name="passwordconfirm" /></td></tr>
-<tr><td colspan="2"><input type="submit" name="reset" value="Submit" /></td></tr>
-</table>
-</fieldset>
+ <fieldset>
+ <input type="hidden" name="resettoken" value="<?=htmlentities($_GET['token'])?>" />
+ <input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
+ <table id="resettable">
+ <tr>
+ <td><label for="password">Password</label></td>
+ <td><input type="password" id="password" name="password" /></td>
+ </tr>
+ <tr>
+ <td><label for="passwordconfirm">Confirm Password</label></td>
+ <td><input type="password" id="passwordconfirm" name="passwordconfirm" /></td>
+ </tr>
+ <tr>
+ <td colspan="2"><input type="submit" name="reset" value="Submit" /></td>
+ </tr>
+ </table>
+ </fieldset>
</form>
<?
} else {
?>
<p>To reset your password, enter your email address:</p>
+
<form method="post">
-<fieldset>
-<input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
-<table id="resettable">
-<tr><td><label for="email">Email</label></td><td><input type="text" id="email" name="email"/></td></tr>
-<tr><td colspan="2"><input type="submit" name="sendtoken" value="Submit" /></td></tr>
-</table>
-</fieldset>
+ <fieldset>
+ <input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
+ <table id="resettable">
+ <tr>
+ <td><label for="email">Email</label></td>
+ <td><input type="text" id="email" name="email"/></td>
+ </tr>
+ <tr>
+ <td colspan="2"><input type="submit" name="sendtoken" value="Submit" /></td>
+ </tr>
+ </table>
+ </fieldset>
</form>
<?
}
View
44 london.hackspace.org.uk/signup.php
@@ -62,17 +62,37 @@
because it helps us with funding.</p>
<form method="post">
-<input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
-<fieldset>
-<table id="signuptable">
-<tr><td><label for="email">Email</label></td><td><input type="text" id="email" name="email"/></td></tr>
-<tr><td><label for="password">Password</label></td><td><input type="password" id="password" name="password" /></td></tr>
-<tr><td><label for="passwordconfirm">Confirm Password</label></td><td><input type="password" id="passwordconfirm" name="passwordconfirm" /></td></tr>
-<tr><td><label for="fullname">Full Name</label></td><td><input type="text" id="fullname" name="fullname"/></td></tr>
-<tr><td><label for="address">Address</label></td><td><textarea id="address" name="address" cols="30" rows="5"></textarea></td></tr>
-<tr><td><label for="hackney">I live in the London Borough of Hackney</label></td><td><input type="checkbox" id="hackney" name="hackney"/></td></tr>
-<tr><td colspan="2"><input type="submit" name="submit" value="Submit" /></td></tr>
-</table>
-</fieldset>
+ <input type="hidden" name="token" value="<?=fRequest::generateCSRFToken()?>" />
+ <fieldset>
+ <table id="signuptable">
+ <tr>
+ <td><label for="email">Email</label></td>
+ <td><input type="text" id="email" name="email" /></td>
+ </tr>
+ <tr>
+ <td><label for="password">Password</label></td>
+ <td><input type="password" id="password" name="password" /></td>
+ </tr>
+ <tr>
+ <td><label for="passwordconfirm">Confirm Password</label></td>
+ <td><input type="password" id="passwordconfirm" name="passwordconfirm" /></td>
+ </tr>
+ <tr>
+ <td><label for="fullname">Full Name</label></td>
+ <td><input type="text" id="fullname" name="fullname" /></td>
+ </tr>
+ <tr>
+ <td><label for="address">Address</label></td>
+ <td><textarea id="address" name="address" cols="30" rows="5"></textarea></td>
+ </tr>
+ <tr>
+ <td><label for="hackney">I live in the London Borough of Hackney</label></td>
+ <td><input type="checkbox" id="hackney" name="hackney" /></td>
+ </tr>
+ <tr>
+ <td colspan="2"><input type="submit" name="submit" value="Submit" /></td>
+ </tr>
+ </table>
+ </fieldset>
</form>
<? require('footer.php'); ?>

0 comments on commit 95aa8bf

Please sign in to comment.
Something went wrong with that request. Please try again.