[SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 3 commits: stop .forward file being a symlink

[Imran Hussain]

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


Commits:
b13af1e6 by Chris Piper at 2017-03-31T14:06:03+01:00
stop .forward file being a symlink
- - - - -
92f40d62 by Imran Hussain at 2017-04-01T18:32:28+01:00
Merge branch 'master' into beta

- - - - -
40c1079f by Imran Hussain at 2017-04-01T18:33:45+01:00
Merge branch 'beta' into sucs-site

- - - - -


1 changed file:

- lib/session.php


Changes:

=====================================
lib/session.php
=====================================
--- a/lib/session.php
+++ b/lib/session.php
@@ -228,7 +228,7 @@ class Session
         // the bash script returns 0 for no and 1 for yes, takes one arg, username
         $this->email = shell_exec("../plugins/sucsunreadmail $user");
 
-        if (file_exists($info['homedirectory'][0] . "/.forward")) {
+        if (file_exists($info['homedirectory'][0] . "/.forward") && ! is_link($info['homedirectory'][0] . "/.forward")) {
             $forward = file($info['homedirectory'][0] . "/.forward");
             $this->email_forward = preg_replace("/\n/", "", $forward[0]);
         }



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/3e35d1492891e1226dd1e72691aa92aeae9f7a58...40c1079f088a43db28ab1af5ae400db4a0a0e4bd
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20170401/89222bac/attachment-0001.html>