--- D:/Web Pages/Mingle Easy/drupal-5.19/sites/all/modules/uc_affiliate2/uc_affiliate2.module-old	Fri Aug 14 12:36:50 2009
+++ D:/Web Pages/Mingle Easy/drupal-5.19/sites/all/modules/uc_affiliate2/uc_affiliate2.module	Fri Aug 14 12:49:25 2009
@@ -66,7 +66,7 @@
       'type' => MENU_LOCAL_TASK
     );
     $items[] = array(
-      'path' => 'affiliate',
+      'path' => 'me',
       'callback' => 'uc_affiliate2_click',
       'access' => user_access('access content'),
       'type' => MENU_CALLBACK
@@ -370,7 +370,7 @@
 
       foreach ($banners as $banner) {
         $banner = '<'. $banner;
-        $banner_link = l($banner, 'affiliate/'. $user->name, array(), NULL, NULL, TRUE, TRUE);
+        $banner_link = l($banner, 'me/'. $user->uid, array(), NULL, NULL, TRUE, TRUE);
 
         $data['banner_preview'][] = $banner;
         $data['banner_code'][] = '<textarea cols="45">'. $banner_link .'</textarea>';
@@ -424,7 +424,7 @@
     }
 
     $product->path = (!$product->path) ? 'node/'. $product->nid : $product->path;
-    $link = $GLOBALS['base_url'] .'/affiliate/'. $user->name .'/'. $product->path;
+    $link = $GLOBALS['base_url'] .'/me/'. $user->uid .'/'. $product->path;
 
     if (empty($product->field_image_cache[0]['filepath'])) {
       $image = 'N/A';
@@ -1023,10 +1023,10 @@
   $output .= '<br /><div id="affiliate-links-header"><h2>' . t('Affiliate Links') . '</h2>';
   $output .= 'You can append a destination page to the end of the affiliate links to redirect to a specific page,
               as well as track clicks to it, i.e.
-              example.com/affiliate/' . $account->name . '/node/1 <br /> <br />';
+              example.com/me/' . $account->uid. '/node/1 <br /> <br />';
 
   $text_link = variable_get('affiliate_text_link_template', '');
-  $text_link = l($text_link, 'affiliate/' . $account->name, array(), NULL, NULL, TRUE, TRUE);
+  $text_link = l($text_link, 'me/' . $account->uid, array(), NULL, NULL, TRUE, TRUE);
   $output .= '<b>Text Link:</b> <br /> <textarea cols="45">' . $text_link . '</textarea>';
 
   $output .= tapir_get_table('_uc_affiliate2_display_banners', $NULL);
@@ -1589,7 +1589,7 @@
 /**
  * Records affiliate ID in the user session and counts the click.
  */
-function uc_affiliate2_click($username = '') {
+function uc_affiliate2_click($username = 0) {
   // If the subdomain handling is enabled, see if the URL references an affiliate in the subdomain
   if (variable_get('affiliate_enable_subdomain_handling', 0)) {
     $subdomain = _uc_affiliate2_get_subdomain();
@@ -1615,9 +1615,9 @@
       $found_affiliate = TRUE;
     }
   }
-  else if ($username) { // regular (affiliate/$affiliate)
+  else if ($username > 0) { // regular (affiliate/$affiliate)
     $found_affiliate = FALSE;
-    $account = user_load(array('name' => $username));
+    $account = user_load(array('uid' => $username));
 
     if (_uc_affiliate2_clicked($account, $goto)) { // valid, redirect
       $found_affiliate = TRUE;