[Xrms-cvs] xrms/include utils-activities.php,1.12,1.13

[Aaron v. M. <va...@us...>]

Update of /cvsroot/xrms/xrms/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10949

Modified Files:
	utils-activities.php 
Log Message:
- altered to properly handle changes in contact_id => change in activity_participant
- altered to audit on update, when either activity or participant changes


Index: utils-activities.php
===================================================================
RCS file: /cvsroot/xrms/xrms/include/utils-activities.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** utils-activities.php	29 Jun 2005 18:41:39 -0000	1.12
--- utils-activities.php	30 Jun 2005 04:37:57 -0000	1.13
***************
*** 115,118 ****
--- 115,122 ----
      if ($contact_id > 0)       { $rec['contact_id']           = $contact_id; }
      if ($activity_recurrence_id > 0) { $rec['activity_recurrence_id']           = $activity_recurrence_id; }
+     if ($activity_resolution_type_id > 0) { $rec['activity_resolution_type_id'] = $activity_resolution_type_id; }
+     if ($activity_priority_id > 0) { $rec['activity_priority_id']           = $activity_priority_id; }
+     if ($resolution_description > 0) { $rec['resolution_description']           = $resolution_description; }
+     
  
      $tbl = 'activities';
***************
*** 198,201 ****
--- 202,206 ----
   */
  function update_activity($con, $activity_data, $activity_id=false, $activity_rst=false, $update_default_participant=true) {
+     global $session_user_id;
      if (!$activity_id AND !$activity_rst) return false;
      if (!$activity_data) return false;
***************
*** 208,212 ****
  
          if ($update_default_participant) {
!             if ($activity_data['contact_id']) {
                  if ($activity_data['contact_id']!=$activity_rst->fields['contact_id']) {
                  //contact changed, change default participant
--- 213,218 ----
  
          if ($update_default_participant) {
!             if (array_key_exists('contact_id',$activity_data)) {
! //                echo '<pre>'; print_r($activity_data); print_r($activity_rst->fields);
                  if ($activity_data['contact_id']!=$activity_rst->fields['contact_id']) {
                  //contact changed, change default participant
***************
*** 218,221 ****
--- 224,228 ----
                          $activity_participant_id=$participant_data['activity_participant_id'];
                          $ret=delete_activity_participant($con, $activity_participant_id);
+                         $updated_participant=true;
                      }
                  }
***************
*** 225,228 ****
--- 232,236 ----
                  //new contact for activity is not blank, so add it as the new default participant
                  $activity_participant_id=add_activity_participant($con, $activity_id, $activity_data['contact_id'], 1);
+                 $updated_participant=true;
              }
          }
***************
*** 241,246 ****
          $update_rst=$con->execute($update_sql);
          if (!$update_rst) { db_error_handler($con, $update_sql); return false; }
!         return true;
!     } else return true;
  }
  
--- 249,258 ----
          $update_rst=$con->execute($update_sql);
          if (!$update_rst) { db_error_handler($con, $update_sql); return false; }
!         $updated_sql=true;
!     }
!     if ($updated_sql OR $updated_participants) {
!          add_audit_item($con, $session_user_id, 'updated', 'activities', $activity_id, 1);
!      }
!      return true;
  }
  
***************
*** 588,591 ****
--- 600,607 ----
   /**
    * $Log$
+   * Revision 1.13  2005/06/30 04:37:57  vanmer
+   * - altered to properly handle changes in contact_id => change in activity_participant
+   * - altered to audit on update, when either activity or participant changes
+   *
    * Revision 1.12  2005/06/29 18:41:39  vanmer
    * - added get_magic_quotes_gpc call to update sql to allow for single quotes within strings