started changing app name to 3rd, changing file names to not have eq in them
[eq/.git] / inc / class.eq.inc.php
index 2ffb985a68c0870437e2752f0c88dd3727e06302..2b16e7a39c0cbb333d32bf24a7ee2094fef88aa7 100644 (file)
@@ -70,10 +70,10 @@ class eq
  
   function eq()
     {
-      if(file_exists("setup/eq_config.local")) {
-       include("setup/eq_config.local");
+      if(file_exists("setup/3rd_config.local")) {
+       include("setup/3rd_config.local");
       } else {
-       include("setup/eq_config");
+       include("setup/3rd_config");
       }
       
       $this->script_path = "$this->application_path"."/bin";
@@ -95,7 +95,7 @@ class eq
                                 mondayFirst : false,
                                 weekNumbers : false';
        
-      $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools - The 3rd Counselor';
+      $GLOBALS['phpgw_info']['flags']['app_header'] = 'The 3rd Counselor';
       $GLOBALS['phpgw']->common->phpgw_header();
 
       $this->current_day = `date '+%d'`;
@@ -116,11 +116,11 @@ class eq
 
   function display_app_header()
     {
-      $this->t->set_file(array('eq_header' => 'header.tpl'));
+      $this->t->set_file(array('3rd_header' => 'header.tpl'));
       
-      if (isset($phpgw_info['user']['preferences']['eq']['eq_font']))
+      if (isset($phpgw_info['user']['preferences']['eq']['3rd_font']))
        {
-         $font = $phpgw_info['user']['preferences']['eq']['eq_font'];
+         $font = $phpgw_info['user']['preferences']['eq']['3rd_font'];
        }
       else
        {
@@ -172,7 +172,7 @@ class eq
       $this->t->set_var('link_email',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_email','Email');
                
-      $this->t->pparse('out','eq_header');
+      $this->t->pparse('out','3rd_header');
     }
 
   function ht_view()
@@ -191,7 +191,7 @@ class eq
       $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ht_view'));
       $this->t->set_var('title','Hometeaching'); 
       
-      $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
+      $sql = "SELECT * FROM 3rd_district where valid=1 ORDER BY district ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
@@ -202,25 +202,25 @@ class eq
          $i++;
        }
 
-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
        {
-         $elder_id[$i] = $this->db->f('elder');
-         $elder_name[$i] = $this->db->f('name');
-         $elder_phone[$elder_id[$i]] = $this->db->f('phone');
+         $indiv_id[$i] = $this->db->f('indiv');
+         $indiv_name[$i] = $this->db->f('name');
+         $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
          $i++;
        }
-      array_multisort($elder_name, $elder_id);
+      array_multisort($indiv_name, $indiv_id);
 
-      // Make an array mapping elder_ids to elder_names
-      for($i=0; $i < count($elder_id); $i++) {
-          $id = $elder_id[$i];
-          $elders[$id] = $elder_name[$i];
+      // Make an array mapping indiv_ids to indiv_names
+      for($i=0; $i < count($indiv_id); $i++) {
+          $id = $indiv_id[$i];
+          $indivs[$id] = $indiv_name[$i];
       }      
 
-      $sql = "SELECT * FROM eq_aaronic where valid=1 ORDER BY aaronic ASC";
+      $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       while ($this->db->next_record())
        {
@@ -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'];
+       $sql = "SELECT distinct companionship FROM 3rd_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');
@@ -253,7 +252,7 @@ class eq
        for ($j=0; $j < count($unique_companionships); $j++) {
          $companion_table_entry = "";
          // Select all the companions in each companionship
-         $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+         $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".
                 "companionship=". $unique_companionships[$j]['companionship'];
          $this->db->query($sql,__LINE__,__FILE__);
 
@@ -262,11 +261,11 @@ class eq
              // Get this companions information
              if($companion_table_entry != "") { $companion_table_entry .= "<td>&nbsp;/&nbsp;</td>"; }
              $companionship = $this->db->f('companionship');
-             $elder_id = $this->db->f('elder');
+             $indiv_id = $this->db->f('indiv');
              $aaronic_id = $this->db->f('aaronic');
-             if($elder_id) {
-               $name = $elders[$elder_id];
-               $phone = $elder_phone[$elder_id];
+             if($indiv_id) {
+               $name = $indivs[$indiv_id];
+               $phone = $indiv_phone[$indiv_id];
              }
              else if($aaronic_id) {
                $name = $aaronic[$aaronic_id]['name'];
@@ -277,7 +276,7 @@ class eq
          $table_data.= "<tr bgcolor=#d3dce3><td colspan=20><table><tr>$companion_table_entry</tr></table><hr></td></tr>";
          
          // Get the names of the families assigned this home teaching companionship
-         $sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
+         $sql = "SELECT * from 3rd_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
          $sql = $sql . " ORDER BY name ASC";
          $this->db->query($sql,__LINE__,__FILE__);
          $k=0;
@@ -304,14 +303,14 @@ class eq
                // " AND companionship=" . $unique_companionships[$j]['companionship'].
 
                // First check to see if the currently assigned companionship has visited them
-               $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+               $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
                   " AND companionship=".$unique_companionships[$j]['companionship'].
                   " AND family=". $family_id;
                $query_id = $this->db2->query($sql,__LINE__,__FILE__);
                if($this->db2->num_rows($query_id) == 0) {
                  // We did not find any visits made by the currently assigned companionship,
                  // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
-                 $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+                 $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
                     " AND companionship!=0".
                     " AND family=". $family_id;
                  $query_id = $this->db2->query($sql,__LINE__,__FILE__);
@@ -416,9 +415,9 @@ class eq
       if($action == 'save')
        {
          // Get a list of all the companionships in this district
-         $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
+         $sql = "SELECT distinct companionship FROM 3rd_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');
@@ -427,9 +426,9 @@ class eq
          for ($j=0; $j < count($unique_companionships); $j++)
            {
              //$comp=$unique_companionships[$j]['companionship'];
-             //print "deleting from eq_visit where companionship=$comp and date=$date and district=$district<br>";
+             //print "deleting from 3rd_visit where companionship=$comp and date=$date and district=$district<br>";
              // Delete all the visits that have taken place for all families for this companionsthip for this month
-             $this->db->query("DELETE from eq_visit where companionship=" . $unique_companionships[$j]['companionship'] .
+             $this->db->query("DELETE from 3rd_visit where companionship=" . $unique_companionships[$j]['companionship'] .
                               " AND " . "date='" . $date . "'",__LINE__,__FILE__);
            }
 
@@ -447,7 +446,7 @@ class eq
                 $visited = $data_array[3];
                 if($visited == "") { $visited = $data_array[4]; }
                 //print "family_id: $family_id companionship: $companionship date: $date visited: $visited<br>";
-                $this->db->query("INSERT INTO eq_visit (family,companionship,date,notes,visited) "
+                $this->db->query("INSERT INTO 3rd_visit (family,companionship,date,notes,visited) "
                                  . "VALUES (" . $family_id .",". $companionship .",'". $date ."','','". $visited ."')",__LINE__,__FILE__);
               }
           }
@@ -455,25 +454,25 @@ class eq
          return false;
        }
       
-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
        {
-         $elder_id[$i] = $this->db->f('elder');
-         $elder_name[$i] = $this->db->f('name');
-         $elder_phone[$elder_id[$i]] = $this->db->f('phone');
+         $indiv_id[$i] = $this->db->f('indiv');
+         $indiv_name[$i] = $this->db->f('name');
+         $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
          $i++;
        }
-      array_multisort($elder_name, $elder_id);
+      array_multisort($indiv_name, $indiv_id);
 
-      // Make an array mapping elder_ids to elder_names
-      for($i=0; $i < count($elder_id); $i++) {
-          $id = $elder_id[$i];
-          $elders[$id] = $elder_name[$i];
+      // Make an array mapping indiv_ids to indiv_names
+      for($i=0; $i < count($indiv_id); $i++) {
+          $id = $indiv_id[$i];
+          $indivs[$id] = $indiv_name[$i];
       }      
 
-      $sql = "SELECT * FROM eq_aaronic where valid=1 ORDER BY aaronic ASC";
+      $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       while ($this->db->next_record())
        {
@@ -483,9 +482,9 @@ class eq
        }
       
       // Select all the unique companionship numbers for this district
-      $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
+      $sql = "SELECT distinct companionship FROM 3rd_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');
@@ -497,7 +496,7 @@ class eq
       for ($j=0; $j < count($unique_companionships); $j++) {
        $companion_table_entry = "";
        // Select all the companions in each companionship
-       $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+       $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".
               "companionship=". $unique_companionships[$j]['companionship'];
        $this->db->query($sql,__LINE__,__FILE__);
        
@@ -506,11 +505,11 @@ class eq
            // Get this companions information
            if($companion_table_entry != "") { $companion_table_entry .= "<td>&nbsp;/&nbsp;</td>"; }
            $companionship = $this->db->f('companionship');
-           $elder_id = $this->db->f('elder');
+           $indiv_id = $this->db->f('indiv');
            $aaronic_id = $this->db->f('aaronic');
-           if($elder_id) {
-             $name = $elders[$elder_id];
-             $phone = $elder_phone[$elder_id];
+           if($indiv_id) {
+             $name = $indivs[$indiv_id];
+             $phone = $indiv_phone[$indiv_id];
            }
            else if($aaronic_id) {
              $name = $aaronic[$aaronic_id]['name'];
@@ -521,7 +520,7 @@ class eq
        $table_data.= "<tr bgcolor=#d3dce3><td colspan=20><table><tr>$companion_table_entry</tr></table><hr></td></tr>";
        
        // Get the names of the families assigned this home teaching companionship
-       $sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
+       $sql = "SELECT * from 3rd_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
        $sql = $sql . " ORDER BY name ASC";
        $this->db->query($sql,__LINE__,__FILE__);
        while ($this->db->next_record())
@@ -534,14 +533,14 @@ class eq
            $header_row="<th width=$comp_width><font size=-2>Families</th>";
 
            // First check to see if the currently assigned companionship has visited them
-           $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+           $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
                   " AND companionship=".$unique_companionships[$j]['companionship'].
                   " AND family=". $family_id;
            $query_id = $this->db2->query($sql,__LINE__,__FILE__);
            if($this->db2->num_rows($query_id) == 0) {
              // We did not find any visits made by the currently assigned companionship,
              // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
-             $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+             $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
                   " AND companionship!=0".
                   " AND family=". $family_id;
              $query_id = $this->db2->query($sql,__LINE__,__FILE__);
@@ -617,7 +616,7 @@ class eq
       $this->t->set_var('lang_date','Date');
       $this->t->set_var('lang_notes','Description');
       
-      $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
+      $sql = "SELECT * FROM 3rd_activity ORDER BY date DESC";
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
@@ -629,7 +628,7 @@ class eq
          $activity_list[$i]['date']  = $this->db->f('date');
          $activity_list[$i]['notes']  = $this->db->f('notes');
 
-         $sql = "SELECT * FROM eq_assignment WHERE assignment='" . $activity_list[$i]['assignment'] . "'";
+         $sql = "SELECT * FROM 3rd_assignment WHERE assignment='" . $activity_list[$i]['assignment'] . "'";
          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record())
            {
@@ -660,15 +659,15 @@ class eq
          $this->t->set_var('edit',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
          $this->t->set_var('lang_edit','Edit');
 
-         $link_data['menuaction'] = 'eq.eq.act_update';
-         $link_data['activity'] = '0';
-         $link_data['action'] = 'add';
-         $this->t->set_var('add','<form method="POST" action="' . $GLOBALS['phpgw']->link('/eq/index.php',$link_data)
-                           . '"><input type="submit" name="Add" value="' . 'Add Activity' .'"></font></form>');
-
          $this->t->fp('list','act_list',True);
        }
 
+      $link_data['menuaction'] = 'eq.eq.act_update';
+      $link_data['activity'] = '0';
+      $link_data['action'] = 'add';
+      $this->t->set_var('add','<form method="POST" action="' . $GLOBALS['phpgw']->link('/eq/index.php',$link_data)
+                       . '"><input type="submit" name="Add" value="' . 'Add Activity' .'"></font></form>');
+
       $this->t->pfp('out','act_list_t');
       $this->save_sessiondata();
     }
@@ -678,14 +677,14 @@ class eq
       $this->t->set_file(array('act_view_t' => 'act_view.tpl'));
       $this->t->set_block('act_view_t','part_list','list');
       
-      $sql = "SELECT * FROM eq_activity WHERE activity=" . intval(get_var('activity',array('GET','POST')));
+      $sql = "SELECT * FROM 3rd_activity WHERE activity=" . intval(get_var('activity',array('GET','POST')));
       $this->db->query($sql,__LINE__,__FILE__);
       $this->db->next_record();
       $this->t->set_var('assignment', $this->db->f('assignment'));
       $this->t->set_var('date', $this->db->f('date'));
       $this->t->set_var('notes', $this->db->f('notes'));
       
-      $sql = "SELECT * FROM eq_assignment WHERE assignment='" . $this->db->f('assignment') . "'";
+      $sql = "SELECT * FROM 3rd_assignment WHERE assignment='" . $this->db->f('assignment') . "'";
       $this->db2->query($sql,__LINE__,__FILE__);
       if($this->db2->next_record())
        {
@@ -710,21 +709,21 @@ class eq
       $this->t->set_var('lang_edit','Edit');
       $this->t->set_var('cal_date',$this->db->f('date'));
       
-      // Now find out which elders participated in this activity
-      $sql = "SELECT * FROM eq_participation WHERE activity=" . intval(get_var('activity',array('GET','POST')));
+      // Now find out which indivs participated in this activity
+      $sql = "SELECT * FROM 3rd_participation WHERE activity=" . intval(get_var('activity',array('GET','POST')));
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
       $i = 0;
       while ($this->db->next_record())
        {
-         $part_list[$i]['elder']  = $this->db->f('elder');
+         $part_list[$i]['indiv']  = $this->db->f('indiv');
          $i++;
        }
       
       for ($i=0; $i < count($part_list); $i++)
        {
-         $sql = "SELECT * FROM eq_elder WHERE elder=" . $part_list[$i]['elder'];
+         $sql = "SELECT * FROM 3rd_indiv WHERE indiv=" . $part_list[$i]['indiv'];
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $names[$i] = $this->db->f('name');
@@ -733,7 +732,7 @@ class eq
       for ($i=0; $i < count($names); $i++)
        {
           //$this->nextmatchs->template_alternate_row_color(&$this->t);
-         $this->t->set_var('elder_name',$names[$i]);
+         $this->t->set_var('indiv_name',$names[$i]);
          if(($i+1) % 3 == 0) { $this->t->set_var('table_sep',"</td></tr><tr>"); }
          else { $this->t->set_var('table_sep',"</td>"); }
          if(($i) % 3 == 0) { $this->nextmatchs->template_alternate_row_color(&$this->t); }
@@ -747,7 +746,7 @@ class eq
   function act_update()
     {
       $this->t->set_file(array('form' => 'act_update.tpl'));
-      $this->t->set_block('form','elder_list','list');
+      $this->t->set_block('form','indiv_list','list');
       $this->t->set_block('form','add','addhandle');
       $this->t->set_block('form','edit','edithandle');
       $this->t->set_var('lang_done','Done');
@@ -761,23 +760,25 @@ class eq
          $activity['assignment'] = get_var('assignment',array('POST'));
          $activity['date'] = get_var('date',array('POST'));
          $activity['notes']= get_var('notes',array('POST'));
-         $this->db->query("UPDATE eq_activity set " .
+         $this->db->query("UPDATE 3rd_activity set " .
                           "   assignment='" . $activity['assignment'] .
                           "', date='" . $activity['date'] . "'" .
                           ", notes='" . $activity['notes'] . "'" .
                           " WHERE activity=" . $activity['activity'],__LINE__,__FILE__);
 
-         // Delete all the elders who have particiapted in this activity
-         $this->db->query("DELETE from eq_participation where activity=".$activity['activity'],__LINE__,__FILE__);
+         // Delete all the individuals who have particiapted in this activity
+         $this->db->query("DELETE from 3rd_participation where activity=".$activity['activity'],__LINE__,__FILE__);
+         
+         // Re-add the individuals who are checked as having participated in this activity
+         $indivs = get_var('indiv_name',array('POST'));
+         if(is_array($indivs)) { // Only do the foreach loop if we have a valid array of indivs to work with
+           foreach ($indivs as $indiv)
+             {
+               $this->db->query("INSERT INTO 3rd_participation (indiv,activity) "
+                                . "VALUES (" . $indiv . ",". $activity['activity'] . ")",__LINE__,__FILE__);
+             }
+         }
          
-         // Re-add the elders who are checked as having participated in this activity
-         $elders = get_var('elder_name',array('POST'));
-         foreach ($elders as $elder)
-           {
-             $this->db->query("INSERT INTO eq_participation (elder,activity) "
-                              . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
-           }
-
          $this->act_list();
          return false;
        }
@@ -787,11 +788,11 @@ class eq
          $activity['assignment'] = get_var('assignment',array('POST'));
          $activity['date'] = get_var('date',array('POST'));
          $activity['notes']= get_var('notes',array('POST'));
-         $this->db->query("INSERT INTO eq_activity (assignment,date,notes) "
+         $this->db->query("INSERT INTO 3rd_activity (assignment,date,notes) "
                           . "VALUES ('" . $activity['assignment'] . "','"
                           . $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__);
 
-         $sql = "SELECT * FROM eq_activity WHERE assignment='".$activity['assignment']."' "
+         $sql = "SELECT * FROM 3rd_activity WHERE assignment='".$activity['assignment']."' "
             . " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
          $this->db->query($sql,__LINE__,__FILE__);
          if($this->db->next_record()) {
@@ -799,11 +800,11 @@ class eq
            $activity['activity'] = $this->db->f('activity');
          }
          
-         $elders = get_var('elder_name',array('POST'));
-         foreach ($elders as $elder)
+         $indivs = get_var('indiv_name',array('POST'));
+         foreach ($indivs as $indiv)
            {
-             $this->db->query("INSERT INTO eq_participation (elder,activity) "
-                              . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
+             $this->db->query("INSERT INTO 3rd_participation (indiv,activity) "
+                              . "VALUES (" . $indiv . ",". $activity['activity'] . ")",__LINE__,__FILE__);
            }
          
          $this->act_list();
@@ -825,7 +826,7 @@ class eq
 
       if($action == 'edit')
        {
-         $sql = "SELECT * FROM eq_activity WHERE activity=" . $activity['activity'];
+         $sql = "SELECT * FROM 3rd_activity WHERE activity=" . $activity['activity'];
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $this->t->set_var('cal_date',$this->jscal->input('date',$this->db->f('date'),'','','','','',$this->cal_options));
@@ -841,7 +842,7 @@ class eq
        }
 
       // Create the assignments drop-down list
-      $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i = 0;
       while ($this->db->next_record())
@@ -863,36 +864,36 @@ class eq
       $assignment_data.='</select>';
       $this->t->set_var('assignment_data',$assignment_data);
       
-      // Create elder selection boxes
-      $sql = "SELECT * FROM eq_elder";
+      // Create individual selection boxes
+      $sql = "SELECT * FROM 3rd_indiv";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
        {
          if($this->db->f('valid') == 1 || $action != 'add') {
-           $elder_name[$i] = $this->db->f('name');
-           $elder_id[$i] = $this->db->f('elder');
-           $elder_valid[$i] = $this->db->f('valid');
+           $indiv_name[$i] = $this->db->f('name');
+           $indiv_id[$i] = $this->db->f('indiv');
+           $indiv_valid[$i] = $this->db->f('valid');
            $i++;
          }
        }
-      array_multisort($elder_name, $elder_id, $elder_valid);
+      array_multisort($indiv_name, $indiv_id, $indiv_valid);
 
       $j=0;
-      for ($i=0; $i < count($elder_id); $i++)
+      for ($i=0; $i < count($indiv_id); $i++)
        {
          //$this->nextmatchs->template_alternate_row_color(&$this->t);
-         $sql = "SELECT * FROM eq_participation where activity=". $activity['activity'] . " AND elder=" . $elder_id[$i];
+         $sql = "SELECT * FROM 3rd_participation where activity=". $activity['activity'] . " AND indiv=" . $indiv_id[$i];
          $this->db->query($sql,__LINE__,__FILE__);
          if($this->db->next_record()) { $this->t->set_var('checked','checked'); $checked=1; }
          else { $this->t->set_var('checked',''); $checked=0; }
-         if($checked || $elder_valid[$i] == 1) {
-           $this->t->set_var('elder_name',$elder_name[$i]);
-           $this->t->set_var('elder',$elder_id[$i]);
+         if($checked || $indiv_valid[$i] == 1) {
+           $this->t->set_var('indiv_name',$indiv_name[$i]);
+           $this->t->set_var('indiv',$indiv_id[$i]);
            if(($j+1) % 3 == 0) { $this->t->set_var('table_sep',"</td></tr><tr>"); }
            else { $this->t->set_var('table_sep',"</td>"); }
            if(($j) % 3 == 0) { $this->nextmatchs->template_alternate_row_color(&$this->t); }
-           $this->t->fp('list','elder_list',True);
+           $this->t->fp('list','indiv_list',True);
            $j++;
          }
        }
@@ -918,7 +919,7 @@ class eq
       $this->t->set_var('lang_name','Assignment Name');
       $this->t->set_var('lang_code','Code');
       
-      $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
@@ -971,7 +972,7 @@ class eq
        {
          $assignment['name'] = get_var('name',array('POST'));
          $assignment['code'] = get_var('code',array('POST'));
-         $this->db->query("UPDATE eq_assignment set " .
+         $this->db->query("UPDATE 3rd_assignment set " .
                           "  name='" . $assignment['name'] . "'" .
                           ", code='" . $assignment['code'] . "'" .
                           " WHERE assignment=" . $assignment['assignment'],__LINE__,__FILE__);
@@ -984,7 +985,7 @@ class eq
        {
          $assignment['name'] = get_var('name',array('POST'));
          $assignment['code'] = get_var('code',array('POST'));
-         $this->db->query("INSERT INTO eq_assignment (name,code) "
+         $this->db->query("INSERT INTO 3rd_assignment (name,code) "
                           . "VALUES ('" . $assignment['name'] . "','"
                           . $assignment['code'] . "')",__LINE__,__FILE__);
          $this->assign_view();
@@ -1004,7 +1005,7 @@ class eq
 
       if($action == 'edit')
        {
-         $sql = "SELECT * FROM eq_assignment WHERE assignment=" . $assignment['assignment'];
+         $sql = "SELECT * FROM 3rd_assignment WHERE assignment=" . $assignment['assignment'];
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $this->t->set_var('name', $this->db->f('name'));
@@ -1033,20 +1034,20 @@ class eq
     {
       $this->t->set_file(array('par_view_t' => 'par_view.tpl'));
       $this->t->set_block('par_view_t','header_list','list1');
-      $this->t->set_block('par_view_t','elder_list','list2');
+      $this->t->set_block('par_view_t','indiv_list','list2');
 
-      $sql = "SELECT * FROM eq_elder where valid=1";
+      $sql = "SELECT * FROM 3rd_indiv where valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
        {
-         $elder_name[$i] = $this->db->f('name');
-         $elder_id[$i] = $this->db->f('elder');
+         $indiv_name[$i] = $this->db->f('name');
+         $indiv_id[$i] = $this->db->f('indiv');
          $i++;
        }
-      array_multisort($elder_name, $elder_id);
+      array_multisort($indiv_name, $indiv_id);
 
-      $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
+      $sql = "SELECT * FROM 3rd_activity ORDER BY date DESC";
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
@@ -1059,7 +1060,7 @@ class eq
          $i++;
        }
 
-      $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while($this->db->next_record())
@@ -1070,8 +1071,8 @@ class eq
          $i++;
        }
       
-      $elder_width=300; $part_width=25; $assignment_width=50;
-      $total_width=$elder_width+$part_width;
+      $indiv_width=300; $part_width=25; $assignment_width=50;
+      $total_width=$indiv_width+$part_width;
       for ($i=0; $i < count($assignment_list); $i++) {
        $this->t->set_var('assignment_name',$assignment_list[$i]['name']);
        $this->t->set_var('assignment_code',$assignment_list[$i]['code']);
@@ -1079,17 +1080,17 @@ class eq
        $total_width += $assignment_width;
       }
 
-      for ($i=0; $i < count($elder_id); $i++) {
+      for ($i=0; $i < count($indiv_id); $i++) {
        $participated=0; $part_table = ''; 
        $this->nextmatchs->template_alternate_row_color(&$this->t);
-       $this->t->set_var('elder_name',$elder_name[$i]);
+       $this->t->set_var('indiv_name',$indiv_name[$i]);
        for ($j=0; $j < count($assignment_list); $j++) {
          $date = "0000-00-00"; $checkmark=0; $num_matches=0;
          for ($k=0; $k < count($activity_list); $k++) {
            if($assignment_list[$j]['assignment'] == $activity_list[$k]['assignment']) { 
-             $sql = "SELECT * FROM eq_participation where "
+             $sql = "SELECT * FROM 3rd_participation where "
                 . " activity=" . $activity_list[$k]['activity']
-                . " AND elder=" . $elder_id[$i];
+                . " AND indiv=" . $indiv_id[$i];
              $this->db->query($sql,__LINE__,__FILE__);
              while($this->db->next_record()) {
                if($activity_list[$k]['date'] > $date) { 
@@ -1112,10 +1113,10 @@ class eq
        if($participated) { $part_table .= '<td align=center><img src="images/checkmark.gif">'.$participated.'</td>'; }
        else { $part_table .= '<td>&nbsp;</td>'; }
        $this->t->set_var('part_table',$part_table);
-       $this->t->fp('list2','elder_list',True);
+       $this->t->fp('list2','indiv_list',True);
       }
       $this->t->set_var('total_width',$total_width);
-      $this->t->set_var('elder_width',$elder_width);
+      $this->t->set_var('indiv_width',$indiv_width);
       $this->t->set_var('part_width',$part_width);
       $this->t->set_var('act_width',$act_width);
       $this->t->pfp('out','par_view_t');
@@ -1126,10 +1127,10 @@ class eq
     {
       $this->t->set_file(array('willing_view_t' => 'willing_view.tpl'));
       $this->t->set_block('willing_view_t','header_list','list1');
-      $this->t->set_block('willing_view_t','elder_list','list2');
+      $this->t->set_block('willing_view_t','indiv_list','list2');
 
       $this->t->set_var('lang_filter','Filter');
-      $this->t->set_var('lang_filter_unwilling','Filter out unwilling Elders:');
+      $this->t->set_var('lang_filter_unwilling','Filter out unwilling individuals:');
 
       $filter_unwilling = get_var('filter_unwilling',array('POST'));
       $this->t->set_var('filter_unwilling',$filter_unwilling);
@@ -1145,19 +1146,19 @@ class eq
       }
       $this->t->set_var('filter_input',$filter_input);
       
-      $sql = "SELECT * FROM eq_elder where valid=1";
+      $sql = "SELECT * FROM 3rd_indiv where valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
        {
-         $elder_name[$i] = $this->db->f('name');
-         $elder_id[$i] = $this->db->f('elder');
-         $elder_phone[$elder_id[$i]] = $this->db->f('phone');
+         $indiv_name[$i] = $this->db->f('name');
+         $indiv_id[$i] = $this->db->f('indiv');
+         $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
          $i++;
        }
-      array_multisort($elder_name, $elder_id);
+      array_multisort($indiv_name, $indiv_id);
 
-      $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while($this->db->next_record())
@@ -1168,7 +1169,7 @@ class eq
          $i++;
        }
 
-      $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
+      $sql = "SELECT * FROM 3rd_activity ORDER BY date DESC";
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
@@ -1181,8 +1182,8 @@ class eq
          $i++;
        }
       
-      $elder_width=275; $willing_width=40; $assignment_width=50;
-      $total_width=$elder_width+$willing_width;
+      $indiv_width=275; $willing_width=40; $assignment_width=50;
+      $total_width=$indiv_width+$willing_width;
       
       for ($i=0; $i < count($assignment_list); $i++) {
        $this->t->set_var('assignment_name',$assignment_list[$i]['name']);
@@ -1192,31 +1193,31 @@ class eq
        $total_willing[$i] = 0;
       }
 
-      for ($i=0; $i < count($elder_id); $i++) {
-       $willing_table = ''; $elder_willing=0;
-       $this->t->set_var('elder_name',$elder_name[$i]);
-       $this->t->set_var('elder_phone',$elder_phone[$elder_id[$i]]);
-       $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&elder_id='
-                                                           . $elder_id[$i] . '&action=' . 'edit'));
+      for ($i=0; $i < count($indiv_id); $i++) {
+       $willing_table = ''; $indiv_willing=0;
+       $this->t->set_var('indiv_name',$indiv_name[$i]);
+       $this->t->set_var('indiv_phone',$indiv_phone[$indiv_id[$i]]);
+       $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&indiv_id='
+                                                           . $indiv_id[$i] . '&action=' . 'edit'));
        for ($j=0; $j < count($assignment_list); $j++) {
          $found_willingness=0; 
-         $sql = "SELECT * FROM eq_willingness where "
+         $sql = "SELECT * FROM 3rd_willingness where "
             . " assignment=" . $assignment_list[$j]['assignment']
-            . " AND elder=" . $elder_id[$i];
+            . " AND indiv=" . $indiv_id[$i];
          $this->db->query($sql,__LINE__,__FILE__);
          while($this->db->next_record()) {
            $found_willingness=1;
            $date_part="";
-           $sql = "SELECT * FROM eq_activity where "
+           $sql = "SELECT * FROM 3rd_activity where "
               . " assignment=". $assignment_list[$j]['assignment']
               . " ORDER by date DESC";
            $this->db2->query($sql,__LINE__,__FILE__);
            if($this->db2->next_record()) {
              $activity = $this->db2->f('activity');
              $date = $this->db2->f('date');
-             $sql = "SELECT * FROM eq_participation where "
+             $sql = "SELECT * FROM 3rd_participation where "
                 . " activity=" . $activity
-                . " AND elder=". $elder_id[$i];
+                . " AND indiv=". $indiv_id[$i];
              $this->db3->query($sql,__LINE__,__FILE__);
              if($this->db3->next_record()) {
                $date_part = $date;
@@ -1225,25 +1226,25 @@ class eq
              
            if($this->db->f('willing') == 'y') {
              $total_willing[$j]++;
-             $elder_willing=1;
+             $indiv_willing=1;
              $willing_table .= '<td align=center><img src="images/checkmark.gif"><br><font size=-2>'.$date_part.'</font></td></td>';
            }
            else if($this->db->f('willing') == 'n') {
              $willing_table .= '<td align=center><img src="images/x.gif"></td>';
            }
            else {
-             $elder_willing=1;
+             $indiv_willing=1;
              $willing_table .= "<td>&nbsp;</td>";
            }
          }
          if(!$found_willingness) {
-           $elder_willing=1;
+           $indiv_willing=1;
            $willing_table .= "<td>&nbsp;</td>";
          }
        }
-       if(($elder_willing == 1) || ($filter_unwilling == 'n')) { 
+       if(($indiv_willing == 1) || ($filter_unwilling == 'n')) { 
          $this->t->set_var('willing_table',$willing_table);
-         $this->t->fp('list2','elder_list',True);
+         $this->t->fp('list2','indiv_list',True);
          $this->nextmatchs->template_alternate_row_color(&$this->t);
        } 
       }
@@ -1255,7 +1256,7 @@ class eq
       $this->t->set_var('stat_table',$stat_table);
       
       $this->t->set_var('total_width',$total_width);
-      $this->t->set_var('elder_width',$elder_width);
+      $this->t->set_var('indiv_width',$indiv_width);
       $this->t->set_var('willing_width',$willing_width);
       $this->t->pfp('out','willing_view_t');
       $this->save_sessiondata(); 
@@ -1271,8 +1272,8 @@ class eq
       $this->t->set_block('willing_update_t','assignment_list','list');
       $this->t->set_block('willing_update_t','save','savehandle');
       
-      $elder_id = get_var('elder_id',array('GET','POST'));
-      $this->t->set_var('elder_id',$elder_id);
+      $indiv_id = get_var('indiv_id',array('GET','POST'));
+      $this->t->set_var('indiv_id',$indiv_id);
       $action = get_var('action',array('GET','POST'));
       
       $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_view'));
@@ -1282,19 +1283,19 @@ class eq
       
       if($action == 'save')
        {
-         // Delete all the previous willingness entries for this elder
-         $this->db->query("DELETE from eq_willingness where elder=" . $elder_id ,__LINE__,__FILE__);
+         // Delete all the previous willingness entries for this individual
+         $this->db->query("DELETE from 3rd_willingness where indiv=" . $indiv_id ,__LINE__,__FILE__);
              
-         // Now, add the assignment willingness that is checked for this elder
+         // Now, add the assignment willingness that is checked for this individual
          $new_data = get_var('willingness',array('POST'));
          foreach ($new_data as $data)
            {
              $data_array = explode("/",$data);
              $assignment = $data_array[0];
              $willing = $data_array[1];
-             //print "elder_id: $elder_id assignment: $assignment willing: $willing<br>";
-             $this->db->query("INSERT INTO eq_willingness (elder,assignment,willing) "
-                              . "VALUES (" . $elder_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
+             //print "indiv_id: $indiv_id assignment: $assignment willing: $willing<br>";
+             $this->db->query("INSERT INTO 3rd_willingness (indiv,assignment,willing) "
+                              . "VALUES (" . $indiv_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
            }      
          $this->willing_view();
          return false;
@@ -1303,16 +1304,16 @@ class eq
       $assignment_width=300; $willing_width=25; $table_width=$assignment_width + $willing_width;
       $table_data=""; 
 
-      // Find out the elder's name
-      $sql = "SELECT * FROM eq_elder WHERE elder=".$elder_id." AND valid=1";
+      // Find out the individual's name
+      $sql = "SELECT * FROM 3rd_indiv WHERE indiv=".$indiv_id." AND valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       if($this->db->next_record()) {
-       $elder_name = $this->db->f('name');
-       $this->t->set_var('elder_name',$elder_name);
+       $indiv_name = $this->db->f('name');
+       $this->t->set_var('indiv_name',$indiv_name);
       }
       
       // Select all the assignments
-      $sql = "SELECT * FROM eq_assignment ORDER by name ASC";
+      $sql = "SELECT * FROM 3rd_assignment ORDER by name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       
       while ($this->db->next_record())
@@ -1325,7 +1326,7 @@ class eq
          $table_data.="<tr bgcolor=". $this->t->get_var('tr_color') ."><td>$assignment_name</td>";
          
          $header_row="<th width=$comp_width><font size=-2>Assignments</th><th>Willingness</th>";
-         $sql = "SELECT * FROM eq_willingness WHERE elder=".$elder_id." AND assignment=".$assignment;
+         $sql = "SELECT * FROM 3rd_willingness WHERE indiv=".$indiv_id." AND assignment=".$assignment;
          $this->db2->query($sql,__LINE__,__FILE__);
          $value = $assignment;
             
@@ -1384,7 +1385,7 @@ class eq
     function ppi_sched()
       {
       $this->t->set_file(array('ppi_sched_t' => 'ppi_sched.tpl'));
-      $this->t->set_block('ppi_sched_t','elder_list','elderlist');
+      $this->t->set_block('ppi_sched_t','indiv_list','indivlist');
       $this->t->set_block('ppi_sched_t','appt_list','apptlist');
       $action = get_var('action',array('GET','POST'));
 
@@ -1400,9 +1401,9 @@ class eq
       $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched&action=save'));
       $this->t->set_var('title','Yearly PPI Scheduler');
 
-      $elder_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $ppi_date_width=20;
-      $table_width=$elder_width + $phone_width + $pri_width + $notes_width + $ppi_date_width;
-      $header_row = "<th width=$elder_width><font size=-2>Elder Name</th>";
+      $indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $ppi_date_width=20;
+      $table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $ppi_date_width;
+      $header_row = "<th width=$indiv_width><font size=-2>individual Name</th>";
       $header_row.= "<th width=$phone_width><font size=-2>Phone</th>";
       $header_row.= "<th width=$pri_width><font size=-2>Priority</th>";
       $header_row.= "<th width=$ppi_date_width><font size=-2>Last PPI</th>";
@@ -1412,19 +1413,29 @@ class eq
       $year = date('Y');
 
       // Get the EQ President
-      $sql = "SELECT * FROM eq_presidency where president=1 and valid=1";
+      $sql = "SELECT * FROM 3rd_presidency where president=1 and valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       if($this->db->next_record()) {
        $president_name = $this->db->f('name');
        $president_name_array = explode(",",$president_name);
        $president_last_name = $president_name_array[0];
-       $president_id = $this->db->f('elder');
+       $president_id = $this->db->f('indiv');
        $presidency_id = $this->db->f('presidency');
-       $interviewer = $this->db->f('elder');
+       $interviewer = $this->db->f('indiv');
        $district_number = '*';
        $district_name = $president_name;
+       $sql = "SELECT * FROM 3rd_indiv where indiv='$president_id'";
+       $this->db2->query($sql,__LINE__,__FILE__);
+       if($this->db2->next_record()) {
+         $indiv_id = $this->db2->f('indiv_id');
+       }
+       $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+       $this->db2->query($sql,__LINE__,__FILE__);
+       if($this->db2->next_record()) {
+         $president_address = $this->db2->f('address');
+       }
       } else {
-       print "<hr><font color=red><h3>-E- Unable to locate EQ President in eq_presidency table</h3></font></hr>";
+       print "<hr><font color=red><h3>-E- Unable to locate President in 3rd_presidency table</h3></font></hr>";
        return;
       }
 
@@ -1435,19 +1446,19 @@ class eq
          if($new_data != "") { 
            foreach ($new_data as $entry)
              {
-               $elder = $entry['elder'];
+               $indiv = $entry['indiv'];
                $appointment = $entry['appointment'];
                $location = $entry['location'];
-               if($location == "") { $location = "$president_last_name"." home"; }
-               if($elder == 0) { $location = ""; }
+               if($location == "") { $location = "$president_last_name"." home ($president_address)"; }
+               if($indiv == 0) { $location = ""; }
                
                //Only perform a database update if we have made a change to this appointment
-               $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and elder='$elder' and location='$location'";
+               $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and indiv='$indiv' and location='$location'";
                $this->db->query($sql,__LINE__,__FILE__);
                if(!$this->db->next_record()) {
                  // Perform database save actions here
-                 $this->db->query("UPDATE eq_appointment set " .
-                                  " elder='" . $elder . "'" .
+                 $this->db->query("UPDATE 3rd_appointment set " .
+                                  " indiv='" . $indiv . "'" .
                                   ",location='" . $location . "'" .
                                   " WHERE appointment=" . $appointment,__LINE__,__FILE__);
                  // Email the appointment
@@ -1462,14 +1473,14 @@ class eq
          foreach ($new_data as $entry)
           {
             $ppi_notes = $entry['notes'];
-            $elder_id = $entry['elder_id'];
+            $indiv_id = $entry['indiv_id'];
             $ppi_pri = $entry['pri'];
             
             // Perform database save actions here
-            $this->db->query("UPDATE eq_elder set " .
+            $this->db->query("UPDATE 3rd_indiv set " .
                              " ppi_notes='" . $ppi_notes . "'" .
                              ",ppi_pri='" . $ppi_pri . "'" .
-                             " WHERE elder=" . $elder_id,__LINE__,__FILE__);
+                             " WHERE indiv=" . $indiv_id,__LINE__,__FILE__);
             
           }
 
@@ -1477,48 +1488,48 @@ class eq
          //Header('Location: ' . $take_me_to_url);
        }
       
-      // create the elder id -> elder name mapping
-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY name ASC";
+      // create the individual id -> individual name mapping
+      $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
-      $elder_id = NULL;
-      $elder_name = NULL;
+      $indiv_id = NULL;
+      $indiv_name = NULL;
       while ($this->db->next_record())
        {
-         $elder_name[$i] = $this->db->f('name');
-         $elder_id[$i] = $this->db->f('elder');
+         $indiv_name[$i] = $this->db->f('name');
+         $indiv_id[$i] = $this->db->f('indiv');
          $i++;
        }
-      array_multisort($elder_name, $elder_id);
+      array_multisort($indiv_name, $indiv_id);
 
       // APPOINTMENT TABLE
-      $date_width=250; $time_width=100; $elder_width=200; $location_width=100;
-      $appt_table_width=$date_width + $time_width + $elder_width + $location_width;
+      $date_width=250; $time_width=100; $indiv_width=200; $location_width=100;
+      $appt_table_width=$date_width + $time_width + $indiv_width + $location_width;
       $appt_header_row = "<th width=$date_width><font size=-2>Date</th>";
       $appt_header_row.= "<th width=$time_width><font size=-2>Time</th>";      
-      $appt_header_row.= "<th width=$elder_width><font size=-2>Elder</th>";
+      $appt_header_row.= "<th width=$indiv_width><font size=-2>indiv</th>";
       $appt_header_row.= "<th width=$location_width><font size=-2>Location</th>";
       $appt_table_data = ""; 
 
-      $total_elders=0; $elders_with_yearly_ppi=0;
+      $total_indivs=0; $indivs_with_yearly_ppi=0;
       
       // Display a scheduling table for the EQ President
       $table_data=""; $appt_table_data="";
-      $table_title = "District ".$district_number.": ".$district_name.": All Elders with Yearly PPI Not Completed";
+      $table_title = "District ".$district_number.": ".$district_name.": All indivs with Yearly PPI Not Completed";
       $appt_table_title = "District ".$district_number.": ".$district_name.": Yearly PPI Appointment Slots";
       $this->t->set_var('table_title',$table_title);
       $this->t->set_var('appt_table_title',$appt_table_title);
       
       // query the database for all the appointments
-      $sql = "SELECT * FROM eq_appointment where presidency=".$presidency_id." and date>=CURDATE() ORDER BY date ASC, time ASC";
+      $sql = "SELECT * FROM 3rd_appointment where presidency=".$presidency_id." and date>=CURDATE() ORDER BY date ASC, time ASC";
       $this->db->query($sql,__LINE__,__FILE__);
        
       while ($this->db->next_record())
        {
          $appointment = $this->db->f('appointment');
-         $elder = $this->db->f('elder');
+         $indiv = $this->db->f('indiv');
          $location = $this->db->f('location');
-         if(($location == "") && ($elder > 0)) { $location = "$president_last_name"." home"; }
+         if(($location == "") && ($indiv > 0)) { $location = "$president_last_name"." home ($president_address)"; }
          
          $date = $this->db->f('date');
          $date_array = explode("-",$date);
@@ -1533,12 +1544,12 @@ class eq
          $appt_table_data.= "<td align=center>$day_string</td>";
          $appt_table_data.= "<td align=center>$time_string</td>";
 
-         $appt_table_data.= '<td align=center><select name=appt_notes['.$appointment.'][elder]>';
+         $appt_table_data.= '<td align=center><select name=appt_notes['.$appointment.'][indiv]>';
          $appt_table_data.= '<option value=0></option>';
-         for ($i=0; $i < count($elder_id); $i++) {
-           $id = $elder_id[$i];
-           $name = $elder_name[$i];
-           if($elder_id[$i] == $elder) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
+         for ($i=0; $i < count($indiv_id); $i++) {
+           $id = $indiv_id[$i];
+           $name = $indiv_name[$i];
+           if($indiv_id[$i] == $indiv) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
            $appt_table_data.= '<option value='.$id.' '.$selected[$id].'>'.$name.'</option>';
          }
          $appt_table_data.='</select></td>';
@@ -1557,46 +1568,46 @@ class eq
       $this->t->set_var('appt_table_width',$appt_table_width);
 
       // PPI SCHEDULING TABLE
-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY ppi_pri ASC";
+      $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY ppi_pri ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       
       $i=0; 
-      $elder_id = NULL;
+      $indiv_id = NULL;
       while ($this->db->next_record())
        {
-         $elder_id[$i] = $this->db->f('elder');
-         $elder_name[$i] = $this->db->f('name');
-         $elder_phone[$elder_id[$i]] = $this->db->f('phone');
-         $elder_ppi_pri[$elder_id[$i]] = $this->db->f('ppi_pri');
-         $elder_ppi_notes[$elder_id[$i]] = $this->db->f('ppi_notes');
+         $indiv_id[$i] = $this->db->f('indiv');
+         $indiv_name[$i] = $this->db->f('name');
+         $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
+         $indiv_ppi_pri[$indiv_id[$i]] = $this->db->f('ppi_pri');
+         $indiv_ppi_notes[$indiv_id[$i]] = $this->db->f('ppi_notes');
          $i++;
-         $total_elders++;
+         $total_indivs++;
        }
 
-      $max = count($elder_id);
+      $max = count($indiv_id);
       
       for($i=0; $i < $max; $i++) {
-          $id = $elder_id[$i];
-          $name = $elder_name[$i];
-         $phone = $elder_phone[$id];
-         $ppi_pri = $elder_ppi_pri[$id];
-         $ppi_notes = $elder_ppi_notes[$id];
+          $id = $indiv_id[$i];
+          $name = $indiv_name[$i];
+         $phone = $indiv_phone[$id];
+         $ppi_pri = $indiv_ppi_pri[$id];
+         $ppi_notes = $indiv_ppi_notes[$id];
 
-         // If this elder has had a yearly PPI this year, don't show him on the schedule list
+         // If this individual has had a yearly PPI this year, don't show him on the schedule list
          $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
-         $sql = "SELECT * FROM eq_ppi WHERE date > '$year_start' AND date < '$year_end' ".
-            "AND elder=" . $id . " AND eqpresppi=1";
+         $sql = "SELECT * FROM 3rd_interview WHERE date > '$year_start' AND date < '$year_end' ".
+            "AND indiv=" . $id . " AND interview_type='ppi'";
          $this->db2->query($sql,__LINE__,__FILE__);
          
          if(!$this->db2->next_record()) {
-           $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC";
+           $sql = "SELECT * FROM 3rd_interview WHERE indiv=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
            $this->db->query($sql,__LINE__,__FILE__);
            if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
            $link_data['menuaction'] = 'eq.eq.ppi_update';
-           $link_data['elder'] = $id;
+           $link_data['indiv'] = $id;
            $link_data['name'] = $name;
-           $link_data['ppi'] = '';
-           $link_data['eqpresppi'] = 1;
+           $link_data['interview'] = '';
+           $link_data['interview_type'] = 1;
            $link_data['action'] = 'add';
            $link_data['interviewer'] = $interviewer;
            $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
@@ -1615,20 +1626,20 @@ class eq
            $table_data.= '</select></td>';
            $table_data.= "<td align=center>$date</td>";
            $table_data.= '<td><input type=text size="50" maxlength="128" name="ppi_notes['.$i.'][notes]" value="'.$ppi_notes.'">';
-           $table_data.= '<input type=hidden name="ppi_notes['.$i.'][elder_id]" value="'.$id.'">';
-           $table_data.= '<input type=hidden name="ppi_notes['.$i.'][elder_name]" value="'.$name.'">';
+           $table_data.= '<input type=hidden name="ppi_notes['.$i.'][indiv_id]" value="'.$id.'">';
+           $table_data.= '<input type=hidden name="ppi_notes['.$i.'][indiv_name]" value="'.$name.'">';
            $table_data.= '</td>';
            $table_data.= '</tr>';
          } else {
            $link_data['menuaction'] = 'eq.eq.ppi_update';
            $link_data['interviewer'] = $this->db2->f('interviewer');
-           $link_data['elder'] = $this->db2->f('elder');
+           $link_data['indiv'] = $this->db2->f('indiv');
            $link_data['name'] = $name;
-           $link_data['ppi'] = $this->db2->f('ppi');
-           $link_data['eqpresppi'] = $this->db2->f('eqpresppi');
+           $link_data['interview'] = $this->db2->f('interview');
+           $link_data['interview_type'] = $this->db2->f('interview_type');
            $link_data['action'] = 'view';
            $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);    
-           $elders_with_yearly_ppi++;
+           $indivs_with_yearly_ppi++;
            $date = $this->db2->f('date');
            $ppi_notes = $this->db2->f('notes');
            if(strlen($ppi_notes) > 40) { $ppi_notes = substr($ppi_notes,0,40) . "..."; }
@@ -1640,11 +1651,11 @@ class eq
            $completed_data.= "<td align=left>$ppi_notes</td>";
            $completed_data.= '</tr>';
          }
-      } // End for Elders Loop
+      } // End for individuals Loop
 
       $name_width=175; $phone_width=100; $date_width=100; $notes_width=300;
       $completed_table_width=$name_width + $phone_width + $date_width + $notes_width;
-      $completed_header_row = "<th width=$name_width><font size=-2>Elder Name</th>";
+      $completed_header_row = "<th width=$name_width><font size=-2>Individual Name</th>";
       $completed_header_row.= "<th width=$phone_width><font size=-2>Phone</th>";      
       $completed_header_row.= "<th width=$date_width><font size=-2>Date</th>";
       $completed_header_row.= "<th width=$notes_width><font size=-2>PPI Notes</th>";
@@ -1655,16 +1666,16 @@ class eq
       $this->t->set_var('completed_header_row',$completed_header_row);
       $this->t->set_var('completed_table_width',$completed_table_width);
       $this->t->set_var('completed',$completed_data);
-      $this->t->fp('elderlist','elder_list',True); 
+      $this->t->fp('indivlist','indiv_list',True); 
       
-      $elders_width=300; $totals_width=100;
-      $totals_table_width=$elders_width + $totals_width;
-      $totals_header_row = "<th width=$elders_width><font size=-2>Elders</th>";
+      $indivs_width=300; $totals_width=100;
+      $totals_table_width=$indivs_width + $totals_width;
+      $totals_header_row = "<th width=$indivs_width><font size=-2>Individuals</th>";
       $totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>";
       $totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
-      $totals_data.= "<td align=left><font size=-2><b>Total Elders with yearly PPIs completed:</b></font></td>";
-      $totals_data.= "<td align=center><font size=-2><b>$elders_with_yearly_ppi / $total_elders</b></font></td>";
-      $percent = ceil(($elders_with_yearly_ppi / $total_elders)*100);
+      $totals_data.= "<td align=left><font size=-2><b>Total Individuals with yearly PPIs completed:</b></font></td>";
+      $totals_data.= "<td align=center><font size=-2><b>$indivs_with_yearly_ppi / $total_indivs</b></font></td>";
+      $percent = ceil(($indivs_with_yearly_ppi / $total_indivs)*100);
       $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
       $this->t->set_var('tr_color',$tr_color);
       $totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
@@ -1684,7 +1695,7 @@ class eq
   function int_sched()
     {
       $this->t->set_file(array('int_sched_t' => 'int_sched.tpl'));
-      $this->t->set_block('int_sched_t','elder_list','elderlist');
+      $this->t->set_block('int_sched_t','indiv_list','indivlist');
       $this->t->set_block('int_sched_t','appt_list','apptlist');
       $action = get_var('action',array('GET','POST'));
 
@@ -1700,9 +1711,9 @@ class eq
       $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_sched&action=save'));
       $this->t->set_var('title','Hometeaching Interviews Scheduler');
 
-      $elder_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $int_date_width=20;
-      $table_width=$elder_width + $phone_width + $pri_width + $notes_width + $int_date_width;
-      $header_row = "<th width=$elder_width><font size=-2>Elder Name</th>";
+      $indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $int_date_width=20;
+      $table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $int_date_width;
+      $header_row = "<th width=$indiv_width><font size=-2>individual Name</th>";
       $header_row.= "<th width=$phone_width><font size=-2>Phone</th>";
       $header_row.= "<th width=$pri_width><font size=-2>Priority</th>";
       $header_row.= "<th width=$int_date_width><font size=-2>Last Interview</th>";
@@ -1718,20 +1729,20 @@ class eq
       if($month >= 10 && $month <= 12) { $quarter_start=$year."-10-01"; $quarter_end=$nextyear."-01-01"; }
       //print "year: $year month: $month quarter_start: $quarter_start quarter_end: $quarter_end<br>";
 
-      // create the elder id -> elder name mapping
-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY name ASC";
+      // create the individual id -> individual name mapping
+      $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
-      $elder_id_data = NULL;
-      $elder_name_data = NULL;
+      $indiv_id_data = NULL;
+      $indiv_name_data = NULL;
       while ($this->db->next_record())
        {
-         $elder_name_data[$i] = $this->db->f('name');
-         $elder_id_data[$i] = $this->db->f('elder');
-         $elderid2name[$elder_id_data[$i]] = $elder_name_data[$i];
+         $indiv_name_data[$i] = $this->db->f('name');
+         $indiv_id_data[$i] = $this->db->f('indiv');
+         $individ2name[$indiv_id_data[$i]] = $indiv_name_data[$i];
          $i++;
        }
-      array_multisort($elder_name_data, $elder_id_data);
+      array_multisort($indiv_name_data, $indiv_id_data);
 
       if($action == 'save')
        {
@@ -1740,25 +1751,35 @@ class eq
          if($new_data != "") { 
            foreach ($new_data as $entry)
              {
-               $elder = $entry['elder'];
+               $indiv = $entry['indiv'];
                $appointment = $entry['appointment'];
                $location = $entry['location'];
                if($location == "") {
                  $supervisor = $entry['supervisor'];
-                 $supervisor_array = explode(",", $elderid2name[$supervisor]);
+                 $supervisor_array = explode(",", $individ2name[$supervisor]);
                  $supervisor_last_name = $supervisor_array[0];
-                 $location = "$supervisor_last_name"." home";
+                 $sql = "SELECT * FROM 3rd_indiv where indiv='$supervisor'";
+                 $this->db2->query($sql,__LINE__,__FILE__);
+                 if($this->db2->next_record()) {
+                   $indiv_id = $this->db2->f('indiv_id');
+                 }
+                 $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+                 $this->db2->query($sql,__LINE__,__FILE__);
+                 if($this->db2->next_record()) {
+                   $supervisor_address = $this->db2->f('address');
+                 }
+                 $location = "$supervisor_last_name"." home ($supervisor_address)";
                }
-               if($elder == 0) { $location = ""; }
+               if($indiv == 0) { $location = ""; }
                
-               //print "elder: $elder appointment: $appointment <br>";
+               //print "indiv: $indiv appointment: $appointment <br>";
                //Only perform a database update if we have made a change to this appointment
-               $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and elder='$elder' and location='$location'";
+               $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and indiv='$indiv' and location='$location'";
                $this->db->query($sql,__LINE__,__FILE__);
                if(!$this->db->next_record()) {
                  // Perform database save actions here
-                 $this->db->query("UPDATE eq_appointment set " .
-                                  " elder='" . $elder . "'" .
+                 $this->db->query("UPDATE 3rd_appointment set " .
+                                  " indiv='" . $indiv . "'" .
                                   ",location='" . $location . "'" .
                                   " WHERE appointment=" . $appointment,__LINE__,__FILE__);
                  
@@ -1773,17 +1794,17 @@ class eq
          foreach ($new_data as $entry)
           {
             $int_notes = $entry['notes'];
-            $elder_id = $entry['elder_id'];
-            $elder_name = $entry['elder_name'];
+            $indiv_id = $entry['indiv_id'];
+            $indiv_name = $entry['indiv_name'];
             $int_pri = $entry['pri'];
             $aaronic = $entry['aaronic'];
-            //print "int_notes: $int_notes elder_name: $elder_name aaronic: $aaronic <Br>";
+            //print "int_notes: $int_notes indiv_name: $indiv_name aaronic: $aaronic <Br>";
             if($aaronic == 0) { 
               // Perform database save actions here
-              $this->db->query("UPDATE eq_elder set " .
+              $this->db->query("UPDATE 3rd_indiv set " .
                                " int_notes='" . $int_notes . "'" .
                                ",int_pri='" . $int_pri . "'" .
-                               " WHERE elder=" . $elder_id,__LINE__,__FILE__);
+                               " WHERE indiv=" . $indiv_id,__LINE__,__FILE__);
             } 
             
           }
@@ -1793,7 +1814,7 @@ class eq
        }
 
       // Get the Districts
-      $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
+      $sql = "SELECT * FROM 3rd_district where valid=1 ORDER BY district ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
@@ -1802,7 +1823,7 @@ class eq
          $districts[$i]['district'] = $this->db->f('district');
          $districts[$i]['name'] = $this->db->f('name');
          $districts[$i]['supervisor'] = $this->db->f('supervisor');
-         $sql = "SELECT * FROM eq_presidency where district=$district and valid=1";
+         $sql = "SELECT * FROM 3rd_presidency where district=$district and valid=1";
          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
            $districts[$i]['presidency'] = $this->db2->f('presidency');
@@ -1812,11 +1833,11 @@ class eq
       
       // APPOINTMENT TABLE
       $district = 1;
-      $date_width=250; $time_width=100; $elder_width=200; $location_width=100;
-      $appt_table_width=$date_width + $time_width + $elder_width + $location_width;
+      $date_width=250; $time_width=100; $indiv_width=200; $location_width=100;
+      $appt_table_width=$date_width + $time_width + $indiv_width + $location_width;
       $appt_header_row = "<th width=$date_width><font size=-2>Date</th>";
       $appt_header_row.= "<th width=$time_width><font size=-2>Time</th>";      
-      $appt_header_row.= "<th width=$elder_width><font size=-2>Elder</th>";
+      $appt_header_row.= "<th width=$indiv_width><font size=-2>Individual</th>";
       $appt_header_row.= "<th width=$location_width><font size=-2>Location</th>";
       $appt_table_data = ""; 
 
@@ -1830,21 +1851,32 @@ class eq
       $supervisor = $districts[$d]['supervisor'];
       $supervisor_array = explode(",", $supervisor);
       $supervisor_last_name = $supervisor_array[0];
-      $table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": All Elders with Interviews Not Completed";
+      $sql = "SELECT * FROM 3rd_indiv where indiv='$supervisor'";
+      $this->db2->query($sql,__LINE__,__FILE__);
+      if($this->db2->next_record()) {
+       $indiv_id = $this->db2->f('indiv_id');
+      }
+      $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+      $this->db2->query($sql,__LINE__,__FILE__);
+      if($this->db2->next_record()) {
+       $supervisor_address = $this->db2->f('address');
+      }
+      $location = "$supervisor_last_name"." home ($supervisor_address)";
+      $table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": All Individuals with Interviews Not Completed";
       $appt_table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": Interview Appointment Slots";
       $this->t->set_var('table_title',$table_title);
       $this->t->set_var('appt_table_title',$appt_table_title);
       
       // query the database for all the appointments
-      $sql = "SELECT * FROM eq_appointment where presidency=".$districts[$d]['presidency']." and date>=CURDATE() ORDER BY date ASC, time ASC";
+      $sql = "SELECT * FROM 3rd_appointment where presidency=".$districts[$d]['presidency']." and date>=CURDATE() ORDER BY date ASC, time ASC";
       $this->db->query($sql,__LINE__,__FILE__);
        
       while ($this->db->next_record())
        {
          $appointment = $this->db->f('appointment');
-         $elder = $this->db->f('elder');
+         $indiv = $this->db->f('indiv');
          $location = $this->db->f('location');
-         if(($location == "") && ($elder > 0)) { $location = "$supervisor_last_name"." home"; }
+         if(($location == "") && ($indiv > 0)) { $location = "$supervisor_last_name"." home ($supervisor_address)"; }
          
          $date = $this->db->f('date');
          $date_array = explode("-",$date);
@@ -1859,12 +1891,12 @@ class eq
          $appt_table_data.= "<td align=center>$day_string</td>";
          $appt_table_data.= "<td align=center>$time_string</td>";
 
-         $appt_table_data.= '<td align=center><select name=appt_notes['.$appointment.'][elder]>';
+         $appt_table_data.= '<td align=center><select name=appt_notes['.$appointment.'][indiv]>';
          $appt_table_data.= '<option value=0></option>';
-         for ($i=0; $i < count($elder_id_data); $i++) {
-           $id = $elder_id_data[$i];
-           $name = $elder_name_data[$i];
-           if($elder_id_data[$i] == $elder) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
+         for ($i=0; $i < count($indiv_id_data); $i++) {
+           $id = $indiv_id_data[$i];
+           $name = $indiv_name_data[$i];
+           if($indiv_id_data[$i] == $indiv) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
            $appt_table_data.= '<option value='.$id.' '.$selected[$id].'>'.$name.'</option>';
          }
          $appt_table_data.='</select></td>';
@@ -1886,9 +1918,9 @@ class eq
       // INTERVIEW SCHEDULING TABLE
       
       // Select all the unique companionship numbers for this district
-      $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$d]['district'];
+      $sql = "SELECT distinct companionship FROM 3rd_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');
@@ -1898,7 +1930,7 @@ class eq
       $i=0;
       for ($j=0; $j < count($unique_companionships); $j++) {
        // Select all the companions from each companionship
-       $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+       $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".
           "companionship=". $unique_companionships[$j]['companionship'];
        $this->db->query($sql,__LINE__,__FILE__);
        $k=0; $int_completed=0;
@@ -1909,38 +1941,38 @@ class eq
        while ($this->db->next_record())
            {         
              // Get this companions information
-             $elder_id = $this->db->f('elder');
+             $indiv_id = $this->db->f('indiv');
              $aaronic_id = $this->db->f('aaronic');
             
-             $sql = "SELECT * FROM eq_elder where elder=$elder_id";
+             $sql = "SELECT * FROM 3rd_indiv where indiv=$indiv_id";
              $this->db2->query($sql,__LINE__,__FILE__);        
              if($this->db2->next_record())
                {
-                 $elder_id = $this->db2->f('elder');
-                 $elder_name = $this->db2->f('name');
-                 $elder_phone[$elder_id] = $this->db2->f('phone');
-                 $elder_int_pri[$elder_id] = $this->db2->f('int_pri');
-                 $elder_int_notes[$elder_id] = $this->db2->f('int_notes');
-                 $elder_aaronic = 0;
+                 $indiv_id = $this->db2->f('indiv');
+                 $indiv_name = $this->db2->f('name');
+                 $indiv_phone[$indiv_id] = $this->db2->f('phone');
+                 $indiv_int_pri[$indiv_id] = $this->db2->f('int_pri');
+                 $indiv_int_notes[$indiv_id] = $this->db2->f('int_notes');
+                 $indiv_aaronic = 0;
                }
              else {
-               $sql = "SELECT * FROM eq_aaronic where aaronic=$aaronic_id";
+               $sql = "SELECT * FROM 3rd_aaronic where aaronic=$aaronic_id";
                $this->db2->query($sql,__LINE__,__FILE__);
                if($this->db2->next_record())
                  {
-                   $elder_id = $this->db2->f('aaronic');
-                   $elder_name = $this->db2->f('name');
-                   $elder_phone[$elder_id] = $this->db2->f('phone');
-                   $elder_aaronic = 1;
+                   $indiv_id = $this->db2->f('aaronic');
+                   $indiv_name = $this->db2->f('name');
+                   $indiv_phone[$indiv_id] = $this->db2->f('phone');
+                   $indiv_aaronic = 1;
                  }
              }
 
-             $id = $elder_id;
-             $name = $elder_name;
-             $phone = $elder_phone[$id];
-             $int_pri = $elder_int_pri[$id];
-             $int_notes = $elder_int_notes[$id];
-             $aaronic = $elder_aaronic;
+             $id = $indiv_id;
+             $name = $indiv_name;
+             $phone = $indiv_phone[$id];
+             $int_pri = $indiv_int_pri[$id];
+             $int_notes = $indiv_int_notes[$id];
+             $aaronic = $indiv_aaronic;
              
              // If the companionship has already had its quarterly interview,
              // Skip the other companion in the companionship.
@@ -1958,19 +1990,19 @@ class eq
              }
              
              // If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list
-             $sql = "SELECT * FROM eq_ppi WHERE date >= '$quarter_start' AND date < '$quarter_end' ".
-                "AND elder=" . $id;
+             $sql = "SELECT * FROM 3rd_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' ".
+                "AND indiv=" . $id;
              $this->db2->query($sql,__LINE__,__FILE__);
              
              if(!$this->db2->next_record()) {
-               $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC";
+               $sql = "SELECT * FROM 3rd_interview WHERE indiv=" . $id . " ORDER BY date DESC";
                $this->db3->query($sql,__LINE__,__FILE__);
                if($this->db3->next_record()) { $date = $this->db3->f('date'); } else { $date = ""; }
                $link_data['menuaction'] = 'eq.eq.int_update';
-               $link_data['elder'] = $id;
+               $link_data['indiv'] = $id;
                $link_data['aaronic'] = 0;
                $link_data['name'] = $name;
-               $link_data['ppi'] = '';
+               $link_data['interview'] = '';
                $link_data['action'] = 'add';
                $link_data['interviewer'] = $districts[$d]['supervisor'];
                $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
@@ -1990,8 +2022,8 @@ class eq
                if($aaronic == 0) { 
                  $table_data.= '<td><input type=text size="50" maxlength="128" name="int_notes['.$i.'][notes]" value="'.$int_notes.'">';
                }
-               $table_data.= '<input type=hidden name="int_notes['.$i.'][elder_id]" value="'.$id.'">';
-               $table_data.= '<input type=hidden name="int_notes['.$i.'][elder_name]" value="'.$name.'">';
+               $table_data.= '<input type=hidden name="int_notes['.$i.'][indiv_id]" value="'.$id.'">';
+               $table_data.= '<input type=hidden name="int_notes['.$i.'][indiv_name]" value="'.$name.'">';
                $table_data.= '<input type=hidden name="int_notes['.$i.'][aaronic]" value="'.$aaronic.'">';
                $table_data.= '</td>';
                $table_data.= '</tr>'."\n";
@@ -1999,10 +2031,10 @@ class eq
              } else {
                $link_data['menuaction'] = 'eq.eq.int_update';
                $link_data['interviewer'] = $this->db2->f('interviewer');
-               $link_data['elder'] = $this->db2->f('elder');
+               $link_data['indiv'] = $this->db2->f('indiv');
                $link_data['aaronic'] = $this->db2->f('aaronic');
                $link_data['name'] = $name;
-               $link_data['ppi'] = $this->db2->f('ppi');
+               $link_data['interview'] = $this->db2->f('interview');
                $link_data['action'] = 'view';
                $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);    
                $comps_with_quarterly_int++;
@@ -2021,7 +2053,7 @@ class eq
        
       $name_width=175; $phone_width=100; $date_width=100; $notes_width=300;
       $completed_table_width=$name_width + $phone_width + $date_width + $notes_width;
-      $completed_header_row = "<th width=$name_width><font size=-2>Elder Name</th>";
+      $completed_header_row = "<th width=$name_width><font size=-2>Individual Name</th>";
       $completed_header_row.= "<th width=$phone_width><font size=-2>Phone</th>";      
       $completed_header_row.= "<th width=$date_width><font size=-2>Date</th>";
       $completed_header_row.= "<th width=$notes_width><font size=-2>Interview Notes</th>";
@@ -2032,14 +2064,14 @@ class eq
       $this->t->set_var('completed_header_row',$completed_header_row);
       $this->t->set_var('completed_table_width',$completed_table_width);
       $this->t->set_var('completed',$completed_data);
-      $this->t->fp('elderlist','elder_list',True);
+      $this->t->fp('indivlist','indiv_list',True);
 
       } // End for each district loop
 
       
-      $elders_width=300; $totals_width=100;
-      $totals_table_width=$elders_width + $totals_width;
-      $totals_header_row = "<th width=$elders_width><font size=-2>Elders</th>";
+      $indivs_width=300; $totals_width=100;
+      $totals_table_width=$indivs_width + $totals_width;
+      $totals_header_row = "<th width=$indivs_width><font size=-2>Individuals</th>";
       $totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>";
       $totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
       $totals_data.= "<td align=left><font size=-2><b>Total Companionships with interviews completed:</b></font></td>";
@@ -2078,7 +2110,7 @@ class eq
       $this->t->set_var('schedule_vis_link_title','Schedule Yearly Visits');
 
       $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched&action=save'));
-      $this->t->set_var('title','EQ Presidency Yearly Visit Scheduler');
+      $this->t->set_var('title','Presidency Yearly Visit Scheduler');
 
       $family_width=500; $phone_width=40; $pri_width=10; $notes_width=128; $visit_date_width=20;
       $table_width=$family_width + $phone_width + $pri_width + $notes_width + $visit_date_width;
@@ -2092,7 +2124,7 @@ class eq
       $year = date('Y');
 
       // create the family id -> family name mapping
-      $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_family where valid=1 and indiv_id != 0 ORDER BY name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       $family_id = NULL;
@@ -2101,7 +2133,7 @@ class eq
          $family_id[$i] = $this->db->f('family');
          $family_name[$i] = $this->db->f('name');
          $familyid2name[$family_id[$i]] = $family_name[$i];
-         $sql = "SELECT * FROM eq_parent where family='$family_id[$i]'";
+         $sql = "SELECT * FROM 3rd_parent where family='$family_id[$i]'";
          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
            $familyid2address[$family_id[$i]] = $this->db2->f('address');
@@ -2129,11 +2161,11 @@ class eq
                if($family == 0) { $location = ""; }
                
                //Only perform a database update if we have made a change to this appointment
-               $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and family='$family' and location='$location'";
+               $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and family='$family' and location='$location'";
                $this->db->query($sql,__LINE__,__FILE__);
                if(!$this->db->next_record()) {
                  // Perform database save actions here
-                 $this->db->query("UPDATE eq_appointment set " .
+                 $this->db->query("UPDATE 3rd_appointment set " .
                                   " family='" . $family . "'" .
                                   ",location='" . $location . "'" .
                                   " WHERE appointment=" . $appointment,__LINE__,__FILE__);
@@ -2153,7 +2185,7 @@ class eq
             $visit_pri = $entry['pri'];
             
             // Perform database save actions here
-            $this->db->query("UPDATE eq_family set " .
+            $this->db->query("UPDATE 3rd_family set " .
                              " visit_notes='" . $visit_notes . "'" .
                              ",visit_pri='" . $visit_pri . "'" .
                              " WHERE family=" . $family,__LINE__,__FILE__);
@@ -2174,18 +2206,18 @@ class eq
       $appt_table_data = ""; 
 
       // Find out what the EQ Presidency ID is
-      $sql = "SELECT * FROM eq_presidency where eqpres=1 and valid=1";
+      $sql = "SELECT * FROM 3rd_presidency where eqpres=1 and valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       if($this->db->next_record()) {
        $presidency_name = $this->db->f('name');
        $presidency_id = $this->db->f('presidency');
       } else {
-       print "<hr><font color=red><h3>-E- Unable to locate EQ Presidency in eq_presidency table</h3></font></hr>";
+       print "<hr><font color=red><h3>-E- Unable to locate Presidency in 3rd_presidency table</h3></font></hr>";
        return;
       }
             
       // query the database for all the appointments
-      $sql = "SELECT * FROM eq_appointment where presidency=$presidency_id and date>=CURDATE() ORDER BY date ASC, time ASC";
+      $sql = "SELECT * FROM 3rd_appointment where presidency=$presidency_id and date>=CURDATE() ORDER BY date ASC, time ASC";
       $this->db->query($sql,__LINE__,__FILE__);
 
       while ($this->db->next_record())
@@ -2236,7 +2268,7 @@ class eq
 
       
       // VISIT SCHEDULING TABLE
-      $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY visit_pri ASC";
+      $sql = "SELECT * FROM 3rd_family where valid=1 and indiv_id != 0 ORDER BY visit_pri ASC";
       $this->db->query($sql,__LINE__,__FILE__);
 
       $total_families=0; $families_with_yearly_visit=0;
@@ -2258,7 +2290,7 @@ class eq
          $total_families++;
        }
 
-      $sql = "SELECT * FROM eq_parent where valid=1";
+      $sql = "SELECT * FROM 3rd_parent where valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       while ($this->db->next_record())
        {
@@ -2278,12 +2310,12 @@ class eq
 
          // If this family has had a yearly visit this year, don't show them on the schedule list
          $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
-         $sql = "SELECT * FROM eq_visit WHERE date > '$year_start' AND date < '$year_end' ".
+         $sql = "SELECT * FROM 3rd_visit WHERE date > '$year_start' AND date < '$year_end' ".
             "AND family=" . $id . " AND companionship=0";
          $this->db2->query($sql,__LINE__,__FILE__);
          
          if(!$this->db2->next_record()) {
-           $sql = "SELECT * FROM eq_visit WHERE family=" . $id . " AND companionship=0 ORDER BY date DESC";
+           $sql = "SELECT * FROM 3rd_visit WHERE family=" . $id . " AND companionship=0 ORDER BY date DESC";
            $this->db->query($sql,__LINE__,__FILE__);
            if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
            $link_data['menuaction'] = 'eq.eq.vis_update';
@@ -2398,38 +2430,38 @@ class eq
       if($num_months == 1) { $this->t->set_var('lang_num_months','Year of History'); }
       else { $this->t->set_var('lang_num_months','Years of History'); }        
 
-      $sql = "SELECT * FROM eq_presidency where president=1 and valid=1";
+      $sql = "SELECT * FROM 3rd_presidency where president=1 and valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       if($this->db->next_record()) {
        $president_name = $this->db->f('name');
-       $interviewer = $this->db->f('elder');
-       $eqpresppi = 1;
+       $interviewer = $this->db->f('indiv');
+       $interview_type = 'ppi';
       } else {
-       print "<hr><font color=red><h3>-E- Unable to locate EQ President in eq_presidency table</h3></font></hr>";
+       print "<hr><font color=red><h3>-E- Unable to locate President in 3rd_presidency table</h3></font></hr>";
        return;
       }
       $this->t->set_var('district_number','*');
       $this->t->set_var('district_name',$president_name);
 
-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
        {
-         $elder_id[$i] = $this->db->f('elder');
-         $elder_name[$i] = $this->db->f('name');
-         $elder_phone[$elder_id[$i]] = $this->db->f('phone');
-         $elder_ppi_pri[$elder_id[$i]] = $this->db->f('ppi_pri');
-         $elder_ppi_notes[$elder_id[$i]] = $this->db->f('ppi_notes');
+         $indiv_id[$i] = $this->db->f('indiv');
+         $indiv_name[$i] = $this->db->f('name');
+         $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
+         $indiv_ppi_pri[$indiv_id[$i]] = $this->db->f('ppi_pri');
+         $indiv_ppi_notes[$indiv_id[$i]] = $this->db->f('ppi_notes');
          $i++;
        }
-      $total_elders=$i;
-      array_multisort($elder_name, $elder_id);
-      //var_dump($elder_name); print "<br><br>"; var_dump($elder_id);
+      $total_indivs=$i;
+      array_multisort($indiv_name, $indiv_id);
+      //var_dump($indiv_name); print "<br><br>"; var_dump($indiv_id);
       
-      $header_row="<th width=$comp_width><font size=-2>Elder Name</th>";
+      $header_row="<th width=$comp_width><font size=-2>Individual Name</th>";
        
-      $elder_width=400; $ppi_width=75; $table_width=$elder_width + $num_months*$ppi_width;
+      $indiv_width=400; $ppi_width=75; $table_width=$indiv_width + $num_months*$ppi_width;
       $table_data="";
       for($m=$num_months; $m >= 0; $m--) {
        $year = date('Y') - $m;
@@ -2437,28 +2469,28 @@ class eq
        $ppis[$m] = 0;
       }
       
-      for ($j=0; $j < count($elder_id); $j++) {
-       $id = $elder_id[$j];
-       $name = $elder_name[$j];
-       $phone = $elder_phone[$id];
+      for ($j=0; $j < count($indiv_id); $j++) {
+       $id = $indiv_id[$j];
+       $name = $indiv_name[$j];
+       $phone = $indiv_phone[$id];
        
        $link_data['menuaction'] = 'eq.eq.ppi_update';
        $link_data['interviewer'] = $interviewer;
-       $link_data['elder'] = $id;
+       $link_data['indiv'] = $id;
        $link_data['name'] = $name;
-       $link_data['ppi'] = '';
-       $link_data['eqpresppi'] = $eqpresppi;
+       $link_data['interview'] = '';
+       $link_data['interview_type'] = $interview_type;
        $link_data['action'] = 'add';
        $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
        $this->nextmatchs->template_alternate_row_color(&$this->t);
        $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
 
-       // Find out how many times PPIs were performed in the past $num_months for this Elder
+       // Find out how many times PPIs were performed in the past $num_months for this individual
        for($m=$num_months; $m >= 0; $m--) {
          $year = date('Y') - $m;
          $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
-         $sql = "SELECT * FROM eq_ppi WHERE date > '$year_start' AND date < '$year_end' ".
-            "AND elder=" . $id . " AND eqpresppi=1";
+         $sql = "SELECT * FROM 3rd_interview WHERE date > '$year_start' AND date < '$year_end' ".
+            "AND indiv=" . $id . " AND interview_type='ppi'";
          $this->db2->query($sql,__LINE__,__FILE__);
                  
          if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
@@ -2467,10 +2499,10 @@ class eq
            $link_data['menuaction'] = 'eq.eq.ppi_update';
            $link_data['companionship'] = $companionship;
            $link_data['interviewer'] = $this->db2->f('interviewer');
-           $link_data['elder'] = $id;
+           $link_data['indiv'] = $id;
            $link_data['name'] = $name;
-           $link_data['ppi'] = $this->db2->f('ppi');
-           $link_data['eqpresppi'] = $eqpresppi;
+           $link_data['interview'] = $this->db2->f('interview');
+           $link_data['interview_type'] = $interview_type;
            $link_data['action'] = 'view';
            $date = $this->db2->f('date');
            $date_array = explode("-",$date);
@@ -2485,9 +2517,9 @@ class eq
       }
       $table_data .= "<tr><td colspan=20><hr></td></tr>";
       
-      $stat_data = "<tr><td><b><font size=-2>$total_elders Elders<br>PPI Totals:</font></b></td>";
+      $stat_data = "<tr><td><b><font size=-2>$total_indivs Individuals<br>PPI Totals:</font></b></td>";
       for($m=$num_months; $m >=0; $m--) {
-       $percent = ceil(($ppis[$m] / $total_elders)*100);
+       $percent = ceil(($ppis[$m] / $total_indivs)*100);
        $stat_data .= "<td align=center><font size=-2><b>$ppis[$m]<br>$percent%</font></b></td>";
       }
       $stat_data .= "</tr>";
@@ -2515,34 +2547,41 @@ class eq
       $companionship = get_var('companionship',array('GET','POST'));
       $interviewer = get_var('interviewer',array('GET','POST'));      
       $name = get_var('name',array('GET','POST'));
-      $ppi = get_var('ppi',array('GET','POST'));
-      $elder = get_var('elder',array('GET','POST'));
+      $interview = get_var('interview',array('GET','POST'));
+      $indiv = get_var('indiv',array('GET','POST'));
       $aaronic = get_var('aaronic',array('GET','POST'));
       $date = get_var('date',array('GET','POST'));
       $notes = get_var('notes',array('GET','POST'));
-      $eqpresppi = get_var('eqpresppi',array('GET','POST'));
-      
-      $sql = "SELECT * FROM eq_elder WHERE elder=" . $interviewer;
+      $interview_type = get_var('interview_type',array('GET','POST'));
+     
+      $sql = "SELECT * FROM 3rd_presidency where valid=1 and (president=1 or counselor=1 or secretary=1)";
       $this->db2->query($sql,__LINE__,__FILE__);
-      $this->db2->next_record();
-      $interviewer_name = $this->db2->f('name');
-      $this->t->set_var('interviewer',$interviewer . ' selected');
-      $this->t->set_var('interviewer_name',$interviewer_name);
-      $this->t->set_var('eqpresppi_checked','');
-      $this->t->fp('int_list','interviewer_list',True);
+      while ($this->db2->next_record())
+      {
+        $indiv = $this->db2->f('indiv');
+       $interviewer_name = $this->db2->f('name');
+        if($indiv == $interviewer) { 
+          $this->t->set_var('interviewer',$interviewer . ' selected');
+        } else {
+         $this->t->set_var('interviewer',$interviewer);
+       }
+        $this->t->set_var('interviewer_name',$interviewer_name);
+        $this->t->set_var('interview_type_checked','');
+        $this->t->fp('int_list','interviewer_list',True);
+      }
     
       if($action == 'save')
        {
          $notes = get_var('notes',array('POST'));
-         $this->db->query("UPDATE eq_ppi set " .
-                          "   ppi='" . $ppi . "'" .
+         $this->db->query("UPDATE 3rd_interview set " .
+                    "   interview='" . $interview . "'" .
                    ", interviewer='" . $interviewer . "'" .
-                         ", elder='" . $elder . "'" .
+                         ", indiv='" . $indiv . "'" .
                        ", aaronic='" . $aaronic . "'" .
                           ", date='" . $date . "'" .
                          ", notes='" . $notes . "'" .
-                     ", eqpresppi='" . $eqpresppi . "'" .
-                          " WHERE ppi=" . $ppi,__LINE__,__FILE__);
+                ", interview_type='" . $interview_type . "'" .
+                          " WHERE interview=" . $interview,__LINE__,__FILE__);
          $this->ppi_view();
          return false;
        }
@@ -2550,9 +2589,9 @@ class eq
       if($action == 'insert')
        {
          $notes = get_var('notes',array('POST'));
-         $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) "
-                          . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
-                          . $date . "','" . $notes . "','" . $eqpresppi  ."')",__LINE__,__FILE__);
+         $this->db->query("INSERT INTO 3rd_interview (interviewer,indiv,aaronic,date,notes,interview_type) "
+                          . "VALUES ('" . $interviewer . "','" . $indiv . "','" . $aaronic . "','"
+                          . $date . "','" . $notes . "','" . $interview_type  ."')",__LINE__,__FILE__);
          $this->ppi_view();
          return false;
        }
@@ -2560,33 +2599,33 @@ class eq
       if($action == 'add')
        {
          $this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options));
-         $this->t->set_var('ppi', '');
+         $this->t->set_var('interview', '');
          $this->t->set_var('interviewer', $interviewer);
          $this->t->set_var('name',$name);
-         $this->t->set_var('elder',$elder);
+         $this->t->set_var('indiv',$indiv);
          $this->t->set_var('date','');
          $this->t->set_var('notes','');
-         $this->t->set_var('eqpresppi',$eqpresppi);
-         $this->t->set_var('eqpresppi_checked','checked');
+         $this->t->set_var('interview_type',$interview_type);
+         $this->t->set_var('interview_type_checked','checked');
          $this->t->set_var('lang_done','Cancel');
          $this->t->set_var('lang_action','Adding New PPI');
-         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&ppi='
-                                                               . $ppi . '&action=' . 'insert'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&interview='
+                                                               . $interview . '&action=' . 'insert'));
        }
 
       if($action == 'edit' || $action == 'view')
        {
-         $sql = "SELECT * FROM eq_ppi WHERE ppi=".$ppi;
+         $sql = "SELECT * FROM 3rd_interview WHERE interview=".$interview;
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
-         $this->t->set_var('ppi',$ppi);
+         $this->t->set_var('interview',$interview);
          $this->t->set_var('name',$name);
          $this->t->set_var('interviewer', $this->db->f('interviewer'));
-         $this->t->set_var('elder',$this->db->f('elder'));
+         $this->t->set_var('indiv',$this->db->f('indiv'));
          $this->t->set_var('date',$this->db->f('date'));
          $this->t->set_var('notes',$this->db->f('notes'));
-         $this->t->set_var('eqpresppi',$this->db->f('eqpresppi'));
-         if($this->db->f('eqpresppi') == 1) { $this->t->set_var('eqpresppi_checked','checked'); }
+         $this->t->set_var('interview_type',$this->db->f('interview_type'));
+         if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); }
        }
       
       if($action == 'edit')
@@ -2594,8 +2633,8 @@ class eq
          $this->t->set_var('cal_date',$this->jscal->input('date',$date,'','','','','',$this->cal_options));
          $this->t->set_var('lang_done','Cancel');
          $this->t->set_var('lang_action','Editing PPI');
-         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&ppi='
-                                                               . $ppi . '&action=' . 'save'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&interview='
+                                                               . $interview . '&action=' . 'save'));
        }
 
       if($action == 'view')
@@ -2606,8 +2645,8 @@ class eq
          $this->t->set_var('disabled','DISABLED');
          $this->t->set_var('lang_done','Done');
          $this->t->set_var('lang_action','Viewing PPI');
-         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&ppi='
-                                                               . $ppi . '&action=' . 'edit'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&interview='
+                                                               . $interview . '&action=' . 'edit'));
        }
       
       $this->t->set_var('lang_reset','Clear Form');
@@ -2653,7 +2692,7 @@ class eq
       else if($current_month >= 7 && $current_month <= 9) { $current_month=9; }
       else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
 
-      $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
+      $sql = "SELECT * FROM 3rd_district where valid=1 ORDER BY district ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
@@ -2664,23 +2703,23 @@ class eq
          $i++;
        }
 
-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
        {
-         $elder_id[$i] = $this->db->f('elder');
-         $elder_name[$i] = $this->db->f('name');
-         $elder_phone[$elder_id[$i]] = $this->db->f('phone');
+         $indiv_id[$i] = $this->db->f('indiv');
+         $indiv_name[$i] = $this->db->f('name');
+         $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
          $i++;
        }
-      array_multisort($elder_name, $elder_id);
-      for($i=0; $i < count($elder_id); $i++) {
-          $id = $elder_id[$i];
-          $elders[$id] = $elder_name[$i];
+      array_multisort($indiv_name, $indiv_id);
+      for($i=0; $i < count($indiv_id); $i++) {
+          $id = $indiv_id[$i];
+          $indivs[$id] = $indiv_name[$i];
       }      
 
-      $sql = "SELECT * FROM eq_aaronic where valid=1 ORDER BY aaronic ASC";
+      $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       while ($this->db->next_record())
        {
@@ -2695,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'];
-
+       $sql = "SELECT distinct companionship FROM 3rd_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');
@@ -2709,11 +2746,11 @@ class eq
          }
        
        $comp_width=250; $int_width=75; $table_width=$comp_width + $num_months*$int_width;
-       $table_data=""; $num_companionships = $j; $num_elders = 0;
+       $table_data=""; $num_companionships = $j; $num_indivs = 0;
        for($m=$num_months; $m >= 0; $m--) { $ints[$m] = 0; }
        for ($j=0; $j < count($unique_companionships); $j++) {
          // Select all the companions in each companionship
-         $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+         $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".
             "companionship=". $unique_companionships[$j]['companionship'];
          $this->db->query($sql,__LINE__,__FILE__);
          $k=0;
@@ -2722,13 +2759,13 @@ class eq
          while ($this->db->next_record())
            {
              // Get this companions information
-             $num_elders++;
+             $num_indivs++;
              $companionship = $this->db->f('companionship');
-             $elder_id = $this->db->f('elder');
+             $indiv_id = $this->db->f('indiv');
              $aaronic_id = $this->db->f('aaronic');
-             if($elder_id) {
-               $name = $elders[$elder_id];
-               $phone = $elder_phone[$elder_id];
+             if($indiv_id) {
+               $name = $indivs[$indiv_id];
+               $phone = $indiv_phone[$indiv_id];
              }
              else if($aaronic_id) {
                $name = $aaronic[$aaronic_id]['name'];
@@ -2737,15 +2774,15 @@ class eq
              $link_data['menuaction'] = 'eq.eq.int_update';
              $link_data['companionship'] = $companionship;
              $link_data['interviewer'] = $supervisor;
-             $link_data['elder'] = $elder_id;
+             $link_data['indiv'] = $indiv_id;
              $link_data['aaronic'] = $aaronic_id;
              $link_data['name'] = $name;
-             $link_data['ppi'] = '';
+             $link_data['interview'] = '';
              $link_data['action'] = 'add';
              $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
              $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
 
-             // Find out how many times Interviews were performed in the past $num_months for this Elder
+             // Find out how many times Interviews were performed in the past $num_months for this individual
              $header_row="<th width=$comp_width><font size=-2>Companionship</th>";
              for($m=$num_months; $m >= 0; $m--) {
                $month = $current_month - $m;
@@ -2755,8 +2792,8 @@ class eq
                $month_start = "$year"."-"."$month"."-"."01";
                $month_end = "$year"."-"."$month"."-"."31";
                $month = "$month"."/"."$year";
-               $sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ".
-                  "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id;
+               $sql = "SELECT * FROM 3rd_interview WHERE date >= '$month_start' AND date <= '$month_end' ".
+                  "AND indiv=" . $indiv_id . " AND aaronic=" . $aaronic_id;
                $this->db2->query($sql,__LINE__,__FILE__);
                $header_row .= "<th width=$int_width><font size=-2>$month</th>";
              
@@ -2768,10 +2805,10 @@ class eq
                  $link_data['menuaction'] = 'eq.eq.int_update';
                  $link_data['companionship'] = $companionship;
                  $link_data['interviewer'] = $this->db2->f('interviewer');
-                 $link_data['elder'] = $elder_id;
+                 $link_data['indiv'] = $indiv_id;
                  $link_data['aaronic'] = $aaronic_id;
                  $link_data['name'] = $name;
-                 $link_data['ppi'] = $this->db2->f('ppi');
+                 $link_data['interview'] = $this->db2->f('interview');
                  $link_data['action'] = 'view';
                  $date = $this->db2->f('date');
                  $date_array = explode("-",$date);
@@ -2841,50 +2878,46 @@ class eq
       $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view'));
       $this->t->set_var('readonly','');
       $this->t->set_var('disabled','');
-      $this->t->set_var('eqpresppi_checked','');
+      $this->t->set_var('interview_type_checked','');
       
       $action = get_var('action',array('GET','POST'));
       $companionship = get_var('companionship',array('GET','POST'));
       $interviewer = get_var('interviewer',array('GET','POST'));      
       $name = get_var('name',array('GET','POST'));
-      $ppi = get_var('ppi',array('GET','POST'));
-      $elder = get_var('elder',array('GET','POST'));
+      $interview = get_var('interview',array('GET','POST'));
+      $indiv = get_var('indiv',array('GET','POST'));
       $aaronic = get_var('aaronic',array('GET','POST'));
       $date = get_var('date',array('GET','POST'));
       $notes = get_var('notes',array('GET','POST'));
-      $eqpresppi = get_var('eqpresppi',array('GET','POST'));
-      
-      $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
-      $this->db->query($sql,__LINE__,__FILE__);
-      while ($this->db->next_record())
-       {
-         $supervisor = $this->db->f('supervisor');
-         $sql = "SELECT * FROM eq_elder WHERE elder=" . $supervisor;
-         $this->db2->query($sql,__LINE__,__FILE__);
-         $this->db2->next_record();
-         $interviewer_name = $this->db2->f('name');
-         
-         if($supervisor == $interviewer) { 
-           $this->t->set_var('interviewer',$supervisor . ' selected');
-         } else {
-           $this->t->set_var('interviewer',$interviewer);
-         }
-         $this->t->set_var('interviewer_name',$interviewer_name);
-         $this->t->fp('int_list','interviewer_list',True);
-       }
+      $interview_type = get_var('interview_type',array('GET','POST'));
+
+      $sql = "SELECT * FROM 3rd_presidency where valid=1 and (president=1 or counselor=1 or secretary=1 or district!=0)";
+      $this->db2->query($sql,__LINE__,__FILE__);
+      while ($this->db2->next_record())
+      {
+        $indiv = $this->db2->f('indiv');
+        $interviewer_name = $this->db2->f('name');
+        if($indiv == $interviewer) {
+          $this->t->set_var('interviewer',$interviewer . ' selected');
+        } else {
+          $this->t->set_var('interviewer',$interviewer);
+        }
+        $this->t->set_var('interviewer_name',$interviewer_name);
+        $this->t->fp('int_list','interviewer_list',True);
+      }
       
       if($action == 'save')
        {
          $notes = get_var('notes',array('POST'));
-         $this->db->query("UPDATE eq_ppi set " .
-                          "   ppi='" . $ppi . "'" .
+         $this->db->query("UPDATE 3rd_interview set " .
+                    "   interview='" . $interview . "'" .
                    ", interviewer='" . $interviewer . "'" .
-                         ", elder='" . $elder . "'" .
+                         ", indiv='" . $indiv . "'" .
                        ", aaronic='" . $aaronic . "'" .
                           ", date='" . $date . "'" .
                          ", notes='" . $notes . "'" .
-                     ", eqpresppi='" . $eqpresppi . "'" .
-                          " WHERE ppi=" . $ppi,__LINE__,__FILE__);
+                ", interview_type='" . $interview_type . "'" .
+                          " WHERE interview=" . $interview,__LINE__,__FILE__);
          $this->int_view();
          return false;
        }
@@ -2892,9 +2925,9 @@ class eq
       if($action == 'insert')
        {
          $notes = get_var('notes',array('POST'));
-         $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) "
-                          . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
-                          . $date . "','" . $notes ."','" . $eqpresppi . "')",__LINE__,__FILE__);
+         $this->db->query("INSERT INTO 3rd_interview (interviewer,indiv,aaronic,date,notes,interview_type) "
+                          . "VALUES ('" . $interviewer . "','" . $indiv . "','" . $aaronic . "','"
+                          . $date . "','" . $notes ."','" . $interview_type . "')",__LINE__,__FILE__);
          $this->int_view();
          return false;
        }
@@ -2902,32 +2935,32 @@ class eq
       if($action == 'add')
        {
          $this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options));
-         $this->t->set_var('ppi', '');
+         $this->t->set_var('interview', '');
          $this->t->set_var('interviewer', $interviewer);
          $this->t->set_var('name',$name);
-         $this->t->set_var('elder',$elder);
+         $this->t->set_var('indiv',$indiv);
          $this->t->set_var('aaronic',$aaronic);
          $this->t->set_var('date','');
          $this->t->set_var('notes','');
          $this->t->set_var('lang_done','Cancel');
          $this->t->set_var('lang_action','Adding New Interview');
-         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
-                                                               . $ppi . '&action=' . 'insert'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
+                                                               . $interview . '&action=' . 'insert'));
        }
 
       if($action == 'edit' || $action == 'view')
        {
-         $sql = "SELECT * FROM eq_ppi WHERE ppi=".$ppi;
+         $sql = "SELECT * FROM 3rd_interview WHERE interview=".$interview;
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
-         $this->t->set_var('ppi',$ppi);
+         $this->t->set_var('interview',$interview);
          $this->t->set_var('name',$name);
          $this->t->set_var('interviewer', $this->db->f('interviewer'));
-         $this->t->set_var('elder',$this->db->f('elder'));
+         $this->t->set_var('indiv',$this->db->f('indiv'));
          $this->t->set_var('aaronic',$this->db->f('aaronic'));
          $this->t->set_var('date',$this->db->f('date'));
          $this->t->set_var('notes',$this->db->f('notes'));
-         if($this->db->f('eqpresppi') == 1) { $this->t->set_var('eqpresppi_checked','checked'); }
+         if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); }
        }
       
       if($action == 'edit')
@@ -2935,8 +2968,8 @@ class eq
          $this->t->set_var('cal_date',$this->jscal->input('date',$date,'','','','','',$this->cal_options));
          $this->t->set_var('lang_done','Cancel');
          $this->t->set_var('lang_action','Editing Interview');
-         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
-                                                               . $ppi . '&action=' . 'save'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
+                                                               . $interview . '&action=' . 'save'));
        }
 
       if($action == 'view')
@@ -2947,8 +2980,8 @@ class eq
          $this->t->set_var('disabled','DISABLED');
          $this->t->set_var('lang_done','Done');
          $this->t->set_var('lang_action','Viewing Interview');
-         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
-                                                               . $ppi . '&action=' . 'edit'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
+                                                               . $interview . '&action=' . 'edit'));
        }
       
       $this->t->set_var('lang_reset','Clear Form');
@@ -2992,7 +3025,7 @@ class eq
       $year = date('Y') - $num_years + 1;
       $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
       
-      $sql = "SELECT * FROM eq_visit WHERE companionship=0 and date > '$year_start' ORDER BY date DESC";
+      $sql = "SELECT * FROM 3rd_visit WHERE companionship=0 and date > '$year_start' ORDER BY date DESC";
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
@@ -3009,7 +3042,7 @@ class eq
        {         
          $this->nextmatchs->template_alternate_row_color(&$this->t);
 
-         $sql = "SELECT * FROM eq_family WHERE family=".$visit_list[$i]['family'];
+         $sql = "SELECT * FROM 3rd_family WHERE family=".$visit_list[$i]['family'];
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
                  
@@ -3037,7 +3070,7 @@ class eq
        }
 
       // List the families that are available to record a visit against
-      $sql = "SELECT * FROM eq_family WHERE valid=1";
+      $sql = "SELECT * FROM 3rd_family WHERE valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
@@ -3091,7 +3124,7 @@ class eq
       if($action == 'save')
        {
          $notes = get_var('notes',array('POST'));
-         $this->db->query("UPDATE eq_visit set " .
+         $this->db->query("UPDATE 3rd_visit set " .
                           "  date='" . $date . "'" .
                          ", notes='" . $notes . "'" .
                           " WHERE visit=" . $visit,__LINE__,__FILE__);
@@ -3102,7 +3135,7 @@ class eq
       if($action == 'insert')
        {
          $notes = get_var('notes',array('POST'));
-         $this->db->query("INSERT INTO eq_visit (family,companionship,date,notes) "
+         $this->db->query("INSERT INTO 3rd_visit (family,companionship,date,notes) "
                           . "VALUES ('" . $family . "','" . $companionship . "','"
                           . $date . "','" . $notes . "')",__LINE__,__FILE__);
          $this->vis_view();
@@ -3125,7 +3158,7 @@ class eq
 
       if($action == 'edit' || $action == 'view')
        {
-         $sql = "SELECT * FROM eq_visit WHERE visit=".$visit;
+         $sql = "SELECT * FROM 3rd_visit WHERE visit=".$visit;
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $this->t->set_var('visit',$visit);
@@ -3182,7 +3215,7 @@ class eq
 
       $this->t->set_block('att_view_t','month_list','list1');
       $this->t->set_block('att_view_t','header_list','list2');
-      $this->t->set_block('att_view_t','elder_list','list3');
+      $this->t->set_block('att_view_t','indiv_list','list3');
       
       $this->t->set_var('linkurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.att_view'));
       $num_quarters = get_var('num_quarters',array('GET','POST'));
@@ -3199,16 +3232,16 @@ class eq
       else if($current_month >= 7 && $current_month <= 9) { $current_month=9; }
       else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
 
-      $sql = "SELECT * FROM eq_elder where valid=1";
+      $sql = "SELECT * FROM 3rd_indiv where valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
        {
-         $elder_name[$i] = $this->db->f('name');
-         $elder_id[$i] = $this->db->f('elder');
+         $indiv_name[$i] = $this->db->f('name');
+         $indiv_id[$i] = $this->db->f('indiv');
          $i++;
        }
-      array_multisort($elder_name, $elder_id);
+      array_multisort($indiv_name, $indiv_id);
       
       // Create a list of sunday dates for a window of 3 months back and current month
       $i=0; 
@@ -3235,7 +3268,7 @@ class eq
        if($found_sunday) { $i++; $found_sunday=0; }
       }
 
-      $total_elders = count($elder_id);
+      $total_indivs = count($indiv_id);
       $old_month=$sunday_list[0]['month']; $span=0;
       for ($i=0; $i < count($sunday_list); $i++) {
         $date = $sunday_list[$i]['date'];
@@ -3259,10 +3292,10 @@ class eq
          $this->t->fp('list1','month_list',True);
        } $span++;
       }
-      $this->t->set_var('total_elders',$total_elders);
+      $this->t->set_var('total_indivs',$total_indivs);
       $this->t->set_var('header_row',$header_row);
       
-      $elder_width=200; $att_width=25; $total_width=$elder_width; 
+      $indiv_width=200; $att_width=25; $total_width=$indiv_width; 
       for ($i=0; $i < count($sunday_list); $i++) {
        $link_data['menuaction'] = 'eq.eq.att_update';
        $link_data['month'] = $sunday_list[$i]['month'];
@@ -3280,17 +3313,17 @@ class eq
        $attendance[$monthnum[$sunday_list[$i]['month']]]=0;
       }
 
-      for ($i=0; $i < count($elder_id); $i++) {
+      for ($i=0; $i < count($indiv_id); $i++) {
         $att_table = "";
        $this->nextmatchs->template_alternate_row_color(&$this->t);
-       $this->t->set_var('elder_name',$elder_name[$i]);
-       #print "checking for elder: " . $elder_id[$i] . "<br>";
+       $this->t->set_var('indiv_name',$indiv_name[$i]);
+       #print "checking for indiv: " . $indiv_id[$i] . "<br>";
        for ($j=0; $j < count($sunday_list); $j++) {
          #print "checking for date: " .  $sunday_list[$j]['date'] . "<br>";
-         #print "SELECT * FROM eq_attendance WHERE date='"
-         #  . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i] . "<br>";
-         $sql = "SELECT * FROM eq_attendance WHERE date='"
-            . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
+         #print "SELECT * FROM 3rd_attendance WHERE date='"
+         #  . $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i] . "<br>";
+         $sql = "SELECT * FROM 3rd_attendance WHERE date='"
+            . $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i];
          $this->db->query($sql,__LINE__,__FILE__);
          if($this->db->next_record()) {
            $cur_month = $sunday_list[$j]['month'];
@@ -3304,10 +3337,10 @@ class eq
          }
        }
        $this->t->set_var('att_table',$att_table);
-       $this->t->fp('list3','elder_list',True);
+       $this->t->fp('list3','indiv_list',True);
       }
       $this->t->set_var('total_width',$total_width);
-      $this->t->set_var('elder_width',$elder_width);
+      $this->t->set_var('indiv_width',$indiv_width);
       $this->t->set_var('att_width',$att_width);
 
       # Now calculate attendance for these months
@@ -3321,17 +3354,17 @@ class eq
       foreach($attendance as $att => $value) {
        $total_attended = $attendance[$att];
        $ave_total_attended += $attendance[$att]; $num_months++;
-       $percent = ceil(($total_attended / $total_elders)*100);
+       $percent = ceil(($total_attended / $total_indivs)*100);
        $attendance_str.="<td align=center><font size=-2><b>$total_attended ($percent%)</b></font></td>";
-       $total_nonattended = $total_elders - $total_attended;
-       $percent = ceil(($total_nonattended / $total_elders)*100);
+       $total_nonattended = $total_indivs - $total_attended;
+       $percent = ceil(($total_nonattended / $total_indivs)*100);
        $nonattendance_str.="<td align=center><font size=-2><b>$total_nonattended ($percent%)</b></font></td>";
        
        $total_attended = ceil(($ave_total_attended / $num_months));
-       $percent = ceil(($total_attended / $total_elders)*100);
+       $percent = ceil(($total_attended / $total_indivs)*100);
        $aveattendance_str .= "<td align=center><font size=-2><b>$total_attended ($percent%)</b></font></td>";
-       $total_attended = $total_elders - ceil(($ave_total_attended / $num_months));
-       $percent = ceil(($total_attended / $total_elders)*100);
+       $total_attended = $total_indivs - ceil(($ave_total_attended / $num_months));
+       $percent = ceil(($total_attended / $total_indivs)*100);
        $avenonattendance_str .= "<td align=center><font size=-2><b>$total_attended ($percent%)</b></font></td>";
       }
       
@@ -3355,7 +3388,7 @@ class eq
       
       $this->t->set_block('form','month_list','list1');
       $this->t->set_block('form','header_list','list2');
-      $this->t->set_block('form','elder_list','list3');
+      $this->t->set_block('form','indiv_list','list3');
 
       $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.att_view'));
 
@@ -3367,41 +3400,41 @@ class eq
 
       if($action == 'save_month' || $action == 'save_day')
        {
-          $new_data = get_var('elders_attended',array('POST'));
+          $new_data = get_var('indivs_attended',array('POST'));
           $month = $monthnum[$month]; if($month < 10) { $month = "0" . $month; }
 
           if($action == 'save_month') {        
-             $this->db->query("DELETE from eq_attendance where date LIKE '".$year."-".$month."-%'",__LINE__,__FILE__);
+             $this->db->query("DELETE from 3rd_attendance where date LIKE '".$year."-".$month."-%'",__LINE__,__FILE__);
           }
 
           if($action == 'save_day') {        
-             $this->db->query("DELETE from eq_attendance where date LIKE '".$year."-".$month."-".$day."'",__LINE__,__FILE__);
+             $this->db->query("DELETE from 3rd_attendance where date LIKE '".$year."-".$month."-".$day."'",__LINE__,__FILE__);
           }   
 
           foreach ($new_data as $data)
           {
              $data_array = explode("-",$data);
-             $elder = $data_array[0];
+             $indiv = $data_array[0];
              $date  = "$data_array[1]-$data_array[2]-$data_array[3]";        
-             $this->db->query("INSERT INTO eq_attendance (elder,date) "
-                              . "VALUES (" . $elder . ",'". $date . "')",__LINE__,__FILE__);
+             $this->db->query("INSERT INTO 3rd_attendance (indiv,date) "
+                              . "VALUES (" . $indiv . ",'". $date . "')",__LINE__,__FILE__);
           }
        
         $this->att_view();
         return false;    
        }
 
-      $sql = "SELECT * FROM eq_elder where valid=1";
+      $sql = "SELECT * FROM 3rd_indiv where valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
        {
-         $elder_name[$i] = $this->db->f('name');
-         $elder_id[$i] = $this->db->f('elder');
-         $elder_attending[$elder_id[$i]] = $this->db->f('attending');
+         $indiv_name[$i] = $this->db->f('name');
+         $indiv_id[$i] = $this->db->f('indiv');
+         $indiv_attending[$indiv_id[$i]] = $this->db->f('attending');
          $i++;
        }
-      array_multisort($elder_name, $elder_id);
+      array_multisort($indiv_name, $indiv_id);
       
       if($action == 'update_month')
       {
@@ -3433,7 +3466,7 @@ class eq
        $this->t->set_var('month',$sunday_list[$i-1]['month']);
        $this->t->set_var('year',$sunday_list[$i-1]['year']);
        $this->t->fp('list1','month_list',True);
-       $elder_width=200; $att_width=25; $total_width=$elder_width;
+       $indiv_width=200; $att_width=25; $total_width=$indiv_width;
        for ($i=0; $i < count($sunday_list); $i++) {
          $link_data['menuaction'] = 'eq.eq.att_update';
          $link_data['month'] = $sunday_list[$i]['month'];
@@ -3465,25 +3498,25 @@ class eq
        $this->t->fp('list2','header_list',True);
       }           
             
-      for ($i=0; $i < count($elder_id); $i++) {
+      for ($i=0; $i < count($indiv_id); $i++) {
         $att_table = "";
        $this->nextmatchs->template_alternate_row_color(&$this->t);
-       $this->t->set_var('elder_name',$elder_name[$i]);
+       $this->t->set_var('indiv_name',$indiv_name[$i]);
        for ($j=0; $j < count($sunday_list); $j++) {
-         $sql = "SELECT * FROM eq_attendance WHERE date='"
-            . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
+         $sql = "SELECT * FROM 3rd_attendance WHERE date='"
+            . $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i];
          $this->db->query($sql,__LINE__,__FILE__);
-         $value = $elder_id[$i] . "-" . $sunday_list[$j]['date'];
+         $value = $indiv_id[$i] . "-" . $sunday_list[$j]['date'];
          if($this->db->next_record()) {
-           $att_table .= '<td align=center><input type="checkbox" name="elders_attended[]" value="'.$value.'" checked></td>';
-         } else if($elder_attending[$elder_id[$i]] == 1) {
-           $att_table .= '<td align=center><input type="checkbox" name="elders_attended[]" value="'.$value.'" checked></td>';
+           $att_table .= '<td align=center><input type="checkbox" name="indivs_attended[]" value="'.$value.'" checked></td>';
+         } else if($indiv_attending[$indiv_id[$i]] == 1) {
+           $att_table .= '<td align=center><input type="checkbox" name="indivs_attended[]" value="'.$value.'" checked></td>';
          } else {
-           $att_table .= '<td align=center><input type="checkbox" name="elders_attended[]" value="'.$value.'"></td>';
+           $att_table .= '<td align=center><input type="checkbox" name="indivs_attended[]" value="'.$value.'"></td>';
          }
        }
        $this->t->set_var('att_table',$att_table);
-       $this->t->fp('list3','elder_list',True);
+       $this->t->fp('list3','indiv_list',True);
       } 
            
       $this->t->set_var('lang_done', 'Cancel');
@@ -3501,7 +3534,7 @@ class eq
       $this->t->set_file(array('dir_view_t' => 'dir_view.tpl'));
       $this->t->set_block('dir_view_t','dir_list','list');
       
-      $sql = "SELECT * FROM eq_parent where valid=1 ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_parent where valid=1 ORDER BY name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
@@ -3537,7 +3570,7 @@ class eq
       $this->t->set_block('org_view_t','org_list','list2');
 
       # Display a list ordered alphabetically
-      $sql = "SELECT * FROM eq_calling ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_calling ORDER BY name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
@@ -3565,7 +3598,7 @@ class eq
       }
 
       # Display a list ordered by organization
-      $sql = "SELECT * FROM eq_calling ORDER BY sequence ASC";
+      $sql = "SELECT * FROM 3rd_calling ORDER BY sequence ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
@@ -3604,7 +3637,7 @@ class eq
       $action = get_var('action',array('GET','POST'));
       
       $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.schedule&action=save'));
-      $this->t->set_var('title','EQ Scheduling Tool');
+      $this->t->set_var('title','Scheduling Tool');
 
       $this->t->set_var('lang_save','Save Schedule');
       $this->t->set_var('lang_reset','Cancel');
@@ -3618,28 +3651,29 @@ class eq
       $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched'));
       $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
       
-      $date_width=150; $time_width=225; $elder_width=200; $family_width=200; $location_width=100;
-      $table_width=$date_width + $time_width + $elder_width + $family_width + $location_width;
+      $date_width=150; $time_width=220; $indiv_width=170; $family_width=180; $location_width=100;
+      $table_width=$date_width + $time_width + $indiv_width + $family_width + $location_width;
       $header_row = "<th width=$date_width><font size=-2>Date</th>";
       $header_row.= "<th width=$time_width><font size=-2>Time</th>";      
-      $header_row.= "<th width=$elder_width><font size=-2>Elder</th>";
+      $header_row.= "<th width=$indiv_width><font size=-2>individual</th>";
       $header_row.= "<th width=$family_width><font size=-2>Family</th>";
       $header_row.= "<th width=$location_width><font size=-2>Location</th>";
       $table_data = "";
 
-      $sql = "SELECT * FROM eq_presidency where valid=1";
+      $sql = "SELECT * FROM 3rd_presidency where valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
        {
          $presidency_data[$i]['id'] = $this->db->f('presidency');
          $presidency_data[$i]['name'] = $this->db->f('name');
-         $presidency_data[$i]['elder'] = $this->db->f('elder');
+         $presidency_data[$i]['indiv'] = $this->db->f('indiv');
          $presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name'];
+         $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['indiv'];
          $i++;
        }
       
-      $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_family where valid=1 and indiv_id != 0 ORDER BY name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
@@ -3647,7 +3681,7 @@ class eq
          $family_id[$i] = $this->db->f('family');
          $family_name[$i] = $this->db->f('name');
          $familyid2name[$family_id[$i]] = $family_name[$i];
-         $sql = "SELECT * FROM eq_parent where family='$family_id[$i]'";
+         $sql = "SELECT * FROM 3rd_parent where family='$family_id[$i]'";
          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
            $familyid2address[$family_id[$i]] = $this->db2->f('address');
@@ -3670,7 +3704,7 @@ class eq
                 $hour = $entry['hour'];
                 $minute = $entry['minute'];
                 $pm = $entry['pm'];
-                $elder = $entry['elder'];
+                $indiv = $entry['indiv'];
                 $family = $entry['family'];
                 $location = $entry['location'];
                 if($pm) { $hour = $hour + 12; }
@@ -3685,30 +3719,40 @@ class eq
                     $family_address = $familyid2address[$family];
                     $location = "$family_last_name"." home ($family_address)";
                   }
-                  else if($elder > 0) {
+                  else if($indiv > 0) {
                     $supervisor_name_array = explode(",",$presidency2name[$presidency]);
                     $supervisor_last_name = $supervisor_name_array[0];
-                    $location = "$supervisor_last_name"." home";
+                    $sql = "SELECT * FROM 3rd_indiv where indiv='$presidency2indiv[$presidency]'";
+                    $this->db2->query($sql,__LINE__,__FILE__);
+                    if($this->db2->next_record()) {
+                      $indiv_id = $this->db2->f('indiv_id');
+                    }
+                    $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+                    $this->db2->query($sql,__LINE__,__FILE__);
+                    if($this->db2->next_record()) {
+                      $supervisor_address = $this->db2->f('address');
+                    }
+                    $location = "$supervisor_last_name"." home ($supervisor_address)";
                   }
                 }
                 
-                // Zero out the family or elder if date = NULL
+                // Zero out the family or individual if date = NULL
                 if($date == "") {
-                  $elder = 0;
+                  $indiv = 0;
                   $family = 0;
                   $location = "";
                 }
 
-                if(($elder == 0) && ($family == 0)) { $location = ""; }
+                if(($indiv == 0) && ($family == 0)) { $location = ""; }
                 
                 // Update an existing appointment
                 if($appointment < $this->max_appointments)
                   {
                     //Only perform a database update if we have made a change to this appointment
-                    $sql = "SELECT * FROM eq_appointment where " .
+                    $sql = "SELECT * FROM 3rd_appointment where " .
                        "appointment='$appointment'" .
                        " and presidency='$presidency'" .
-                       " and elder='$elder'" .
+                       " and indiv='$indiv'" .
                        " and family='$family'" .
                        " and date='$date'" .
                        " and time='$time'" .
@@ -3717,9 +3761,9 @@ class eq
                     if(!$this->db->next_record()) {
                       $old_date = $this->db->f('date');
                       $old_time = $this->db->f('time');
-                      $this->db2->query("UPDATE eq_appointment set" .
+                      $this->db2->query("UPDATE 3rd_appointment set" .
                                        " family=" . $family . 
-                                       " ,elder=" . $elder . 
+                                       " ,indiv=" . $indiv . 
                                        " ,date='" . $date . "'" .
                                        " ,time='" . $time . "'" .
                                        " ,location='" . $location . "'" .
@@ -3734,15 +3778,15 @@ class eq
                 // Add a new appointment
                 else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
                   {
-                    //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family<br>";
-                    $this->db2->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time,location,uid) "
-                          . "VALUES (NULL,'" . $presidency . "','" . $family . "','" . $elder . "','"
+                    //print "adding entry: appt=$appointment date: $date time: $time indiv: $indiv family: $family<br>";
+                    $this->db2->query("INSERT INTO 3rd_appointment (appointment,presidency,family,indiv,date,time,location,uid) "
+                          . "VALUES (NULL,'" . $presidency . "','" . $family . "','" . $indiv . "','"
                           . $date . "','" . $time  . "','" . $location . "','" . $uid ."')",__LINE__,__FILE__);
 
                     // Now reselect this entry from the database to see if we need
                     // to send an appointment out for it.
-                    $sql = "SELECT * FROM eq_appointment where " .
-                       "elder='$elder'" .
+                    $sql = "SELECT * FROM 3rd_appointment where " .
+                       "indiv='$indiv'" .
                        " and family='$family'" .
                        " and presidency='$presidency'" .
                        " and date='$date'" .
@@ -3752,7 +3796,7 @@ class eq
                     $this->db3->query($sql,__LINE__,__FILE__);
                     if($this->db3->next_record()) {
                       // Email the appointment if warranted
-                      if(($date != "") && ($time != "") && (($elder > 0) || $family > 0)) { 
+                      if(($date != "") && ($time != "") && (($indiv > 0) || $family > 0)) { 
                         $this->email_appt($this->db3->f('appointment'));
                       }
                     }
@@ -3764,34 +3808,34 @@ class eq
          //Header('Location: ' . $take_me_to_url);
        }
       
-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
        {
-         $elder_id[$i] = $this->db->f('elder');
-         $elder_name[$i] = $this->db->f('name');
-         $elder_phone[$elder_id[$i]] = $this->db->f('phone');
+         $indiv_id[$i] = $this->db->f('indiv');
+         $indiv_name[$i] = $this->db->f('name');
+         $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
          $i++;
        }
-      array_multisort($elder_name, $elder_id);
+      array_multisort($indiv_name, $indiv_id);
       
       for ($i=0; $i < count($presidency_data); $i++) {
        $presidency = $presidency_data[$i]['id'];
-       $interviewer = $presidency_data[$i]['elder'];
+       $interviewer = $presidency_data[$i]['indiv'];
        $name = $presidency_data[$i]['name'];
        $this->t->set_var('presidency_name',$name);
        $table_data="";
        
        // query the database for all the appointments
-       $sql = "SELECT * FROM eq_appointment where presidency=$presidency and date>=CURDATE() ORDER BY date ASC, time ASC";
+       $sql = "SELECT * FROM 3rd_appointment where presidency=$presidency and date>=CURDATE() ORDER BY date ASC, time ASC";
        $this->db->query($sql,__LINE__,__FILE__);
 
        // Prefill any existing appointment slots
        while ($this->db->next_record())
          {
            $appointment = $this->db->f('appointment');
-           $elder = $this->db->f('elder');
+           $indiv = $this->db->f('indiv');
            $family = $this->db->f('family');
            $location = $this->db->f('location');
 
@@ -3802,10 +3846,20 @@ class eq
                $family_address = $familyid2address[$family];
                $location = "$family_last_name"." home ($family_address)";
              }
-             else if($elder > 0) {
+             else if($indiv > 0) {
                $supervisor_name_array = explode(",",$presidency2name[$presidency]);
                $supervisor_last_name = $supervisor_name_array[0];
-               $location = "$supervisor_last_name"." home";
+               $sql = "SELECT * FROM 3rd_indiv where indiv='$presidency2indiv[$presidency]'";
+               $this->db2->query($sql,__LINE__,__FILE__);
+               if($this->db2->next_record()) {
+                 $indiv_id = $this->db2->f('indiv_id');
+               }
+               $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+               $this->db2->query($sql,__LINE__,__FILE__);
+               if($this->db2->next_record()) {
+                 $supervisor_address = $this->db2->f('address');
+               }
+               $location = "$supervisor_last_name"." home ($supervisor_address)";
              }
            }
            
@@ -3834,21 +3888,21 @@ class eq
            $table_data .= $this->get_time_selection_form($hour, $minute, $pm, $presidency, $appointment);
            $table_data.= "</td>";
            
-           // Elder drop down list (for PPIs)
-           $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][elder]>';
+           // individual drop down list (for PPIs)
+           $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv] STYLE="font-size : 8pt">';
            $table_data.= '<option value=0></option>';  
-           for ($j=0; $j < count($elder_id); $j++) {
-             $id = $elder_id[$j];
-             $name = $elder_name[$j];
-             if($elder_id[$j] == $elder) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
+           for ($j=0; $j < count($indiv_id); $j++) {
+             $id = $indiv_id[$j];
+             $name = $indiv_name[$j];
+             if($indiv_id[$j] == $indiv) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
              $table_data.= '<option value='.$id.' '.$selected[$id].'>'.$name.'</option>';
            }
            $table_data.='</select></td>';
 
            // Family drop down list (for Visits)
-           $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][family]>';
+           $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][family] STYLE="font-size : 8pt">';
            $table_data.= '<option value=0></option>';              
-           for ($j=0; $j < count($elder_id); $j++) {
+           for ($j=0; $j < count($indiv_id); $j++) {
              $id = $family_id[$j];
              $name = $family_name[$j];
              if($family_id[$j] == $family) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
@@ -3858,7 +3912,7 @@ class eq
 
            // Location text box
            $table_data.= '<td align=center><input type=text size="25" maxlength="120" ';
-           $table_data.= 'name="sched['.$presidency.']['.$appointment.'][location]" value="'.$location.'">';
+           $table_data.= 'name="sched['.$presidency.']['.$appointment.'][location]" value="'.$location.'" STYLE="font-size : 8pt">';
            
            $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][appointment]" value="'.$appointment.'">';
            $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][presidency]" value="'.$presidency.'">';
@@ -3883,20 +3937,20 @@ class eq
          $table_data .= $this->get_time_selection_form(0, 0, 0, $presidency, $appointment);
          $table_data.= "</td>";
          
-         // Elder drop down list
-         $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][elder]>';
+         // individual drop down list
+         $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv] STYLE="font-size : 8pt">';
          $table_data.= '<option value=0></option>';  
-         for ($j=0; $j < count($elder_id); $j++) {
-           $id = $elder_id[$j];
-           $name = $elder_name[$j];
+         for ($j=0; $j < count($indiv_id); $j++) {
+           $id = $indiv_id[$j];
+           $name = $indiv_name[$j];
            $table_data.= '<option value='.$id.'>'.$name.'</option>';
          }
          $table_data.='</select></td>';
          
          // Family drop down list
-         $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][family]>';
+         $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][family] STYLE="font-size : 8pt">';
          $table_data.= '<option value=0></option>';        
-         for ($j=0; $j < count($elder_id); $j++) {
+         for ($j=0; $j < count($indiv_id); $j++) {
            $id = $family_id[$j];
            $name = $family_name[$j];
            $table_data.= '<option value='.$id.'>'.$name.' Family</option>';
@@ -3905,7 +3959,7 @@ class eq
 
          // Location text box
          $table_data.= '<td align=center><input type=text size="25" maxlength="120" ';
-         $table_data.= 'name="sched['.$presidency.']['.$appointment.'][location]" value="">';
+         $table_data.= 'name="sched['.$presidency.']['.$appointment.'][location]" value="" STYLE="font-size : 8pt">';
          
          $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][appointment]" value="'.$appointment.'">';
          $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][presidency]" value="'.$presidency.'">';
@@ -3928,12 +3982,12 @@ class eq
   function email()
     {
       $this->t->set_file(array('email_t' => 'email.tpl'));
-      $this->t->set_block('email_t','elder_list','list');
+      $this->t->set_block('email_t','indiv_list','list');
 
       $action = get_var('action',array('GET','POST'));
       
       $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email'));
-      $this->t->set_var('title','EQ Email Tool');
+      $this->t->set_var('title','Email Tool');
 
       $this->t->set_var('lang_email','Send Email');
       $this->t->set_var('lang_reset','Cancel');
@@ -3972,17 +4026,17 @@ class eq
 
       $this->t->pfp('out','admin_t');
 
-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
        {
-         $elder_id[$i] = $this->db->f('elder');
-         $elder_name[$i] = $this->db->f('name');
-         $elder2name[$elder_id[$i]] = $elder_name[$i];
+         $indiv_id[$i] = $this->db->f('indiv');
+         $indiv_name[$i] = $this->db->f('name');
+         $indiv2name[$indiv_id[$i]] = $indiv_name[$i];
          $i++;
        }
-      array_multisort($elder_name, $elder_id);
+      array_multisort($indiv_name, $indiv_id);
 
       if($action == 'upload')
        {        
@@ -3996,6 +4050,12 @@ class eq
            if(!move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path)) {
              $uploadstatus = "<b><font color=red> -E- Unable to move the uploaded file to ";
              $uploadstatus.= "the target path (check the path and permissions) of: $target_path</font></b>";
+             $uploadstatus = "<b>The following file was uploaded successfully: </b><br><br>";
+             $uploadstatus.= "Tmp Filename : " . $_FILES['uploadedfile']['tmp_name'] . "<br>";
+             $uploadstatus.= "Filename     : " . $_FILES['uploadedfile']['name'] . "<br>";
+             $uploadstatus.= "Type         : " . $_FILES['uploadedfile']['type'] . "<br>";
+             $uploadstatus.= "Size         : " . $_FILES['uploadedfile']['size'] . "<br>";
+             $uploadstatus.= "Error        : " . $_FILES['uploadedfile']['error'] . "<br>";     
              $this->t->set_var('uploadstatus',$uploadstatus);
              $this->t->pfp('uploadhandle','upload',True);
              return 0;
@@ -4060,7 +4120,7 @@ class eq
            
            # run the import perl script to encorporate it into the DB
            ob_start('ob_logstdout', 2);
-           print "-> Importing the data into the EQ database<br>\n";
+           print "-> Importing the data into the database<br>\n";
            ob_flush(); flush(); sleep(1);
            $import_log = $this->upload_target_path . '/import.log';
            $data_log = $this->upload_target_path . '/data.log';
@@ -4101,25 +4161,25 @@ class eq
           {
             $id = $entry['id'];
             $email = $entry['email'];
-            $elder = $entry['elder'];
+            $indiv = $entry['indiv'];
             $name = $entry['name'];
             $district = $entry['district'];
             $president = $entry['president'];
             $counselor = $entry['counselor'];
             $secretary = $entry['secretary'];
             $eqpresidency = $entry['eqpresidency'];
-            // Set the elder id to 0 for EQ Presidency tagged entry
-            if($eqpresidency == 1) { $elder="0"; }
-            // Re-look up the elder name for the ID if we aren't an EQ Presidency tagged entry
-            else { $name = $elder2name[$elder]; }
-            //print "id=$id elder=$elder name=$name email=$email district=$district president=$president ";
+            // Set the individual id to 0 for EQ Presidency tagged entry
+            if($eqpresidency == 1) { $indiv="0"; }
+            // Re-look up the individual name for the ID if we aren't an EQ Presidency tagged entry
+            else { $name = $indiv2name[$indiv]; }
+            //print "id=$id indiv=$indiv name=$name email=$email district=$district president=$president ";
             //print "counselor=$counselor secretary=$secretary eqpres=$eqpresidency<br>";
 
-            if(($elder > 0) || ($name != "")) {
+            if(($indiv > 0) || ($name != "")) {
               if($id < $this->max_presidency_members) {
                 //print "Updating Existing Entry<br>";
-                $this->db2->query("UPDATE eq_presidency set" .
-                                  " elder=" . $elder . 
+                $this->db2->query("UPDATE 3rd_presidency set" .
+                                  " indiv=" . $indiv . 
                                   " ,district=" . $district . 
                                   " ,name='" . $name . "'" .
                                   " ,email='" . $email . "'" .
@@ -4131,9 +4191,9 @@ class eq
                 
               } else {
                 //print "Adding New Entry<br>";
-                $this->db2->query("INSERT INTO eq_presidency (presidency,elder,district,name,"
+                $this->db2->query("INSERT INTO 3rd_presidency (presidency,indiv,district,name,"
                                   . "email,president,counselor,secretary,eqpres,valid) "
-                                  . "VALUES (NULL,'" . $elder . "','" . $district . "','"
+                                  . "VALUES (NULL,'" . $indiv . "','" . $district . "','"
                                   . $name . "','" . $email . "','" . $president  . "','"
                                   . $counselor . "','" . $secretary . "','" . $eqpres  . "','1'"
                                   .")",__LINE__,__FILE__);
@@ -4143,31 +4203,31 @@ class eq
             }
           }
 
-         // Now update the eq_district table appropriately
+         // Now update the 3rd_district table appropriately
          
          // Delete all the previous district entries from the table
-         $this->db->query("DELETE from eq_district where valid=1",__LINE__,__FILE__);
-         $this->db->query("DELETE from eq_district where valid=0",__LINE__,__FILE__);
+         $this->db->query("DELETE from 3rd_district where valid=1",__LINE__,__FILE__);
+         $this->db->query("DELETE from 3rd_district where valid=0",__LINE__,__FILE__);
 
          // Always add a "District 0" assigned to the High Priests Group
          $district = 0;
          $name = "High Priests";
-         $elder = 0;
+         $indiv = 0;
          $valid = 0;
-         $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) "
+         $this->db2->query("INSERT INTO 3rd_district (district,name,supervisor,valid) "
                            . "VALUES ('" . $district . "','" . $name . "','"
-                           . $elder . "','" . $valid . "'"
+                           . $indiv . "','" . $valid . "'"
                            .")",__LINE__,__FILE__);
          
          
-         // Requery the eq_presidency table
-         $sql = "SELECT * FROM eq_presidency where valid=1";
+         // Requery the 3rd_presidency table
+         $sql = "SELECT * FROM 3rd_presidency where valid=1";
          $this->db->query($sql,__LINE__,__FILE__);
          while ($this->db->next_record())
            {
              // Extract the data for each presidency record
              $id = $this->db->f('presidency');
-             $elder = $this->db->f('elder');
+             $indiv = $this->db->f('indiv');
              $name = $this->db->f('name');
              $district = $this->db->f('district');
              $name = $this->db->f('name');
@@ -4175,9 +4235,9 @@ class eq
 
              // If we have a valid district, add it to the district table
              if($district > 0) {
-               $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) "
+               $this->db2->query("INSERT INTO 3rd_district (district,name,supervisor,valid) "
                                  . "VALUES ('" . $district . "','" . $name . "','"
-                                 . $elder . "','" . $valid . "'"
+                                 . $indiv . "','" . $valid . "'"
                                  .")",__LINE__,__FILE__);
              }
              
@@ -4194,15 +4254,15 @@ class eq
 
       // Now save off the data needed for an EQ Presidency Table Update
       
-      $sql = "SELECT * FROM eq_presidency where valid=1";
+      $sql = "SELECT * FROM 3rd_presidency where valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       $table_data = "";
-      $header_row = "<th>Elder</th><th>Email</th><th>District</th><th>President</th><th>Counselor</th><th>Secretary</th><th>EQ Presidency</th>";
+      $header_row = "<th>Individual</th><th>Email</th><th>District</th><th>President</th><th>Counselor</th><th>Secretary</th><th>Presidency</th>";
       while ($this->db->next_record())
        {
          // Extract the data for each presidency record
          $id = $this->db->f('presidency');
-         $elder = $this->db->f('elder');
+         $indiv = $this->db->f('indiv');
          $district = $this->db->f('district');
          $name = $this->db->f('name');
          $email = $this->db->f('email');
@@ -4217,21 +4277,21 @@ class eq
          // Presidency ID
          $table_data .= '<input type=hidden name="eqpres['.$id.'][id]" value="'.$id.'">';
          
-         // Elder
+         // individual
          if($eqpresidency == 0) { 
-           $table_data.= '<td align=center><select name="eqpres['.$id.'][elder]">';
+           $table_data.= '<td align=center><select name="eqpres['.$id.'][indiv]">';
            $table_data.= '<option value=0></option>';  
-           for ($j=0; $j < count($elder_id); $j++) {
-             $tmp_id = $elder_id[$j];
-             $name = $elder_name[$j];
-             if($elder_id[$j] == $elder) { $eldername = $name; $selected = 'selected="selected"'; } else { $selected = ''; }
+           for ($j=0; $j < count($indiv_id); $j++) {
+             $tmp_id = $indiv_id[$j];
+             $name = $indiv_name[$j];
+             if($indiv_id[$j] == $indiv) { $indivname = $name; $selected = 'selected="selected"'; } else { $selected = ''; }
              $table_data.= '<option value='.$tmp_id.' '.$selected.'>'.$name.'</option>';
            }
            $table_data.='</select></td>';
-           $table_data.='<input type=hidden name="eqpres['.$id.'][name]" value="'.$eldername.'">';
+           $table_data.='<input type=hidden name="eqpres['.$id.'][name]" value="'.$indivname.'">';
          } else {
-           $table_data.= '<td align=left><input type=text size="20" name="eqpresname" value="EQ Presidency"></td>';
-           $table_data.= '<input type=hidden name="eqpres['.$id.'][name]" value="EQ Presidency">';
+           $table_data.= '<td align=left><input type=text size="20" name="eqpresname" value="Presidency"></td>';
+           $table_data.= '<input type=hidden name="eqpres['.$id.'][name]" value="Presidency">';
          }
            
          // Email Address
@@ -4264,7 +4324,7 @@ class eq
          else { $table_data .= '<option value=0 selected="selected">0</option><option value=1>1</option>'; }
          $table_data.='</select></td>';
 
-         // EQ Presidency
+         // Presidency
          $table_data.= '<td align=center><select name="eqpres['.$id.'][eqpresidency]">';
          if($eqpresidency == 1) { $table_data .= '<option value=0>0</option><option value=1 selected="selected">1</option>'; }
          else { $table_data .= '<option value=0 selected="selected">0</option><option value=1>1</option>'; }
@@ -4276,17 +4336,17 @@ class eq
          $this->t->set_var('tr_color',$tr_color);
        }
 
-      // Now create 1 blank row to always have a line available to add a new elder with
+      // Now create 1 blank row to always have a line available to add a new individual with
       $id = $this->max_presidency_members;
       $table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
       // Presidency ID
       $table_data .= '<input type=hidden name="eqpres['.$id.'][id]" value="'.$id.'">';
-      // Elder
-      $table_data.= '<td align=center><select name="eqpres['.$id.'][elder]">';
+      // individual
+      $table_data.= '<td align=center><select name="eqpres['.$id.'][indiv]">';
       $table_data.= '<option value=0></option>';  
-      for ($j=0; $j < count($elder_id); $j++) {
-       $tmp_id = $elder_id[$j];
-       $name = $elder_name[$j];
+      for ($j=0; $j < count($indiv_id); $j++) {
+       $tmp_id = $indiv_id[$j];
+       $name = $indiv_name[$j];
        $table_data.= '<option value='.$tmp_id.'>'.$name.'</option>';
       }
       $table_data.='</select></td>';
@@ -4313,7 +4373,7 @@ class eq
       $table_data.= '<td align=center><select name="eqpres['.$id.'][secretary]">';
       $table_data.= '<option value=0>0</option><option value=1>1</option>';
       $table_data.='</select></td>';
-      // EQ Presidency
+      // Presidency
       $table_data.= '<td align=center><select name="eqpres['.$id.'][eqpresidency]">';
       $table_data.= '<option value=0>0</option><option value=1>1</option>';
       $table_data.='</select></td>';
@@ -4333,7 +4393,7 @@ class eq
     {
       //print "Emailing notification of appointment: $appointment <br>";
 
-      $sql = "SELECT * FROM eq_appointment where appointment='$appointment'";
+      $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment'";
       $this->db->query($sql,__LINE__,__FILE__);
        
       while ($this->db->next_record())
@@ -4343,8 +4403,8 @@ class eq
          $location = $this->db->f('location');
          $interviewer = "";
          $email = "";
-         $elder = $this->db->f('elder');
-         $elder_name = "";
+         $indiv = $this->db->f('indiv');
+         $indiv_name = "";
          $family = $this->db->f('family');
          $family_name = "";
          $appt_name = "";
@@ -4364,37 +4424,36 @@ 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'";
+         $sql = "SELECT * FROM 3rd_presidency where presidency='$presidency'";
          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
            $email = $this->db2->f('email');
            $interviewer = $this->db2->f('name');
          }
 
-         if($elder > 0) { 
-           $sql = "SELECT * FROM eq_elder where elder='$elder'";
+         // Set the email address of the interviewer
+         $from = $email;
+
+         if($indiv > 0) { 
+           $sql = "SELECT * FROM 3rd_indiv where indiv='$indiv'";
            $this->db2->query($sql,__LINE__,__FILE__);
            if($this->db2->next_record()) {
-             $elder_name = $this->db2->f('name');
+             $indiv_name = $this->db2->f('name');
              $phone = $this->db2->f('phone');
-             $appt_name = $elder_name . " Interview";
+             $appt_name = $indiv_name . " Interview";
              $duration = $this->default_ppi_appt_duration * 60;
            }
          }
 
          if($family > 0) { 
-           $sql = "SELECT * FROM eq_family where family='$family'";
+           $sql = "SELECT * FROM 3rd_family where family='$family'";
            $this->db2->query($sql,__LINE__,__FILE__);
            if($this->db2->next_record()) {
              $family_name = $this->db2->f('name');
              $phone = $this->db2->f('phone');
-             $elder_id = $this->db2->f('elder_id');
+             $indiv_id = $this->db2->f('indiv_id');
              $appt_name = $family_name . " Family Visit";
-             $sql = "SELECT * FROM eq_elder where elder='$elder_id'";
+             $sql = "SELECT * FROM 3rd_indiv where indiv='$indiv_id'";
              $this->db3->query($sql,__LINE__,__FILE__);
              if($this->db3->next_record()) {
                $phone = $this->db3->f('phone');
@@ -4415,7 +4474,7 @@ class eq
            $uid = rand() . rand(); // Generate a random identifier for this appointment
            $subject = "Created: $appt_name";
            
-           $this->db->query("UPDATE eq_appointment set" .
+           $this->db->query("UPDATE 3rd_appointment set" .
                             " uid=" . $uid . 
                             " WHERE appointment=" . $appointment,__LINE__,__FILE__);
 
@@ -4429,7 +4488,7 @@ class eq
            print "Sent deleted appointment to " . $interviewer . " at " . $email . " for " . $appt_date . " " . $appt_time . "<br>";
            $subject = "Canceled: $appt_date $appt_time";
            
-           $this->db->query("UPDATE eq_appointment set" .
+           $this->db->query("UPDATE 3rd_appointment set" .
                             " uid=0" . 
                             " WHERE appointment=" . $appointment,__LINE__,__FILE__);
            
@@ -4447,7 +4506,7 @@ class eq
                                  $dtend, $date, $location, $subject, $subject, $uid);
            
            $uid = rand() . rand(); // Generate a random identifier for this appointment
-           $this->db->query("UPDATE eq_appointment set" .
+           $this->db->query("UPDATE 3rd_appointment set" .
                             " uid=" . $uid .
                             " WHERE appointment=" . $appointment,__LINE__,__FILE__);