Index: uc_worldpay.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_worldpay/uc_worldpay.info,v
retrieving revision 1.1.4.1
diff -u -p -r1.1.4.1 uc_worldpay.info
--- uc_worldpay.info	7 Dec 2008 18:34:06 -0000	1.1.4.1
+++ uc_worldpay.info	22 Oct 2009 08:35:59 -0000
@@ -1,5 +1,6 @@
 ; $Id: uc_worldpay.info,v 1.1.4.1 2008/12/07 18:34:06 rareface Exp $
 name = Worldpay
+core = 6.x
 description = Integrates Worldpay's redirected payment service with Ubercart.
 dependencies[] = uc_payment
 package = Ubercart - payment
Index: uc_worldpay.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_worldpay/uc_worldpay.module,v
retrieving revision 1.2
diff -u -p -r1.2 uc_worldpay.module
--- uc_worldpay.module	5 Dec 2008 18:28:29 -0000	1.2
+++ uc_worldpay.module	22 Oct 2009 08:36:00 -0000
@@ -13,7 +13,7 @@
  */
 function uc_worldpay_menu() {
   $items['cart/worldpay/complete'] = array(
-    'title' => t('Order complete'),
+    'title' => 'Order complete',
     'page callback' => 'uc_worldpay_complete',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
@@ -127,6 +127,18 @@ function uc_payment_method_worldpay($op,
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
       );
+      $form['payment_parameters']['uc_worldpay_test_url'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Test URL'),
+        '#description' => t('The Worldpay test environment URL.'),
+        '#default_value' => variable_get('uc_worldpay_test_url', 'https://select-test.wp3.rbsworldpay.com/wcc/purchase'),
+      );
+      $form['payment_parameters']['uc_worldpay_live_url'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Live URL'),
+        '#description' => t('The Worldpay live environment URL.'),
+        '#default_value' => variable_get('uc_worldpay_live_url', 'https://secure.wp3.rbsworldpay.com/wcc/purchase'),
+      );
       $form['payment_parameters']['uc_worldpay_test'] = array(
         '#type' => 'checkbox',
         '#title' => t('Enable test mode'),
@@ -241,8 +253,8 @@ function uc_worldpay_form_alter(&$form, 
         );
       }
 
-      $test_server = 'https://select-test.worldpay.com/wcc/purchase';
-      $live_server = 'https://select.worldpay.com/wcc/purchase';
+      $test_server = variable_get('uc_worldpay_test_url', 'https://select-test.wp3.rbsworldpay.com/wcc/purchase');
+      $live_server = variable_get('uc_worldpay_live_url', 'https://secure.wp3.rbsworldpay.com/wcc/purchase');
       $form['#action'] = (variable_get('uc_worldpay_test', TRUE)) ? $test_server : $live_server;
       $form['submit'] = array(
         '#type' => 'submit',
@@ -335,4 +347,4 @@ function uc_worldpay_theme() {
       'arguments' => array(),
     ),
   );
-}
\ No newline at end of file
+}