? LICENSE.txt
? userpoints_ubercart-282582-32.patch
Index: uc_userpoints_payment.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_ubercart/uc_userpoints_payment.info,v
retrieving revision 1.2
diff -u -p -r1.2 uc_userpoints_payment.info
--- uc_userpoints_payment.info	13 Jul 2008 01:50:59 -0000	1.2
+++ uc_userpoints_payment.info	25 Feb 2009 07:17:55 -0000
@@ -1,6 +1,14 @@
 ; $Id: uc_userpoints_payment.info,v 1.2 2008/07/13 01:50:59 bmagistro Exp $
 name = Userpoints Payment
 description = Interfaces userpoints with ubercart, for the purpose of making puchases.
-version = "5.x-1.8"
+
 package = Ubercart - Userpoints
-dependencies = userpoints uc_order uc_cart uc_payment workflow_ng
\ No newline at end of file
+dependencies[] = userpoints
+dependencies[] = uc_order
+dependencies[] = uc_cart
+dependencies[] = uc_payment
+; Information added by drupal.org packaging script on 2008-07-28
+project = "userpoints_ubercart"
+datestamp = "1235547493"
+
+core = 6.x
Index: uc_userpoints_payment.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_ubercart/uc_userpoints_payment.install,v
retrieving revision 1.1
diff -u -p -r1.1 uc_userpoints_payment.install
--- uc_userpoints_payment.install	10 Jul 2008 01:14:51 -0000	1.1
+++ uc_userpoints_payment.install	25 Feb 2009 07:17:55 -0000
@@ -4,32 +4,29 @@
  * Install the initial schema.
  */
 function uc_userpoints_payment_install() {
-  switch ($GLOBALS['db_type']) {
-    case 'mysql':
-    case 'mysqli':
-     db_query("CREATE TABLE {uc_up_payment_log} (
-          uplog_id      INT     NOT NULL AUTO_INCREMENT,
-          uid           INT(10) NOT NULL DEFAULT '0',
-          oid						INT(10) NOT NULL DEFAULT '0',
-          points        INT(10) NOT NULL DEFAULT '0',
-          PRIMARY KEY (uplog_id)
-        ) /*!40100 DEFAULT CHARACTER SET utf8 */;");
-      break;
-    case 'pgsql':
-			db_query("CREATE TABLE {uc_up_payment_log} (
-					 uplog_id   serial,
-					 uid   INT NOT NULL DEFAULT '0',
-					 oid   INT NOT NULL DEFAULT '0',
-					 points   INT NOT NULL DEFAULT '0',
-					 PRIMARY KEY (uplog_id)
-				 )");
-			 break;
-  }
+  // Create tables.
+  drupal_install_schema('uc_userpoints_payment');
 }
 
 /**
 * Implementation of hook_uninstall().
 */
 function uc_userpoints_payment_uninstall() {
-  db_query('DROP TABLE {uc_up_payment_log}');
-}
\ No newline at end of file
+  // Remove tables.
+  drupal_uninstall_schema('uc_userpoints_payment');
+}
+
+/**
+ * Define the database scheme for hook_schema().
+ */
+function uc_userpoints_payment_schema() {
+  $schema['uc_up_payment_log'] = array(
+    'fields' => array(
+         'uplog_id' => array('type' => 'serial', 'not null' => TRUE ),
+         'uid' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
+         'oid' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
+         'points' => array('type' => 'int', 'not null' => TRUE, 'default' => 0)),
+    'primary key' => array('uplog_id'),
+  );
+  return $schema;
+}
Index: uc_userpoints_payment.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_ubercart/uc_userpoints_payment.module,v
retrieving revision 1.6
diff -u -p -r1.6 uc_userpoints_payment.module
--- uc_userpoints_payment.module	2 Nov 2008 01:17:08 -0000	1.6
+++ uc_userpoints_payment.module	25 Feb 2009 07:17:55 -0000
@@ -1,17 +1,14 @@
 <?php
-<<<<<<< uc_userpoints_payment.module
-=======
 
-//$Id: uc_userpoints_payment.module,v 1.6 2008/11/02 01:17:08 bmagistro Exp $
+//$Id: uc_userpoints_payment.module,v 1.5 2008/07/27 23:05:40 bmagistro Exp $
 
->>>>>>> 1.4
 define('USERPOINTS_UC_PAYMENT',   'userpoints_ubercart_payment');
 define('USERPOINTS_DISPLAY',	    'userpoints_display');
 define('USERPOINTS_PAY_MODERATE',	'userpoints_pay_moderate');
 define('USERPOINTS_PAY_CATEGORY',		'userpoints_PAY_category');
 
-function uc_userpoints_payment_help($section) {
-  switch ($section) {
+function uc_userpoints_payment_help($path, $arg) {
+  switch ($path) {
     case 'admin/modules#description':
       $output = t('<strong>Userpoints Payment:</strong> Interfaces userpoints with Ubercart so users can make purchases with points.');
       break;
@@ -202,7 +199,7 @@ function uc_payment_method_points($op, &
 		case 'settings':
 			// Add a few points related fields to the payment methods settings form.
 			$form['userpoints_ubercart_permission'] = array(
-				'#value' => '<div>'. t('Please adjust the settings for using points under the userpoints section <a href=\'/admin/settings/userpoints\'>(click here)</a>.  This area is for enabling points as payment method only.') .'</div>',
+				'#value' => '<div>'. t('Please adjust the settings for using points under the '.l('userpoints admin settings','admin/settings/userpoints').'.  This area is for enabling points as payment method only.') .'</div>',
 		);
 			return $form;
 			break;