X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=5b1679d8cfeb5a273327d66b261497b8cbcd6b1c;hb=9dc519979d37f94ab0bec341d3508819cd3b68d3;hp=850129bf5ea7f2df04d6b382ba1a6d9794f188ff;hpb=5f9a574d6d8aa73a22afe75d08ed1c16f4af81f4;p=eq%2F.git diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index 850129b..5b1679d 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -8,7 +8,7 @@ * Free Software Foundation; either version 2 of the License, or (at your * * option) any later version. * \**************************************************************************/ - /* $Id: class.eq.inc.php,v 1.1.1.1 2001/05/20 07:40:32 seek3r Exp $ */ + /* $Id: class.eq.inc.php,v 1.1.1.1 2005/07/20 07:40:32 ajp Exp $ */ class eq { @@ -26,11 +26,13 @@ class eq var $default_int_num_years; var $default_vis_num_years; var $default_att_num_quarters; + var $max_num_districts; var $current_year; var $current_month; var $upload_target_path; var $script_path; var $max_appointments; + var $max_presidency_members; var $public_functions = array ( @@ -61,10 +63,14 @@ class eq 'send_ical_appt' => True, 'assign_view' => True, 'assign_update' => True, + 'get_time_selection_form' => True, ); function eq() { + // LOCAL CONFIGURATION. PLEASE UPDATE AS APPROPRIATE. + $this->upload_target_path = "/home/users/eqpres/eq_data"; + $this->script_path = "/usr/share/phpgroupware/eq/bin"; $this->default_ht_num_months = 3; $this->default_ppi_num_months = 3; $this->default_ppi_num_years = 0; @@ -72,9 +78,14 @@ class eq $this->default_int_num_years = 0; $this->default_att_num_quarters = 1; $this->default_vis_num_years = 1; + $this->max_num_districts = 4; + $this->time_drop_down_lists = 1; + $this->time_drop_down_list_inc = 15; + $this->default_visit_appt_duration = 45; + $this->default_ppi_appt_duration = 30; + $this->max_presidency_members = 99; $this->max_appointments = 32768; - $this->upload_target_path = "/home/users/eqpres/eq_data/"; - $this->script_path = "/usr/share/phpgroupware/eq/"; + // END LOCAL CONFIGURATION $this->db = $GLOBALS['phpgw']->db; $this->db2 = $this->db; @@ -85,13 +96,13 @@ class eq $this->grants = $GLOBALS['phpgw']->acl->get_grants('eq'); $this->grants[$this->account] = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE; - $this->jscal = CreateObject('phpgwapi.jscalendar'); // before phpgw_header() !!! + $this->jscal = CreateObject('eq.jscalendar'); // before phpgw_header() !!! $this->cal_options = 'daFormat : "%Y-%m-%d", ifFormat : "%Y-%m-%d", mondayFirst : false, weekNumbers : false'; - $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools'; + $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools - The 3rd Counselor'; $GLOBALS['phpgw']->common->phpgw_header(); $this->current_day = `date '+%d'`; @@ -313,10 +324,10 @@ class eq if($this->db2->next_record()) { if($this->db2->f('visited') == 'y') { $visits[$m]++; $total_visits[$m]++; - $table_data .= ''; + $table_data .= ''; } else if($this->db2->f('visited') == 'n') { - $table_data .= ''; + $table_data .= ''; } else { $visits[$m]++; $total_visits[$m]++; @@ -581,7 +592,7 @@ class eq $this->t->set_file(array('act_list_t' => 'act_list.tpl')); $this->t->set_block('act_list_t','act_list','list'); - $this->t->set_var('lang_name','Activity Name'); + $this->t->set_var('lang_name','Assignment'); $this->t->set_var('lang_date','Date'); $this->t->set_var('lang_notes','Description'); @@ -660,7 +671,7 @@ class eq $this->t->set_var('name', $this->db2->f('name')); $this->t->set_var('code', $this->db2->f('code')); } - $this->t->set_var('lang_name','Activity Name'); + $this->t->set_var('lang_name','Assignment'); $this->t->set_var('lang_date','Date'); $this->t->set_var('lang_notes','Description'); $this->t->set_var('lang_done','Done'); @@ -1070,14 +1081,14 @@ class eq } } if($checkmark) { - $part_table .= ''; + $part_table .= ''; $part_table .= ''.$num_matches.'
'; $part_table .= ''.$date.''; } else { $part_table .= ' '; } } - if($participated) { $part_table .= ''.$participated.''; } + if($participated) { $part_table .= ''.$participated.''; } else { $part_table .= ' '; } $this->t->set_var('part_table',$part_table); $this->t->fp('list2','elder_list',True); @@ -1096,6 +1107,23 @@ class eq $this->t->set_block('willing_view_t','header_list','list1'); $this->t->set_block('willing_view_t','elder_list','list2'); + $this->t->set_var('lang_filter','Filter'); + $this->t->set_var('lang_filter_unwilling','Filter out unwilling Elders:'); + + $filter_unwilling = get_var('filter_unwilling',array('POST')); + $this->t->set_var('filter_unwilling',$filter_unwilling); + + if($filter_unwilling == 'y' || $filter_unwilling == '') { + $filter_input = "Y"; + $filter_input.= "N"; + $filter_input.= "  "; + } else { + $filter_input = "Y"; + $filter_input.= "N"; + $filter_input.= "  "; + } + $this->t->set_var('filter_input',$filter_input); + $sql = "SELECT * FROM eq_elder where valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; @@ -1144,14 +1172,13 @@ class eq } for ($i=0; $i < count($elder_id); $i++) { - $willing_table = ''; - $this->nextmatchs->template_alternate_row_color(&$this->t); + $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 ($j=0; $j < count($assignment_list); $j++) { - $found_willingness=0; + $found_willingness=0; $sql = "SELECT * FROM eq_willingness where " . " assignment=" . $assignment_list[$j]['assignment'] . " AND elder=" . $elder_id[$i]; @@ -1177,21 +1204,27 @@ class eq if($this->db->f('willing') == 'y') { $total_willing[$j]++; - $willing_table .= '
'.$date_part.''; + $elder_willing=1; + $willing_table .= '
'.$date_part.''; } else if($this->db->f('willing') == 'n') { - $willing_table .= ''; + $willing_table .= ''; } else { + $elder_willing=1; $willing_table .= " "; } } if(!$found_willingness) { + $elder_willing=1; $willing_table .= " "; } } - $this->t->set_var('willing_table',$willing_table); - $this->t->fp('list2','elder_list',True); + if(($elder_willing == 1) || ($filter_unwilling == 'n')) { + $this->t->set_var('willing_table',$willing_table); + $this->t->fp('list2','elder_list',True); + $this->nextmatchs->template_alternate_row_color(&$this->t); + } } $stat_table = 'Total Willing to Serve'; @@ -1361,26 +1394,28 @@ class eq { // Save any changes made to the appointment table $new_data = get_var('appt_notes',array('POST')); - foreach ($new_data as $entry) - { - $elder = $entry['elder']; - $appointment = $entry['appointment']; - - //print "elder: $elder appointment: $appointment
"; - - //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'"; - $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 . "'" . - " WHERE appointment=" . $appointment,__LINE__,__FILE__); - // Email the appointment - $this->email_appt($appointment); - } - - } + if($new_data != "") { + foreach ($new_data as $entry) + { + $elder = $entry['elder']; + $appointment = $entry['appointment']; + + //print "elder: $elder appointment: $appointment
"; + + //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'"; + $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 . "'" . + " WHERE appointment=" . $appointment,__LINE__,__FILE__); + // Email the appointment + $this->email_appt($appointment); + } + + } + } // Save any changes made to the ppi notes table $new_data = get_var('ppi_notes',array('POST')); @@ -1399,7 +1434,7 @@ class eq } $take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched'); - Header('Location: ' . $take_me_to_url); + //Header('Location: ' . $take_me_to_url); } // Get the EQ President @@ -1409,6 +1444,7 @@ class eq $president_name = $this->db->f('name'); $president_id = $this->db->f('elder'); $presidency_id = $this->db->f('presidency'); + $interviewer = $this->db->f('elder'); $district_number = '*'; $district_name = $president_name; } else { @@ -1531,6 +1567,7 @@ class eq $link_data['ppi'] = ''; $link_data['eqpresppi'] = 1; $link_data['action'] = 'add'; + $link_data['interviewer'] = $interviewer; $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); $tr_color = $this->nextmatchs->alternate_row_color($tr_color); $this->t->set_var('tr_color',$tr_color); @@ -1654,25 +1691,27 @@ class eq { // Save any changes made to the appointment table $new_data = get_var('appt_notes',array('POST')); - foreach ($new_data as $entry) - { - $elder = $entry['elder']; - $appointment = $entry['appointment']; - - //print "elder: $elder appointment: $appointment
"; - //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'"; - $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 . "'" . - " WHERE appointment=" . $appointment,__LINE__,__FILE__); - - // Email the appointment - $this->email_appt($appointment); - } - } + if($new_data != "") { + foreach ($new_data as $entry) + { + $elder = $entry['elder']; + $appointment = $entry['appointment']; + + //print "elder: $elder appointment: $appointment
"; + //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'"; + $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 . "'" . + " WHERE appointment=" . $appointment,__LINE__,__FILE__); + + // Email the appointment + $this->email_appt($appointment); + } + } + } // Save any changes made to the int notes table $new_data = get_var('int_notes',array('POST')); @@ -1695,7 +1734,7 @@ class eq } $take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_sched'); - Header('Location: ' . $take_me_to_url); + //Header('Location: ' . $take_me_to_url); } // Get the Districts @@ -1869,12 +1908,12 @@ class eq } // If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list - $sql = "SELECT * FROM eq_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' ". + $sql = "SELECT * FROM eq_ppi WHERE date >= '$quarter_start' AND date < '$quarter_end' ". "AND elder=" . $id; $this->db2->query($sql,__LINE__,__FILE__); if(!$this->db2->next_record()) { - $sql = "SELECT * FROM eq_interview WHERE elder=" . $id . " ORDER BY date DESC"; + $sql = "SELECT * FROM eq_ppi WHERE elder=" . $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'; @@ -1883,6 +1922,7 @@ class eq $link_data['name'] = $name; $link_data['interview'] = ''; $link_data['action'] = 'add'; + $link_data['interviewer'] = $districts[$d]['supervisor']; $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); $table_data.= "$name"; $table_data.= "$phone"; @@ -2005,25 +2045,27 @@ class eq { // Save any changes made to the appointment table $new_data = get_var('appt_notes',array('POST')); - foreach ($new_data as $entry) - { - $family = $entry['family']; - $appointment = $entry['appointment']; - - //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'"; - $this->db->query($sql,__LINE__,__FILE__); - if(!$this->db->next_record()) { - - // Perform database save actions here - $this->db->query("UPDATE eq_appointment set " . - " family='" . $family . "'" . - " WHERE appointment=" . $appointment,__LINE__,__FILE__); - - // Email the appointment - $this->email_appt($appointment); - } - } + if($new_data != "") { + foreach ($new_data as $entry) + { + $family = $entry['family']; + $appointment = $entry['appointment']; + + //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'"; + $this->db->query($sql,__LINE__,__FILE__); + if(!$this->db->next_record()) { + + // Perform database save actions here + $this->db->query("UPDATE eq_appointment set " . + " family='" . $family . "'" . + " WHERE appointment=" . $appointment,__LINE__,__FILE__); + + // Email the appointment + $this->email_appt($appointment); + } + } + } // Save any changes made to the visit notes table $new_data = get_var('vis_notes',array('POST')); @@ -2042,7 +2084,7 @@ class eq } $take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched'); - Header('Location: ' . $take_me_to_url); + //Header('Location: ' . $take_me_to_url); } // APPOINTMENT TABLE @@ -2054,7 +2096,7 @@ class eq $appt_table_data = ""; // Find out what the EQ Presidency ID is - $sql = "SELECT * FROM eq_presidency where president=0 and counselor=0 and secretary=0 and valid=1"; + $sql = "SELECT * FROM eq_presidency where eqpres=1 and valid=1"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $presidency_name = $this->db->f('name'); @@ -2362,7 +2404,7 @@ class eq $month = $date_array[1]; $day = $date_array[2]; $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); - $table_data .= ' '.$month.'-'.$day.''; + $table_data .= ' '.$month.'-'.$day.''; } else { $table_data .= " "; } } @@ -2407,25 +2449,14 @@ class eq $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); - } - + $sql = "SELECT * FROM eq_elder WHERE elder=" . $interviewer; + $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->fp('int_list','interviewer_list',True); + if($action == 'save') { $notes = get_var('notes',array('POST')); @@ -2433,6 +2464,7 @@ class eq " ppi='" . $ppi . "'" . ", interviewer='" . $interviewer . "'" . ", elder='" . $elder . "'" . + ", aaronic='" . $aaronic . "'" . ", date='" . $date . "'" . ", notes='" . $notes . "'" . ", eqpresppi='" . $eqpresppi . "'" . @@ -2444,8 +2476,8 @@ class eq if($action == 'insert') { $notes = get_var('notes',array('POST')); - $this->db->query("INSERT INTO eq_ppi (interviewer,elder,date,notes,eqpresppi) " - . "VALUES ('" . $interviewer . "','" . $elder . "','" + $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) " + . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','" . $date . "','" . $notes . "','" . $eqpresppi ."')",__LINE__,__FILE__); $this->ppi_view(); return false; @@ -2647,7 +2679,7 @@ class eq $month_start = "$year"."-"."$month"."-"."01"; $month_end = "$year"."-"."$month"."-"."31"; $month = "$month"."/"."$year"; - $sql = "SELECT * FROM eq_interview WHERE date >= '$month_start' AND date <= '$month_end' ". + $sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ". "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id; $this->db2->query($sql,__LINE__,__FILE__); $header_row .= "$month"; @@ -2670,7 +2702,7 @@ class eq $month = $date_array[1]; $day = $date_array[2]; $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); - $table_data .= ' '.$month.'-'.$day.''; + $table_data .= ' '.$month.'-'.$day.''; } else { $table_data .= " "; } } @@ -2758,14 +2790,14 @@ class eq if($action == 'save') { $notes = get_var('notes',array('POST')); - $this->db->query("UPDATE eq_interview set " . - " interview='" . $interview . "'" . + $this->db->query("UPDATE eq_ppi set " . + " ppi='" . $interview . "'" . ", interviewer='" . $interviewer . "'" . ", elder='" . $elder . "'" . ", aaronic='" . $aaronic . "'" . ", date='" . $date . "'" . ", notes='" . $notes . "'" . - " WHERE interview=" . $interview,__LINE__,__FILE__); + " WHERE ppi=" . $interview,__LINE__,__FILE__); $this->int_view(); return false; } @@ -2773,7 +2805,7 @@ class eq if($action == 'insert') { $notes = get_var('notes',array('POST')); - $this->db->query("INSERT INTO eq_interview (interviewer,elder,aaronic,date,notes) " + $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes) " . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','" . $date . "','" . $notes ."')",__LINE__,__FILE__); $this->int_view(); @@ -2798,7 +2830,7 @@ class eq if($action == 'edit' || $action == 'view') { - $sql = "SELECT * FROM eq_interview WHERE interview=".$interview; + $sql = "SELECT * FROM eq_ppi WHERE ppi=".$interview; $this->db->query($sql,__LINE__,__FILE__); $this->db->next_record(); $this->t->set_var('interview',$interview); @@ -3177,7 +3209,7 @@ class eq $attended[$i][$cur_month]=1; $attendance[$monthnum[$cur_month]]++; } - $att_table .= ''; + $att_table .= ''; } else { $att_table .= ' '; } @@ -3587,7 +3619,7 @@ class eq } $take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.schedule'); - Header('Location: ' . $take_me_to_url); + //Header('Location: ' . $take_me_to_url); } $sql = "SELECT * FROM eq_presidency where valid=1"; @@ -3664,24 +3696,7 @@ class eq // Hour & Minutes selection $table_data.= ""; - $table_data.= ''; - $table_data.= ' : '; - $table_data.= ''; - $table_data.= ''; + $table_data .= $this->get_time_selection_form($hour, $minute, $pm, $presidency, $appointment); $table_data.= ""; // Elder drop down list (for PPIs) @@ -3726,25 +3741,7 @@ class eq // Time selection $table_data.= ""; - $table_data.= ''; - $table_data.= ' : '; - $table_data.= ''; - $table_data.= ''; + $table_data .= $this->get_time_selection_form(0, 0, 0, $presidency, $appointment); $table_data.= ""; // Elder drop down list @@ -3791,22 +3788,44 @@ class eq $this->t->set_block('admin_t','upload','uploadhandle'); $this->t->set_block('admin_t','admin','adminhandle'); $this->t->set_block('admin_t','cmd','cmdhandle'); + $this->t->set_block('admin_t','presidency','presidencyhandle'); $this->t->set_var('upload_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.admin&action=upload')); + $this->t->set_var('presidency_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.admin&action=presidency')); $action = get_var('action',array('GET','POST')); $this->t->pfp('out','admin_t'); - + + $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder 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]; + $i++; + } + array_multisort($elder_name, $elder_id); + if($action == 'upload') { - $target_path = $this->upload_target_path . basename( $_FILES['uploadedfile']['name']); + $target_path = $this->upload_target_path . '/' . basename( $_FILES['uploadedfile']['name']); - if((($_FILES['uploadedfile']['type'] == "application/zip") || - ($_FILES['uploadedfile']['type'] == "application/x-zip-compressed") || - ($_FILES['uploadedfile']['type'] == "application/x-zip") || - ($_FILES['uploadedfile']['type'] == "application/octet-stream")) && - (move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path))) { + if(($_FILES['uploadedfile']['type'] == "application/zip") || + ($_FILES['uploadedfile']['type'] == "application/x-zip-compressed") || + ($_FILES['uploadedfile']['type'] == "application/x-zip") || + ($_FILES['uploadedfile']['type'] == "application/octet-stream")) { + + if(!move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path)) { + $uploadstatus = " -E- Unable to move the uploaded file to "; + $uploadstatus.= "the target path (check the path and permissions) of: $target_path"; + $this->t->set_var('uploadstatus',$uploadstatus); + $this->t->pfp('uploadhandle','upload',True); + return 0; + } + $uploadstatus = "The following file was uploaded successfully:

"; $uploadstatus.= "Filename : " . $_FILES['uploadedfile']['name'] . "
"; $uploadstatus.= "Type : " . $_FILES['uploadedfile']['type'] . "
"; @@ -3818,9 +3837,9 @@ class eq # make a directory for this data to be stored in $date="data_" . date("Y_m_d"); - $data_dir = $this->upload_target_path . $date; + $data_dir = $this->upload_target_path . '/' . $date; print "-> Making the data directory: $date
\n"; - exec('mkdir ' . $data_dir . ' 2>&1', $result, $return_code); + exec('mkdir -p ' . $data_dir . ' 2>&1', $result, $return_code); if($return_code != 0) { print implode('\n',$result) . "
"; print ""; @@ -3855,7 +3874,7 @@ class eq # update the data_latest link to point to this new directory print "-> Updating the latest data dir link
\n"; - $data_latest = $this->upload_target_path . 'data_latest'; + $data_latest = $this->upload_target_path . '/data_latest'; exec('rm ' . $data_latest. '; ln -s ' . $data_dir .' '. $data_latest .' 2>&1', $result, $return_code); if($return_code != 0) { print implode('\n',$result) . "
"; @@ -3871,8 +3890,8 @@ class eq ob_flush(); flush(); sleep(1); $import_log = $this->upload_target_path . '/import.log'; $data_log = $this->upload_target_path . '/data.log'; - $import_cmd = $this->script_path . 'import_ward_data ' . $data_latest . ' | tee ' . $import_log; - $parse_cmd = $this->script_path . 'parse_ward_data -v ' . $data_latest . ' > ' . $data_log; + $import_cmd = $this->script_path . '/import_ward_data ' . $data_latest . ' 2>&1 | tee ' . $import_log; + $parse_cmd = $this->script_path . '/parse_ward_data -v ' . $data_latest . ' > ' . $data_log . '2>&1'; #print "import_cmd: $import_cmd
"; #print "parse_cmd: $parse_cmd
"; ob_start('ob_logstdout', 2); @@ -3901,12 +3920,238 @@ class eq $this->t->pfp('uploadhandle','upload',True); } } + else if($action == "presidency") + { + $new_data = get_var('eqpres',array('POST')); + foreach ($new_data as $entry) + { + $id = $entry['id']; + $email = $entry['email']; + $elder = $entry['elder']; + $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 "; + //print "counselor=$counselor secretary=$secretary eqpres=$eqpresidency
"; + + if(($elder > 0) || ($name != "")) { + if($id < $this->max_presidency_members) { + //print "Updating Existing Entry
"; + $this->db2->query("UPDATE eq_presidency set" . + " elder=" . $elder . + " ,district=" . $district . + " ,name='" . $name . "'" . + " ,email='" . $email . "'" . + " ,president='" . $president . "'" . + " ,counselor='" . $counselor . "'" . + " ,secretary='" . $secretary . "'" . + " ,eqpres='" . $eqpresidency . "'" . + " WHERE presidency=" . $id,__LINE__,__FILE__); + + } else { + //print "Adding New Entry
"; + $this->db2->query("INSERT INTO eq_presidency (presidency,elder,district,name," + . "email,president,counselor,secretary,eqpres,valid) " + . "VALUES (NULL,'" . $elder . "','" . $district . "','" + . $name . "','" . $email . "','" . $president . "','" + . $counselor . "','" . $secretary . "','" . $eqpres . "','1'" + .")",__LINE__,__FILE__); + } + } else { + //print "Ignoring Blank Entry
"; + } + } + + // Now update the eq_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__); + + // Always add a "District 0" assigned to the High Priests Group + $district = 0; + $name = "High Priests"; + $elder = 0; + $valid = 0; + $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) " + . "VALUES ('" . $district . "','" . $name . "','" + . $elder . "','" . $valid . "'" + .")",__LINE__,__FILE__); + + + // Requery the eq_presidency table + $sql = "SELECT * FROM eq_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'); + $name = $this->db->f('name'); + $district = $this->db->f('district'); + $name = $this->db->f('name'); + $valid = 1; + + // 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) " + . "VALUES ('" . $district . "','" . $name . "','" + . $elder . "','" . $valid . "'" + .")",__LINE__,__FILE__); + } + + } + + $this->t->set_var('adminhandle',''); + $this->t->pfp('adminhandle','admin'); + } else { $this->t->set_var('adminhandle',''); $this->t->pfp('adminhandle','admin'); } + + // Now save off the data needed for an EQ Presidency Table Update + + $sql = "SELECT * FROM eq_presidency where valid=1"; + $this->db->query($sql,__LINE__,__FILE__); + $table_data = ""; + $header_row = "ElderEmailDistrictPresidentCounselorSecretaryEQ Presidency"; + while ($this->db->next_record()) + { + // Extract the data for each presidency record + $id = $this->db->f('presidency'); + $elder = $this->db->f('elder'); + $district = $this->db->f('district'); + $name = $this->db->f('name'); + $email = $this->db->f('email'); + $president = $this->db->f('president'); + $counselor = $this->db->f('counselor'); + $secretary = $this->db->f('secretary'); + $eqpresidency = $this->db->f('eqpres'); + + // Create the forms needed in the table + $table_data .= ""; + + // Presidency ID + $table_data .= ''; + + // Elder + if($eqpresidency == 0) { + $table_data.= ''; + $table_data.=''; + } else { + $table_data.= ''; + $table_data.= ''; + } + + // Email Address + $table_data .= ''; + + // District + $table_data.= ''; + + // President + $table_data.= ''; + + // Counselor + $table_data.= ''; + + // Secretary + $table_data.= ''; + + // EQ Presidency + $table_data.= ''; + + // End of ROW + $table_data .= "\n"; + $tr_color = $this->nextmatchs->alternate_row_color($tr_color); + $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 + $id = $this->max_presidency_members; + $table_data .= ""; + // Presidency ID + $table_data .= ''; + // Elder + $table_data.= ''; + $table_data.=''; + // Email Address + $table_data.=''; + // District + $table_data.= ''; + // President + $table_data.= ''; + // Counselor + $table_data.= ''; + // Secretary + $table_data.= ''; + // EQ Presidency + $table_data.= ''; + // End of ROW + $table_data .= "\n"; + $tr_color = $this->nextmatchs->alternate_row_color($tr_color); + $this->t->set_var('tr_color',$tr_color); + $this->t->set_var('header_row',$header_row); + $this->t->set_var('table_data',$table_data); + $this->t->pfp('presidencyhandle','presidency',True); + $this->save_sessiondata(); } @@ -3943,6 +4188,7 @@ class eq // Format the appointment time into an iCal UTC equivalent $dtstamp = gmdate("Ymd"."\T"."His"."\Z"); $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'] . "<" . @@ -3963,7 +4209,7 @@ class eq $phone = $this->db2->f('phone'); $appt_name = $elder_name . " Interview"; $location = "$interviewer"."'s home"; - $duration = 1800; // 30 minutes + $duration = $this->default_ppi_appt_duration * 60; } } @@ -3985,11 +4231,13 @@ class eq if($this->db3->next_record()) { $location=$this->db3->f('address'); } - $duration = 2700; // 45 minutes + $duration = $this->default_visit_appt_duration * 60; } } $dtend = gmdate("Ymd"."\T"."His"."\Z", mktime($hour,$minute,$seconds+$duration,$month,$day,$year)); + $dtendstr = date("g:i A", mktime($hour,$minute,$seconds+$duration,$month,$day,$year)); + $date = $dtstartstr . "-" . $dtendstr; $description = "$appt_name : $phone"; if(($uid == 0) && ($appt_name != "")) { @@ -4005,7 +4253,7 @@ class eq $action = "PUBLISH"; $this->send_ical_appt($action, $email, $from, $subject, $dtstamp, $dtstart, - $dtend, $location, $appt_name, $description, $uid); + $dtend, $date, $location, $appt_name, $description, $uid); } else if(($uid != 0) && ($appt_name == "")) { // Remove the calendar item for this appointment since it has already been sent @@ -4019,7 +4267,7 @@ class eq $action = "CANCEL"; $this->send_ical_appt($action, $email, $from, $subject, $dtstamp, $dtstart, - $dtend, $location, $appt_name, $description, $uid); + $dtend, $date, $location, $subject, $subject, $uid); } else if($uid != 0) { // Update the existing appointment since we have changed it @@ -4028,7 +4276,7 @@ class eq $subject = "Canceled: $appt_date $appt_time"; $action = "CANCEL"; $this->send_ical_appt($action, $email, $from, $subject, $dtstamp, $dtstart, - $dtend, $location, $appt_name, $description, $uid); + $dtend, $date, $location, $subject, $subject, $uid); $uid = rand() . rand(); // Generate a random identifier for this appointment $this->db->query("UPDATE eq_appointment set" . @@ -4038,7 +4286,7 @@ class eq $subject = "Updated: $appt_name"; $action = "PUBLISH"; $this->send_ical_appt($action, $email, $from, $subject, $dtstamp, $dtstart, - $dtend, $location, $appt_name, $description, $uid); + $dtend, $date, $location, $appt_name, $description, $uid); } } @@ -4046,16 +4294,36 @@ class eq return true; } - function send_ical_appt($action, $to, $from, $subject, $dtstamp, $dtstart, $dtend, $location, $summary, $description, $uid) + function send_ical_appt($action, $to, $from, $subject, $dtstamp, $dtstart, $dtend, $date, $location, $summary, $description, $uid) { - $headers = 'From: ' . "$from" . "\n" . - 'Reply-To: ' . "$from" . "\n" . - 'X-Mailer: PHP/' . phpversion() . "\n" . - 'Content-Type: text/calendar;' . "\n" . - 'Content-Transfer-Encoding: 7bit' . "\n"; - - //$message = "phone: $phone date: $date time: $time"; - $message =""; + // Initialize our local variables + $boundary = "=MIME_APPOINTMENT_BOUNDARY"; + $message = ""; + $headers = ""; + + // Form the headers for the email message + $headers.="X-Mailer: PHP/" . phpversion() . "\n"; + $headers.="Mime-Version: 1.0\n"; + $headers.="Content-Type: multipart/mixed; boundary=\"$boundary\"\n"; + $headers.="Content-Disposition: inline\n"; + $headers.="Reply-To: $from\n"; + $headers.="From: $from\n"; + + // Print the plaintext version of the appointment + $message.="--$boundary\n"; + $message.="Content-Type: text/plain; charset=us-ascii\n"; + $message.="Content-Disposition: inline\n"; + $message.="\n"; + $message.="What: $description\n"; + $message.="When: $date\n"; + $message.="Where: $location\n"; + $message.="\n"; + + // Print the .ics attachment version of the appointment + $message.="--$boundary\n"; + $message.="Content-Type: text/calendar; charset=us-ascii\n"; + $message.="Content-Disposition: attachment; filename=\"appointment.ics\"\n"; + $message.="\n"; $message.="BEGIN:VCALENDAR" . "\n"; $message.="VERSION:2.0" . "\n"; $message.="PRODID:-//Microsoft Corporation//Outlook 11.0 MIMEDIR//EN" . "\n"; @@ -4074,10 +4342,65 @@ class eq $message.="CLASS:PUBLIC" . "\n"; $message.="END:VEVENT" . "\n"; $message.="END:VCALENDAR" . "\n"; - + + // Complete the message + $message.="--$boundary\n"; + + // Send the message mail($to, $subject, $message, $headers); } + + function get_time_selection_form($hour, $minute, $pm, $presidency, $appointment) + { + $form_data = ""; + $blank = 0; + + if($hour == 0) { $blank = 1; } + + if($this->time_drop_down_lists == 1) { + // Create drop down lists to get the time + $form_data.= ''; + $form_data.= ' : '; + $form_data.= ''; + } else { + // Use free form text fields to get the time + if($blank == 1) { $hour = ""; $minute = ""; $ampm = ""; } + $form_data.= ''; + $form_data.= ':'; + $form_data.= ''; + $form_data.= ' '; + } + // Always use a drop-down select form for am/pm + $form_data.= ''; + + return $form_data; + } } ?>