changed from email address, import email addresses to eq_elder, flush temp files...

[eq/.git] / inc / class.eq.inc.php

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index c7601008cc1bcb0f13c2cba2fcc2598999e22d81..921c142ca88a4bcadc5858172d4bba5ba75b21fb 100644 (file)
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -4424,10 +4424,6 @@ class eq
          $dtstart = gmdate("Ymd"."\T"."His"."\Z", mktime($hour,$minute,$seconds,$month,$day,$year));
          $dtstartstr = date("l, F d, o g:i A", mktime($hour,$minute,$seconds,$month,$day,$year));
          
-         // Set the email address of the person making the appointment
-         $from = $GLOBALS['phpgw_info']['user']['fullname'] . "<" .
-                 $GLOBALS['phpgw_info']['user']['preferences']['email']['address'] . ">";
-         
          $sql = "SELECT * FROM eq_presidency where presidency='$presidency'";
          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
@@ -4435,6 +4431,9 @@ class eq
            $interviewer = $this->db2->f('name');
          }
 
+         // Set the email address of the interviewer
+         $from = $email;
+
          if($elder > 0) { 
            $sql = "SELECT * FROM eq_elder where elder='$elder'";
            $this->db2->query($sql,__LINE__,__FILE__);