[geeklog-cvs] geeklog-1.3/public_html/admin mail.php,1.26,1.27

[dhaun at iowaoutdoors.org]

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

Modified Files:
	mail.php 
Log Message:
Use COM_formatEmailAddress


Index: mail.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/mail.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** mail.php	12 Oct 2004 09:41:44 -0000	1.26
--- mail.php	19 Oct 2004 10:53:18 -0000	1.27
***************
*** 60,64 ****
  function display_form ()
  {
!     global $_CONF, $_TABLES, $_USER, $LANG31, $HTTP_SERVER_VARS;
  
      $retval = '';
--- 60,64 ----
  function display_form ()
  {
!     global $_CONF, $_TABLES, $_USER, $LANG31;
  
      $retval = '';
***************
*** 70,74 ****
      $mail_templates->set_var ('startblock_email', COM_startBlock ($LANG31[1],
              '', COM_getBlockTemplate ('_admin_block', 'header')));
!     $mail_templates->set_var ('php_self', $HTTP_SERVER_VARS['PHP_SELF']);
      $mail_templates->set_var ('lang_note', $LANG31[19]);
      $mail_templates->set_var ('lang_to', $LANG31[18]);
--- 70,75 ----
      $mail_templates->set_var ('startblock_email', COM_startBlock ($LANG31[1],
              '', COM_getBlockTemplate ('_admin_block', 'header')));
!     $mail_templates->set_var ('php_self', $_CONF['site_admin_url']
!                                           . '/mail.php');
      $mail_templates->set_var ('lang_note', $LANG31[19]);
      $mail_templates->set_var ('lang_to', $LANG31[18]);
***************
*** 161,165 ****
      $nrows = DB_numRows ($result);
  
!     $from = $vars['fra'] . ' <' . $vars['fraepost'] . '>';
      $subject = COM_stripslashes ($vars['subject']);
      $message = COM_stripslashes ($vars['message']);
--- 162,166 ----
      $nrows = DB_numRows ($result);
  
!     $from = COM_formatEmailAddress ($vars['fra'], $vars['fraepost']);
      $subject = COM_stripslashes ($vars['subject']);
      $message = COM_stripslashes ($vars['message']);
***************
*** 170,180 ****
      for ($i = 0; $i < $nrows; $i++) {
          $A = DB_fetchArray ($result);
-         $to = '';
          if (empty ($A['fullname'])) {
!             $to .= $A['username'];
          } else {
!             $to .= $A['fullname'];
          }
-         $to .= ' <' . $A['email'] . '>';
  
          if (!COM_mail ($to, $subject, $message, $from, $html, $priority)) {
--- 171,179 ----
      for ($i = 0; $i < $nrows; $i++) {
          $A = DB_fetchArray ($result);
          if (empty ($A['fullname'])) {
!             $to = COM_formatEmailAddress ($A['username'], $A['email']);
          } else {
!             $to = COM_formatEmailAddress ($A['fullname'], $A['email']);
          }
  
          if (!COM_mail ($to, $subject, $message, $from, $html, $priority)) {