[geeklog-cvs] geeklog-1.3/public_html profiles.php,1.37,1.38

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv5908

Modified Files:
	profiles.php 
Log Message:
Use COM_formatEmailAddress


Index: profiles.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/profiles.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** profiles.php	7 Oct 2004 21:10:23 -0000	1.37
--- profiles.php	19 Oct 2004 10:53:18 -0000	1.38
***************
*** 80,84 ****
      if (!empty($author) && !empty($subject) && !empty($message)) {
          if (COM_isemail($authoremail)) {
!             $result = DB_query("SELECT username,email FROM {$_TABLES['users']} WHERE uid = $uid");
              $A = DB_fetchArray($result);
  
--- 80,84 ----
      if (!empty($author) && !empty($subject) && !empty($message)) {
          if (COM_isemail($authoremail)) {
!             $result = DB_query("SELECT username,fullname,email FROM {$_TABLES['users']} WHERE uid = $uid");
              $A = DB_fetchArray($result);
  
***************
*** 96,101 ****
              $subject = substr ($subject, 0, strcspn ($subject, "\r\n"));
              $message = strip_tags (COM_stripslashes ($message)) . $sig;
!             $from = $author . ' <' . $authoremail . '>';
!             COM_mail ($A['email'], $subject, $message, $from);
              COM_updateSpeedlimit ('mail');
  
--- 96,106 ----
              $subject = substr ($subject, 0, strcspn ($subject, "\r\n"));
              $message = strip_tags (COM_stripslashes ($message)) . $sig;
!             if (!empty ($A['fullname'])) {
!                 $to = COM_formatEmailAddress ($A['fullname'], $A['email']);
!             } else {
!                 $to = COM_formatEmailAddress ($A['username'], $A['email']);
!             }
!             $from = COM_formatEmailAddress ($author, $authoremail);
!             COM_mail ($to, $subject, $message, $from);
              COM_updateSpeedlimit ('mail');
  
***************
*** 261,266 ****
                          . '#comments');
  
!  	$mailto = $to . ' <' . $toemail . '>';
!  	$mailfrom = $from . ' <' . $fromemail . '>';
   	$subject = COM_undoSpecialChars(strip_tags(stripslashes('Re: '.$A['title'])));
  
--- 266,271 ----
                          . '#comments');
  
!     $mailto = COM_formatEmailAddress ($to, $toemail);
!     $mailfrom = COM_formatEmailAddress ($from, $fromemail);
   	$subject = COM_undoSpecialChars(strip_tags(stripslashes('Re: '.$A['title'])));