X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=8058a9dd91d6886394675078f11cb6fadb8a721a;hb=3863cd10053208a8b4203a228dd367d435fd0c5f;hp=8802e7565f413db6ea75cbcb1a02e27727112fd9;hpb=fcd809d95772f33ac232309c3caa3d0c85307963;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 8802e75..8058a9d 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -1191,7 +1191,7 @@ class eq
$appt_table_data = "";
// create the family id -> family name mapping
- $sql = "SELECT * FROM eq_family where valid=1 and companionship != 0 ORDER BY name ASC";
+ $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$family_id = NULL;
@@ -1247,7 +1247,7 @@ class eq
// VISIT SCHEDULING TABLE
- $sql = "SELECT * FROM eq_family where valid=1 and companionship != 0 ORDER BY visit_pri ASC";
+ $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY visit_pri ASC";
$this->db->query($sql,__LINE__,__FILE__);
$total_families=0; $families_with_yearly_visit=0;
@@ -2496,7 +2496,7 @@ class eq
}
array_multisort($elder_name, $elder_id);
- $sql = "SELECT * FROM eq_family where valid=1 and companionship != 0 ORDER BY name ASC";
+ $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -2680,7 +2680,10 @@ class eq
{
$target_path = $this->upload_target_path . basename( $_FILES['uploadedfile']['name']);
- if((($_FILES['uploadedfile']['type'] == "application/zip") || ($_FILES['uploadedfile']['type'] == "application/x-zip-compressed")) &&
+ 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))) {
$uploadstatus = "The following file was uploaded successfully:
";
$uploadstatus.= "Filename : " . $_FILES['uploadedfile']['name'] . "
";
@@ -2762,7 +2765,9 @@ class eq
print "";
} else if(($_FILES['uploadedfile']['type'] != "application/zip") &&
- ($_FILES['uploadedfile']['type'] != "application/x-zip-compressed")) {
+ ($_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! ";
$uploadstatus.= "
Detected file format: " . $_FILES['uploadedfile']['type'] . "";
$this->t->set_var('uploadstatus',$uploadstatus);