[xoops-svn] SF.net SVN: xoops:[8661] XoopsModules/xpayment/releases/1.41/htdocs/modules /xpayment/index.php

[<wis...@us...>]

Revision: 8661
          http://xoops.svn.sourceforge.net/xoops/?rev=8661&view=rev
Author:   wishcraft
Date:     2012-01-07 03:45:08 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
XPayment 1.41 - Minor Changes to stop duplicate Unpaid Invoices, Minor fix to accepting discount in realtime submission of invoice. - See changelog.txt

Modified Paths:
--------------
    XoopsModules/xpayment/releases/1.41/htdocs/modules/xpayment/index.php

Modified: XoopsModules/xpayment/releases/1.41/htdocs/modules/xpayment/index.php
===================================================================
--- XoopsModules/xpayment/releases/1.41/htdocs/modules/xpayment/index.php	2012-01-07 01:01:14 UTC (rev 8660)
+++ XoopsModules/xpayment/releases/1.41/htdocs/modules/xpayment/index.php	2012-01-07 03:45:08 UTC (rev 8661)
@@ -31,10 +31,17 @@
 			$invoice_handler =& xoops_getmodulehandler('invoice', 'xpayment');
 
 			// Stops Duplication
+			$userip = getIPData(false);
 			if (isset($_POST['key'])) {
 				$criteria = new CriteriaCompo(new Criteria('`plugin`', (!empty($_POST['plugin'])?$_POST['plugin']:'xpayment')));
 				$criteria->add(new Criteria('`key`', $_POST['key']));
 				$criteria->add(new Criteria('`mode`', 'UNPAID'));
+				if ($userip['uid']>0) {
+					$criteria->add(new Criteria('`user_uid`', $userip['uid']));
+				} else {
+					$criteria->add(new Criteria('`user_ip`', $userip['ip4'].$userip['ip6']));
+					$criteria->add(new Criteria('`user_netaddy`', $userip['network-addy']));
+				}
 				if ($invoice_handler->getCount($criteria)==1) {
 					$invoices = $invoice_handler->getObjects($criteria, false);
 					header( "HTTP/1.1 301 Moved Permanently" ); 
@@ -64,7 +71,7 @@
 			$invoice->setVar('donation', ((isset($_POST['donation'])||isset($_POST['donations']))?true:false));
 			$invoice->setVar('comment', $_POST['comment']);
 			
-			$userip = getIPData(false);
+			
 			$invoice->setVar('user_ip', $userip['ip4'].$userip['ip6']);
 			$invoice->setVar('user_netaddy', $userip['network-addy']);
 			$invoice->setVar('user_uid', $userip['uid']);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.