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

application/controllers/information.php

@@ -554,7 +554,7 @@ class Information extends CI_Controller
             case 'ru':
             case 'jp':
                 $information = $this->Information_model->Detail($url);
-                if ($delete_only || $information->ic_ht_area_type === 'q') {
+                if ($delete_only || !$information || $information->ic_ht_area_type === 'q') {
                     //只删除操作，在url修改和不发布信息的时候使用
                     $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/delete_only?static_html_url=' . $url;
                 } else {

application/third_party/trainsystem/controllers/returnorders.php

@@ -10,6 +10,7 @@ class returnorders extends CI_Controller{
 		$this->load->model("train_system_model");
 		$this->load->model("Sendmail_model");
 		$this->load->model('BIZ_train_model');
+		
     }
 	
 	public function index(){
@@ -17,6 +18,11 @@ class returnorders extends CI_Controller{
 	}
 	
 	public function returntickets(){
+		header('Access-Control-Allow-Origin:*');
+	    header('Access-Control-Allow-Methods:POST, GET');
+	    header('Access-Control-Max-Age:0');
+	    header('Access-Control-Allow-Headers:x-requested-with, Content-Type');
+	    header('Access-Control-Allow-Credentials:true');
 		//第三方订单号(为了避免一个子订单乘客分开出票而产生错误)
 		$ordernumber = $this->input->get_post('ordernumber');
 		//护照姓名

webht/third_party/dingmail/controllers/index.php

@@ -231,7 +231,7 @@ class Index extends CI_Controller {
 		
 		$tolist_array = array();
 		$tolist_array['0'] = new stdClass();
-		$tolist_array['0']->ddu_Email = 'cyc@hainatravel.com';
+		$tolist_array['0']->ddu_Email = 'hr@chinahighlights.net';
 		
 		if($this->do_sendmail('cyc',$tolist_array,'','应聘简历',$mailnody)){
 			echo '{"status":1}';
@@ -246,15 +246,16 @@ class Index extends CI_Controller {
         $mail = new PHPMailer();
         $mail->IsSMTP();
         $mail->Host = 'smtp.mxhichina.com';//smtp.sendgrid.net
-		$mail->Port = 25; 
+		$mail->Port = 465; 
         $mail->SMTPAuth = true;
+		$mail->SMTPSecure = false;
         $mail->Username = 'admin@hainatravel.com';
         $mail->Password = "Hainatravel123";//Hainatravel1234
-        $mail->SMTPSecure = 'tls';
+        $mail->SMTPSecure = 'ssl';
         $mail->CharSet = "utf-8";
         $mail->Encoding = "base64";
         $mail->IsHTML(true);
-		
+		//$mail->SMTPDebug = 2;
 		
 		$mail->FromName = $fromuser; 		//收件人昵称
         $mail->From = 'admin@hainatravel.com';         //发件人
@@ -574,6 +575,28 @@ class Index extends CI_Controller {
 		return;
     }
 	
+	public function upload_photos() {
+        $save_path = date('Y-m-d');
+        $jsfunction = 'get_photo_url';
+        $upload_id = 'Profile_file';
+        $config['upload_path'] = APPPATH . 'upload/' . $save_path;
+        if (!is_dir($config['upload_path'])) {
+            @mkdir($config['upload_path'], 0777, true);
+        }
+        $config['allowed_types'] = 'gif|jpg|png';
+        $config['encrypt_name'] = true;
+
+        $this->load->library('upload', $config);
+        if (!$this->upload->do_upload($upload_id)) {
+            $error = array('error' => $this->upload->display_errors());
+            var_dump($error);
+        } else {
+            $data = array('upload_data' => $this->upload->data());
+            $file_name = 'http://' . $_SERVER['HTTP_HOST'] . '/' . $config['upload_path'] . '/' . $data['upload_data']['file_name'];
+            echo "<script>parent.$jsfunction('$file_name');</script>";
+        }
+    }
+	
 	//退出
 	public function logout(){
         $this->session->unset_userdata('dingding_user_info');

webht/third_party/dingmail/views/mail.php

@@ -7,7 +7,7 @@
   <title>HT在线平台</title>
  <!-- <link href="/css/webht/bootstrap.min.css" rel="stylesheet">
   <link href="/css/webht/webht.css?v=1" rel="stylesheet">-->
-  <script src="/min?f=/js/jquery.min.js,/js/bootstrap.min.js,/js/webht.js,/js/jquery.suggest.js"></script>
+  <script src="/min?f=/js/jquery.min.js,/js/bootstrap.min.js,/js/webht.js"></script>
   <link href="/min?f=/css/webht/bootstrap.min.css,/css/webht/webht.css" rel="stylesheet">
   <link type="text/css" rel="stylesheet" href="/css/webht/jquery.suggest.css" />
   <script src="/js/TQEditor/TQEditor.js" type="text/javascript"></script>
@@ -287,7 +287,7 @@
         <h4 class="modal-title" id="myModalLabel">插入图片</h4>
       </div>
       <div class="modal-body">
-      	<form action="<?php echo site_url('apps/outlook/index/upload_photos');?>" 
+      	<form action="<?php echo site_url('apps/dingmail/index/upload_photos');?>" 
 	        method="post" 
 	        target="ifm1"
 	        class="form-inline form_upload_photos"
@@ -322,6 +322,8 @@
 </div>
 
 <script type="text/javascript" defer="true"> 
+jQuery.browser={};(function(){jQuery.browser.msie=false; jQuery.browser.version=0;if(navigator.userAgent.match(/MSIE ([0-9]+)./)){ jQuery.browser.msie=true;jQuery.browser.version=RegExp.$1;}})();
+
 var $img_modal=$('#myModal-img');
 var doname="<?php echo $_SERVER['HTTP_HOST']; ?>";
 var TQE=new tqEditor('emailcontent',