--- \user_relationships\user_relationship_mailer\user_relationship_mailer_defaults.inc	    Mon Apr 27 20:59:32 2009
+++ \user_relationshipsnew\user_relationship_mailer\user_relationship_mailer_defaults.inc	Thu May 07 02:02:00 2009
@@ -1,5 +1,5 @@
 <?php
-// $Id: user_relationship_mailer_defaults.inc,v 1.1.2.7 2009/04/27 15:29:32 alexk Exp $
+// $Id: user_relationship_mailer_defaults.inc,v 1.1.2.6 2009/03/27 15:13:37 alexk Exp $
 /**
  * @file User Relationships Mailer implementation. Contains all default strings and action definitions
  */
@@ -8,71 +8,24 @@
 $_user_relationship_mailer_ops = array('request', 'cancel', 'approve', 'disapprove', 'remove', 'pre_approved');
 
 /**
- * Replacements for mail messages
- * @param relationship relationship object for which emails are being sent
- */
-function user_relationship_mailer_replacements(&$relationship) {
-  $requester = $relationship->requester;
-  $requestee = $relationship->requestee;
-  //load relationship type, if necessary
-  if (!$relationship->relationship_type) {
-    $relationship->relationship_type = user_relationships_type_load($relationship->rtid);
-  }
-  $replacements = array(
-    '@site'                     => variable_get('site_name', 'Drupal'),
-    '@site_url'                 => $GLOBALS['base_url'],
-
-    '@requester_name'           => $requester->name,
-    '@requester_link'           => theme('user_relationships_user_link', $requester->uid),
-    '@requester_uid'            => $requester->uid,
-    '@requester_list_link'      => url("user/{$requester->uid}/relationships/list", array('absolute' => TRUE)),
-    '@requester_pending_link'   => url("user/{$requester->uid}/relationships/requests", array('absolute' => TRUE)),
-
-    '@requestee_name'           => $requestee->name,
-    '@requestee_link'           => theme('user_relationships_user_link', $requestee->uid),
-    '@requestee_uid'            => $requestee->uid,
-    '@requestee_list_link'      => url("user/{$requestee->uid}/relationships/list", array('absolute' => TRUE)),
-    '@requestee_pending_link'   => url("user/{$requestee->uid}/relationships/requests", array('absolute' => TRUE)),
-
-    '@relationship_name'        => $relationship->relationship_type->name,
-    '@relationship_plural_name' => $relationship->relationship_type->plural_name,
-  );
-  
-  // #443326 Integration with realname module
-  if (module_exists('realname')) {
-    $replacements['@requester_realname'] = $requester->realname;
-    $replacements['@requestee_realname'] = $requestee->realname;
-  }
-
-  //'remove' action needs a few more variables for the template
-  if ($deleted_by = $relationship->deleted_by) {
-    $replacements['@deleted_by_name'] = $deleted_by->name;
-    $replacements['@deleted_by_link'] = url("user/{$deleted_by->uid}", array('absolute' => TRUE));
-    $replacements['@deleted_by_uid']  = $deleted_by->uid;
-  }
-
-  return $replacements;
-}
-
-/**
  * Default request relationship message
  */
 function user_relationship_mailer_request_default() {
-  $subject = "[@site] @requester_name wants to be your @relationship_name";
+  $subject = "[site-name] [requester-name] wants to be your [relationship-name]";
   $message = <<<MESSAGE
-Dear @requestee_name,
+Dear [requestee-name],
 
-@requester_name wants to be your @relationship_name.
+[requester-name] wants to be your [relationship-name].
 
-Here's a link to @requester_name's profile:
-  @requester_link
+Here's a link to [requester-name]'s profile:
+  [requester-link]
 
-To approve/disapprove this, log in to @site_url and see your pending relationship requests at @requestee_pending_link.
+To approve/disapprove this, log in to  [site-url] and see your pending relationship requests at [requestee-pending-link].
 
 Regards,
-The @site team
+The [site-name] team
 This message was sent to you because you have user relationships email notifications turned on.
-If you no longer wish to receive these emails, you can turn them off at @site_url/user/@requestee_uid/edit.
+If you no longer wish to receive these emails, you can turn them off at  [site-url]/user/[requester-uid]/edit.
 MESSAGE;
 
   return array(
@@ -85,17 +38,17 @@
  * Default cancel request message
  */
 function user_relationship_mailer_cancel_default() {
-  $subject = "[@site] @requester_name has canceled their @relationship_name request";
+  $subject = "[site-name] [requester-name] has canceled their [relationship-name] request";
   $message = <<<MESSAGE
-Dear @requestee_name,
+Dear [requestee-name],
 
-@requester_name has canceled their @relationship_name request.
+[requester-name] has canceled their [relationship-name] request.
 
 Regards,
-The @site team
+The [site-name] team
 
 This message was sent to you because you have user relationships email notifications turned on.
-If you no longer wish to receive these emails, you can turn them off at @site_url/user/@requestee_uid/edit.
+If you no longer wish to receive these emails, you can turn them off at  [site-url]/user/[requester-uid]/edit.
 MESSAGE;
 
   return array(
@@ -108,20 +61,20 @@
  * Default approve to relationship message
  */
 function user_relationship_mailer_approve_default() {
-  $subject = "[@site] You are @requestee_name's newest @relationship_name";
+  $subject = "[site-name] You are [requestee-name]'s newest [relationship-name]";
   $message = <<<MESSAGE
-Dear @requester_name,
+Dear [requester-name],
 
-@requestee_name has approved your request to be their @relationship_name.
+[requestee-name] has approved your request to be their [relationship-name].
 
 Here's a link to your relationships:
-  @requester_list_link
+  [requester-list-link]
 
 Regards,
-The @site team
+The [site-name] team
 
 This message was sent to you because you have user relationships email notifications turned on.
-If you no longer wish to receive these emails, you can turn them off at @site_url/user/@requester_uid/edit.
+If you no longer wish to receive these emails, you can turn them off at  [site-url]/user/[requester-uid]/edit.
 MESSAGE;
 
   return array(
@@ -134,17 +87,17 @@
  * Default disapprove to relationship message
  */
 function user_relationship_mailer_disapprove_default() {
-  $subject = "[@site] @requestee_name has declined your relationship request";
+  $subject = "[site-name] [requestee-name] has declined your relationship request";
   $message = <<<MESSAGE
-Dear @requester_name,
+Dear [requester-name],
 
-@requestee_name has declined your request to be their @relationship_name.
+[requestee-name] has declined your request to be their [relationship-name].
 
 Regards,
-The @site team
+The [site-name] team
 
 This message was sent to you because you have user relationships email notifications turned on.
-If you no longer wish to receive these emails, you can turn them off at @site_url/user/@requester_uid/edit.
+If you no longer wish to receive these emails, you can turn them off at  [site-url]/user/[requester-uid]/edit.
 MESSAGE;
 
   return array(
@@ -157,17 +110,17 @@
  * Default removed relationship message
  */
 function user_relationship_mailer_remove_default() {
-  $subject = "[@site] @relationship_name relationship between @requester_name and @requestee_name has been deleted";
+  $subject = "[site-name] [relationship-name] relationship between [requester-name] and [requestee-name] has been deleted";
   $message = <<<MESSAGE
-Dear @target_name,
+Dear [target-name],
 
-@requester_name's @relationship_name relationship to @requestee_name has been deleted by @deleted_by_name.
+[requester-name]'s [relationship-name] relationship to [requestee-name] has been deleted by [deleted-by-name].
 
 Regards,
-The @site team
+The [site-name] team
 
 This message was sent to you because you have user relationships email notifications turned on.
-If you no longer wish to receive these emails, you can turn them off at @site_url/user/@profile_uid/edit.
+If you no longer wish to receive these emails, you can turn them off at  [site-url]/user/[profile-uid]/edit.
 MESSAGE;
 
   return array(
@@ -180,21 +133,21 @@
  * Default no approval request relationship message
  */
 function user_relationship_mailer_pre_approved_default() {
-  $subject = "[@site] New @relationship_name relationship between @requester_name and @requestee_name";
+  $subject = "[site-name] New [relationship-name] relationship between [requester-name] and [requestee-name]";
   $message = <<<MESSAGE
-Dear @target_name,
+Dear [target-name],
 
-We have just created a new @relationship_name relationship between @requester_name and @requestee_name.
+We have just created a new [relationship-name] relationship between [requester-name] and [requestee-name].
 
 Regards,
-The @site team
+The [site-name] team
 
 This message was sent to you because you have user relationships email notifications turned on.
-If you no longer wish to receive these emails, you can turn them off at @site_url/user/@profile_uid/edit.
+If you no longer wish to receive these emails, you can turn them off at  [site-url]/user/[profile-uid]/edit.
 MESSAGE;
 
   return array(
     'subject' => $subject,
     'message' => $message,
   );
-}
+}