Index: uc_ideal_easy_payment.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_ideal_easy/uc_ideal_easy_payment.info,v
retrieving revision 1.1
diff -u -r1.1 uc_ideal_easy_payment.info
--- uc_ideal_easy_payment.info	19 Aug 2008 07:15:36 -0000	1.1
+++ uc_ideal_easy_payment.info	26 Jan 2009 18:35:06 -0000
@@ -2,6 +2,8 @@
 name = Ideal Easy
 description = Receive payments through checkout via Ideal Easy ABN/Amro.
 package = Ubercart - payment
-dependencies = uc_payment
+dependencies[] = uc_payment
+core = 6.x
+version = 6.x-1.x-dev
 
 
Index: uc_ideal_easy_payment.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_ideal_easy/uc_ideal_easy_payment.install,v
retrieving revision 1.1
diff -u -r1.1 uc_ideal_easy_payment.install
--- uc_ideal_easy_payment.install	19 Aug 2008 07:15:36 -0000	1.1
+++ uc_ideal_easy_payment.install	26 Jan 2009 18:34:53 -0000
@@ -1,23 +1,44 @@
 <?php
 // $Id: uc_ideal_easy_payment.install,v 1.1 2008/08/19 07:15:36 keesje76 Exp $
 
-/**
- * Implementation of hook_install().
- */
+function uc_ideal_easy_payment_schema() {
+  $schema['uc_payment_ideal_easy'] = array(
+    'description' => t("Table for Ubercart payments trough iDEAL easy"),
+    'fields' => array(
+      'order_id' => array(
+        'description' => t('Primary Key: Unique order_id.'),
+        'type' => 'mediumint',
+        'length' => 9,
+        'not null' => TRUE),
+      'transaction_id' => array(
+        'description' => t('transaction_id'),
+        'type' => 'mediumint',
+				'length' => 9,
+        'not null' => TRUE),
+      'description' => array(
+        'description' => t('description'),
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => 9),
+      'order_status' => array(
+        'description' => t('A Unix timestamp indicating when the cache entry was created.'),
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => 4),
+      'return_succes' => array(
+        'description' => t('Any custom HTTP headers to be added to cached data.'),
+        'type' => 'text',
+        'not null' => TRUE)
+      ),
+    'primary key' => array('order_id'),
+    );
+  return $schema;
+}
+
 function uc_ideal_easy_payment_install() {
-  switch ($GLOBALS['db_type']) {
-    case 'mysql':
-    case 'mysqli':
-      db_query("CREATE TABLE {uc_payment_ideal_easy} (
-        order_id mediumint(9) NOT NULL,
-        transaction_id mediumint(9) NOT NULL,
-        description varchar(64) NOT NULL,
-        order_status tinyint(4) NOT NULL,
-        return_succes tinytext NOT NULL,
-        PRIMARY KEY  (order_id)
-      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
-      break;
-    case 'pgsql':
-      break;
-  }
+  drupal_install_schema('uc_payment_ideal_easy');
 }
+
+function uc_ideal_easy_payment_uninstall() {
+  drupal_uninstall_schema('uc_payment_ideal_easy');
+}
\ No newline at end of file
Index: uc_ideal_easy_payment.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_ideal_easy/uc_ideal_easy_payment.module,v
retrieving revision 1.1
diff -u -r1.1 uc_ideal_easy_payment.module
--- uc_ideal_easy_payment.module	19 Aug 2008 07:15:36 -0000	1.1
+++ uc_ideal_easy_payment.module	26 Jan 2009 18:34:27 -0000
@@ -16,53 +16,58 @@
 /*******************************************************************************
  * Hook Functions (Drupal)
  ******************************************************************************/
+/**
+ * Implementation of hook_theme().
+ */
+function uc_ideal_easy_payment_theme() {
+  return array(
+    'uc_ideal_easy_payment_method_form' => array(
+      'arguments' => array('form' => NULL),
+    ),
+	);
+}
 
  /**
  * Implementation of hook_menu().
  */
-function uc_ideal_easy_payment_menu($may_cache) {
+function uc_ideal_easy_payment_menu() {
   $items = array();
 
-    $items[] = array(
-      'path' => 'cart/checkout/ideal_easy_request',
-      'title' => t('iDEAL Payment Page'),
-      'callback' => 'uc_ideal_easy_request_form',
-      'access' => user_access('access content'),
+    $items['cart/checkout/ideal_easy_request'] = array(
+      'title' => 'iDEAL Payment Page',
+      'page callback' => 'uc_ideal_easy_request_form',
+      'access arguments' => array('access arguments content'),
       'type' => MENU_CALLBACK,
     );
 
-    $items[] = array(
-      'path' => 'cart/checkout/ideal_easy_dirreq',
-      'title' => t('iDEAL Payment Page'),
-      'callback' => 'uc_ideal_easy_dirreq_form',
-      'access' => user_access('access content'),
+    $items['cart/checkout/ideal_easy_dirreq'] = array(
+      'title' => 'iDEAL Payment Page',
+      'page callback' => 'uc_ideal_easy_dirreq_form',
+      'access arguments' => array('access arguments content'),
       'type' => MENU_CALLBACK,
     );
 
-    $items[] = array(
-      'path' => 'ideal_easy_rtrn',
-      'title' => t('iDEAL Payment'),
-      'callback' => 'uc_ideal_easy_stat_call',
-      'callback arguments' => array('ok'),
-      'access' => user_access('access content'),
+    $items['ideal_easy_rtrn'] = array(
+      'title' => 'iDEAL Payment',
+      'page callback' => 'uc_ideal_easy_stat_call',
+      'page arguments' => array('ok'),
+      'access arguments' => array('access arguments content'),
       'type' => MENU_CALLBACK,
     );
 
-    $items[] = array(
-      'path' => 'cart/checkout/ideal_easy_stat_canc',
-      'title' => t('iDEAL Payment'),
-      'callback' => 'uc_ideal_easy_stat_call',
-      'callback arguments' => array('cancel'),
-      'access' => user_access('access content'),
+    $items['cart/checkout/ideal_easy_stat_canc'] = array(
+      'title' => 'iDEAL Payment',
+      'page callback' => 'uc_ideal_easy_stat_call',
+      'page arguments' => array('cancel'),
+      'access arguments' => array('access arguments content'),
       'type' => MENU_CALLBACK,
     );
 
-    $items[] = array(
-      'path' => 'cart/checkout/ideal_easy_stat_err',
-      'title' => t('iDEAL Payment'),
-      'callback' => 'uc_ideal_easy_stat_call',
-      'callback arguments' => array('error'),
-      'access' => user_access('access content'),
+    $items['cart/checkout/ideal_easy_stat_err'] = array(
+      'title' => 'iDEAL Payment',
+      'page callback' => 'uc_ideal_easy_stat_call',
+      'page arguments' => array('error'),
+      'access arguments' => array('access arguments content'),
       'type' => MENU_CALLBACK,
     );
 
@@ -86,7 +91,7 @@
     'callback' => 'uc_payment_method_ideal_easy',
     'weight' => 2,
     'checkout' => TRUE,
-    'backend' => TRUE,
+    'no_gateway' => TRUE,
   );
 
   return $methods;
@@ -208,7 +213,7 @@
  */
 function uc_ideal_easy_payment_settings_form() {
 
-  $url_base = url(NULL, NULL, NULL, TRUE);
+  $url_base = url();
 
   $form['ideal_easy_acquirerurl'] = array(
     '#type' => 'textfield',
@@ -261,7 +266,7 @@
 
 function uc_ideal_easy_call(&$arg1, $arg2) {
 
-  $url_base = url(NULL, NULL, NULL, TRUE);
+  $url_base = url();
 
   $redirect_message1 = t('You will be redirected to the iDEAL gateway...');
   $redirect_message2 = t('You will return to our shop after completing your iDEAL payment transaction.');
@@ -300,7 +305,7 @@
 
 /*Get request form*/
 function uc_ideal_easy_build_request_form($orderid, $amount, &$arg1, $arg2) {
-  $url_base = url(NULL, NULL, NULL, TRUE);
+  $url_base = url();
 
   $acquirerurl = variable_get('ideal_easy_acquirerurl', 'https://internetkassa.abnamro.nl/ncol/test/orderstandard.asp');
   $pspid = variable_get('ideal_easy_pspid', '000000000');
@@ -377,14 +382,14 @@
       //Here you should retrieve the order from the database, mark it as "payed"
       $order = uc_order_load($_SESSION['ideal_easy_order_id']);
       if ($order == FALSE) { //Check if order exist
-        watchdog('uc_ideal_easy_payment', t('iDEAL payment completion attempted for non-existent order.'), WATCHDOG_ERROR);
+        watchdog('uc_ideal_easy_payment', 'iDEAL payment completion attempted for non-existent order.', WATCHDOG_ERROR);
         return;
       }
       //uc_order_update_status($order_id, 1);   *Uitgezet 281107 KK
       uc_order_update_status($order->order_id, uc_order_state_default('post_checkout'));
       //uc_order_update_status($order->order_id, uc_order_state_default('payment_received')); *Uitgezet 210408 KK
       unset($_SESSION['ideal_easy_order_id']);
-      // This lets us know it's a legitimate access of the complete page.
+      // This lets us know it's a legitimate access arguments of the complete page.
       $_SESSION['do_complete'] = TRUE;
       drupal_goto('cart/checkout/complete');
       exit();
@@ -394,7 +399,7 @@
       //Transaction failed, inform the consumer
       drupal_set_message(t('Your iDEAL payment has been canceled by you or by the IDEAL process. Please try again or go back to select another payment method.'), 'error');
       if ($order_id == $_SESSION['ideal_easy_order_id']) { //Check if orer_id is valid
-        // This lets us know it's a legitimate access of the review page.
+        // This lets us know it's a legitimate access arguments of the review page.
         $_SESSION['do_review'] = TRUE;
         // Ensure the cart we're looking at is the one that payment was attempted for.
         $_SESSION['cart_order'] = uc_cart_get_id();