Index: buddylist_ui.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/buddylist/buddylist_ui/Attic/buddylist_ui.module,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 buddylist_ui.module
--- buddylist_ui.module	23 Sep 2007 15:15:44 -0000	1.1.2.4
+++ buddylist_ui.module	23 Dec 2007 21:33:07 -0000
@@ -90,9 +90,18 @@
       );
       
     $items[] = array (
-      'path' => 'buddylist/buddylistpage',
-      'title' => t('Buddylist'), // isnīt shown
-      'callback' => 'buddylist_ui_central_page',
+      'path' => 'buddylist',
+      'title' => t('My @buddylist', buddylist_ui_translation()),
+      'access' => $editAccess,
+      'callback' => 'theme',
+      'callback arguments' => array('buddylist_ui_page_buddylist', $id),
+      );
+      
+    $items[] = array (
+      'path' => 'buddylist/confirmed',
+      'title' => t('My @Buddies', buddylist_ui_translation()),
+      'callback' => 'theme',
+      'callback arguments' => array('buddylist_ui_page_buddylist', $id),
       'type' => MENU_DEFAULT_LOCAL_TASK,
       'weight' => 0,
       'access' => $editAccess,
@@ -100,12 +109,12 @@
       
     $items[] = array(
       'path' => 'buddylist/requests',
-      'title' => t('Pending requests'),
+      'title' => t('My @Buddy Requests', buddylist_ui_translation()),
       'access' => $editAccess,
       'callback' => 'theme',
       'type' => MENU_LOCAL_TASK,
       'weight' => 1,
-      'callback arguments' => array('buddylist_ui_pending_requests', $id)
+      'callback arguments' => array('buddylist_ui_page_pending_requests', $id)
     );
     
     // admin backend
@@ -123,23 +132,6 @@
 }
 
 /**
- * central page for buddylist actions
- * @return string, html formatted output
- */
-function buddylist_ui_central_page() {
-  drupal_set_title(t("Buddylist"));
-  $view = views_get_view('buddy_api_buddylist'); 
-  $title = views_get_title($view);
-  $view_buddylist = views_build_view('embed', $view, array(), FALSE);
-  if (!strlen($view_buddylist)){
-  	$output .= '<p>'. t('NONE') .'</p>';
-  }
-  $output .= $view_buddylist;
-  
-  return theme_box($title, $output, $region = 'main');
-}
-
-/**
  * budbuddylist_ui_admin_settings administration settings page
  */
 function buddylist_ui_admin_settings() {
@@ -186,7 +178,7 @@
  * @return
  */
 function buddylist_ui_pending_requested_deny_submit($form_id, $form_values) {
-  buddy_api_deny_request($form_values['requester_account'], $form_values['requestee_account']);
+  buddy_api_deny_request($form_values['requestee_account'], $form_values['requester_account']);
   return 'user/' . $form_values['requester_account']->uid;
 }
 
@@ -217,7 +209,7 @@
  * @return
  */
 function buddylist_ui_pending_requested_accept_submit($form_id, $form_values) {
-  buddy_api_accept_request($form_values['requester_account'], $form_values['requestee_account']);
+  buddy_api_accept_request($form_values['requestee_account'], $form_values['requester_account']);
   return 'user/' . $form_values['requester_account']->uid;
 }
 
@@ -305,23 +297,19 @@
     return $actions;
   }
 
-  if (in_array($viewed_user->uid, array_keys(buddy_api_get_requestees('uid', $viewing_user->uid)))) {
-    $actions[] = t('You have requested to add this user to your @buddylist. (See !your_pending_requests)', array (
-      '!your_pending_requests' => l(t('your pending requests'
-    ), 'buddylist/requests')) + buddylist_ui_translation());
+  if (in_array($viewed_user->uid, array_keys(buddy_api_get_requestees($viewing_user->uid)))) {
+    $actions[] = theme('buddylist_ui_action_sent_request', $viewed_user);
   } 
   else
-    if (in_array($viewed_user->uid, array_keys(buddy_api_get_buddies('uid', $viewing_user->uid)))) {
-      $actions[] = theme('remove_from_buddylist_link', $viewed_user);
+    if (in_array($viewed_user->uid, array_keys(buddy_api_get_buddies($viewing_user->uid)))) {
+      $actions[] = theme('buddylist_ui_action_remove_buddy', $viewed_user);
     } 
     else
-      if (in_array($viewing_user->uid, array_keys(buddy_api_get_requestees('uid', $viewed_user->uid)))) {
-        $actions[] = t('This user has requested to add you to your @buddylist. (See !your_pending_requests)', array (
-          '!your_pending_requests' => l(t('your pending requests'
-        ), 'buddylist/requests')) + buddylist_ui_translation());
+      if (in_array($viewing_user->uid, array_keys(buddy_api_get_requestees($viewed_user->uid)))) {
+        $actions[] = theme('buddylist_ui_action_confirm_request', $viewed_user);
       } 
       else {
-        $actions[] = theme('add_to_buddylist_link', $viewed_user);
+        $actions[] = theme('buddylist_ui_action_add_buddy', $viewed_user);
       }
 
   return $actions;
@@ -359,7 +347,8 @@
     } 
     else
       if ($type == 'load') {
-        $thisuser->buddies = buddy_api_get_buddies('object', $thisuser->uid);
+        // Do not load buddies as objects to avoid recursion !!!
+        $thisuser->buddies = buddy_api_get_buddies($thisuser->uid);
       }
 }
 
@@ -374,7 +363,7 @@
   if (user_access('view buddy lists') && !$buddy_of) {
     $i = 0;
     
-    if ($buddies = buddy_api_get_buddies('object', $user->uid)) {
+    if ($buddies = buddy_api_get_buddies($user->uid, 'object')) {
       foreach ($buddies as $buddy) {
         $listbuddies[] = $buddy;
         $i++;
@@ -412,7 +401,7 @@
   if (empty ($buddy->name)) {
     drupal_set_message(t('This user does not exist'));
   }
-  elseif (in_array($uid, array_keys(buddy_api_get_buddies('uid', $user->uid)))) {
+  elseif (in_array($uid, array_keys(buddy_api_get_buddies($user->uid)))) {
     drupal_set_message(t('This user is already on your @buddylist', buddylist_ui_translation()));
   }
   elseif ($user->uid == $uid) {
@@ -470,7 +459,7 @@
     drupal_set_message('This user does not exist');
   } 
   else
-    if (!in_array($uid, array_keys(buddy_api_get_buddies('uid', $user->uid)))) {
+    if (!in_array($uid, array_keys(buddy_api_get_buddies($user->uid)))) {
       drupal_set_message('This user is not on your @buddylist', buddylist_ui_translation());
     } 
     else {
@@ -502,7 +491,7 @@
  * @param $buddyuser
  * @return
  */
-function theme_add_to_buddylist_link($buddyuser) {
+function theme_buddylist_ui_action_add_buddy($buddyuser) {
   return l(t('Add %name to my @buddylist', array (
     '%name' => $buddyuser->name
   ) + buddylist_ui_translation()), 'buddy/add/' . $buddyuser->uid, NULL, drupal_get_destination(), NULL, FALSE, TRUE);
@@ -512,13 +501,58 @@
  * @param $buddyuser
  * @return
  */
-function theme_remove_from_buddylist_link($buddyuser) {
+function theme_buddylist_ui_action_remove_buddy($buddyuser) {
   return l(t('Remove %name from my @buddylist', array (
     '%name' => $buddyuser->name
   ) + buddylist_ui_translation()), 'buddy/delete/' . $buddyuser->uid, NULL, drupal_get_destination(), NULL, FALSE, TRUE);
 }
 
-function theme_buddylist_ui_pending_requests($id) {
+/**
+ * @param $buddyuser
+ * @return
+ */
+function theme_buddylist_ui_action_sent_request($buddyuser) {
+  return t('You have requested to add %name to your @buddylist. (See !your_pending_requests)', array (
+    '%name' => $buddyuser->name,
+    '!your_pending_requests' => l(t('your pending requests'
+  ), 'buddylist/requests')) + buddylist_ui_translation());
+}
+
+/**
+ * @param $buddyuser
+ * @return
+ */
+function theme_buddylist_ui_action_confirm_request($buddyuser) {
+  return t('%name has requested to add you to your @buddylist. (See !your_pending_requests)', array (
+    '%name' => $buddyuser->name,
+    '!your_pending_requests' => l(t('your pending requests'
+  ), 'buddylist/requests')) + buddylist_ui_translation());
+}
+
+/**
+ * Main page for displaying confirmed buddylist
+ * 
+ * @return string, html formatted output
+ */
+function theme_buddylist_ui_page_buddylist() {
+  drupal_set_title(t('@Buddylist', buddylist_ui_translation()));
+  $view = views_get_view('buddy_api_buddylist'); 
+  $title = views_get_title($view);
+  $view_buddylist = views_build_view('embed', $view, array(), FALSE);
+  if (!strlen($view_buddylist)){
+    $output .= '<p>'. t('NONE') .'</p>';
+  }
+  $output .= $view_buddylist;
+  
+  return theme_box($title, $output, $region = 'main');
+}
+
+/**
+ * Main page for displaying pending buddy requests (sent & received)t
+ * 
+ * @return string, html formatted output
+ */
+function theme_buddylist_ui_page_pending_requests($id) {
   drupal_set_title('Pending Requests');
   
   $view = views_get_view('buddy_api_received_requests');