[SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 9 commits: Fix banana award system

[Imran Hussain]

Imran Hussain pushed to branch sucs-site at sucssite / sucs-site


Commits:
7ab02831 by Imran Hussain at 2018-11-19T08:48:11+00:00
Fix banana award system

- - - - -
6d74b256 by Imran Hussain at 2018-11-19T08:50:05+00:00
Fix banana award system


(cherry picked from commit 7ab02831465a57d4816198bab91fdd9d6bf1f1a5)
- - - - -
9fa6882d by Laurence Sebastian Bowes at 2018-11-21T14:39:07+00:00
Make signup send one email, and fix some grammar that has been annoying me since I joined
- - - - -
949b1895 by Imran Hussain at 2018-11-21T17:23:31+00:00
We would like to thank ~rollercow for everything he has done for the soc, his input is always useful.

- - - - -
2f8573a1 by Imran Hussain at 2018-11-21T17:25:02+00:00
Thank you to ~worldinsidme for all the help, hope to see you around in mw more :)

- - - - -
a7b7b1eb by Imran Hussain at 2018-11-21T17:26:16+00:00
Thank you ~kais58, your input is always welcome and wanted.

- - - - -
17a04e75 by Imran Hussain at 2018-11-21T17:28:40+00:00
Add an actual student to the list of admin staff members.

- - - - -
fdddf673 by Imran Hussain at 2018-11-21T17:31:09+00:00
Merge branch 'master' into beta

- - - - -
199951bf by Imran Hussain at 2018-11-21T17:32:51+00:00
Merge branch 'beta' into sucs-site

- - - - -


2 changed files:

- components/signup.php
- static/About/Staff.txt


Changes:

=====================================
components/signup.php
=====================================
--- a/components/signup.php
+++ b/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 at 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 at sucs.org",
-                                        "User '" . $fields['username'] . "' Created on SUCS",
-                                        $logsmessage,
-                                        "From: \"SUCS Admin\" <admin at sucs.org>"
-                                    );
-                                    mail(
-                                        "treasurer at sucs.org",
+                                        "logs at sucs.org,treasurer at sucs.org",
                                         "User '" . $fields['username'] . "' Created on SUCS",
                                         $logsmessage,
                                         "From: \"SUCS Admin\" <admin at 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
=====================================
--- a/static/About/Staff.txt
+++ b/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">



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/221418e90eedfeefdff669ff3f120110828b0c02...199951bf6bf62542d5f5ef3fab2517fc33289fda

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/221418e90eedfeefdff669ff3f120110828b0c02...199951bf6bf62542d5f5ef3fab2517fc33289fda
You're receiving this email because of your account on projects.sucs.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20181121/2809deb0/attachment-0001.html>