From b7dcdce08b19a86081821d5ed831f30664e501c0 Mon Sep 17 00:00:00 2001
From: Isabel Jenkins <unreturnable@sucs.org>
Date: Mon, 20 Feb 2017 18:08:32 +0000
Subject: [PATCH 1/2] Sometimes the little mistakes are hard to spot

---
 static/About/History.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/About/History.txt b/static/About/History.txt
index bc4a00d..a825002 100644
--- a/static/About/History.txt
+++ b/static/About/History.txt
@@ -29,7 +29,7 @@
 </td>
 <td><a href="/~elbows">elbows</a> (Laurence Sebastian Bowes)</td>
 <td><a href="/~unreturnable">unreturnable</a> (Isabel Jenkins)</td>
-<td><a href="/~coatlus">coatlus</a> (Megan Warren-Davis)</td>
+<td><a href="/~coatlus">coatlus</a> (Quetzal Mac Creamer Shorey)</td>
 <td><a href="/~andy">andy</a> (Andrew Vincent Pover)</td>
 <td><a href="/~gigosaurus">gigosaurus</a> (Christopher Lindsay Manners)</td>
 </tr>
-- 
GitLab


From c1fe7de7b05a45d39b8851b7f00077392ff04d32 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 31 Mar 2017 12:11:13 +0100
Subject: [PATCH 2/2] Close #37: untested fix for using symlinks to view files
 as the apache user

---
 components/members.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/members.php b/components/members.php
index 386d62a..4b08f40 100644
--- a/components/members.php
+++ b/components/members.php
@@ -48,11 +48,11 @@ if ($session->loggedin) {
                 $homedir = explode('/', $usernames[0]['homedir']);
                 $usernames[0]['acctype'] = ucfirst($homedir[2]);
                 // Project
-                if (file_exists($usernames[0]['homedir'] . '/.project')) {
+                if (file_exists($usernames[0]['homedir'] . '/.project') && ! is_link($usernames[0]['homedir'] . '/.project')) {
                     $usernames[0]['project'] = file_get_contents($usernames[0]['homedir'] . '/.project');
                 }
                 // Plan
-                if (file_exists($usernames[0]['homedir'] . '/.plan')) {
+                if (file_exists($usernames[0]['homedir'] . '/.plan') && ! is_link($usernames[0]['homedir'] . '/.plan')) {
                     $usernames[0]['plan'] = file_get_contents($usernames[0]['homedir'] . '/.plan');
                 }
                 // Website
-- 
GitLab