Refactoring muamba_availability_info()

diff --git a/muamba.business.inc b/muamba.business.inc
index d7de83484331e7021e520953fd3ec3145f50a752..34dcf06b6742062c7608bc63439afdaab231e8f8 100644 (file)
--- a/muamba.business.inc
+++ b/muamba.business.inc
@@ -417,22 +417,31 @@ function muamba_widget($node, $size = 'small') {
  */
 function muamba_availability_info($nid) {
   global $user;
-  $available = muamba_check_availability($nid);
-  $node      = node_load($nid);
+  $available   = muamba_check_availability($nid);
+  $node        = node_load($nid);
+  $transaction = muamba_current_transactions($nid, $user->uid);
 
   if ($node->uid == $user->uid) {
     return t('You own the item');
   }
-  elseif (!$available) {
-    $transaction = muamba_current_transactions($nid, $user->uid);
-
-    if (isset($transaction['uid']) && $transaction['uid'] == $user->uid) {
-      return t('You requested');
+  else {
+    if (!$available) {
+      if (isset($transaction['uid']) && $transaction['uid'] == $user->uid) {
+        return t('You requested, status is @status', array(
+          '@status' => muamba_statuses($transaction['status'])
+        ));
+      }
+      else {
+        return t('No');
+      }
     }
     else {
-      return t('No');
+      if (isset($transaction['uid']) && $transaction['uid'] == $user->uid) {
+        return t('Yes, you requested');
+      }
+      else {
+        return t('Yes');
+      }
     }
   }
-
-  return t('Yes');
 }

diff --git a/muamba.db.inc b/muamba.db.inc
index 5e3a403ac00a2c91b196d9ea1f23658f237bc895..4275ddea57be5619dfa88487a82b38a0a2cb44a6 100644 (file)
--- a/muamba.db.inc
+++ b/muamba.db.inc
@@ -151,7 +151,9 @@ function muamba_current_transactions($data, $uid = NULL) {
     return $rows[0];
   }
 
-  return $rows;
+  if (isset($rows)) {
+    return $rows;
+  }
 }
 
 /**