projects / eq / .git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed some bugs in the scheduling appointment email logic.
[eq/.git] / inc / class.eq.inc.php
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 53de695e33061ddc190754d3a71239a147eca8dc..850129bf5ea7f2df04d6b382ba1a6d9794f188ff 100644 (file)
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -726,9 +726,9 @@ class eq
       
       if($action == 'save')
        {
-         $activity['assignment'] = $this->db->db_addslashes(get_var('assignment',array('POST')));
-         $activity['date'] = $this->db->db_addslashes(get_var('date',array('POST')));
-         $activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST')));
+         $activity['assignment'] = get_var('assignment',array('POST'));
+         $activity['date'] = get_var('date',array('POST'));
+         $activity['notes']= get_var('notes',array('POST'));
          $this->db->query("UPDATE eq_activity set " .
                           "   assignment='" . $activity['assignment'] .
                           "', date='" . $activity['date'] . "'" .
@@ -752,9 +752,9 @@ class eq
 
       if($action == 'insert')
        {
-         $activity['assignment'] = $this->db->db_addslashes(get_var('assignment',array('POST')));
-         $activity['date'] = $this->db->db_addslashes(get_var('date',array('POST')));
-         $activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST')));
+         $activity['assignment'] = get_var('assignment',array('POST'));
+         $activity['date'] = get_var('date',array('POST'));
+         $activity['notes']= get_var('notes',array('POST'));
          $this->db->query("INSERT INTO eq_activity (assignment,date,notes) "
                           . "VALUES ('" . $activity['assignment'] . "','"
                           . $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__);
@@ -763,7 +763,7 @@ class eq
             . " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
          $this->db->query($sql,__LINE__,__FILE__);
          if($this->db->next_record()) {
-           print "activity: " . $this->db->f('activity') . "<br>";
+           //print "activity: " . $this->db->f('activity') . "<br>";
            $activity['activity'] = $this->db->f('activity');
          }
          
@@ -937,8 +937,8 @@ class eq
 
       if($action == 'save')
        {
-         $assignment['name'] = $this->db->db_addslashes(get_var('name',array('POST')));
-         $assignment['code'] = $this->db->db_addslashes(get_var('code',array('POST')));
+         $assignment['name'] = get_var('name',array('POST'));
+         $assignment['code'] = get_var('code',array('POST'));
          $this->db->query("UPDATE eq_assignment set " .
                           "  name='" . $assignment['name'] . "'" .
                           ", code='" . $assignment['code'] . "'" .
@@ -950,8 +950,8 @@ class eq
 
       if($action == 'insert')
        {
-         $assignment['name'] = $this->db->db_addslashes(get_var('name',array('POST')));
-         $assignment['code'] = $this->db->db_addslashes(get_var('code',array('POST')));
+         $assignment['name'] = get_var('name',array('POST'));
+         $assignment['code'] = get_var('code',array('POST'));
          $this->db->query("INSERT INTO eq_assignment (name,code) "
                           . "VALUES ('" . $assignment['name'] . "','"
                           . $assignment['code'] . "')",__LINE__,__FILE__);
@@ -1683,6 +1683,7 @@ class eq
             $elder_name = $entry['elder_name'];
             $int_pri = $entry['pri'];
             $aaronic = $entry['aaronic'];
+            //print "int_notes: $int_notes elder_name: $elder_name aaronic: $aaronic <Br>";
             if($aaronic == 0) { 
               // Perform database save actions here
               $this->db->query("UPDATE eq_elder set " .
@@ -1886,20 +1887,24 @@ class eq
                $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
                $table_data.= "<td align=center>$phone</td>";
                $table_data.= "<td align=center>";
-               $table_data.= '<select name=int_notes['.$i.'][pri]>';
-               foreach(range(0,6) as $num) {
-                 if($num == 0) { $num = 1; } else {$num = $num*5; }
-                 if($int_pri == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
-                 $table_data.= '<option value='.$num.' '.$selected[$num].'>'.$num.'</option>';
+               if($aaronic == 0) { 
+                 $table_data.= '<select name=int_notes['.$i.'][pri]>';
+                 foreach(range(0,6) as $num) {
+                   if($num == 0) { $num = 1; } else {$num = $num*5; }
+                   if($int_pri == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
+                   $table_data.= '<option value='.$num.' '.$selected[$num].'>'.$num.'</option>';
+                 }
+                 $table_data.= '</select></td>';
                }
-               $table_data.= '</select></td>';
                $table_data.= "<td align=center>$date</td>";
-               $table_data.= '<td><input type=text size="50" maxlength="128" name="int_notes['.$i.'][notes]" value="'.$int_notes.'">';
+               if($aaronic == 0) { 
+                 $table_data.= '<td><input type=text size="50" maxlength="128" name="int_notes['.$i.'][notes]" value="'.$int_notes.'">';
+               }
                $table_data.= '<input type=hidden name="int_notes['.$i.'][elder_id]" value="'.$id.'">';
                $table_data.= '<input type=hidden name="int_notes['.$i.'][elder_name]" value="'.$name.'">';
                $table_data.= '<input type=hidden name="int_notes['.$i.'][aaronic]" value="'.$aaronic.'">';
                $table_data.= '</td>';
-               $table_data.= '</tr>';
+               $table_data.= '</tr>'."\n";
                $i++;
              } else {
                $link_data['menuaction'] = 'eq.eq.int_update';
@@ -2201,7 +2206,7 @@ class eq
            $families_with_yearly_visit++;
            $date = $this->db2->f('date');
            $vis_notes = $this->db2->f('notes');
-           if(strlen($vis_notes) > 40) { $vis_notes = substr($vis_notes,0,40) . "..."; }
+           if(strlen($vis_notes) > 40) { $vis_notes = stripslashes(substr($vis_notes,0,40) . "..."); }
            $completed_data.= "<tr bgcolor=". $this->t->get_var('tr_color2') ."><td title=\"$phone\"><a href=$link>$name Family</a></td>";
            $completed_data.= "<td align=center>$phone</td>";
            $completed_data.= "<td align=center><a href=".$link.">$date</a></td>";
@@ -2212,7 +2217,7 @@ class eq
          }
       }
 
-      $name_width=175; $phone_width=100; $date_width=100; $notes_width=300;
+      $name_width=190; $phone_width=100; $date_width=100; $notes_width=300;
       $completed_table_width=$name_width + $phone_width + $date_width + $notes_width;
       $completed_header_row = "<th width=$name_width><font size=-2>Family Name</th>";
       $completed_header_row.= "<th width=$phone_width><font size=-2>Phone</th>";      
@@ -2423,7 +2428,7 @@ class eq
       
       if($action == 'save')
        {
-         $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+         $notes = get_var('notes',array('POST'));
          $this->db->query("UPDATE eq_ppi set " .
                           "   ppi='" . $ppi . "'" .
                    ", interviewer='" . $interviewer . "'" .
@@ -2438,7 +2443,7 @@ class eq
 
       if($action == 'insert')
        {
-         $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+         $notes = get_var('notes',array('POST'));
          $this->db->query("INSERT INTO eq_ppi (interviewer,elder,date,notes,eqpresppi) "
                           . "VALUES ('" . $interviewer . "','" . $elder . "','"
                           . $date . "','" . $notes . "','" . $eqpresppi  ."')",__LINE__,__FILE__);
@@ -2752,7 +2757,7 @@ class eq
       
       if($action == 'save')
        {
-         $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+         $notes = get_var('notes',array('POST'));
          $this->db->query("UPDATE eq_interview set " .
                     "   interview='" . $interview . "'" .
                    ", interviewer='" . $interviewer . "'" .
@@ -2767,7 +2772,7 @@ class eq
 
       if($action == 'insert')
        {
-         $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+         $notes = get_var('notes',array('POST'));
          $this->db->query("INSERT INTO eq_interview (interviewer,elder,aaronic,date,notes) "
                           . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
                           . $date . "','" . $notes ."')",__LINE__,__FILE__);
@@ -2965,7 +2970,7 @@ class eq
       
       if($action == 'save')
        {
-         $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+         $notes = get_var('notes',array('POST'));
          $this->db->query("UPDATE eq_visit set " .
                           "  date='" . $date . "'" .
                          ", notes='" . $notes . "'" .
@@ -2976,7 +2981,7 @@ class eq
 
       if($action == 'insert')
        {
-         $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+         $notes = get_var('notes',array('POST'));
          $this->db->query("INSERT INTO eq_visit (family,companionship,date,notes) "
                           . "VALUES ('" . $family . "','" . $companionship . "','"
                           . $date . "','" . $notes . "')",__LINE__,__FILE__);
@@ -3519,40 +3524,64 @@ class eq
                 $time = $hour.':'.$minute.':'.'00';
                 $uid = 0;
 
+                // Zero out the family or elder if date = NULL
+                if($date == "") {
+                  $elder = 0;
+                  $family = 0;
+                }
+                
                 // Update an existing appointment
                 if($appointment < $this->max_appointments)
                   {
                     //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'" .
-                       "and family='$family'" .
-                       "and date='$date'" .
-                       "and time='$time'";
+                       " and presidency='$presidency'" .
+                       " and elder='$elder'" .
+                       " and family='$family'" .
+                       " and date='$date'" .
+                       " and time='$time'";
                     $this->db->query($sql,__LINE__,__FILE__);
                     if(!$this->db->next_record()) {
-                      $this->db->query("UPDATE eq_appointment set" .
+                      $old_date = $this->db->f('date');
+                      $old_time = $this->db->f('time');
+                      $this->db2->query("UPDATE eq_appointment set" .
                                        " family=" . $family . 
                                        " ,elder=" . $elder . 
                                        " ,date='" . $date . "'" .
                                        " ,time='" . $time . "'" .
+                                       " ,presidency='" . $presidency . "'" .
                                        " WHERE appointment=" . $appointment,__LINE__,__FILE__);
                       
                       // Email the appointment
-                      if(($date != "") && ($time != "")) { 
-                        $this->email_appt($appointment);
-                      }
+                      $this->email_appt($appointment);
                     }
                   }
                 
                 // Add a new appointment
                 else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
                   {
-                    $this->db->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time,uid) "
+                    //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family<br>";
+                    $this->db2->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time,uid) "
                           . "VALUES (NULL,'" . $presidency . "','" . $family . "','"
                           . $elder . "','" . $date . "','" . $time  . "','" . $uid ."')",__LINE__,__FILE__);
-                    
-                    //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family<br>";                    
+
+                    // Now reselect this entry from the database to see if we need
+                    // to send an appointment out for it.
+                    $sql = "SELECT * FROM eq_appointment where " .
+                       "elder='$elder'" .
+                       " and family='$family'" .
+                       " and presidency='$presidency'" .
+                       " and date='$date'" .
+                       " and time='$time'" .
+                       " and uid='$uid'";
+                    $this->db3->query($sql,__LINE__,__FILE__);
+                    if($this->db3->next_record()) {
+                      // Email the appointment if warranted
+                      if(($date != "") && ($time != "") && (($elder > 0) || $family > 0)) { 
+                        $this->email_appt($this->db3->f('appointment'));
+                      }
+                    }
                   }
               }
           }
phpgroupware module for managing the administrative tasks of an Elders Quorum