[SUCS Devel] [Git][sucssite/sucs-site][beta] 4 commits: Sometimes the little mistakes are hard to spot

[Imran Hussain]

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


Commits:
b7dcdce0 by Isabel Jenkins at 2017-02-20T18:08:32+00:00
Sometimes the little mistakes are hard to spot
- - - - -
c1fe7de7 by Imran Hussain at 2017-03-31T12:11:13+01:00
Close #37: untested fix for using symlinks to view files as the apache user

- - - - -
e7d69442 by Imran Hussain at 2017-03-31T12:15:42+01:00
Merge branch 'master' of projects.sucs.org:sucssite/sucs-site

- - - - -
70eb93ea by Imran Hussain at 2017-03-31T12:21:40+01:00
Merge branch 'master' into beta

- - - - -


2 changed files:

- components/members.php
- static/About/History.txt


Changes:

=====================================
components/members.php
=====================================
--- 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


=====================================
static/About/History.txt
=====================================
--- 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>



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/4f12c56e902bdfc2b318734d34268a3cc1935105...70eb93ea8e870a62d93bdf23798453be4d49956e
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20170331/9574539c/attachment-0001.html>