changed from email address, import email addresses to eq_elder, flush temp files...
[eq/.git] / inc / class.eq.inc.php
index dd8cff777d6393019e1a1a319dee087b0a991949..921c142ca88a4bcadc5858172d4bba5ba75b21fb 100644 (file)
@@ -235,12 +235,11 @@ class eq
        $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
        $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
        $this->db->query($sql,__LINE__,__FILE__);
-       $j=0;
+       $j=0; $unique_companionships = '';
        while ($this->db->next_record())
          {
            $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -418,7 +417,7 @@ class eq
          // Get a list of all the companionships in this district
          $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
          $this->db->query($sql,__LINE__,__FILE__);
-         $j=0;
+         $j=0; $unique_companionships = '';
          while ($this->db->next_record())
            {
              $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -485,7 +484,7 @@ class eq
       // Select all the unique companionship numbers for this district
       $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
       $this->db->query($sql,__LINE__,__FILE__);
-      $j=0; $unique_companionships='';
+      $j=0; $unique_companionships = '';
       while ($this->db->next_record())
        {
          $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -660,15 +659,15 @@ class eq
          $this->t->set_var('edit',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
          $this->t->set_var('lang_edit','Edit');
 
-         $link_data['menuaction'] = 'eq.eq.act_update';
-         $link_data['activity'] = '0';
-         $link_data['action'] = 'add';
-         $this->t->set_var('add','<form method="POST" action="' . $GLOBALS['phpgw']->link('/eq/index.php',$link_data)
-                           . '"><input type="submit" name="Add" value="' . 'Add Activity' .'"></font></form>');
-
          $this->t->fp('list','act_list',True);
        }
 
+      $link_data['menuaction'] = 'eq.eq.act_update';
+      $link_data['activity'] = '0';
+      $link_data['action'] = 'add';
+      $this->t->set_var('add','<form method="POST" action="' . $GLOBALS['phpgw']->link('/eq/index.php',$link_data)
+                       . '"><input type="submit" name="Add" value="' . 'Add Activity' .'"></font></form>');
+
       $this->t->pfp('out','act_list_t');
       $this->save_sessiondata();
     }
@@ -772,12 +771,14 @@ class eq
          
          // Re-add the elders who are checked as having participated in this activity
          $elders = get_var('elder_name',array('POST'));
-         foreach ($elders as $elder)
-           {
-             $this->db->query("INSERT INTO eq_participation (elder,activity) "
-                              . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
-           }
-
+         if(is_array($elders)) { // Only do the foreach loop if we have a valid array of elders to work with
+           foreach ($elders as $elder)
+             {
+               $this->db->query("INSERT INTO eq_participation (elder,activity) "
+                                . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
+             }
+         }
+         
          $this->act_list();
          return false;
        }
@@ -1599,7 +1600,7 @@ class eq
          $this->db2->query($sql,__LINE__,__FILE__);
          
          if(!$this->db2->next_record()) {
-           $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC";
+           $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " AND eqpresppi=1 ORDER BY date DESC";
            $this->db->query($sql,__LINE__,__FILE__);
            if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
            $link_data['menuaction'] = 'eq.eq.ppi_update';
@@ -1919,7 +1920,7 @@ class eq
       // Select all the unique companionship numbers for this district
       $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$d]['district'];
       $this->db->query($sql,__LINE__,__FILE__);
-      $j=0;
+      $j=0; $unique_companionships = '';
       while ($this->db->next_record())
        {
          $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -2552,15 +2553,22 @@ class eq
       $date = get_var('date',array('GET','POST'));
       $notes = get_var('notes',array('GET','POST'));
       $eqpresppi = get_var('eqpresppi',array('GET','POST'));
-      
-      $sql = "SELECT * FROM eq_elder WHERE elder=" . $interviewer;
+     
+      $sql = "SELECT * FROM eq_presidency where valid=1 and (president=1 or counselor=1 or secretary=1)";
       $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->set_var('eqpresppi_checked','');
-      $this->t->fp('int_list','interviewer_list',True);
+      while ($this->db2->next_record())
+      {
+        $elder = $this->db2->f('elder');
+       $interviewer_name = $this->db2->f('name');
+        if($elder == $interviewer) { 
+          $this->t->set_var('interviewer',$interviewer . ' selected');
+        } else {
+         $this->t->set_var('interviewer',$interviewer);
+       }
+        $this->t->set_var('interviewer_name',$interviewer_name);
+        $this->t->set_var('eqpresppi_checked','');
+        $this->t->fp('int_list','interviewer_list',True);
+      }
     
       if($action == 'save')
        {
@@ -2726,13 +2734,11 @@ class eq
        $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
        $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
-
        $this->db->query($sql,__LINE__,__FILE__);
-       $j=0;
+       $j=0; $unique_companionships = '';
        while ($this->db->next_record())
          {
            $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -2884,25 +2890,21 @@ class eq
       $date = get_var('date',array('GET','POST'));
       $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_presidency where valid=1 and (president=1 or counselor=1 or secretary=1 or district!=0)";
+      $this->db2->query($sql,__LINE__,__FILE__);
+      while ($this->db2->next_record())
+      {
+        $elder = $this->db2->f('elder');
+        $interviewer_name = $this->db2->f('name');
+        if($elder == $interviewer) {
+          $this->t->set_var('interviewer',$interviewer . ' selected');
+        } else {
+          $this->t->set_var('interviewer',$interviewer);
+        }
+        $this->t->set_var('interviewer_name',$interviewer_name);
+        $this->t->fp('int_list','interviewer_list',True);
+      }
       
       if($action == 'save')
        {
@@ -4048,6 +4050,12 @@ class eq
            if(!move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path)) {
              $uploadstatus = "<b><font color=red> -E- Unable to move the uploaded file to ";
              $uploadstatus.= "the target path (check the path and permissions) of: $target_path</font></b>";
+             $uploadstatus = "<b>The following file was uploaded successfully: </b><br><br>";
+             $uploadstatus.= "Tmp Filename : " . $_FILES['uploadedfile']['tmp_name'] . "<br>";
+             $uploadstatus.= "Filename     : " . $_FILES['uploadedfile']['name'] . "<br>";
+             $uploadstatus.= "Type         : " . $_FILES['uploadedfile']['type'] . "<br>";
+             $uploadstatus.= "Size         : " . $_FILES['uploadedfile']['size'] . "<br>";
+             $uploadstatus.= "Error        : " . $_FILES['uploadedfile']['error'] . "<br>";     
              $this->t->set_var('uploadstatus',$uploadstatus);
              $this->t->pfp('uploadhandle','upload',True);
              return 0;
@@ -4416,10 +4424,6 @@ class eq
          $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'] . "<" .
-                 $GLOBALS['phpgw_info']['user']['preferences']['email']['address'] . ">";
-         
          $sql = "SELECT * FROM eq_presidency where presidency='$presidency'";
          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
@@ -4427,6 +4431,9 @@ class eq
            $interviewer = $this->db2->f('name');
          }
 
+         // Set the email address of the interviewer
+         $from = $email;
+
          if($elder > 0) { 
            $sql = "SELECT * FROM eq_elder where elder='$elder'";
            $this->db2->query($sql,__LINE__,__FILE__);