X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=2af40b12a295756e52b9fadcb3a591cf6c302974;hb=96aa338c7566eb9eec4e2200140358166b223790;hp=5ac7c0ab9769a6b88b9a68b8670e4876ad6a7f76;hpb=63574045f42044601bfc460bf844ea82387f421f;p=eq%2F.git

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 5ac7c0a..2af40b1 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -400,16 +400,9 @@ 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<br>";
-	      // Delete all the visits that have taken place for all families for this month
+	      // 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'] .
 			       " AND " . "date='" . $date . "'",__LINE__,__FILE__);
 	    }
@@ -3879,12 +3872,11 @@ class eq
 	    
 	    # unzip the data into this directory
 	    print "-> Unzipping the data<br>\n";
-	    $data_file = $data_dir . '';
-	    exec('unzip ' . $data_dir . '/*.zip -d ' . $data_dir . ' 2>&1', $result, $return_code);
+	    exec($this->unzip_path .' -u '. $data_dir . '/*.zip -d ' . $data_dir . ' 2>&1', $result, $return_code);
 	    if($return_code != 0) {
 	      print implode('\n',$result) . "<br>";
 	      print "<b><font color=red>";
-	      print "-E- Unable to unzip the uploaded file into the data dir. Aborting import.";
+	      print "-E- Unable to unzip the uploaded file into the data dir: $data_dir. Aborting import.";
 	      print "</font></b>";
 	      return 0;
 	    }