### Eclipse Workspace Patch 1.0
#P contributions
Index: modules/affiliate/affiliate.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/affiliate/affiliate.module,v
retrieving revision 1.7
diff -u -r1.7 affiliate.module
--- modules/affiliate/affiliate.module	6 Jun 2006 14:12:05 -0000	1.7
+++ modules/affiliate/affiliate.module	21 Nov 2006 02:17:15 -0000
@@ -4,7 +4,7 @@
 /**
  * Implementation of hook_help().
  */
-function affiliate_help($section) {
+function affiliate_help($section='') {
   switch ($section) {
   case 'admin/modules#description':
     return t('Tracks source of visitors.');
@@ -29,13 +29,14 @@
 
     if ($may_cache) {
       $access = user_access('administer affiliates');
-      $items[] = array('path' => 'admin/affiliate',
-		       'title' => t('affiliates'),
+      $items[] = array('path' => 'admin/settings/affiliate',
+		       'title' => t('Affiliates'),
+		       'description' => t('Track source of visitors'),
 		       'access' => $access,
 		       'callback' => 'affiliate_admin',
 		       'type' => MENU_NORMAL_ITEM);
-      $items[] = array('path' => 'admin/affiliate/users',
-		       'title' => t('users by affiliate'),
+      $items[] = array('path' => 'admin/settings/affiliate/users',
+		       'title' => t('Users by Affiliate'),
 		       'access' => $access,
 		       'callback' => 'affiliate_admin_users',
 		       'type' => MENU_DEFAULT_LOCAL_TASK);
@@ -178,7 +179,7 @@
 	$aff = db_fetch_object(db_query($sql, $user->affiliate));
 	$items[] = array('title' => t('Referred by'),
 			 'value' => l($aff->name, 
-				      "admin/affiliate/users/".$aff->uid));
+				      "admin/settings/affiliate/users/".$aff->uid));
       } else {
 	$items[] = array('title' => t('Referred by'),
 			 'value' => t('none'));
@@ -275,7 +276,7 @@
  * Displays affiliates.
  */
 function affiliate_admin() {
-  $ec = module_exist('store');
+  $ec = module_exists('store');
 
   $header = array(
     array('data' => t('ID'), 'field' => 'aid'),
@@ -286,6 +287,8 @@
     $header[] = array('data' => t('Sales'), 'field' => 'sales');
   }
   $header[] = array('data' => t('Operations'));
+  
+  $output = '';
 
   // I can't figure out how to get sum(clicks) and count(au.uid) in a 
   // single query.  It requires two left joins, and rows get counted
@@ -311,9 +314,9 @@
 
   $sql = ('SELECT ad.aid, ad.enabled, u1.name, '.
 	  '       count(au.uid) as referred '.
-	  'FROM {affiliate_details} as ad, {users} as u1 '.
+	  'FROM {affiliate_details} as ad LEFT JOIN {users} as u1 on ad.aid = u1.uid '.
 	  'LEFT JOIN {affiliate_users} as au on ad.aid = au.aid '.
-	  'WHERE ad.aid = u1.uid GROUP BY ad.aid');
+	  'GROUP BY ad.aid');
   $count = 'SELECT COUNT(DISTINCT(aid)) FROM {affiliate_details}';
 
   $sql .= tablesort_sql($header);
@@ -324,7 +327,7 @@
       (array('data' => l($row->aid, '', 
 			 array('title' => t('an affiliate formatted link')),
 			 "a=$row->aid")),
-       array('data' => l($row->name, "admin/affiliate/users/$row->aid", 
+       array('data' => l($row->name, "admin/settings/affiliate/users/$row->aid", 
 			 array('title' => 
 			       t('View users attached to this affiliate')))),
        array('data' => is_null($clicks[$row->aid]) ? 0 : $clicks[$row->aid]),
@@ -345,7 +348,7 @@
     $rows[] = array(array('data' => $pager, 'colspan' => '5'));
   }
   $output = theme('table', $header, $rows);
-  $output .= affiliate_edit_user_form();
+  $output .= drupal_get_form('affiliate_edit_user_form');
   return $output;
 }
 
@@ -361,7 +364,7 @@
      '#default_value' => 0,
      '#options' => $all);
   $form['submit'] = array('#type' => 'submit', '#value' => t('Edit'));
-  return drupal_get_form('affiliate_edit_user_form', $form);
+  return $form;
 }
 
 function affiliate_edit_user_form_submit($form_id, $form_values) {
@@ -407,5 +410,3 @@
     variable_set('affiliate_cron_last', time());
   }
 }
-
-?>
Index: modules/affiliate/affiliate.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/affiliate/affiliate.install,v
retrieving revision 1.1
diff -u -r1.1 affiliate.install
--- modules/affiliate/affiliate.install	6 Jun 2006 14:12:05 -0000	1.1
+++ modules/affiliate/affiliate.install	21 Nov 2006 02:17:14 -0000
@@ -37,4 +37,11 @@
   }
 }
 
-?>
+/**
+ * Implementation of hook_uninstall().
+ */ 
+function affiliate_uninstall() {
+  db_query('DROP TABLE {affiliate_details}');
+  db_query('DROP TABLE {affiliate_users}');
+  db_query('DROP TABLE {affiliate_counts}');
+}
Index: modules/affiliate/affiliate.info
===================================================================
RCS file: modules/affiliate/affiliate.info
diff -N modules/affiliate/affiliate.info
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/affiliate/affiliate.info	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,3 @@
+; $Id$
+name = Affiliate
+description = Allows site owners to issue affiliate links to their partners