adding msi so you don't have to build to use MLSFileTrimmer.exe

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

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 328b1ab47fc75869b61cdffb2a98c073a631d945..921c142ca88a4bcadc5858172d4bba5ba75b21fb 100644 (file)
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -235,12 +235,11 @@ class eq
        $this->t->set_var('district_number',$districts[$i]['district']);
        $this->t->set_var('district_name',$districts[$i]['name']);      
        $supervisor = $districts[$i]['supervisor'];
-       $unique_companionships='';
                
        // Select all the unique companionship numbers for this district
        $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
        $this->db->query($sql,__LINE__,__FILE__);
-       $j=0;
+       $j=0; $unique_companionships = '';
        while ($this->db->next_record())
          {
            $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -418,7 +417,7 @@ class eq
          // Get a list of all the companionships in this district
          $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
          $this->db->query($sql,__LINE__,__FILE__);
-         $j=0;
+         $j=0; $unique_companionships = '';
          while ($this->db->next_record())
            {
              $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -485,7 +484,7 @@ class eq
       // Select all the unique companionship numbers for this district
       $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
       $this->db->query($sql,__LINE__,__FILE__);
-      $j=0; $unique_companionships='';
+      $j=0; $unique_companionships = '';
       while ($this->db->next_record())
        {
          $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -1921,7 +1920,7 @@ class eq
       // Select all the unique companionship numbers for this district
       $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$d]['district'];
       $this->db->query($sql,__LINE__,__FILE__);
-      $j=0;
+      $j=0; $unique_companionships = '';
       while ($this->db->next_record())
        {
          $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -2735,13 +2734,11 @@ class eq
        $this->t->set_var('district_number',$districts[$i]['district']);
        $this->t->set_var('district_name',$districts[$i]['name']);      
        $supervisor = $districts[$i]['supervisor'];
-       $unique_companionships='';
                
        // Select all the unique companionship numbers for this district
        $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
-
        $this->db->query($sql,__LINE__,__FILE__);
-       $j=0;
+       $j=0; $unique_companionships = '';
        while ($this->db->next_record())
          {
            $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -4427,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()) {
@@ -4438,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__);