--- uc_order_export.module.orig 2009-02-20 15:11:16.000000000 +0100 +++ uc_order_export.module 2009-02-20 15:12:10.000000000 +0100 @@ -191,7 +191,7 @@ if (isset($_SESSION['sort_status']) && is_numeric($_SESSION['sort_status'])) { $status = 'o.order_status = ' . $_SESSION['sort_status']; } else { - $status = 'o.order_status != 0'; + $status = 'o.order_status = 0'; } } $sql = 'SELECT o.order_id,o.billing_first_name,o.billing_last_name,o.order_total, ' @@ -316,7 +316,11 @@ $formats = uc_order_export_formats(); $format = $formats[$form_values['format']]; - $orders = array_filter($form_values['orders']); + $orders = array_filter($form_values['orders'], 'is_numeric'); + if(count($orders) == 0){ + drupal_set_message(t('No orders selected'), 'error'); + return; + } $sql = sprintf("SELECT * FROM {uc_orders} o WHERE order_id IN (%s)",implode(",",$orders)); $result = db_query($sql); @@ -654,6 +658,7 @@ } function _uc_order_export_get_payment_info($order_id,$method) { + if($method == '') return; $sql = "SELECT * FROM {uc_payment_%s} WHERE order_id = %d"; $res = db_query($sql,$method,$order_id); $payment = db_fetch_object($res); @@ -691,6 +696,7 @@ function _uc_order_export_get_comment_info($order_id) { $sql = "SELECT * FROM {uc_order_comments} WHERE order_id=%d"; $res = db_query($sql,$order_id); + $comments = array(); while ($comment = db_fetch_object($res)) { $comments[] = trim($comment->message); } return split("\n",wordwrap(join('',$comments),80)); }