--- hotel_booking.module	2010-01-04 00:28:09.000000000 +0000
+++ hotel_bookingNew.module	2010-01-08 16:24:06.000000000 +0000
@@ -599,7 +599,7 @@ function hotel_search_view($args) {
       $content .= '<form action="book_room" method="post"><div>';
       $content .= '<input type="hidden" name="nodeid[]" value="'. $node->nid .'" /></div>';
       $content .= '<h3 class="booking-title">'. $node->title .'</h3>';
-      $content .= '<h3 class="booking-price">$ ' . number_format($total, 2, '.', ',') .'</h3>';
+      $content .= '<h3 class="booking-price">' . uc_currency_format($total, 2) .'</h3>';
        if (variable_get('hotel_booking_search_teaser_body', 'teaser') == 'teaser') {
         $content .= '<div class="hotel-roomdesc">'. check_markup($node->teaser, $node->format, FALSE) ."</div>";
       }
@@ -611,9 +611,9 @@ function hotel_search_view($args) {
       $content .= t('Book This Room') .'" /></div>';
 
       $content .= '<fieldset class="clear collapsible collapsed"><legend><a href="#">'. t('Pricing Details') .'</a></legend>';
-      $content .= '<div class="hotel-total">Room Total:<br />$ '. number_format($total, 2, '.', ',') .'</div>';
-      $content .= '<div class="hotel-perperson-total">Total / Person:<br />$ '. $pp .'</div>';
-      $content .= '<div class="hotel-avgpernight">Avg / Night:<br />$ '. $avg .'</div>';
+      $content .= '<div class="hotel-total">Room Total:<br />'. uc_currency_format($total) .'</div>';
+      $content .= '<div class="hotel-perperson-total">Total / Person:<br />'. uc_currency_format($pp) .'</div>';
+      $content .= '<div class="hotel-avgpernight">Avg / Night:<br />'. uc_currency_format($avg) .'</div>';
       $content .= '<h5 class="clear">'. t('Nightly Breakdown:') .'</h5>';
       $content .= '<div class="hotel-result-days">';
       $content .= '<input type="hidden" name="roomtype" value="'. $node->nid .'" />';
@@ -622,7 +622,7 @@ function hotel_search_view($args) {
       $content .= '<input type="hidden" name="total" value="'. $total .'" />';
 
       for ($z = 0; $z < sizeof($rooms[$rtid]['nights']); $z++) {
-        $content .= '<div class="hotel-result-day">'. date('M j', strtotime("$checkin + $z day")) ."<br />$ " . number_format($rooms[$rtid]['nights'][date("Y-m-d", strtotime("$checkin + $z day"))]['price'], 2, '.', ',');
+        $content .= '<div class="hotel-result-day">'. date('M j', strtotime("$checkin + $z day")) ."<br />" . uc_currency_format($rooms[$rtid]['nights'][date("Y-m-d", strtotime("$checkin + $z day"))]['price']);
         $content .= '<input type="hidden" name="date[]" value="'. date('Y-m-d', strtotime("$checkin + $z day")) .'" />';
         $content .= '<input type="hidden" name="price[]" value="'. number_format($rooms[$rtid]['nights'][date("Y-m-d", strtotime("$checkin + $z day"))]['price'], 2, '.', ',') .'" />';
         $content .= '</div>';
@@ -1403,10 +1403,10 @@ function hotel_booking_order_details_tab
       $thisday = $item->data['nights'][$i];
       $foo = explode('-', $thisday);
       $today = date('l F j, Y', mktime(0, 0, 0, $foo[1], $foo[2], $foo[0]));
-      $rows[] = array($today, '',  t('Night !night', array('!night' => ($i + 1))), $checkin, '', array('data' => '$'. number_format($item->data['prices'][$i], 2, '.', ','), 'class' => 'price'));
+      $rows[] = array($today, '',  t('Night !night', array('!night' => ($i + 1))), $checkin, '', array('data' => $currency_sign. number_format($item->data['prices'][$i], 2, '.', ','), 'class' => 'price'));
       foreach ($addons as $nid => $info) {
         if ($addons[$nid]['daily'] && $addons[$nid]['data']['days'][$thisday]) {
-          $rows[] = array('', l($addons[$nid]['order']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => '$' . number_format(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['order']->price), 2, '.', ','), 'class' => 'price'));
+          $rows[] = array('', l($addons[$nid]['order']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => $currency_sign . number_format(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['order']->price), 2, '.', ','), 'class' => 'price'));
         }
       }
     }
@@ -1415,7 +1415,7 @@ function hotel_booking_order_details_tab
     $rows[] = array($today, '', '', t('Check-Out'), '', '');
     foreach ($addons as $nid => $info) {
       if ($addons[$nid]['daily'] && $addons[$nid]['data']['days'][$thisday]) {
-        $rows[] = array('', l($addons[$nid]['order']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => '$' . number_format(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['order']->price), 2, '.', ','), 'class' => 'price'));
+        $rows[] = array('', l($addons[$nid]['order']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => $currency_sign . number_format(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['order']->price), 2, '.', ','), 'class' => 'price'));
       }
     }
 
@@ -1428,7 +1428,7 @@ function hotel_booking_order_details_tab
     $header = array(array('data' => t('Additional Add-On & Upgrade Items'), 'colspan' => 2, 'width' => '100%'), 'data' => t('Total'));
     foreach ($addons as $nid => $info) {
       if (!$addons[$nid]['daily']) {
-        $rows[] = array($addons[$nid]['order']->qty .'x', array('data' => l($addons[$nid]['order']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']), 'width' => '100%'), array('data' => '$' . number_format(($addons[$nid]['order']->qty * $addons[$nid]['order']->price), 2, '.', ','), 'class' => 'price'));
+        $rows[] = array($addons[$nid]['order']->qty .'x', array('data' => l($addons[$nid]['order']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']), 'width' => '100%'), array('data' => $currency_sign . number_format(($addons[$nid]['order']->qty * $addons[$nid]['order']->price), 2, '.', ','), 'class' => 'price'));
       }
     }
 
@@ -1615,17 +1615,18 @@ function hotel_booking_cart_details_tabl
     if ($addons && $daily_items) {
       $addon_title = t('Date Based Add-On Items');
       $qtys = t('Qty.');
-    }
+    }
+    $currency_sign = variable_get('uc_currency_sign', $currency_sign);
     $header = array(t('Dates'), array('data' => $addon_title, 'width' => '45%'), array('data' => t(''), 'colspan' => 2), $qtys, t('Total'));
     for ($i = 0; $i < sizeof($item->data['nights']); $i++) {
       $checkin = ($i == 0) ? t('Check-In') : '';
       $thisday = $item->data['nights'][$i];
       $foo = explode('-', $thisday);
       $today = date('l F j, Y', mktime(0, 0, 0, $foo[1], $foo[2], $foo[0]));
-      $rows[] = array($today, '',  t('Night !night', array('!night' => ($i + 1))), $checkin, '', array('data' => '$'. number_format($item->data['prices'][$i], 2, '.', ','), 'class' => 'price'));
+      $rows[] = array($today, '',  t('Night !night', array('!night' => ($i + 1))), $checkin, '', array('data' => $currency_sign. number_format($item->data['prices'][$i], 2, '.', ','), 'class' => 'price'));
       foreach ($addons as $nid => $info) {
         if ($addons[$nid]['daily'] && $addons[$nid]['data']['days'][$thisday]) {
-          $rows[] = array('', l($addons[$nid]['node']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => '$' . number_format(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['node']->sell_price), 2, '.', ','), 'class' => 'price'));
+          $rows[] = array('', l($addons[$nid]['node']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => $currency_sign . number_format(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['node']->sell_price), 2, '.', ','), 'class' => 'price'));
         }
       }
     }
@@ -1634,7 +1635,7 @@ function hotel_booking_cart_details_tabl
     $rows[] = array($today, '', '', t('Check-Out'), '', '');
     foreach ($addons as $nid => $info) {
       if ($addons[$nid]['daily'] && $addons[$nid]['data']['days'][$thisday]) {
-        $rows[] = array('', l($addons[$nid]['node']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => '$' . number_format(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['node']->sell_price), 2, '.', ','), 'class' => 'price'));
+        $rows[] = array('', l($addons[$nid]['node']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']),'','',array('data' => $addons[$nid]['data']['days'][$thisday], 'class' => 'qty'), array('data' => $currency_sign . number_format(($addons[$nid]['data']['days'][$thisday] * $addons[$nid]['node']->sell_price), 2, '.', ','), 'class' => 'price'));
       }
     }
 
@@ -1647,7 +1648,7 @@ function hotel_booking_cart_details_tabl
     $header = array(array('data' => t('Additional Add-On & Upgrade Items'), 'colspan' => 2, 'width' => '100%'), 'data' => t('Total'));
     foreach ($addons as $nid => $info) {
       if (!$addons[$nid]['daily']) {
-        $rows[] = array($addons[$nid]['cart']['qty'] .'x', array('data' => l($addons[$nid]['node']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']), 'width' => '100%'), array('data' => '$' . number_format(($addons[$nid]['cart']['qty'] * $addons[$nid]['node']->sell_price), 2, '.', ','), 'class' => 'price'));
+        $rows[] = array($addons[$nid]['cart']['qty'] .'x', array('data' => l($addons[$nid]['node']->title, 'booking_upgrades/'. $addons[$nid]['data']['parent_id']), 'width' => '100%'), array('data' => $currency_sign . number_format(($addons[$nid]['cart']['qty'] * $addons[$nid]['node']->sell_price), 2, '.', ','), 'class' => 'price'));
       }
     }
     return theme('table', $header, $rows);