X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=1fac1b24b5846d3cbe0c61bc8987d4d738744524;hb=f5a615c34500340248bd22d70078e9cb0fb22926;hp=9e6f8e2df09cd95c9eb7f1be7e12d719c75e0b6f;hpb=4988a4401709530d1d8ca1f640a6d0c207e74f44;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 9e6f8e2..1fac1b2 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -22,7 +22,13 @@ class eq
var $default_ht_num_months;
var $default_ppi_num_months;
var $default_ppi_num_years;
+ var $default_int_num_months;
+ var $default_int_num_years;
var $default_att_num_months;
+ var $current_year;
+ var $current_month;
+ var $upload_target_path;
+ var $script_path;
var $public_functions = array
(
@@ -34,18 +40,30 @@ class eq
'par_view' => True,
'ppi_view' => True,
'ppi_update' => True,
+ 'ppi_sched' => True,
+ 'int_view' => True,
+ 'int_update' => True,
+ 'vis_sched' => True,
'vis_view' => True,
'vis_update' => True,
'att_view' => True,
- 'att_update' => True
+ 'att_update' => True,
+ 'dir_view' => True,
+ 'org_view' => True,
+ 'schedule' => True,
+ 'admin' => True
);
function eq()
{
- $this->default_ht_num_months = 1;
- $this->default_ppi_num_months = 1;
+ $this->default_ht_num_months = 3;
+ $this->default_ppi_num_months = 3;
$this->default_ppi_num_years = 0;
- $this->default_att_num_months = 1;
+ $this->default_int_num_months = 3;
+ $this->default_int_num_years = 0;
+ $this->default_att_num_months = 3;
+ $this->upload_target_path = "/home/users/eqpres/eq_data/";
+ $this->script_path = "/usr/share/phpgroupware/eq/";
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
@@ -63,6 +81,14 @@ class eq
$GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools';
$GLOBALS['phpgw']->common->phpgw_header();
+
+ $this->current_day = `date '+%d'`;
+ $this->current_day = $this->current_day-0; // Make it numeric
+ $this->current_month = `date '+%m'`;
+ $this->current_month = $this->current_month-0; // Make it numeric
+ $this->current_year = `date '+%Y'`;
+ $this->current_year = $this->current_year-0; // Make it numeric
+
echo parse_navbar();
$this->display_app_header();
}
@@ -99,12 +125,27 @@ class eq
$link_data['menuaction'] = 'eq.eq.ppi_view';
$this->t->set_var('link_ppi',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_ppi','PPIs');
+ $link_data['menuaction'] = 'eq.eq.int_view';
+ $this->t->set_var('link_int',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+ $this->t->set_var('lang_int','Interviews');
$link_data['menuaction'] = 'eq.eq.vis_view';
$this->t->set_var('link_visit',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_visit','Visits');
$link_data['menuaction'] = 'eq.eq.att_view';
$this->t->set_var('link_attendance',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_attendance','Attendance');
+ $link_data['menuaction'] = 'eq.eq.dir_view';
+ $this->t->set_var('link_dir',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+ $this->t->set_var('lang_dir','Directory');
+ $link_data['menuaction'] = 'eq.eq.org_view';
+ $this->t->set_var('link_org',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+ $this->t->set_var('lang_org','Callings');
+ $link_data['menuaction'] = 'eq.eq.admin';
+ $this->t->set_var('link_admin',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+ $this->t->set_var('lang_admin','Admin');
+ $link_data['menuaction'] = 'eq.eq.schedule';
+ $this->t->set_var('link_schedule',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+ $this->t->set_var('lang_schedule','Scheduling');
$this->t->pparse('out','eq_header');
}
@@ -124,7 +165,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";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
@@ -143,6 +184,7 @@ class eq
{
$elder_id[$i] = $this->db->f('elder');
$elder_name[$i] = $this->db->f('name');
+ $elder_phone[$elder_id[$i]] = $this->db->f('phone');
$i++;
}
array_multisort($elder_name, $elder_id);
@@ -159,6 +201,7 @@ class eq
{
$aaronic_id = $this->db->f('aaronic');
$aaronic[$aaronic_id]['name'] = $this->db->f('name');
+ $aaronic[$aaronic_id]['phone'] = $this->db->f('phone');
}
$total_families = 0;
@@ -192,18 +235,25 @@ class eq
while ($this->db->next_record())
{
// Get this companions information
- if($companion_table_entry != "") { $companion_table_entry .= " / "; }
+ if($companion_table_entry != "") { $companion_table_entry .= " / "; }
$companionship = $this->db->f('companionship');
$elder_id = $this->db->f('elder');
$aaronic_id = $this->db->f('aaronic');
- if($elder_id) { $name = $elders[$elder_id]; }
- else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; }
- $companion_table_entry .= "$name";
+ if($elder_id) {
+ $name = $elders[$elder_id];
+ $phone = $elder_phone[$elder_id];
+ }
+ else if($aaronic_id) {
+ $name = $aaronic[$aaronic_id]['name'];
+ $phone = $aaronic[$aaronic_id]['phone'];
+ }
+ $companion_table_entry .= "$name $companion_table_entry Families "; }
+ else {
+ $visits[$m]++; $total_visits[$m]++;
+ $table_data .= " ";
+ }
+ }
+ else {
+ $visits[$m]++; $total_visits[$m]++;
+ $table_data .= " ";
}
- else { $table_data .= " "; }
}
$table_data .= "";
$k++;
@@ -307,7 +370,7 @@ class eq
if($action == 'save')
{
// Get a list of all the companionships in this district
- $sql = "SELECT distinct companionship FROM eq_companionship where district=". $district;
+ $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
$this->db->query($sql,__LINE__,__FILE__);
$j=0;
while ($this->db->next_record())
@@ -317,6 +380,15 @@ class eq
}
for ($j=0; $j < count($unique_companionships); $j++)
{
+ // FIXME: We won't be able to go back and edit history on families that have been
+ // reassigned to a different companionship. The following delete command will not delete
+ // the history of visits under an older companionship, only the ones for the existing
+ // companionship. This will lead to duplicate visits being entered for an older
+ // month for the same family, making it impossible to change the past history once
+ // a family is reassigned. However, you will be able to view the history just fine.
+
+ //$comp=$unique_companionships[$j]['companionship'];
+ //print "deleting from eq_visit where companionship=$comp and date=$date and district=$district / "; }
$companionship = $this->db->f('companionship');
$elder_id = $this->db->f('elder');
$aaronic_id = $this->db->f('aaronic');
- if($elder_id) { $name = $elders[$elder_id]; }
- else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; }
- $companion_table_entry .= "$name";
+ if($elder_id) {
+ $name = $elders[$elder_id];
+ $phone = $elder_phone[$elder_id];
+ }
+ else if($aaronic_id) {
+ $name = $aaronic[$aaronic_id]['name'];
+ $phone = $aaronic[$aaronic_id]['phone'];
+ }
+ $companion_table_entry .= "$name $companion_table_entry Families Elder Name Phone Priority Last PPI Scheduling Notes Date Time Elder ";
+ $appt_table_data.= "$day_string ";
+ $appt_table_data.= "$time_string ";
+
+ $appt_table_data.= '';
+ $appt_table_data.= ''.$name.' ';
+ }
+ $appt_table_data.=' $name $phone ";
+ //$table_data.= "$ppi_pri ";
+ $table_data.= "";
+ $table_data.= '';
+ foreach(range(0,6) as $num) {
+ if($num == 0) { $num = 1; } else {$num = $num*5; }
+ if($ppi_pri == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
+ $table_data.= ''.$num.' ';
+ }
+ $table_data.= ' ';
+ $table_data.= "$date ";
+ $table_data.= '$name $phone ";
+ $completed_data.= "$date $ppi_notes ";
+ $completed_data.= 'Elder Name Phone Date PPI Notes Elders $year ";
+ $totals_data.= "Total Elders with yearly PPIs completed: $elders_with_yearly_ppi / $total_elders ";
+ $totals_data.= "Percentage: $percent% ";
+
+ $this->t->set_var('totals',$totals_data);
+ $this->t->set_var('totals_header_row',$totals_header_row);
+ $this->t->set_var('totals_table_width',$totals_table_width);
+
+ $this->t->pfp('out','ppi_sched_t');
+ $this->save_sessiondata();
+
+ }
+
+ function vis_sched()
+ {
+ $this->t->set_file(array('vis_sched_t' => 'vis_sched.tpl'));
+ $this->t->set_block('vis_sched_t','family_list','familylist');
+ $this->t->set_block('vis_sched_t','appt_list','apptlist');
+ $action = get_var('action',array('GET','POST'));
+
+ $this->t->set_var('lang_save','Save Appt / Pri / Notes');
+ $this->t->set_var('lang_reset','Clear Changes');
+
+ $this->t->set_var('vis_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_view'));
+ $this->t->set_var('vis_link_title','View Yearly Visits');
+
+ $this->t->set_var('schedule_vis_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched'));
+ $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');
+
+ $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;
+ $header_row = "Family Name Phone Priority Last Visit Scheduling Notes Date Time Family ";
+ $appt_table_data.= "$day_string ";
+ $appt_table_data.= "$time_string ";
+
+ $appt_table_data.= '';
+ $appt_table_data.= ''.$name.' Family ';
+ }
+ $appt_table_data.=' $name Family $phone ";
+ $table_data.= "";
+ $table_data.= '';
+ foreach(range(0,6) as $num) {
+ if($num == 0) { $num = 1; } else {$num = $num*5; }
+ if($vis_pri == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
+ $table_data.= ''.$num.' ';
+ }
+ $table_data.= ' ';
+ $table_data.= "$date ";
+ $table_data.= '$name Family $phone ";
+ $completed_data.= "$date $vis_notes ";
+ $completed_data.= 'Family Name Phone Date Visit Notes Families $year ";
+ $totals_data.= "Total Families with yearly Visits completed: $families_with_yearly_visit / $total_families ";
+ $totals_data.= "Percentage: $percent% ";
+
+ $this->t->set_var('table_width',$table_width);
+ $this->t->set_var('header_row',$header_row);
+ $this->t->set_var('table_data',$table_data);
+ $this->t->set_var('totals_header_row',$totals_header_row);
+ $this->t->set_var('totals_table_width',$totals_table_width);
+ $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->set_var('totals',$totals_data);
+ $this->t->fp('familylist','family_list',True);
+ $this->t->fp('apptlist','appt_list',True);
+
+ $this->t->pfp('out','vis_sched_t');
+ $this->save_sessiondata();
+
+ }
+
function ppi_view()
{
$this->t->set_file(array('ppi_view_t' => 'ppi_view.tpl'));
@@ -798,25 +1444,21 @@ class eq
if($num_months == 1) { $this->t->set_var('lang_num_months','Month of History'); }
else { $this->t->set_var('lang_num_months','Months of History'); }
$this->t->set_var('lang_filter','Filter');
-
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_view'));
- $this->t->set_var('eqpres_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_view&eqpresppi=1'));
- $eqpresppi = get_var('eqpresppi',array('GET','POST'));
+
+ $this->t->set_var('ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_view'));
+ $this->t->set_var('ppi_link_title','Yearly PPIs');
+ $eqpresppi = 0;
+
+ $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');
- if($eqpresppi == 1) {
- $num_months = get_var('num_months',array('GET','POST'));
- if($num_months == '') { $num_months = $this->default_ppi_num_years; }
- $this->t->set_var('num_months',$num_months);
- $this->t->set_var('ppi_link_title','PPIs');
- $this->t->set_var('title','EQ President Yearly PPIs');
- 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'); }
- $this->t->set_var('eqpres_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_view'));
- }
- else {
- $this->t->set_var('ppi_link_title','EQ President Yearly PPIs');
- $this->t->set_var('title','PPIs');
- }
+ $this->t->set_var('title','Yearly PPIs');
+ $num_months = get_var('num_months',array('GET','POST'));
+ if($num_months == '') { $num_months = $this->default_ppi_num_years; }
+ $this->t->set_var('num_months',$num_months);
+ 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_district where valid=1 ORDER BY district ASC";
$this->db->query($sql,__LINE__,__FILE__);
@@ -826,7 +1468,7 @@ class eq
$districts[$i]['district'] = $this->db->f('district');
$districts[$i]['name'] = $this->db->f('name');
$districts[$i]['supervisor'] = $this->db->f('supervisor');
- if($eqpresppi == 0) { $i++; }
+ $i++;
}
$sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
@@ -836,6 +1478,9 @@ class eq
{
$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');
$i++;
}
array_multisort($elder_name, $elder_id);
@@ -850,28 +1495,21 @@ class eq
{
$aaronic_id = $this->db->f('aaronic');
$aaronic[$aaronic_id]['name'] = $this->db->f('name');
+ $aaronic[$aaronic_id]['phone'] = $this->db->f('phone');
}
$total_companionships = 0;
+ $total_elders = 0;
$this->nextmatchs->template_alternate_row_color(&$this->t);
for ($i=0; $i < count($districts); $i++) {
- if($eqpresppi == 1) {
- $this->t->set_var('district_number','*');
- $this->t->set_var('district_name','EQ President');
- } else {
- $this->t->set_var('district_number',$districts[$i]['district']);
- $this->t->set_var('district_name',$districts[$i]['name']);
- }
+ $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
- if($eqpresppi == 1) {
- $sql = "SELECT distinct companionship FROM eq_companionship";
- }
- else {
- $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
- }
+ $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
+
$this->db->query($sql,__LINE__,__FILE__);
$j=0;
while ($this->db->next_record())
@@ -880,21 +1518,17 @@ class eq
$j++;
}
- $comp_width=400; $ppi_width=25; $table_width=$comp_width + $num_months*$ppi_width;
+ $comp_width=400; $ppi_width=75; $table_width=$comp_width + $num_months*$ppi_width;
$table_data=""; $num_companionships = $j; $num_elders = 0;
for($m=$num_months; $m >= 0; $m--) { $ppis[$m] = 0; }
for ($j=0; $j < count($unique_companionships); $j++) {
// Select all the companions in each companionship
- if($eqpresppi) {
- $sql = "SELECT * FROM eq_companionship where valid=1 and aaronic=0 and ".
- "companionship=". $unique_companionships[$j]['companionship'];
- }
- else {
- $sql = "SELECT * FROM eq_companionship where valid=1 and ".
- "companionship=". $unique_companionships[$j]['companionship'];
- }
+ $sql = "SELECT * FROM eq_companionship where valid=1 and aaronic=0 and ".
+ "companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
$k=0;
+ $comp = $unique_companionships[$j]['companionship'];
+ for($m=$num_months; $m >= 0; $m--) { $ppi_recorded[$comp][$m] = 0; }
while ($this->db->next_record())
{
// Get this companions information
@@ -902,50 +1536,44 @@ class eq
$companionship = $this->db->f('companionship');
$elder_id = $this->db->f('elder');
$aaronic_id = $this->db->f('aaronic');
- if($elder_id) { $name = $elders[$elder_id]; }
- else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; }
+ if($elder_id) {
+ $name = $elders[$elder_id];
+ $phone = $elder_phone[$elder_id];
+ }
+ else if($aaronic_id) {
+ $name = $aaronic[$aaronic_id]['name'];
+ $phone = $aaronic[$aaronic_id]['phone'];
+ }
$link_data['menuaction'] = 'eq.eq.ppi_update';
$link_data['companionship'] = $companionship;
$link_data['interviewer'] = $supervisor;
$link_data['elder'] = $elder_id;
+ $link_data['aaronic'] = $aaronic_id;
$link_data['name'] = $name;
$link_data['ppi'] = '';
$link_data['eqpresppi'] = $eqpresppi;
$link_data['action'] = 'add';
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
- if($aaronic_id == 0) {
- $table_data.= "$name $name ";
- }
-
+ $table_data.= "$name Companionship $year $month $year "; }
}
@@ -969,84 +1592,108 @@ class eq
}
$table_data .= "Unassigned Potential Home Teachers $name "; }
- }
- $table_data .= "$num_elders Elders $num_companionships Companionships $num_elders Elders $ppis[$m] $total_companionships Total Comps $total_ppis[$m] Elder $name $year "; }
+ }
+ $table_data .= "$num_elders Elders $ppis[$m] $total_elders Total Elders $total_ppis[$m] $name Companionship $month "; }
+ }
+ $table_data .= "$num_companionships Companionships $quarter_total $total_companionships Total Comps $quarter_total $cur_month $cur_year ';
@@ -1484,6 +2475,36 @@ class eq
$this->t->set_var('elder_width',$elder_width);
$this->t->set_var('att_width',$att_width);
+ # Now calculate attendance for these months
+ $attendance_str = "";
+ $nonattendance_str = "";
+ $aveattendance_str = "";
+ $avenonattendance_str = "";
+ $num_months=0;
+ $ave_total_attended=0;
+ ksort($attendance);
+ foreach($attendance as $att => $value) {
+ $total_attended = $attendance[$att];
+ $ave_total_attended += $attendance[$att]; $num_months++;
+ $percent = ceil(($total_attended / $total_elders)*100);
+ $attendance_str.="$total_attended ($percent%) $total_nonattended ($percent%) $total_attended ($percent%) $total_attended ($percent%) Date Time Elder Family ";
+
+ // Date selection
+ $table_data.= '';
+ $table_data.= $this->jscal->input('sched['.$district.']['.$appointment.'][date]',$date,'','','','','',$this->cal_options);
+ $table_data.= ' ';
+
+ // Hour & Minutes selection
+ $table_data.= "";
+ $table_data.= '';
+ foreach(range(1,12) as $num) {
+ if($hour == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
+ $table_data.= ''.$num.' ';
+ }
+ $table_data.= ' ';
+ $table_data.= ' : ';
+ $table_data.= '';
+ foreach(range(0,3) as $num) {
+ $num = $num * 15; if($num == 0) { $num = "00"; }
+ if($minute == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
+ $table_data.= ''.$num.' ';
+ }
+ $table_data.= ' ';
+ $table_data.= '';
+ if($pm == 0) { $table_data.= 'am '; $table_data.= 'pm '; }
+ else { $table_data.= 'am '; $table_data.= 'pm '; }
+ $table_data.= ' ';
+ $table_data.= " ";
+
+ // Elder drop down list (for PPIs)
+ $table_data.= '';
+ $table_data.= ''.$name.' ';
+ }
+ $table_data.=' ';
+ $table_data.= ''.$name.' Family ';
+ }
+ $table_data.=' ";
+
+ // Date selection
+ $table_data.= '';
+ $table_data.= $this->jscal->input('sched['.$district.']['.$appointment.'][date]','','','','','','',$this->cal_options);
+ $table_data.= ' ';
+
+ // Time selection
+ $table_data.= "";
+ $table_data.= '';
+ $table_data.= ''.$num.' ';
+ }
+ $table_data.= ' ';
+ $table_data.= ' : ';
+ $table_data.= '';
+ $table_data.= ''.$num.' ';
+ }
+ $table_data.= ' ';
+ $table_data.= '';
+ $table_data.= 'am ';
+ $table_data.= 'pm ';
+ $table_data.= ' ';
+ $table_data.= " ";
+
+ // Elder drop down list
+ $table_data.= '';
+ $table_data.= ''.$name.' ';
+ }
+ $table_data.=' ';
+ $table_data.= ''.$name.' Family ';
+ }
+ $table_data.=' The following file was uploaded successfully: \n";
+
+ # make a directory for this data to be stored in
+ $date="data_" . date("Y_m_d");
+ $data_dir = $this->upload_target_path . $date;
+ print "-> Making the data directory: $date";
+ print "-E- Unable to create the data directory. Aborting import.";
+ print " ";
+ print "-E- Unable to move the uploaded file into the data dir. Aborting import.";
+ print " ";
+ print "-E- Unable to unzip the uploaded file into the data dir. Aborting import.";
+ print " ";
+ print "-E- Unable to update the data latest link. Aborting import.";
+ print "
";
+
+ } else 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")) {
+ $uploadstatus = "The file format must be a .zip file, please try again! Detected file format: " . $_FILES['uploadedfile']['type'] . " ";
+ $this->t->set_var('uploadstatus',$uploadstatus);
+ $this->t->pfp('uploadhandle','upload',True);
+ } else {
+ $uploadstatus = " There was an error (" . $_FILES['uploadedfile']['error'];
+ $uploadstatus.= ") uploading the file, please try again! 
