Merge branch 'master' into beta

components/signup.php

@@ -167,7 +167,7 @@ if (isset($_REQUEST['signupid']) && isset($_REQUEST['signuppw'])) {
                                 mail(
                                     $error_email,
                                     "Signup Error",
-                                    "User " . $fields['username'] . " already exists in the databse, THIS SHOULD NEVER HAPPEN\n Love the signup system.\n\nP.S. the signup id is: " . $signupid,
+                                    "User " . $fields['username'] . " already exists in the database, THIS SHOULD NEVER HAPPEN\n Love, the signup system.\n\nP.S. the signup id is: " . $signupid,
                                     "From: \"SUCS Admin\" <admin@sucs.org>"
                                 );
                                 $failed = true;
@@ -251,16 +251,10 @@ if (isset($_REQUEST['signupid']) && isset($_REQUEST['signuppw'])) {
                                     if ($override) {
                                         $logsmessage .= "User " . $session->username . " overrode validation.\n";
                                     }
-                                    $logsmessage .= "Love The Signup System";
+                                    $logsmessage .= "Love, The Signup System";
                                     // DEV: CHANGE THIS EMAIL ADDRESS
                                     mail(
-                                        "logs@sucs.org",
-                                        "User '" . $fields['username'] . "' Created on SUCS",
-                                        $logsmessage,
-                                        "From: \"SUCS Admin\" <admin@sucs.org>"
-                                    );
-                                    mail(
-                                        "treasurer@sucs.org",
+                                        "logs@sucs.org,treasurer@sucs.org",
                                         "User '" . $fields['username'] . "' Created on SUCS",
                                         $logsmessage,
                                         "From: \"SUCS Admin\" <admin@sucs.org>"
@@ -335,7 +329,7 @@ if (isset($_REQUEST['signupid']) && isset($_REQUEST['signuppw'])) {
                         foreach ($errorreparray as $key => $value) {
                             $errorreport .= $key . ": " . $value . "\n";
                         }
-                        $errorreport .= "\nLove from the Signup System";
+                        $errorreport .= "\nLove, the Signup System";
                         mail(
                             $error_email,
                             "Signup system error report",

static/About/Staff.txt

@@ -28,12 +28,10 @@
 <h2>Additional Staff</h2>
 <p>If you're trying to contact the Admin team please email admin@</p>
 <ul>
-<li>Chris Jones (<a href="/~rollercow">rollercow</a>)</li>
 <li>Tim Clark (<a href="/~eclipse">eclipse</a>)<br /></li>
 <li>Thomas Lake (<a href="/~tswsl1989/">tswsl1989</a>)</li>
-<li>Nicholas Corlett (<a href="/~worldinsideme">worldinsideme</a>)</li>
-<li>Callum Massey (<a href="/~kais58/">kais58</a>)</li>
 <li>Imran Hussain (<a href="/~imranh/">imranh</a>)</li>
+<li>Laurence Bowes (<a href="/~elbows/">elbows</a>)</li>
 </ul>
 <h2>Thanks</h2>
 <p>
@@ -53,6 +51,9 @@ exceptional help over the years.</p>
 <li>James Frost (<a href="/~frosty">frosty</a>)</li>
 <li>Peter Berry (<a href="/~pwb">pwb</a>)</li>
 <li>Andrew Price (<a href="/~welshbyte">welshbyte</a>)</li>
+<li>Chris Jones (<a href="/~rollercow">rollercow</a>)</li>
+<li>Nicholas Corlett (<a href="/~worldinsideme">worldinsideme</a>)</li>
+<li>Callum Massey (<a href="/~kais58/">kais58</a>)</li>
 </ul>
 <!--
 <div class="box">