diff --git a/application/controllers/information.php b/application/controllers/information.php index 5754cf89..33ddc63b 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -678,13 +678,7 @@ class Information extends CI_Controller } } } - //AMP更新和生成 end - //为新闻添加默认发布时间 - $meta_news_createdate = get_meta($information->ic_id, 'meta_news_createdate'); - if (empty ($meta_news_createdate)) { - add_meta($information->ic_id, 'meta_news_createdate', date('m/d/Y', time())); - } - + //如果URL有修改也删除静态文件 if ($this->input->post('ic_url') != $information->ic_url) { $this->update_cache($information->ic_url, true); @@ -1045,6 +1039,7 @@ class Information extends CI_Controller $data_H1 = array(); $data_H1['infocategory'] = $this->Information_model->get_detail_by_path($information->is_path, 1); //信息所属分类，获取信息顶级节点内容 $data_H1['author'] = ''; //获取作者信息 + $data_H1['meta_news_createdate'] = get_meta($information->ic_id, 'meta_news_createdate'); $author = $this->Operator_model->get_author_nikename($information->ic_author); if (!empty ($author)) { $data_H1['author'] = $author->OPI_FirstName; @@ -1206,11 +1201,12 @@ class Information extends CI_Controller //信息推荐 $template_recommand = $recommand_information; //$this->recommand_information($information); 从外面传进来，pc和移动只需要查一次，减少数据库负担 $template = str_replace('', $this->load->view($template_path . '-next', array('recommands' => $template_recommand), true), $template); + $meta_show_advertise = get_meta($information->ic_id, 'meta_show_advertise'); // //广告，改叫tips，防止被插件屏蔽 - if (!empty ($template_recommand['Tips Right TOP'])) { + if (!empty ($template_recommand['Tips Right TOP']) && $meta_show_advertise == 'yes') { $template = str_replace('', "
", $template); } - if (!empty ($template_recommand['Tips Right'])) { + if (!empty ($template_recommand['Tips Right']) && $meta_show_advertise == 'yes') { $template = str_replace('', "
" . $template_recommand['Tips Right']->it_content . "
", $template); } @@ -1221,6 +1217,7 @@ class Information extends CI_Controller $tips_right_a = []; $tips_right_b = []; $tips_right_c = []; + for ($i = 1; $i <= 12; $i++) { $key = 'List Tips Right A_' . $i; if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { @@ -1249,8 +1246,9 @@ class Information extends CI_Controller ), true ); - + if($meta_show_advertise == 'yes'){ $template = str_replace('', $tips_right_list_content, $template); + } } //文中的信息推荐 @@ -1656,6 +1654,8 @@ class Information extends CI_Controller public function make_www_cache_gh($device, $information, $recommand_information) { $data = array(); + $meta_show_advertise = get_meta($information->ic_id, 'meta_show_advertise'); + $data['meta_show_advertise'] = $meta_show_advertise; switch ($device) { case 'mobile': //获取移动优先的模板，如果有的话 @@ -1671,7 +1671,7 @@ class Information extends CI_Controller //获取PC的模板，如果有的话 $template_path = 'mobile_first/' . $this->config->item('site_code'); if (is_file(APPPATH . 'views/' . $template_path . '-pc' . EXT)) { - $template = $this->load->view($template_path . '-pc', '', true); + $template = $this->load->view($template_path . '-pc', $data, true); $html_path_ext = '-pc.htm'; } else { return false; @@ -1723,6 +1723,7 @@ class Information extends CI_Controller $data_H1 = array(); $data_H1['infocategory'] = $this->Information_model->get_detail_by_path($information->is_path, 1); //信息所属分类，获取信息顶级节点内容 $data_H1['author'] = ''; //获取作者信息 + $data_H1['meta_news_createdate'] = get_meta($information->ic_id, 'meta_news_createdate'); $author = $this->Operator_model->get_author_nikename($information->ic_author); if (!empty ($author)) { @@ -1771,7 +1772,7 @@ class Information extends CI_Controller if (!empty ($template_recommand['Tips Right TOP'])) { // $template = str_replace('', "
", $template); } - if (!empty ($template_recommand['Tips Right'])) { + if (!empty ($template_recommand['Tips Right']) && $meta_show_advertise == 'yes') { $template = str_replace('', "
" . $template_recommand['Tips Right']->it_content . "
", $template); } // 右侧列表广告 @@ -1806,8 +1807,9 @@ class Information extends CI_Controller ), true ); - + if($meta_show_advertise == 'yes'){ $template = str_replace('', $tips_right_list_content, $template); + } //文中的信息推荐 if (strpos($information->ic_content, '') !== false) { // $information->ic_content = str_replace('', $this->load->view($template_path . '-recommends-article', array('recommands' => $template_recommand), TRUE), $information->ic_content); @@ -2018,6 +2020,8 @@ class Information extends CI_Controller $data = array(); $data['information'] = $information; $recommand_template = ''; + $meta_show_advertise = get_meta($information->ic_id, 'meta_show_advertise'); + $data['meta_show_advertise'] = $meta_show_advertise; switch ($device) { case 'mobile': //获取移动优先的模板，如果有的话 @@ -2034,7 +2038,7 @@ class Information extends CI_Controller //获取PC的模板，如果有的话 $template_path = 'mobile_first/' . $this->config->item('site_code'); if (is_file(APPPATH . 'views/' . $template_path . '-pc' . EXT)) { - $template = $this->load->view($template_path . '-pc', '', true); + $template = $this->load->view($template_path . '-pc', $data, true); $html_path_ext = '-pc.htm'; } else { return false; @@ -2078,6 +2082,7 @@ class Information extends CI_Controller $breadcrumb_data = $this->Information_model->get_breadcrumb_data($information->is_id, $information->is_path, $group_map); $ads_by_google = !empty (get_meta($information->ic_id, 'meta_google_ad_article')); + $data['meta_news_createdate'] = get_meta($information->ic_id, 'meta_news_createdate'); $data['ads_by_google'] = $ads_by_google; $data['author'] = ''; //获取作者信息 $author = $this->Operator_model->get_author_nikename($information->ic_author); @@ -2115,13 +2120,14 @@ class Information extends CI_Controller $template_recommand = $recommand_information; $template = str_replace('', $this->load->view($recommand_template, array('recommands' => $template_recommand), true), $template); //广告，改叫tips，防止被插件屏蔽 - if (!empty ($template_recommand['Tips Right'])) { + if (!empty ($template_recommand['Tips Right']) && $meta_show_advertise == 'yes') { $template = str_replace('', "
" . $template_recommand['Tips Right']->it_content . "
", $template); } // 右侧列表广告 $tips_right_a = []; $tips_right_b = []; $tips_right_c = []; + for ($i = 1; $i <= 12; $i++) { $key = 'List Tips Right A_' . $i; if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { @@ -2146,13 +2152,15 @@ class Information extends CI_Controller array( 'tips_right_a' => $tips_right_a, 'tips_right_b' => $tips_right_b, - 'tips_right_c' => $tips_right_c + 'tips_right_c' => $tips_right_c, ), true ); - $template = str_replace('', $tips_right_list_content, $template); - + if($meta_show_advertise == 'yes'){ + $template = str_replace('', $tips_right_list_content, $template); + } + //文中的信息推荐 if (strpos($information->ic_content, '') !== false) { $information->ic_content = str_replace('', $this->load->view($template_path . '-recommends-article', array('recommands' => $template_recommand), true), $information->ic_content); diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php index 59a3049a..650fa120 100644 --- a/application/third_party/order/views/ah/confirm_order.php +++ b/application/third_party/order/views/ah/confirm_order.php @@ -399,7 +399,6 @@ select.gender_pick {border: 1px solid #d1d1d1; information to book all your hotels, transportation, and activities. If the information you provide is incorrect, you would not be able to board your flight or trains, and therefore reissuing of tickets would be at your expense!

-

Primary contact

@@ -718,6 +717,8 @@ select.gender_pick {border: 1px solid #d1d1d1;

Your flight information will be forwarded to your guide/driver for airport pick up and drop off. Please ensure the details you provide are correct. You can skip this if your don't need airport transfer service.

+

If you are not yet purchase your airline and insurance, please fill in the TBC in the link and provide those information to your consultant or keep update after you confirm them.

+
diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php index 7c730f0e..86f065d5 100644 --- a/application/third_party/order/views/confirm_order.php +++ b/application/third_party/order/views/confirm_order.php @@ -718,7 +718,8 @@ select.gender_pick {border: 1px solid #d1d1d1;

Your Flight Information

Your flight information will be forwarded to your guide/driver for airport pick up and drop off. Please ensure the details you provide are correct. You can skip this if your don't need airport - transfer service.

+ transfer service.

+

If you are not yet purchase your airline and insurance, please fill in the TBC in the link and provide those information to your consultant or keep update after you confirm them.

diff --git a/application/third_party/order/views/gh/confirm_order.php b/application/third_party/order/views/gh/confirm_order.php index e2a67d86..d5f045dd 100644 --- a/application/third_party/order/views/gh/confirm_order.php +++ b/application/third_party/order/views/gh/confirm_order.php @@ -720,6 +720,7 @@ select.gender_pick {border: 1px solid #d1d1d1;

Your flight information will be forwarded to your guide/driver for airport pick up and drop off. Please ensure the details you provide are correct. You can skip this if your don't need airport transfer service.

+

If you are not yet purchase your airline and insurance, please fill in the TBC in the link and provide those information to your consultant or keep update after you confirm them.

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 8f935525..90a71f86 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1154,6 +1154,25 @@ placeholder="124343,8784," value="ic_id, 'meta_bread_info'); ?>" />
+
+ + + +
+
diff --git a/application/views/mobile_first/ah-feedback-30-list.php b/application/views/mobile_first/ah-feedback-30-list.php index a066b2af..0fba7709 100644 --- a/application/views/mobile_first/ah-feedback-30-list.php +++ b/application/views/mobile_first/ah-feedback-30-list.php @@ -1,8 +1,8 @@ $feedback) {?> -