? massmailer.patch
Index: massmailer.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/massmailer/massmailer.module,v
retrieving revision 1.8
diff -u -r1.8 massmailer.module
--- massmailer.module	11 Mar 2005 17:52:38 -0000	1.8
+++ massmailer.module	17 May 2005 22:06:43 -0000
@@ -562,9 +562,9 @@
   }
 
   $form .= form_textarea(t('Create Subscribers'), 'subscribers', '', 70, 5, t('Enter email addresses separated by commas'));
-  if(module_exist('contact')) {
-    $current_searches = massmailer_engine('_get_contact_search', array('lid'=>$lid));
-    $result = db_query('SELECT name, sid FROM {contact_search} WHERE type = \'%s\' ORDER BY name', 'search');
+  if(module_exist('contact_manager')) {
+    $current_searches = massmailer_engine('_get_contact_manager_search', array('lid'=>$lid));
+    $result = db_query('SELECT name, sid FROM {contact_manager_search} WHERE type = \'%s\' ORDER BY name', 'search');
     $searches[] = '--';
     while($search = db_fetch_object($result)) {
       if(!in_array($search->sid, $current_searches)) {
@@ -630,7 +630,7 @@
     $content .= form_group($name, t('Description: ').$list->description);
   }
 
-  $group = massmailer_show_contact_searches($lid);
+  $group = massmailer_show_contact_manager_searches($lid);
   $group .= massmailer_show_subscribers($lid, $page);
   $content .= form_group('Subscription Information', $group);
 
@@ -974,14 +974,14 @@
 * @param $lid The id of the list.
 * @return html formatted list of contact searches subscribed to the list.
 */
-function massmailer_show_contact_searches($lid) {
-  if(module_exist('contact')) {
-    $sids = massmailer_engine('_get_contact_search', array('lid'=>$lid));
+function massmailer_show_contact_manager_searches($lid) {
+  if(module_exist('contact_manager')) {
+    $sids = massmailer_engine('_get_contact_manager_search', array('lid'=>$lid));
 
     foreach($sids as $sid){
       $links = array();
-      $search = db_fetch_object(db_query('SELECT name, sid FROM {contact_search} WHERE sid = %d', $sid));
-      $links[] = l(t('view'), 'contact/saved/'. $search->sid, array('title'=>t('view saved contact search')));
+      $search = db_fetch_object(db_query('SELECT name, sid FROM {contact_manager_search} WHERE sid = %d', $sid));
+      $links[] = l(t('view'), 'contact_manager/saved/'. $search->sid, array('title'=>t('view saved contact search')));
       $links[] = l(t('unsubscribe'), 'admin/massmailer/list/unsubscribe/search/'. $lid .'/'. $search->sid, array('title'=>t('unsubscribe this contact search')));
       $list[] = $search->name .' - '. theme('links', $links);
     }
@@ -999,19 +999,19 @@
 * @return themed results of subscriber add.
 */
 function massmailer_add_subscribers($edit) {
-  if(massmailer_can_engine('_add_contact_search') && module_exist('contact')) {
+  if(massmailer_can_engine('_add_contact_manager_search') && module_exist('contact_manager')) {
     if($edit['contact_search']) {
-      if(massmailer_engine('_add_contact_search', array('lid'=>$edit['lid'], 'csid'=>$edit['contact_search']))) {
-        $search = db_fetch_object(db_query('SELECT name FROM {contact_search} WHERE sid = %d', $edit['contact_search']));
+      if(massmailer_engine('_add_contact_manager_search', array('lid'=>$edit['lid'], 'csid'=>$edit['contact_search']))) {
+        $search = db_fetch_object(db_query('SELECT name FROM {contact_manager_search} WHERE sid = %d', $edit['contact_search']));
         drupal_set_message(t('Successfully added the following contact search to the list: %s', array('%s'=> $search->name)));
       }
     }
   }
-  elseif (module_exist('contact')){
-    $search = db_fetch_array(db_query('SELECT edit FROM {contact_search} WHERE sid=\'%s\'', $sid));
+  elseif (module_exist('contact_manager')){
+    $search = db_fetch_array(db_query('SELECT edit FROM {contact_manager_search} WHERE sid=\'%s\'', $sid));
 
     $_SESSION['contact_search'] = unserialize($search['edit']);
-    $sql = _contact_query();
+    $sql = _contact_manager_query();
     $results = db_query($sql);
     $_SESSION['contact_search'] = null;
 
@@ -1087,7 +1087,7 @@
 function massmailer_unsubscribe($op, $lid, $id) {
   switch ($op) {
     case 'search' :
-        if (massmailer_engine('_remove_contact_search', array('lid'=>$lid, 'csid'=>$id))) {
+        if (massmailer_engine('_remove_contact_manager_search', array('lid'=>$lid, 'csid'=>$id))) {
           drupal_set_message(t('Successfully unsubscribed the contact search from the list'));
         }
         else {
Index: engines/phplist/phplist.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/massmailer/engines/phplist/phplist.module,v
retrieving revision 1.6
diff -u -r1.6 phplist.module
--- engines/phplist/phplist.module	25 Feb 2005 11:02:56 -0000	1.6
+++ engines/phplist/phplist.module	17 May 2005 22:06:43 -0000
@@ -491,7 +491,7 @@
  * @param $lid The id value of the list.
  * @return boolean true if successful.
  */
-function phplist_add_contact_search($lid, $csid) {
+function phplist_add_contact_manager_search($lid, $csid) {
   return db_query('INSERT INTO {phplist_contact_searches} (lid, csid) VALUES (%d, %d)', $lid, $csid);
 }
 
@@ -503,7 +503,7 @@
  * @param $lid The id value of the list.
  * @return boolean true if successful.
  */
-function phplist_remove_contact_search($lid, $csid) {
+function phplist_remove_contact_manager_search($lid, $csid) {
   return db_query('DELETE FROM {phplist_contact_searches} WHERE lid=%d AND csid=%d', $lid, $csid);
 }
 
@@ -514,7 +514,7 @@
  * @param $lid The id value of the list.
  * @return array of contact search ids that are subscribed to the list.
  */
-function phplist_get_contact_search($lid) {
+function phplist_get_contact_manager_search($lid) {
   $results = db_query('SELECT csid FROM {phplist_contact_searches} WHERE lid=%d', $lid);
   $sids = array();
   while($sid = db_fetch_object($results)) {
@@ -666,7 +666,7 @@
   while($message = db_fetch_object($messages)) {
     $lists = phplist_get_lists($message->mid);
     foreach($lists as $list) {
-      $searches = phplist_get_contact_search($list->lid);
+      $searches = phplist_get_contact_manager_search($list->lid);
       foreach($searches as $search) {
         $contacts = phplist_get_contacts($search);
         foreach($contacts as $contact) {
@@ -718,10 +718,10 @@
 function phplist_get_contacts($sid) {
   $contacts = array();
 
-  $search = db_fetch_array(db_query('SELECT edit FROM {contact_search} WHERE sid=%d', $sid));
+  $search = db_fetch_array(db_query('SELECT edit FROM {contact_manager_search} WHERE sid=%d', $sid));
 
   $_SESSION['contact_search'] = unserialize($search['edit']);
-  $sql = _contact_query();
+  $sql = _contact_manager_query();
   $results = db_query($sql);
   $_SESSION['contact_search'] = null;