ad tracker code update

themes/tajian/controller/FrontapiController.php

@@ -795,10 +795,10 @@ eof;
                         try {
                             $adTrackPostbackRes = $this->adTrackPostBack();
                             if (!empty($adTrackPostbackRes) && !empty($adTrackPostbackRes['status']) && $adTrackPostbackRes['status'] != 200) {
-                                $this->logError( "Ad tracker postback result status {$adTrackPostbackRes['status']}, response: " . json_encode($adTrackPostbackRes['result']) );
+                                $this->logError( "[Register] Ad tracker postback result status {$adTrackPostbackRes['status']}, response: " . json_encode($adTrackPostbackRes['result']) );
                             }
                         }catch(Exception $e) {
-                            $this->logError("Ad tracker postback failed: " . $e->getMessage());
+                            $this->logError("[Register] Ad tracker postback failed: " . $e->getMessage());
                         }
                     }else {
                         $err = '注册失败，请稍后再试';
@@ -861,6 +861,16 @@ eof;
 
                     $msg = "登录成功，开始收藏你喜欢的视频吧";
                     $code = 1;
+
+                    //广告跟踪回调
+                    try {
+                        $adTrackPostbackRes = $this->adTrackPostBack();
+                        if (!empty($adTrackPostbackRes) && !empty($adTrackPostbackRes['status']) && $adTrackPostbackRes['status'] != 200) {
+                            $this->logError( "[Login] Ad tracker postback result status {$adTrackPostbackRes['status']}, response: " . json_encode($adTrackPostbackRes['result']) );
+                        }
+                    }catch(Exception $e) {
+                        $this->logError("[Login] Ad tracker postback failed: " . $e->getMessage());
+                    }
                 }else {
                     $err = '登录失败，请稍后重试';
                 }

themes/tajian/controller/SiteController.php

@@ -62,18 +62,22 @@ Class SiteController extends Controller {
         $postbackParaMap = FSC::$app['config']['ad_tracker']['postbackParaMap'];
         if (!empty($postbackParaMap)) {
             foreach ($postbackParaMap as $find => $replace) {
-                $postbackApi = str_replace("\{{$find}\}", @adParaDataFromCookie[$replace], $postbackApi);
+                if (!empty($adParaDataFromCookie[$replace])) {
+                    $postbackApi = str_replace("{{$find}}", $adParaDataFromCookie[$replace], $postbackApi);
+                }
             }
         }
 
         //把广告参数追加到回调API网址中
+        /*
         foreach($adParaDataFromCookie as $key => $val) {
             $postbackApi .= "&{$key}=" . urlencode($val);
         }
+        */
 
-        //请求回调API，所有广告参数同时GET和POST传参数以支持不同传参模式
+        //GET方式请求回调API
         $timeout = 10;
-        return $this->request($postbackApi, $adParaDataFromCookie, $timeout);
+        return $this->request($postbackApi, null, $timeout);
     }
 
     //TODO: 增加cookie跟踪同意/不同意选择，确保用户知道cookie跟踪了哪些数据