From 22f8ccdc502f6eb9f95c8ab8759219ae4725e501 Mon Sep 17 00:00:00 2001
From: YuanMing <tutugreen@users.noreply.github.com>
Date: Wed, 10 Oct 2018 00:07:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E5=8E=86=E5=8F=B2=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=BA=9B=E7=BB=86?=
 =?UTF-8?q?=E5=B0=8F=E7=9A=84=E5=81=8F=E5=B7=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JSJApiPay/JSJApiPay.class.php   |  2 +-
 JSJApiPay_Alipay_Web.php        |  4 ++--
 JSJApiPay_QQ_Pay_QRCode.php     |  4 ++--
 JSJApiPay_WeChat_Pay_QRCode.php |  4 ++--
 README.md                       |  6 +++++-
 callback/JSJApiPay_callback.php | 20 ++++++++++++++++----
 6 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/JSJApiPay/JSJApiPay.class.php b/JSJApiPay/JSJApiPay.class.php
index bbba6fe..13fdd29 100644
--- a/JSJApiPay/JSJApiPay.class.php
+++ b/JSJApiPay/JSJApiPay.class.php
@@ -6,7 +6,7 @@
  * @author     tutugreen (yuanming@tutugreen.com)
  * @copyright  Copyright (c) Tutugreen.com 2016~2018
  * @license    MIT
- * @version    0.19-2018-06-19-01
+ * @version    0.20-2018-10-09-01
  * @link       https://github.com/tutugreen/WHMCS-JSJ-API-Pay-Gateway
  * 
  */
diff --git a/JSJApiPay_Alipay_Web.php b/JSJApiPay_Alipay_Web.php
index 76e38f4..e0e1258 100644
--- a/JSJApiPay_Alipay_Web.php
+++ b/JSJApiPay_Alipay_Web.php
@@ -6,7 +6,7 @@
  * @author     tutugreen (yuanming@tutugreen.com)
  * @copyright  Copyright (c) Tutugreen.com 2016~2018
  * @license    MIT
- * @version    0.19-2018-06-19-01
+ * @version    0.20-2018-10-09-01
  * @link       https://github.com/tutugreen/WHMCS-JSJ-API-Pay-Gateway
  * 
  */
@@ -106,7 +106,6 @@ function JSJApiPay_Alipay_Web_link($params) {
 <!-- Loading Required JS/CSS -->
 <script type="text/javascript" src="//cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
 <script type="text/javascript" src="//cdn.bootcss.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-<!-- Jquery Polling Invoice & Check Result-->
 <form name="JSJApiPay_Alipay_Web_form" action="{$parameter['api_url']}" method="POST">
 	<input type="hidden" name="addnum" value="{$parameter['addnum']}">
 	<input type="hidden" name="total" value="{$parameter['amount']}">
@@ -118,6 +117,7 @@ function JSJApiPay_Alipay_Web_link($params) {
 <a href="#" onclick="document.forms['JSJApiPay_Alipay_Web_form'].submit();">
     <img src="{$img}" alt="点击使用支付宝支付">
 </a>
+<!-- Jquery Polling Invoice & Check Result-->
 <script>
 jQuery(document).ready(function() {
 	var paid_status = false
diff --git a/JSJApiPay_QQ_Pay_QRCode.php b/JSJApiPay_QQ_Pay_QRCode.php
index fe2612f..8afc168 100644
--- a/JSJApiPay_QQ_Pay_QRCode.php
+++ b/JSJApiPay_QQ_Pay_QRCode.php
@@ -6,7 +6,7 @@
  * @author     tutugreen (yuanming@tutugreen.com)
  * @copyright  Copyright (c) Tutugreen.com 2016~2018
  * @license    MIT
- * @version    0.19-2018-06-19-01
+ * @version    0.20-2018-10-09-01
  * @link       https://github.com/tutugreen/WHMCS-JSJ-API-Pay-Gateway
  * 
  */
@@ -155,7 +155,6 @@ function JSJApiPay_QQ_Pay_QRCode_link($params) {
 <script type="text/javascript" src="//cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
 <script type="text/javascript" src="//cdn.bootcss.com/jquery.qrcode/1.0/jquery.qrcode.min.js"></script>
 <script type="text/javascript" src="//cdn.bootcss.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-<!-- Jquery Polling Invoice & Check Result-->
 <div class="JSJApiPay_QQ_Pay_QRCode" style="max-width: 240px;margin: 0 auto">
 	{$tooltip_QRCode_info}
 		<!-- QRCode Should Be Display Here , Or Check Your Explorer Version.-->
@@ -173,6 +172,7 @@ function JSJApiPay_QQ_Pay_QRCode_link($params) {
 <script>
 	$(function () { $("[data-toggle='tooltip']").tooltip({html : true }); });
 </script>
+<!-- Jquery Polling Invoice & Check Result-->
 <script>
 jQuery(document).ready(function() {
 	var paid_status = false
diff --git a/JSJApiPay_WeChat_Pay_QRCode.php b/JSJApiPay_WeChat_Pay_QRCode.php
index 009c95a..5428b8a 100644
--- a/JSJApiPay_WeChat_Pay_QRCode.php
+++ b/JSJApiPay_WeChat_Pay_QRCode.php
@@ -6,7 +6,7 @@
  * @author     tutugreen (yuanming@tutugreen.com)
  * @copyright  Copyright (c) Tutugreen.com 2016~2018
  * @license    MIT
- * @version    0.19-2018-06-19-01
+ * @version    0.20-2018-10-09-01
  * @link       https://github.com/tutugreen/WHMCS-JSJ-API-Pay-Gateway
  * 
  */
@@ -150,7 +150,6 @@ function JSJApiPay_WeChat_Pay_QRCode_link($params) {
 <script type="text/javascript" src="//cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
 <script type="text/javascript" src="//cdn.bootcss.com/jquery.qrcode/1.0/jquery.qrcode.min.js"></script>
 <script type="text/javascript" src="//cdn.bootcss.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-<!-- Jquery Polling Invoice & Check Result-->
 <div class="JSJApiPay_WeChat_Pay_QRCode" style="max-width: 240px;margin: 0 auto">
 	{$tooltip_QRCode_info}
 		<!-- QRCode Should Be Display Here , Or Check Your Explorer Version.-->
@@ -168,6 +167,7 @@ function JSJApiPay_WeChat_Pay_QRCode_link($params) {
 <script>
 	$(function () { $("[data-toggle='tooltip']").tooltip({html : true }); });
 </script>
+<!-- Jquery Polling Invoice & Check Result-->
 <script>
 jQuery(document).ready(function() {
 	var paid_status = false
diff --git a/README.md b/README.md
index c8de1b4..6e9ec42 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,11 @@ N/A at now.
 
 ## 更新日志
 
-**最近版本更新:v0.19-2018-06-19-01**
+**最近版本更新:v0.20-2018-10-09-01**
+
+2018-10-09-01：
+
+作为历史版本，完善一些细小的偏差。
 
 2018-06-19-01：
 
diff --git a/callback/JSJApiPay_callback.php b/callback/JSJApiPay_callback.php
index 58b994b..126d747 100644
--- a/callback/JSJApiPay_callback.php
+++ b/callback/JSJApiPay_callback.php
@@ -6,7 +6,7 @@
  * @author     tutugreen (yuanming@tutugreen.com)
  * @copyright  Copyright (c) Tutugreen.com 2016~2018
  * @license    MIT
- * @version    0.19-2018-06-19-01
+ * @version    0.20-2018-10-09-01
  * @link       https://github.com/tutugreen/WHMCS-JSJ-API-Pay-Gateway
  * 
  */
@@ -52,6 +52,17 @@
 	echo "非法访问";
 }
 
+if ($_POST['act'] or $_GET['act']){
+}else{
+	if ($debug) {
+	    $act = $_POST['act'] ? $_POST['act'] : $_GET['act'];
+		$msg="[JSJApiPay]收到未知回调，act 变量缺失或错误";
+		JSJApiPay_logResult($msg);
+	}
+	$api_pay_failed = "true";
+	echo "非法访问";
+}
+
 if ($api_pay_failed<>"true"){
 	$gateway = getGatewayVariables($gatewaymodule);
 	if (!$gateway["type"]) die("Module Not Activated，您所请求的回调接口未启用！"); # Checks gateway module is active before accepting callback
@@ -72,9 +83,9 @@
 	//Start
 		$JSJApiPay_config['apiid'] = trim($gateway['apiid']);
 		$JSJApiPay_config['apikey'] = trim($gateway['apikey']);
-		$JSJApiPay_config['fee_acc'] = trim($GATEWAY['fee_acc']);
+		$JSJApiPay_config['fee_acc'] = trim($gateway['fee_acc']);
 
-	if ($_GET['act']=='return' or $_GET['act']=='bd'){
+	if ($act=='return' or $act=='bd'){
 		//回调地址
 		/********************************************
 			这里会传过来几个参数 分别为：
@@ -180,7 +191,8 @@
         	$invoiceid = checkCbInvoiceID($invoiceid,$gateway["name"]); # Checks invoice ID is a valid invoice number or ends processing
         	checkCbTransID($transid);
         	addInvoicePayment($invoiceid,$transid,$amount,$fee,$gatewaymodule);
-        	logTransaction($GATEWAY["name"],$_POST,"Successful-A");
+        	logTransaction($gateway["name"],$_POST,"Successful-A");
+			exit;
 		}
 	}
 }