[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31511] branches/proposals/6.x/lib

[<nk...@us...>]

Revision: 31511
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31511&view=rev
Author:   nkoth
Date:     2010-12-20 10:42:54 +0000 (Mon, 20 Dec 2010)

Log Message:
-----------
[FIX][bp/31510] After datachannel with payment is executed, execution stopped leading to payment not being reflected properly as paid in Tiki Payments.

Modified Paths:
--------------
    branches/proposals/6.x/lib/payment/behavior/execute_datachannel.php
    branches/proposals/6.x/lib/wiki-plugins/wikiplugin_datachannel.php

Modified: branches/proposals/6.x/lib/payment/behavior/execute_datachannel.php
===================================================================
--- branches/proposals/6.x/lib/payment/behavior/execute_datachannel.php	2010-12-20 10:39:28 UTC (rev 31510)
+++ branches/proposals/6.x/lib/payment/behavior/execute_datachannel.php	2010-12-20 10:42:54 UTC (rev 31511)
@@ -8,6 +8,7 @@
 function payment_behavior_execute_datachannel( $data, $params, $posts, $executionId ) {
 	include 'lib/wiki-plugins/wikiplugin_datachannel.php';
 	unset($params['price']);
+	$params['quietReturn'] = 'y';	
 	$_POST['datachannel_execution'] = $executionId;
 	foreach ($posts as $key => $post) {
 		$_POST[$key] = $post;

Modified: branches/proposals/6.x/lib/wiki-plugins/wikiplugin_datachannel.php
===================================================================
--- branches/proposals/6.x/lib/wiki-plugins/wikiplugin_datachannel.php	2010-12-20 10:39:28 UTC (rev 31510)
+++ branches/proposals/6.x/lib/wiki-plugins/wikiplugin_datachannel.php	2010-12-20 10:42:54 UTC (rev 31511)
@@ -31,6 +31,12 @@
 				'filter' => 'pagename',
 				'default' => '$_SERVER[\'HTTP_REFERER\']',
 			),
+			'quietReturn' => array(
+				'required' => false,
+				'name' => tra('Do not use returnURI but instead return true quietly'),
+				'description' => tra('If set to y, will return quietly after data channel has run which would be needed if plugin is used in non-wiki page context.'),
+				'default' => 'n',
+			),
 			'buttonLabel' => array(
 				'required' => false,
 				'name' => tra('Button Label'),
@@ -258,7 +264,11 @@
 			
 			if (empty($params['returnURI'])) { $params['returnURI'] = $_SERVER['HTTP_REFERER']; }	// default to return to same page
 			if (empty($params['debug']) || $params['debug'] != 'y') {
-				header( 'Location: ' . $params['returnURI'] );
+				if (isset($params['quietReturn']) && $params['quietReturn'] == 'y') {
+					return true;
+				} else {
+					header( 'Location: ' . $params['returnURI'] );
+				}
 				die;
 			}
 			$smarty->assign('datachannel_feedbacks', array_merge($installer->getFeedback(), $profile->getFeedback()) );


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