[Xrms-cvs] xrms/activities edit-2.php,1.81,1.82

[ongardie <ong...@us...>]

Update of /cvsroot/xrms/xrms/activities
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19099/activities

Modified Files:
	edit-2.php 
Log Message:
- Added full_http_site_root() to utils-misc.php
- Made SMTPs' getError() easier to use
- Improved activity modified emails


Index: edit-2.php
===================================================================
RCS file: /cvsroot/xrms/xrms/activities/edit-2.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** edit-2.php	17 Oct 2006 21:48:43 -0000	1.81
--- edit-2.php	12 Jan 2007 22:17:09 -0000	1.82
***************
*** 351,362 ****
  }
  
! if ($email_to) {
!     $sql1 = "SELECT email FROM users WHERE user_id = '$session_user_id'";
!     $rst1 = $con->execute($sql1);
!     if ($rst1) $from_email_address = $rst1->fields['email'];
!     if (!$from_email_address) $from_email_address = get_system_parameter($con, "Sender Email Address");
!     $mimeType = "html";
      $output = _("Activity");
!     $output .= "<a href=\"" . $http_site_root . ": " . "/activities/one.php?activity_id=" . $activity_id . "\">" . htmlspecialchars($activity_title) . "</a>";
      $output .= "\n<br>" . _("Activity Type") . ": " .  $activity_type;
      $output .= "\n<br>" . _("Owner") . ": " .  $username;
--- 351,358 ----
  }
  
! if (!empty($email_to)) {
! 
      $output = _("Activity");
!     $output .= " <a href=\"" . full_http_site_root() . "/activities/one.php?activity_id=" . $activity_id . "\">" . htmlspecialchars($activity_title) . "</a>";
      $output .= "\n<br>" . _("Activity Type") . ": " .  $activity_type;
      $output .= "\n<br>" . _("Owner") . ": " .  $username;
***************
*** 365,376 ****
      $output .= "\n<br>" . _("Contact") . ": " . $contact_name . "<br>\n";
      $output .= "\n<br>" . _("Activity Notes") . ": <br>\n" .  htmlspecialchars($activity_description);
!     require_once ( $include_directory . 'classes/SMTPs/SMTPs.php' );
      $objSMTP = new SMTPs ();
      $objSMTP->setConfig( $xrms_file_root.'/include/classes/SMTPs/SMTPs.ini.php');
      $objSMTP->setFrom ( $from_email_address  );
      $objSMTP->setSubject ( _("Updated Activity") . " " . $activity_title );
      $objSMTP->setTo ( $email_to );
!     $objSMTP->setBodyContent ( $output, $mimeType );
      $objSMTP->sendMsg ();
  }
  
--- 361,382 ----
      $output .= "\n<br>" . _("Contact") . ": " . $contact_name . "<br>\n";
      $output .= "\n<br>" . _("Activity Notes") . ": <br>\n" .  htmlspecialchars($activity_description);
! 
!     $from_email_address = $con->GetOne('SELECT email FROM users WHERE user_id=?', $session_user_id);
!     if (!$from_email_address)
!          $from_email_address = get_system_parameter($con, "Sender Email Address");
! 
!     require_once $include_directory . 'classes/SMTPs/SMTPs.php';
      $objSMTP = new SMTPs ();
      $objSMTP->setConfig( $xrms_file_root.'/include/classes/SMTPs/SMTPs.ini.php');
+ 
      $objSMTP->setFrom ( $from_email_address  );
      $objSMTP->setSubject ( _("Updated Activity") . " " . $activity_title );
      $objSMTP->setTo ( $email_to );
!     $objSMTP->setBodyContent ( $output, 'html');
! 
      $objSMTP->sendMsg ();
+     $errors = $objSMTP->getErrors();
+     if(!empty($errors))
+ 	trigger_error('SMTP errors: '.$errors, E_USER_WARNING);
  }
  
***************
*** 393,396 ****
--- 399,407 ----
  /**
   * $Log$
+  * Revision 1.82  2007/01/12 22:17:09  ongardie
+  * - Added full_http_site_root() to utils-misc.php
+  * - Made SMTPs' getError() easier to use
+  * - Improved activity modified emails
+  *
   * Revision 1.81  2006/10/17 21:48:43  braverock
   * - use SMTPs class to email activities
***************
*** 683,685 ****
   *
   */
! ?>
\ No newline at end of file
--- 694,696 ----
   *
   */
! ?>