X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=2b16e7a39c0cbb333d32bf24a7ee2094fef88aa7;hb=abf09ae712c55d6e251ffd4a89dc63faa64b971a;hp=2c53def85f89b6bc3f2b096dac6fc36556b5b32a;hpb=477ea41b8890c9ffefd9f9b0fb58367492a59de9;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 2c53def..2b16e7a 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -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'`;
@@ -202,22 +202,22 @@ class eq
$i++;
}
- $sql = "SELECT * FROM 3rd_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 3rd_aaronic where valid=1 ORDER BY aaronic ASC";
@@ -261,11 +261,11 @@ class eq
// Get this companions information
if($companion_table_entry != "") { $companion_table_entry .= "
$name ";
- // 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="Companionship ";
for($m=$num_months; $m >= 0; $m--) {
$month = $current_month - $m;
@@ -2793,7 +2793,7 @@ class eq
$month_end = "$year"."-"."$month"."-"."31";
$month = "$month"."/"."$year";
$sql = "SELECT * FROM 3rd_interview WHERE date >= '$month_start' AND date <= '$month_end' ".
- "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id;
+ "AND indiv=" . $indiv_id . " AND aaronic=" . $aaronic_id;
$this->db2->query($sql,__LINE__,__FILE__);
$header_row .= "$month ";
@@ -2805,7 +2805,7 @@ 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['interview'] = $this->db2->f('interview');
@@ -2885,7 +2885,7 @@ class eq
$interviewer = get_var('interviewer',array('GET','POST'));
$name = get_var('name',array('GET','POST'));
$interview = get_var('interview',array('GET','POST'));
- $elder = get_var('elder',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'));
@@ -2895,9 +2895,9 @@ class eq
$this->db2->query($sql,__LINE__,__FILE__);
while ($this->db2->next_record())
{
- $elder = $this->db2->f('elder');
+ $indiv = $this->db2->f('indiv');
$interviewer_name = $this->db2->f('name');
- if($elder == $interviewer) {
+ if($indiv == $interviewer) {
$this->t->set_var('interviewer',$interviewer . ' selected');
} else {
$this->t->set_var('interviewer',$interviewer);
@@ -2912,7 +2912,7 @@ class eq
$this->db->query("UPDATE 3rd_interview set " .
" interview='" . $interview . "'" .
", interviewer='" . $interviewer . "'" .
- ", elder='" . $elder . "'" .
+ ", indiv='" . $indiv . "'" .
", aaronic='" . $aaronic . "'" .
", date='" . $date . "'" .
", notes='" . $notes . "'" .
@@ -2925,8 +2925,8 @@ class eq
if($action == 'insert')
{
$notes = get_var('notes',array('POST'));
- $this->db->query("INSERT INTO 3rd_interview (interviewer,elder,aaronic,date,notes,interview_type) "
- . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
+ $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;
@@ -2938,7 +2938,7 @@ class eq
$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','');
@@ -2956,7 +2956,7 @@ class eq
$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'));
@@ -3215,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'));
@@ -3232,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 3rd_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;
@@ -3268,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'];
@@ -3292,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'];
@@ -3313,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] . " ";
+ $this->t->set_var('indiv_name',$indiv_name[$i]);
+ #print "checking for indiv: " . $indiv_id[$i] . " ";
for ($j=0; $j < count($sunday_list); $j++) {
#print "checking for date: " . $sunday_list[$j]['date'] . " ";
#print "SELECT * FROM 3rd_attendance WHERE date='"
- # . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i] . " ";
+ # . $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i] . " ";
$sql = "SELECT * FROM 3rd_attendance WHERE date='"
- . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
+ . $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'];
@@ -3337,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
@@ -3354,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.="$total_attended ($percent%) ";
- $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.="$total_nonattended ($percent%) ";
$total_attended = ceil(($ave_total_attended / $num_months));
- $percent = ceil(($total_attended / $total_elders)*100);
+ $percent = ceil(($total_attended / $total_indivs)*100);
$aveattendance_str .= "$total_attended ($percent%) ";
- $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 .= "$total_attended ($percent%) ";
}
@@ -3388,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'));
@@ -3400,7 +3400,7 @@ 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') {
@@ -3414,27 +3414,27 @@ class eq
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 3rd_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 3rd_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')
{
@@ -3466,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'];
@@ -3498,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 3rd_attendance WHERE date='"
- . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
+ . $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 .= ' ';
- } else if($elder_attending[$elder_id[$i]] == 1) {
- $att_table .= ' ';
+ $att_table .= ' ';
+ } else if($indiv_attending[$indiv_id[$i]] == 1) {
+ $att_table .= ' ';
} else {
- $att_table .= ' ';
+ $att_table .= ' ';
}
}
$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');
@@ -3637,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');
@@ -3651,11 +3651,11 @@ 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=220; $elder_width=170; $family_width=180; $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 = "Date ";
$header_row.= "Time ";
- $header_row.= "Elder ";
+ $header_row.= "individual ";
$header_row.= "Family ";
$header_row.= "Location ";
$table_data = "";
@@ -3667,13 +3667,13 @@ class eq
{
$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'];
- $presidency2elder[$presidency_data[$i]['id']] = $presidency_data[$i]['elder'];
+ $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['indiv'];
$i++;
}
- $sql = "SELECT * FROM 3rd_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())
@@ -3704,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; }
@@ -3719,10 +3719,10 @@ 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];
- $sql = "SELECT * FROM 3rd_elder where elder='$presidency2elder[$presidency]'";
+ $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');
@@ -3736,14 +3736,14 @@ class eq
}
}
- // 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)
@@ -3752,7 +3752,7 @@ class eq
$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'" .
@@ -3763,7 +3763,7 @@ class eq
$old_time = $this->db->f('time');
$this->db2->query("UPDATE 3rd_appointment set" .
" family=" . $family .
- " ,elder=" . $elder .
+ " ,indiv=" . $indiv .
" ,date='" . $date . "'" .
" ,time='" . $time . "'" .
" ,location='" . $location . "'" .
@@ -3778,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 ";
- $this->db2->query("INSERT INTO 3rd_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 ";
+ $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 3rd_appointment where " .
- "elder='$elder'" .
+ "indiv='$indiv'" .
" and family='$family'" .
" and presidency='$presidency'" .
" and date='$date'" .
@@ -3796,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'));
}
}
@@ -3808,21 +3808,21 @@ class eq
//Header('Location: ' . $take_me_to_url);
}
- $sql = "SELECT * FROM 3rd_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="";
@@ -3835,7 +3835,7 @@ class eq
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');
@@ -3846,10 +3846,10 @@ 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];
- $sql = "SELECT * FROM 3rd_elder where elder='$presidency2elder[$presidency]'";
+ $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');
@@ -3888,13 +3888,13 @@ class eq
$table_data .= $this->get_time_selection_form($hour, $minute, $pm, $presidency, $appointment);
$table_data.= "";
- // Elder drop down list (for PPIs)
- $table_data.= '';
+ // individual drop down list (for PPIs)
+ $table_data.= '';
$table_data.= ' ';
- 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.= ''.$name.' ';
}
$table_data.=' ';
@@ -3902,7 +3902,7 @@ class eq
// Family drop down list (for Visits)
$table_data.= '';
$table_data.= ' ';
- 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] = ''; }
@@ -3937,12 +3937,12 @@ class eq
$table_data .= $this->get_time_selection_form(0, 0, 0, $presidency, $appointment);
$table_data.= " ";
- // Elder drop down list
- $table_data.= '';
+ // individual drop down list
+ $table_data.= '';
$table_data.= ' ';
- 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.= ''.$name.' ';
}
$table_data.=' ';
@@ -3950,7 +3950,7 @@ class eq
// Family drop down list
$table_data.= '';
$table_data.= ' ';
- 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.= ''.$name.' Family ';
@@ -3982,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');
@@ -4026,17 +4026,17 @@ class eq
$this->t->pfp('out','admin_t');
- $sql = "SELECT * FROM 3rd_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')
{
@@ -4120,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 \n";
+ print "-> Importing the data into the database \n";
ob_flush(); flush(); sleep(1);
$import_log = $this->upload_target_path . '/import.log';
$data_log = $this->upload_target_path . '/data.log';
@@ -4161,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 ";
- if(($elder > 0) || ($name != "")) {
+ if(($indiv > 0) || ($name != "")) {
if($id < $this->max_presidency_members) {
//print "Updating Existing Entry ";
$this->db2->query("UPDATE 3rd_presidency set" .
- " elder=" . $elder .
+ " indiv=" . $indiv .
" ,district=" . $district .
" ,name='" . $name . "'" .
" ,email='" . $email . "'" .
@@ -4191,9 +4191,9 @@ class eq
} else {
//print "Adding New Entry ";
- $this->db2->query("INSERT INTO 3rd_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__);
@@ -4212,11 +4212,11 @@ class eq
// 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 3rd_district (district,name,supervisor,valid) "
. "VALUES ('" . $district . "','" . $name . "','"
- . $elder . "','" . $valid . "'"
+ . $indiv . "','" . $valid . "'"
.")",__LINE__,__FILE__);
@@ -4227,7 +4227,7 @@ class eq
{
// 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');
@@ -4237,7 +4237,7 @@ class eq
if($district > 0) {
$this->db2->query("INSERT INTO 3rd_district (district,name,supervisor,valid) "
. "VALUES ('" . $district . "','" . $name . "','"
- . $elder . "','" . $valid . "'"
+ . $indiv . "','" . $valid . "'"
.")",__LINE__,__FILE__);
}
@@ -4257,12 +4257,12 @@ class eq
$sql = "SELECT * FROM 3rd_presidency where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$table_data = "";
- $header_row = "Elder Email District President Counselor Secretary EQ Presidency ";
+ $header_row = "Individual Email District President Counselor Secretary Presidency ";
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');
@@ -4277,21 +4277,21 @@ class eq
// Presidency ID
$table_data .= ' ';
- // Elder
+ // individual
if($eqpresidency == 0) {
- $table_data.= '';
+ $table_data.= '';
$table_data.= ' ';
- 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.= ''.$name.' ';
}
$table_data.=' ';
- $table_data.=' ';
+ $table_data.=' ';
} else {
- $table_data.= ' ';
- $table_data.= ' ';
+ $table_data.= ' ';
+ $table_data.= ' ';
}
// Email Address
@@ -4324,7 +4324,7 @@ class eq
else { $table_data .= '0 1 '; }
$table_data.=' ';
- // EQ Presidency
+ // Presidency
$table_data.= '';
if($eqpresidency == 1) { $table_data .= '0 1 '; }
else { $table_data .= '0 1 '; }
@@ -4336,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 .= "";
// Presidency ID
$table_data .= ' ';
- // Elder
- $table_data.= '';
+ // individual
+ $table_data.= '';
$table_data.= ' ';
- 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.= ''.$name.' ';
}
$table_data.=' ';
@@ -4373,7 +4373,7 @@ class eq
$table_data.= '';
$table_data.= '0 1 ';
$table_data.=' ';
- // EQ Presidency
+ // Presidency
$table_data.= '';
$table_data.= '0 1 ';
$table_data.=' ';
@@ -4403,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 = "";
@@ -4434,13 +4434,13 @@ class eq
// Set the email address of the interviewer
$from = $email;
- if($elder > 0) {
- $sql = "SELECT * FROM 3rd_elder where elder='$elder'";
+ 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;
}
}
@@ -4451,9 +4451,9 @@ class eq
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 3rd_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');