[phpwiki-checkins] SF.net SVN: phpwiki:[6847] trunk/lib/MailNotify.php

[<var...@us...>]

Revision: 6847
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6847&view=rev
Author:   vargenau
Date:     2009-06-03 11:47:39 +0000 (Wed, 03 Jun 2009)

Log Message:
-----------
Gforge stores fully qualified e-mail address

Modified Paths:
--------------
    trunk/lib/MailNotify.php

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2009-06-02 16:50:19 UTC (rev 6846)
+++ trunk/lib/MailNotify.php	2009-06-03 11:47:39 UTC (rev 6847)
@@ -1,4 +1,4 @@
-<?php 
+<?php
 rcs_id('$Id$');
 /* Copyright (C) 2006-2007 Reini Urban
  * Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -61,7 +61,11 @@
 
     function fromId() {
         global $request;
-        return $request->_user->getId() . '@' .  $request->get('REMOTE_HOST');
+        if (defined('GFORGE') and GFORGE) {
+            return $request->_user->getId();
+        } else {
+            return $request->_user->getId() . '@' .  $request->get('REMOTE_HOST');
+        }
     }
 
     function userEmail($userid, $doverify = true) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.