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

application/third_party/trainsystem/controllers/returnorders.php

@@ -102,10 +102,10 @@ class returnorders extends CI_Controller{
 			$this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body);
 			//发送邮件给客人
 			$customer_subject = 'China Train Ticket(s) Cancelation';
-			$customer_body = '<p>Dear '.$data->tst_realname.',</p><p>Your tickets (ticket number '.$back_detail_data->result->ordernumber.', for name '.$data->tst_realname.',train No. '.$back_detail_data->result->checi.') have been cancelled online successfully. Your travel advisor ('.$toName.',email address:'.$toEmail.',phone number '.$Mobile.') will contact you with the refund details via email within 24 hours.';
+			$customer_body = '<p>Dear '.$data->tst_realname.',</p><p>Your tickets (ticket number '.$back_detail_data->result->ordernumber.', for name '.$data->tst_realname.', train No. '.$back_detail_data->result->checi.') have been cancelled online successfully. Your travel advisor ('.$toName.', email address: '.$toEmail.', phone number '.$Mobile.') will contact you with the refund details via email within 24 hours.';
 			$customer_email = $this->BIZ_train_model->get_guest_info($coli_id);
 			$customer_email = $customer_email[0]->GUT_Email;
-			$this->Sendmail_model->SendMailToTable($toName,$toEmail,$data->tst_realname,'Phoebe@chinahighlights.net',$customer_subject,$customer_body);
+			$this->Sendmail_model->SendMailToTable($toName,$toEmail,$data->tst_realname,$customer_email,$customer_subject,$customer_body);
 			echo '{"reason":"退票成功","status":"200"}';
 		}else{
 			//退票失败后发送邮件
@@ -117,7 +117,7 @@ class returnorders extends CI_Controller{
 			$customer_body = '<p>Dear '.$data->tst_realname.',</p><p>Your application for online ticket cancellation (ticket number '.$back_detail_data->result->ordernumber.', for name '.$data->tst_realname.', train No.'.$back_detail_data->result->checi.') has failed.Your travel advisor('.$toName.', email address: '.$toEmail.', phone number '.Mobile.') will contact you via email within 24 hours. Please call us if you need to contact us urgently.</p>';
 			$customer_email = $this->BIZ_train_model->get_guest_info($coli_id);
 			$customer_email = $customer_email[0]->GUT_Email;
-			$this->Sendmail_model->SendMailToTable($toName,$toEmail,$data->tst_realname,'Phoebe@chinahighlights.net',$customer_subject,$customer_body);
+			$this->Sendmail_model->SendMailToTable($toName,$toEmail,$data->tst_realname,$customer_email,$customer_subject,$customer_body);
 			header("HTTP/1.1 404 Not Found");
 			echo '{"reason":"退票失败","status":"404"}';
 		}

media/popselectpicture.php

@@ -106,6 +106,24 @@ function is_remote_ip()
 	return true;
 }
 
+//CDN分发之后，源站和前端域名不一致在这里修正，否则程序生成的链接是源站的域名
+$base_url='';
+switch ($_SERVER['SERVER_NAME']){
+	case 'origin-ct.mycht.cn':
+		$base_url='https://ct.mycht.cn';
+		break;
+	case 'origin-gm.mycht.cn':
+		$base_url='https://gm.mycht.cn';
+		break;
+	case 'origin-cht.mycht.cn':
+		$base_url='https://cht.mycht.cn';
+		break;
+	case 'origin-int.mycht.cn':
+		$base_url='https://int.mycht.cn';
+		break;
+	default:$base_url='https://'.$_SERVER['HTTP_HOST'];
+}
+
 		?>
 		<?php 
 		if (isset($_GET['rwidth'])) {
@@ -116,7 +134,7 @@ function is_remote_ip()
 		<?php if (isset($_GET['remote']) || is_remote_ip()){ ?>
 			<iframe  id="test" frameborder="0" src="http://photo.chtcdn.com:3581/OutputApp/searchpicture.aspx?<?php echo($rwidth);?>webcode=<?php echo $media_site_code; ?>&lgc=<?php echo $_GET['site_lgc'];?>&apptype=translate&uname=ycc&upass=ycc&lmisn=1&WebUrl=<?php echo isset($_GET['WebUrl'])?$_GET['WebUrl']:false;?>&redirecturl=http://<?php echo $_SERVER['HTTP_HOST']; ?>/media/transitval.php" > </iframe>
 			<?php }else{ ?>
-		   <iframe  id="test" frameborder="0" src="https://video.chtcdn.com/OutputApp/searchpicture.aspx?<?php echo($rwidth);?>webcode=<?php echo $media_site_code; ?>&lgc=<?php echo $_GET['site_lgc'];?>&apptype=infomation&WebUrl=<?php echo isset($_GET['WebUrl'])?$_GET['WebUrl']:false;?>&redirecturl=https://<?php echo $_SERVER['HTTP_HOST']; ?>/media/transitval.php" > </iframe>
+		   <iframe  id="test" frameborder="0" src="https://video.chtcdn.com/OutputApp/searchpicture.aspx?<?php echo($rwidth);?>webcode=<?php echo $media_site_code; ?>&lgc=<?php echo $_GET['site_lgc'];?>&apptype=infomation&WebUrl=<?php echo isset($_GET['WebUrl'])?$_GET['WebUrl']:false;?>&redirecturl=<?php echo $base_url; ?>/media/transitval.php" > </iframe>
 		<?php } ?>
 	</body>
 </html>