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\" " ); $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 @@

Who can join?

How much is it?

Additional Staff

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.

When are the next ones?

-

When the Exec Plan plan the next one, contact exec@sucs.org if one has happenend for a while.

+

When the Exec Plan plan the next one, contact exec@sucs.org if one hasn't happened for a while.

Can I take part?

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. 

+a future SUCS Talks event, e-mail us at exec [at] sucs [dot] org. 

How can I watch the videos?

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 @@ -

-
-

Michael Dec (grepwood) - "Time to glorify my waste of time again"

-
-
-
- - - - - - - - - -
-

Length: 00m 00s

-

Video: 600x480 (MPEG-4 AVC, 00MB)

-
-
-

 

-
-
+
+
+

Michael Dec (grepwood) - "Time to glorify my waste of time again"

+
+
+
+ + + + + + + + + +
+

Length: 19m 03s

+

Video: 600x480 (MPEG-4 AVC, 1.1GB)

+
+
+

 

+
+
\ No newline at end of file diff --git a/static/Knowledge/FAQ.txt b/static/Knowledge/FAQ.txt index 50f5a604816fe158398fc072bb7caa03627a8972..59eb0d38c9859e23a21f34ace6b4a629cd2b5ef4 100644 --- a/static/Knowledge/FAQ.txt +++ b/static/Knowledge/FAQ.txt @@ -111,7 +111,6 @@
I missed you at Freshers' Fayre and enrolment, how do I join?
Use the online form at the bottom of the Joining page or come to the room.
-
Why should I join SUCS?
There is more information about joining SUCS and the benefits of joining on the Joining page.
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 @@

ShortURI

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.

Web Mail

-

Check your SUCS e-mail account via the web using Roundcube. Learn more about accessing your SUCS e-mail in our Help section.

+

Check your SUCS e-mail account via the web using Roundcube. Learn more about accessing your SUCS e-mail in our Help section.

PasteBin

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.

Desktop on Demand

-

Desktop on Demand allows you to connect to one of the SUCS computer remotely to run linux applications from anywhere. For more information see Using Desktop on Demand.

\ No newline at end of file +

Desktop on Demand allows you to connect to one of the SUCS computers remotely to run linux applications from anywhere. For more information see Using Desktop on Demand.

\ 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 @@

Webalizer

Cacti (Bypass login here)

Nut

-

Ganglia

\ No newline at end of file +

Ganglia

+

 

\ No newline at end of file