diff --git a/components/members.php b/components/members.php
index 39529be4c06f2ddb3fa2e3d73f8c7d8616be9773..f922e6b7543de4abbc1989f3485c312eaca5eb24 100644
--- a/components/members.php
+++ b/components/members.php
@@ -88,7 +88,8 @@ if ($session->loggedin) {
$stats['yeartop'] = $DB->GetAll($yeartop_sql, array(academicYear(time())."-09-01"));
// bottom 5
- $stats['bottom'] = $DB->GetAll("SELECT username, sum(score) as sum FROM awards GROUP BY username ORDER BY sum ASC LIMIT 5");
+ // exclude sambws and frostys allways decresing banana that scres up the result
+ $stats['bottom'] = $DB->GetAll("SELECT username, sum(score) as sum FROM awards WHERE id!=685 and id!=393 GROUP BY username ORDER BY sum ASC LIMIT 5");
// recent awards
// today's definition of "recent" is all awards within three days of the newest award and a minimum of five...
// if this seems like a dumb method then try something else :-)
diff --git a/components/signup.php b/components/signup.php
index bcd46f066289d245f8b009fc65e874585a4042be..ce64df34bc3a0e1dae0fd33a29a38c21e13cac97 100644
--- a/components/signup.php
+++ b/components/signup.php
@@ -333,7 +333,7 @@ if(isset($_REQUEST['signupid'])&&isset($_REQUEST['signuppw'])){
mail(
$error_email,
"Error adding user to mailing lists from signup id: ".$signupid,
- $execoutputstr,
+ $execoutputstr.$ececreturn,
"From: \"SUCS Admin\" <admin@sucs.org>"
);
$failed=true;
diff --git a/htdocs/images/lastsnap.jpg b/htdocs/images/lastsnap.jpg
index a29f5d3e897e93971aa2d38e8ac97f77568608f8..a65171498d3fd4547c93808c8d61fa2e94e04638 100644
Binary files a/htdocs/images/lastsnap.jpg and b/htdocs/images/lastsnap.jpg differ
diff --git a/static/About/Joining.txt b/static/About/Joining.txt
index bb7c466882aab11034c87f7f0876d4a818cfe865..3c1d1204ee2f2083cae37a0bf1912442a3727172 100644
--- a/static/About/Joining.txt
+++ b/static/About/Joining.txt
@@ -1,6 +1,6 @@
<h2>Who can join?</h2>
<ul>
-<li>You <strong>must</strong> be a member of Swansea University Student Union (<a href="http://swansea-union.co.uk/">SUSU</a>) to be able to join the society.</li>
+<li>You <strong>must</strong> be a member of Swansea University Students' Union (<a href="http://swansea-union.co.uk/">SUSU</a>) to be able to join the society.</li>
</ul>
<h2>How much is it?</h2>
<ul>
diff --git a/static/About/Room.txt b/static/About/Room.txt
index 457c4ddf3cdf4d99d6fd505028969870694af5c4..ba2df62038302b4da0e21efd815172d3d3fb4a79 100644
--- a/static/About/Room.txt
+++ b/static/About/Room.txt
@@ -2,4 +2,4 @@
<p><img alt="The SUCS Room" src="../pictures/sucsroom.jpg" /></p>
<h3>Where to find the room</h3>
<p style="float: left; margin: 0.5em"><a href="../pictures/room-map.jpg"><img alt="Location of SUCS Room on Campus Map" src="../pictures/room-map_thumb.jpg" /></a></p>
-<p>The SUCS room is located at the bottom of the Student Union building, approximately halfway along the side facing the back of Fulton House. To unlock the door, members can swipe their student cards in the card reader or hold them up to the <abbr>RFID</abbr> sensor pad denoted by the black square (both located to the right, underneath the window).</p>
\ No newline at end of file
+<p>The SUCS room is located at the bottom of the Student Union building, approximately halfway along the side facing the back of Fulton House. To unlock the door, members can swipe their student card in the card reader or hold it up to the <abbr>RFID</abbr> sensor pad denoted by the black square (both located to the right of our blue door, underneath the window).</p>
\ No newline at end of file
diff --git a/static/About/Staff.txt b/static/About/Staff.txt
index 3b53ed6dfd632622a7f2ee48809618e6d15e6c19..6b38b14b069e877ec669dc17f29293c3073b6e4b 100644
--- a/static/About/Staff.txt
+++ b/static/About/Staff.txt
@@ -16,9 +16,11 @@
</li>
<li>
<div>
+<div> <img height="100" src="https://sucs.org/pictures/people/sockitwench.png" width="100" />
<br />
<strong>Secretary</strong><br />Courtney Simone Vasile (~sockitwench)
</div>
+</div>
</li>
<li>
<div> <img height="100" src="https://sucs.org/pictures/people/andy.png" width="100" />
@@ -26,6 +28,12 @@
<strong>Publicity</strong><br />Andrew Vincent Pover (~andy)
</div>
</li>
+<li>
+<div> <img height="100" src="https://sucs.org/pictures/people/unreturnable.png" width="100" />
+ <br />
+ <strong>Gaming</strong><br />Peter Jenkins (~unreturnable)
+</div>
+</li>
</ul>
<div class="clear"></div>
<h2>Additional Staff</h2>
diff --git a/static/Community/Talks.txt b/static/Community/Talks.txt
index 14489cf4b8559e784ad2b405ece47938dada7807..52a57ea3f166bd28b5e26096cd68c818103c9abb 100644
--- a/static/Community/Talks.txt
+++ b/static/Community/Talks.txt
@@ -7,10 +7,10 @@ Linux. The talks are a great way to meet people, learn things, and share your
knowledge.</p>
<h3>When are the next
ones?</h3>
-<p>When the Exec Plan plan the next one, contact <a href="mailto:exec@sucs.org">exec@sucs.org</a> if one has happenend for a while.</p>
+<p>When the Exec Plan plan the next one, contact <a href="mailto:exec@sucs.org">exec@sucs.org</a> if one hasn't happened for a while.</p>
<h3>Can I take part?</h3>
<p>You certainly can! If you want to do a talk at
-a future SUCS Talks event, either e-mail us at exec [at] sucs [dot] org. </p>
+a future SUCS Talks event, e-mail us at exec [at] sucs [dot] org. </p>
<h3>How can I watch the videos?</h3>
<p>Each talk is
available below as both a streaming flash video (you just need flash installed
diff --git a/static/Community/Talks/2014-03-20/grepwood.txt b/static/Community/Talks/2014-03-20/grepwood.txt
index b884e3d79c4949048842a960dc849452ca672538..10db02b333d689bcacdbaa48e210e134d9de9fdd 100644
--- a/static/Community/Talks/2014-03-20/grepwood.txt
+++ b/static/Community/Talks/2014-03-20/grepwood.txt
@@ -1,23 +1,23 @@
-<div class="box">
-<div class="boxhead">
-<h2>Michael Dec (grepwood) - "Time to glorify my waste of time again"</h2>
-</div>
-<div class="boxcontent">
-<div id="player">
-<object data="//sucs.org/videos/talks/mediaplayer.swf?file=2014-03-20/grepwood.flv" height="480" id="player" type="application/x-shockwave-flash" width="600">
-<param name="height" value="480" />
-<param name="width" value="600" />
-<param name="file" value="/videos/talks/2014-03-20/grepwood.flv" />
-<param name="image" value="/videos/talks/2014-03-20/grepwood.png" />
-<param name="id" value="player" />
-<param name="displayheight" value="480" />
-<param name="FlashVars" value="image=/videos/talks/2014-03-20/grepwood.png" />
-</object>
-</div>
-<p><strong>Length: </strong>00m 00s</p>
-<p><strong>Video: </strong><a href="/videos/talks/2014-03-20/grepwood.flv" title="600x480 MPEG-4 AVC - 00MB">600x480</a> (MPEG-4 AVC, 00MB)</p>
-</div>
-<div class="boxfoot">
-<p> </p>
-</div>
-</div>
+<div class="box">
+<div class="boxhead">
+<h2>Michael Dec (grepwood) - "Time to glorify my waste of time again"</h2>
+</div>
+<div class="boxcontent">
+<div id="player">
+<object data="//sucs.org/videos/talks/mediaplayer.swf?file=2014-03-20/grepwood.flv" height="480" id="player" type="application/x-shockwave-flash" width="600">
+<param name="height" value="480" />
+<param name="width" value="600" />
+<param name="file" value="/videos/talks/2014-03-20/grepwood.flv" />
+<param name="image" value="/videos/talks/2014-03-20/grepwood.png" />
+<param name="id" value="player" />
+<param name="displayheight" value="480" />
+<param name="FlashVars" value="image=/videos/talks/2014-03-20/grepwood.png" />
+</object>
+</div>
+<p><strong>Length: </strong>19m 03s</p>
+<p><strong>Video: </strong><a href="/videos/talks/2014-03-20/grepwood.flv" title="600x480 MPEG-4 AVC - 00MB">600x480</a> (MPEG-4 AVC, 1.1GB)</p>
+</div>
+<div class="boxfoot">
+<p> </p>
+</div>
+</div>
\ No newline at end of file
diff --git a/static/Knowledge/FAQ.txt b/static/Knowledge/FAQ.txt
index f2c4c3f8287b6a632b9bcb1cf107578241bba3c9..9141c0ae51754a462df166e4a9a6ea1f7ba19938 100644
--- a/static/Knowledge/FAQ.txt
+++ b/static/Knowledge/FAQ.txt
@@ -111,7 +111,6 @@
<dl>
<dt><a id="s_m1">I missed you at Freshers' Fayre and enrolment, how do I join?</a></dt>
<dd>Use the online form at the bottom of the <a href="../About/Joining">Joining</a> page or come to the room.</dd>
-
<dt><a id="s_m2">Why should I join SUCS?</a></dt>
<dd>There is more information about joining SUCS and the benefits of joining on the <a href="../About/Joining">Joining page</a>.</dd>
</dl>
@@ -191,7 +190,7 @@
<dt><a id="t_r5">How do I connect to GuestNET?</a></dt>
<dd>Take a look at the GuestNET How To page in the Help section <a href="Help/SUCS%20Services/Connecting%20to%20GuestNet">here</a>.</dd>
<dt><a id="iDevice"> I have an iPhone/iPad/Mac how do I connect to the WiFi?</a></dt><a id="iDevice">
-</a><dd><a id="iDevice">You can use the wireless profile </a><a href="https://sucs.org/SUCS_WiFi.mobileconfig">here</a></dd></dl>
+</a><dd><a id="iDevice">You can use the wireless profile </a><a href="https://sucs.org/files/SUCS_WiFi.mobileconfig">here</a></dd></dl>
<p><a id="iDevice">
</a></p>
<h3><a id="iDevice"></a><a id="computers">Computers</a></h3>
diff --git a/static/Tools.txt b/static/Tools.txt
index 80b9700c33a4219dd2e664377410b0657f03df81..a12c659531144ad05ed4f089a5ef459eda090a52 100644
--- a/static/Tools.txt
+++ b/static/Tools.txt
@@ -4,8 +4,8 @@
<h2><a href="Tools/ShortURI">ShortURI</a></h2>
<p>Make long web addresses shorter. Useful if you wish to paste it to Milliways, or perhaps a forum or chatroom elsewhere; you can use ShortURI to create a shorter version that will direct you to the original address.</p>
<h2><a href="https://sucs.org/webmail">Web Mail</a></h2>
-<p>Check your SUCS e-mail account via the web using <cite>Roundcube</cite>. Learn more about <a href="/Knowledge/Help/SUCS%20Services/Accessing%20your%20email">accessing your SUCS e-mail</a> in our Help section.</p>
+<p>Check your SUCS e-mail account via the web using <cite>Roundcube</cite>. Learn more about <a href="Knowledge/Help/SUCS%20Services/Accessing%20your%20email">accessing your SUCS e-mail</a> in our Help section.</p>
<h2><a href="Tools/PasteBin">PasteBin</a></h2>
<p>If you are having trouble with some code and have gone to Milliways for help, use the Pastebin to avoid spamming Milliways with lines of code, plus it also has a nifty syntax highlighting feature. </p>
<h2><a href="Tools/Desktop%20on%20Demand">Desktop on Demand</a></h2>
-<p>Desktop on Demand allows you to connect to one of the SUCS computer remotely to run linux applications from anywhere. For more information see <a href="/Knowledge/Help/SUCS%20Services/Using%20Desktop%20on%20Demand">Using Desktop on Demand</a>.</p>
\ No newline at end of file
+<p>Desktop on Demand allows you to connect to one of the SUCS computers remotely to run linux applications from anywhere. For more information see <a href="Knowledge/Help/SUCS%20Services/Using%20Desktop%20on%20Demand">Using Desktop on Demand</a>.</p>
\ No newline at end of file
diff --git a/static/stats.txt b/static/stats.txt
index 9e94550dcb1e80186171bf8d26eaf1649e0badbc..f094145c6df0b54303f56a53b82f73c04083b0b6 100644
--- a/static/stats.txt
+++ b/static/stats.txt
@@ -3,4 +3,5 @@
<p><a href="https://sucs.org/stats/webalizer/" title="Webalizer" target="_blank">Webalizer</a></p>
<p><a href="https://sucs.org/stats/cacti/" title="Cacti" target="_blank">Cacti</a> (Bypass login <a href="https://sucs.org/stats/cacti/graph_view.php?action=tree&tree_id=1&leaf_id=8&select_first=true" target="_blank">here</a>)</p>
<p><a href="https://sucs.org/stats/nut/upsstats.cgi" target="_self">Nut</a></p>
-<p><a href="https://sucs.org/stats/ganglia/" title="Ganglia" target="_blank">Ganglia</a></p>
\ No newline at end of file
+<p><a href="https://sucs.org/stats/ganglia/" title="Ganglia" target="_blank">Ganglia</a></p>
+<p> </p>
\ No newline at end of file