From 0be455fd417ed7d31b5303ddf8c3263135e6a92c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Thu, 4 Aug 2022 15:38:42 +0800 Subject: [PATCH 1/2] fix --- .../third_party/trainsystem/controllers/innerTrainSearch.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/third_party/trainsystem/controllers/innerTrainSearch.php b/application/third_party/trainsystem/controllers/innerTrainSearch.php index b63afc43..cb34d55d 100644 --- a/application/third_party/trainsystem/controllers/innerTrainSearch.php +++ b/application/third_party/trainsystem/controllers/innerTrainSearch.php @@ -577,7 +577,7 @@ class innerTrainSearch extends CI_Controller{ $strSign = $TimeStamp.$serviceName.$companyId.$key; $sign = md5($strSign); $E_sign = md5(urlencode($strSign)); - echo($strSign . "
"); + //echo($strSign . "
"); echo($sign. "
"); echo($E_sign. "
"); $JSONRETURN = "http://apiproxy-uat.ctripqa.com/apiproxy/soa2/19946"; @@ -610,7 +610,7 @@ class innerTrainSearch extends CI_Controller{ $post_data_train->authentication->companyId = $companyId; $post_data_train->authentication->messageIdentity = $sign_train; $post_data_train->searchTrainsParam = new stdClass(); - $post_data_train->searchTrainsParam->departDate = "2022-07-22"; + $post_data_train->searchTrainsParam->departDate = date("Y-m-d",strtotime("3 day")); //"2022-07-22"; $post_data_train->searchTrainsParam->fromStationName = "北京"; $post_data_train->searchTrainsParam->toStationName = "深圳"; From 765c0e0550fcff8fe36704dcfee93730ed7efcd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 8 Aug 2022 15:07:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?mainland=20china=20=E6=94=B9=E4=B8=BA=20the?= =?UTF-8?q?=20mainland=20of=20china?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 8d985390..106e273e 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -363,7 +363,14 @@ class Information extends CI_Controller } echo json_encode($data); } else { - $this->InfoContents_model->Update($information->is_ic_id, $this->input->post('ic_url'), $this->input->post('ic_url_title'), $this->input->post('ic_type'), $this->input->post('ic_title'), $this->input->post('ic_content'), $this->input->post('ic_summary'), $this->input->post('ic_seo_title'), $this->input->post('ic_seo_description'), $this->input->post('ic_seo_keywords'), $this->input->post('ic_show_bread_crumbs'), $this->input->post('ic_status'), $this->input->post('ic_template'), $this->input->post('ic_photo'), $this->input->post('ic_photo_width'), $this->input->post('ic_photo_height'), $this->input->post('ic_recommend_tours'), $this->input->post('ic_recommend_packages'), $this->input->post('ic_ht_area_id'), $this->input->post('ic_ht_area_type'), $this->input->post('ic_ht_product_id'), $this->input->post('ic_ht_product_type'), $this->input->post('ic_author')); + $ic_content = $this->input->post('ic_content'); + if (strcasecmp($this->config->item('site_code'), "chinatravel") == 0){ //ct站替换中国大陆的英文 + if (stripos($ic_content, 'mainland china') !== false){ + $ic_content = str_ireplace('mainland china','the mainland of china',$ic_content); + } + } + + $this->InfoContents_model->Update($information->is_ic_id, $this->input->post('ic_url'), $this->input->post('ic_url_title'), $this->input->post('ic_type'), $this->input->post('ic_title'), $ic_content, $this->input->post('ic_summary'), $this->input->post('ic_seo_title'), $this->input->post('ic_seo_description'), $this->input->post('ic_seo_keywords'), $this->input->post('ic_show_bread_crumbs'), $this->input->post('ic_status'), $this->input->post('ic_template'), $this->input->post('ic_photo'), $this->input->post('ic_photo_width'), $this->input->post('ic_photo_height'), $this->input->post('ic_recommend_tours'), $this->input->post('ic_recommend_packages'), $this->input->post('ic_ht_area_id'), $this->input->post('ic_ht_area_type'), $this->input->post('ic_ht_product_id'), $this->input->post('ic_ht_product_type'), $this->input->post('ic_author')); //AMP更新和生成 beign $auto_update_amp = $this->input->get_post('auto_update_amp'); @@ -447,7 +454,7 @@ class Information extends CI_Controller } $data[] = array('name' => 'ok', 'value' => $this->lang->line('form_info_success'), 'update_info_log' => $update_info_log); - $this->Logs_model->backup($information->is_id, $this->input->post('ic_content')); + $this->Logs_model->backup($information->is_id, $ic_content); $this->Logs_model->backup_summary($information->is_id, $this->input->post('ic_summary')); //作者个人页面更新