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

application/controllers/information.php

@@ -1380,6 +1380,11 @@ class Information extends CI_Controller
     if (!empty ($meta_addon_js)) {
       $template = str_replace('<!--@ADDON-JS@-->', '<script src="' . $meta_addon_js . '"></script>', $template);
     }
+    
+    $meta_index_set = get_meta($information->ic_id, 'meta_index_set');
+    if (!empty ($meta_index_set)) {
+      $template = str_replace('<!--@Meta_Robots@-->', '<meta name="robots" content="' . $meta_index_set . '" />', $template);
+    }
     //设置内容图片缓加载
     $lazy_content = $this->html_optimize_lib->set_lazy_loader($information->ic_content, 'https://data.chinahighlights.com/grey.gif');
     $template = str_replace('<!--@CUSTOM-CONENT@-->', $lazy_content, $template);
@@ -2004,6 +2009,11 @@ class Information extends CI_Controller
     if (!empty ($meta_addon_js)) {
       $template = str_replace('<!--@ADDON-JS@-->', '<script src="' . $meta_addon_js . '"></script>', $template);
     }
+    
+    $meta_index_set = get_meta($information->ic_id, 'meta_index_set');
+    if (!empty ($meta_index_set)) {
+      $template = str_replace('<!--@Meta_Robots@-->', '<meta name="robots" content="' . $meta_index_set . '" />', $template);
+    }
     //设置内容图片缓加载
     $lazy_content = $this->html_optimize_lib->set_lazy_loader($information->ic_content, 'https://data.chinahighlights.com/grey.gif');
     $template = str_replace('<!--@CUSTOM-CONENT@-->', $lazy_content, $template);
@@ -2367,6 +2377,11 @@ class Information extends CI_Controller
     if (!empty ($meta_addon_js)) {
       $template = str_replace('<!--@ADDON-JS@-->', '<script src="' . $meta_addon_js . '"></script>', $template);
     }
+    
+    $meta_index_set = get_meta($information->ic_id, 'meta_index_set');
+    if (!empty ($meta_index_set)) {
+      $template = str_replace('<!--@Meta_Robots@-->', '<meta name="robots" content="' . $meta_index_set . '" />', $template);
+    }
     //设置内容图片缓加载
     $lazy_content = $this->html_optimize_lib->set_lazy_loader($information->ic_content, 'https://data.asiahighlights.com/grey.gif');
     $template = str_replace('<!--@CUSTOM-CONENT@-->', $lazy_content, $template);

application/views/mobile_first/ah-pc.php

@@ -12,6 +12,7 @@
     <meta name="apple-mobile-web-app-title" content="Asia Highlights - Since 2016!">
     <meta name="keywords" content="<!--@KEYWORDS@-->">
     <meta name="description" content="<!--@DESCRIPTION@-->">
+    <!--@Meta_Robots@-->
     <!--@OG:IMAGE@-->
     <link rel="canonical" href="<!--@CANONICAL@-->">
     <link rel="shortcut icon" href="https://data.asiahighlights.com/favicon.ico" />

application/views/mobile_first/ah.php

@@ -9,6 +9,7 @@
   <meta name="keywords" content="<!--@KEYWORDS@-->">
   <meta name="description" content="<!--@DESCRIPTION@-->">
   <link rel="canonical" href="<!--@CANONICAL@-->">
+  <!--@Meta_Robots@-->
   <meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
   <!--@OG:IMAGE@-->
   <link rel="shortcut icon" href="https://data.asiahighlights.com/favicon.ico" />

application/views/mobile_first/ch-pc.php

@@ -12,6 +12,7 @@
     <meta name="apple-mobile-web-app-title" content="China Highlights - Since 1998!">
     <meta name="keywords" content="<!--@KEYWORDS@-->">
     <meta name="description" content="<!--@DESCRIPTION@-->">
+    <!--@Meta_Robots@-->
     <!--@Meta-Ezoic-NoAds@-->
     <!--@OG:IMAGE@-->
     <link rel="canonical" href="<!--@CANONICAL@-->">

application/views/mobile_first/ch.php

@@ -8,6 +8,7 @@
   </title>
   <meta name="keywords" content="<!--@KEYWORDS@-->">
   <meta name="description" content="<!--@DESCRIPTION@-->">
+  <!--@Meta_Robots@-->
   <meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
   <!--@Meta-Ezoic-NoAds@-->
   <!--@OG:IMAGE@-->

application/views/mobile_first/gh-pc.php

@@ -12,6 +12,7 @@
     <meta name="apple-mobile-web-app-title" content="Global Highlights - Since 2018!">
     <meta name="keywords" content="<!--@KEYWORDS@-->">
     <meta name="description" content="<!--@DESCRIPTION@-->">
+    <!--@Meta_Robots@-->
     <!--@Meta-Ezoic-NoAds@-->
     <!--@OG:IMAGE@-->
     <link rel="canonical" href="<!--@CANONICAL@-->">

application/views/mobile_first/gh.php

@@ -8,6 +8,7 @@
   </title>
   <meta name="keywords" content="<!--@KEYWORDS@-->">
   <meta name="description" content="<!--@DESCRIPTION@-->">
+  <!--@Meta_Robots@-->
   <link rel="canonical" href="<!--@CANONICAL@-->">
   <meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
   <!--@OG:IMAGE@-->