Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hainatravel/information-system into master

Browse Source
hotfix/paypal-note
candice 3 years ago
parent 5c3ceefcd2 765c0e0550
commit 8aeae0bd84
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File

11
application/controllers/information.php
Unescape Escape View File

@ -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'));
//作者个人页面更新

4
application/third_party/trainsystem/controllers/innerTrainSearch.php vendored
Unescape Escape View File

@ -577,7 +577,7 @@ class innerTrainSearch extends CI_Controller{
$strSign = $TimeStamp.$serviceName.$companyId.$key;
$sign = md5($strSign);
$E_sign = md5(urlencode($strSign));
echo($strSign . "<hr/>");
//echo($strSign . "<hr/>");
echo($sign. "<hr/>");
echo($E_sign. "<hr/>");
$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 = "深圳";

Write Preview
Loading…
Cancel
Save