From fc97b0a1c55a45eb1024300fe2226928996d5b6c Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 13 Mar 2019 14:59:00 +0800
Subject: [PATCH] =?UTF-8?q?Trippest=E5=AE=A2=E4=BA=BA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2:=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=AE=A2=E4=BA=BA=E5=85=A8=E5=90=8D;=20*=E7=9A=84=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=AC=A1=E6=95=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trippestOrderSync/controllers/api.php     | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/api.php b/webht/third_party/trippestOrderSync/controllers/api.php
index bf58bf84..f235f9a6 100644
--- a/webht/third_party/trippestOrderSync/controllers/api.php
+++ b/webht/third_party/trippestOrderSync/controllers/api.php
@@ -1,6 +1,6 @@
 <?php
 defined('BASEPATH') OR exit('No direct script access allowed');
-
+error_reporting(0);
 class Api extends CI_Controller {
 
     public function __construct(){
@@ -95,7 +95,14 @@ class Api extends CI_Controller {
             }
             // 领队名字
             // $operation_tmp['full_leader_name'] = trim($poi->GUT_FirstName . " " . $poi->GUT_LastName);
-            $operation_tmp['leader_name'] = substr_replace($poi->GUT_FirstName,str_repeat('*', mb_strlen($poi->GUT_FirstName, 'UTF-8')-2),1,-1) . " " . substr_replace($poi->GUT_LastName,str_repeat('*', mb_strlen($poi->GUT_LastName, 'UTF-8')-2),1,-1);
+            $replace_cnt1 = $replace_cnt2 = 0;
+            if (mb_strlen($poi->GUT_FirstName, 'UTF-8') > 2) {
+                $replace_cnt1 = mb_strlen($poi->GUT_FirstName, 'UTF-8')-2;
+            }
+            if (mb_strlen($poi->GUT_LastName, 'UTF-8') > 2) {
+                $replace_cnt2 = mb_strlen($poi->GUT_LastName, 'UTF-8')-2;
+            }
+            $operation_tmp['leader_name'] = substr_replace($poi->GUT_FirstName,str_repeat('*', $replace_cnt1),1,-1) . " " . substr_replace($poi->GUT_LastName,str_repeat('*', $replace_cnt2),1,-1);
             $operation_tmp['leader_name'] = trim($operation_tmp['leader_name']);
             // 行程人数
             $operation_tmp['personNum_text'] = $poi->COLD_PersonNum + $poi->COLD_ChildNum;
@@ -259,7 +266,14 @@ class Api extends CI_Controller {
                 }
                 // 领队名字
                 // $vro['full_leader_name'] = trim($poi->GUT_FirstName . " " . $poi->GUT_LastName);
-                $vro['leader_name'] = substr_replace($poi->GUT_FirstName, str_repeat('*', mb_strlen($poi->GUT_FirstName, 'UTF-8')-2), 1,-1) . " " . substr_replace($poi->GUT_LastName,str_repeat('*', mb_strlen($poi->GUT_LastName, 'UTF-8')-2),1,-1);
+                $replace_cnt1 = $replace_cnt2 = 0;
+                if (mb_strlen($poi->GUT_FirstName, 'UTF-8') > 2) {
+                    $replace_cnt1 = mb_strlen($poi->GUT_FirstName, 'UTF-8')-2;
+                }
+                if (mb_strlen($poi->GUT_LastName, 'UTF-8') > 2) {
+                    $replace_cnt2 = mb_strlen($poi->GUT_LastName, 'UTF-8')-2;
+                }
+                $vro['leader_name'] = substr_replace($poi->GUT_FirstName, str_repeat('*', $replace_cnt1), 1,-1) . " " . substr_replace($poi->GUT_LastName,str_repeat('*', $replace_cnt2),1,-1);
                 $vro['leader_name'] = trim($vro['leader_name']);
                 // 行程人数
                 $vro['personNum_text'] = $poi->COLD_PersonNum + $poi->COLD_ChildNum;
@@ -328,7 +342,14 @@ class Api extends CI_Controller {
                 }
                 // 领队名字
                 // $vro['full_leader_name'] = trim($poi->GUT_FirstName . " " . $poi->GUT_LastName);
-                $vro['leader_name'] = substr_replace($poi->GUT_FirstName,str_repeat('*', mb_strlen($poi->GUT_FirstName, 'UTF-8')-2),1,-1) . " " . substr_replace($poi->GUT_LastName,str_repeat('*', mb_strlen($poi->GUT_LastName, 'UTF-8')-2),1,-1);
+                $replace_cnt1 = $replace_cnt2 = 0;
+                if (mb_strlen($poi->GUT_FirstName, 'UTF-8') > 2) {
+                    $replace_cnt1 = mb_strlen($poi->GUT_FirstName, 'UTF-8')-2;
+                }
+                if (mb_strlen($poi->GUT_LastName, 'UTF-8') > 2) {
+                    $replace_cnt2 = mb_strlen($poi->GUT_LastName, 'UTF-8')-2;
+                }
+                $vro['leader_name'] = substr_replace($poi->GUT_FirstName,str_repeat('*', $replace_cnt1),1,-1) . " " . substr_replace($poi->GUT_LastName,str_repeat('*', $replace_cnt2),1,-1);
                 $vro['leader_name'] = trim($vro['leader_name']);
                 // 行程人数
                 $vro['personNum_text'] = $poi->COLD_PersonNum + $poi->COLD_ChildNum;