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

application/controllers/information.php

@@ -990,6 +990,14 @@ class Information extends CI_Controller
             $main_css_string = compress_css(GET_HTTP('https://proxy-data.chinahighlights.com/css/mobile-first.css'));
         }
         $template = str_replace('<!--@MAIN-CSS@-->', '<style type="text/css">' . $main_css_string . '</style>', $template);
+
+        // /china-trains/ 节点
+        if ($information->is_parent_id == "278008234") {
+            $template = str_replace(
+                '<!--@CHINA-TRAINS-CSS@-->',
+                '<link href="https://proxy-data.chinahighlights.com/css/china-trains.css" rel="stylesheet">',
+                $template);
+        }
         //额外样式
         $meta_addon_css = get_meta($information->ic_id, 'meta_addon_css');
         if (!empty($meta_addon_css)) {

application/views/mobile_first/ah-pc.php

@@ -128,8 +128,7 @@
                                                 Couple</a></li>
                                         <li><a href="/southeast-asia/tours/cambodia-and-vietnam-highlights">12 Days</a>
                                         </li>
-                                        <li><a href="/southeast-asia/tours/from-south-vietnam-to-north-cambodia">8
+                                        <li><a href="/southeast-asia/tours/from-south-vietnam-to-north-cambodia">8 Days</a></li>
-                                                Days</a></li>
                                     </ul>
 
                                 </div>

application/views/mobile_first/ah.php

@@ -131,9 +131,7 @@
             class="menu__link">2 Weeks in Vietnam and Cambodia With Mekong Cruise</a></li>
         <li class="menu__item" role="menuitem"><a href="/southeast-asia/tours/cambodia-and-vietnam-highlights"
             class="menu__link">12 Days in Vietnam and Cambodia</a></li>
-        <li class="menu__item" role="menuitem" style="margin-bottom: 30px;"><a
+        <li class="menu__item" role="menuitem" style="margin-bottom: 30px;"><a href="/southeast-asia/tours/from-south-vietnam-to-north-cambodia" class="menu__link">8 Days in Vietnam and Cambodia</a></li>
-            href="/southeast-asia/tours/from-south-vietnam-to-north-cambodia" class="menu__link">8 Days in Vietnam and
-            Cambodia</a></li>
 
         <li class="menu__item" role="menuitem" style="margin-bottom: 30px;"><a
             href="/southeast-asia/tours/classic-vietnam-and-thailand" class="menu__link">2 Weeks in Vietnam and

application/views/mobile_first/ch-pc.php

@@ -25,6 +25,7 @@
     <link rel="dns-prefetch" href="https://www.google-analytics.com">
     <!--@MAIN-CSS@-->
     <!--@ADDON-CSS@-->
+    <!--@CHINA-TRAINS-CSS@-->
     <!-- Google Tag Manager -->
     <script>(function (w, d, s, l, i) {
             w[l] = w[l] || [];
@@ -890,4 +891,4 @@ function validateNewsletterForm() {
     <!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->
 </body>
 
-</html>
+</html>

application/views/mobile_first/ch.php

@@ -22,6 +22,7 @@
   <link rel="shortcut icon" href="https://data.chinahighlights.com/favicon.ico">
   <!--@MAIN-CSS@-->
   <!--@ADDON-CSS@-->
+  <!--@CHINA-TRAINS-CSS@-->
   <!-- Google Tag Manager -->
   <script>(function (w, d, s, l, i) {
       w[l] = w[l] || []; w[l].push({
@@ -836,4 +837,4 @@ function validateNewsletterForm() {
   <!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->
 </body>
 
-</html>
+</html>

media/popselectpicture.php

@@ -95,28 +95,30 @@ $_SERVER["REMOTE_ADDR"]!=='221.7.151.34' && $_SERVER["REMOTE_ADDR"]!=='221.7.151
 */
 	function is_remote_ip()
 	{
-		$ip_list = '';
+		// 电脑使用自动分配 IP，取消外网 IP 限制。
-		if (isset($_SERVER["REMOTE_ADDR"])) $ip_list = $_SERVER["REMOTE_ADDR"] . ' ';
+		return false;
-		if (isset($_SERVER["HTTP_X_FORWARDED_FOR"])) $ip_list .= $_SERVER["HTTP_X_FORWARDED_FOR"];
+		// $ip_list = '';
-		//$ip_list=$_SERVER["REMOTE_ADDR"].' '.$_SERVER["HTTP_X_FORWARDED_FOR"];
+		// if (isset($_SERVER["REMOTE_ADDR"])) $ip_list = $_SERVER["REMOTE_ADDR"] . ' ';
-		//print_r($_SERVER);
+		// if (isset($_SERVER["HTTP_X_FORWARDED_FOR"])) $ip_list .= $_SERVER["HTTP_X_FORWARDED_FOR"];
-		echo '<!--' . $ip_list . '-->';
+		// //$ip_list=$_SERVER["REMOTE_ADDR"].' '.$_SERVER["HTTP_X_FORWARDED_FOR"];
+		// //print_r($_SERVER);
+		// echo '<!--' . $ip_list . '-->';
 
-		if (
+		// if (
-			stripos($ip_list, '202.103.68.34') !== false
+		// 	stripos($ip_list, '202.103.68.34') !== false
-			|| stripos($ip_list, '221.7.151.39') !== false
+		// 	|| stripos($ip_list, '221.7.151.39') !== false
-			|| stripos($ip_list, '221.7.151.37') !== false
+		// 	|| stripos($ip_list, '221.7.151.37') !== false
-			|| stripos($ip_list, '221.7.151.41') !== false
+		// 	|| stripos($ip_list, '221.7.151.41') !== false
-			|| stripos($ip_list, '111.59.90.31') !== false
+		// 	|| stripos($ip_list, '111.59.90.31') !== false
-			|| stripos($ip_list, '180.140.114.225') !== false
+		// 	|| stripos($ip_list, '180.140.114.225') !== false
-			|| stripos($ip_list, '116.8.4.34') !== false
+		// 	|| stripos($ip_list, '116.8.4.34') !== false
-			|| stripos($ip_list, '180.140.114.208') !== false
+		// 	|| stripos($ip_list, '180.140.114.208') !== false
-			|| stripos($ip_list, '116.8.4.34') !== false
+		// 	|| stripos($ip_list, '116.8.4.34') !== false
-			|| stripos($ip_list, '::1') !== false //这个也是本地IP
+		// 	|| stripos($ip_list, '::1') !== false //这个也是本地IP
-		) {
+		// ) {
-			return false;
+		// 	return false;
-		}
+		// }
-		return true;
+		// return true;
 	}
 
 	//CDN分发之后，源站和前端域名不一致在这里修正，否则程序生成的链接是源站的域名
@@ -154,4 +156,4 @@ $_SERVER["REMOTE_ADDR"]!=='221.7.151.34' && $_SERVER["REMOTE_ADDR"]!=='221.7.151
 	<?php } ?>
 </body>
 
-</html>
+</html>