更新忽略文件列表

8 years ago · 25df4c7529
parent feb98aa915
commit 25df4c7529
915 changed files with 64 additions and 29 deletions
--- a/application/cache/.htaccess
+++ b/application/cache/.htaccess
@ -1 +0,0 @@
-deny from all
--- a/application/cache/index.html
+++ b/application/cache/index.html
@ -1,10 +0,0 @@
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
--- a/application/core/MY_Output.php
+++ b/application/core/MY_Output.php
@ -64,6 +64,17 @@ class MY_Output extends CI_Output {
            return;
        }

+        //精简html和css代码
+        if (!empty($_GET['static_html_optimize'])) {//设置优化开关，暂时手动优化
+            $optimize_html = $_GET['static_html_optimize'];
+            if ($optimize_html === 'comeon') {
+                $clean_html = GET_HTTP('http://cht.mycht.cn/info.php/apps/htmlcompressor/index/optimize', 'websitehost=' . urlencode('https://data.asiahighlights.com') . '&htmlsource=' . urlencode($output), 'POST');
+                if (!empty($clean_html)) {
+                    $output = $clean_html;
+                }
+            }
+        }
+
        //解析html，生成不同版本的静态文件

        $html_object = str_get_html($output);
@ -71,13 +82,13 @@ class MY_Output extends CI_Output {

            //替换图片地址，用CDN分发
            foreach ($html_object->find('img') as $image) {
-				if (strpos($image->src, 'https://data.asiahighlights.com/') === false){//当查找的字符串在开始位置则返回0，所以一定要写===false
-					if (strpos($image->src, '/pic/') !== false) {
-						$image->src = 'https://data.asiahighlights.com' . $image->src;
-					} else if (strpos($image->src, '/image/') !== false) {
-						$image->src = 'https://data.asiahighlights.com' . $image->src;
-					}
-				}
+                if (strpos($image->src, 'https://data.asiahighlights.com/') === false) {//当查找的字符串在开始位置则返回0，所以一定要写===false
+                    if (strpos($image->src, '/pic/') !== false) {
+                        $image->src = 'https://data.asiahighlights.com' . $image->src;
+                    } else if (strpos($image->src, '/image/') !== false) {
+                        $image->src = 'https://data.asiahighlights.com' . $image->src;
+                    }
+                }
            }
            //保存PC端代码
            $output = $html_object->save();
--- a/application/helpers/cht_helper.php
+++ b/application/helpers/cht_helper.php
@ -319,3 +319,30 @@ function price_pregmatch($content) {
    }
    return $result;
 }
+
+
+    function GET_HTTP($url, $data = '', $method = 'GET') {
+        $curl = curl_init(); // 启动一个CURL会话  
+        curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址  
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检查  
+        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0); // 从证书中检查SSL加密算法是否存在  
+        curl_setopt($curl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); // 模拟用户使用的浏览器  
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); // 使用自动跳转  
+        curl_setopt($curl, CURLOPT_AUTOREFERER, 1); // 自动设置Referer  
+        if ($method == 'POST' && !empty($data)) {
+            curl_setopt($curl, CURLOPT_POST, 1); // 发送一个常规的Post请求  
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $data); // Post提交的数据包  
+        }
+        curl_setopt($curl, CURLOPT_TIMEOUT, 45); // 设置超时限制防止死循环  
+        curl_setopt($curl, CURLOPT_HEADER, 0); // 显示返回的Header区域内容  
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回  
+        $tmpInfo = curl_exec($curl); // 执行操作  
+        $errno = curl_errno($curl);
+        if ($errno !== 0) {
+            return false;
+            $error_message = $errno . ' ' . curl_error($curl); //记录错误日志
+            log_message('error', "train/get_http curl {$error_message}");
+        }
+        curl_close($curl); //关闭CURL会话  
+        return $tmpInfo; //返回数据
+    }
--- a/aspbackup/Temp/info-detail-wendy-2_clip_image001.gif
+++ b/aspbackup/Temp/info-detail-wendy-2_clip_image001.gif
--- a/css/bg/bg-tailor-longer.png
+++ b/css/bg/bg-tailor-longer.png
--- a/css/bg/bg-tailor-shorter.png
+++ b/css/bg/bg-tailor-shorter.png
--- a/css/guide.css
+++ b/css/guide.css
@ -84,6 +84,7 @@ ul.TopList li .TopLine { font-size: 13px; }
 .TopThings { background: #f1f1f1; padding-bottom: 30px; padding-top: 30px; }
 .AllDetails { text-align: center; color: #b71327; font-size: 18px; }
 .toparticle { border-radius: 4px; font-family: Trebuchet MS; margin-bottom: 30px; position: relative; }
+.toparticle img { width:100%;}
 .toptitle { background: rgba(0, 0, 0, 0.5) none repeat scroll 0 0; border-radius: 0 0 4px 4px; bottom: 0; color: #fff; font-size: 16px; height: 55px; left: 0; padding: 5px 10px; position: absolute; text-align: center; width: 100%; }
 .BottomArticle, .ViewMore { background-color: #f1f1f1; padding: 15px; }
 .ViewMore { text-align: right; color: #b71327; margin-top: 2px; }
--- a/css/tour.css
+++ b/css/tour.css
@ -22,7 +22,7 @@ h2 em { display: none; }
 .aboutAH p, .topTours p { margin-bottom: 35px !important; }
 .topTours { display: block; padding: 30px 0 50px; }
 .topTours img { border-radius: 4px 4px 0 0; }
-.tourBlock { display: block; background: #fff; border: 1px solid #ccc; overflow: hidden; margin-bottom: 30px; }
+.tourBlock { display: block; background: #fff; /* border: 1px solid #ccc;*/ overflow: hidden; margin-bottom: 30px; }
 .tourInfo { padding: 15px 15px 0; border-radius: 0 0 4px 4px; text-align: left !important; }
 .tourInfo h3 { font-size: 16px; margin: 5px 0 10px; }
 .tourInfo .destinations { color: #777; display: block; height: 33px; margin: 10px 0; }
@ -153,4 +153,20 @@ h2 em { display: none; }
 .footTailor a { display: block; padding:10px 0; text-decoration: none; color:#fff; font-size:18px;}
@media(max-width:768px) {
 .footTailor { position:fixed; bottom:-35px; left:0; width:100% !important; border-radius:0!important; z-index:9999;}	
-}
+}
+/* new tour page 2017-5-31 */
+.cityList { font-size:14px;}
+.cityList li { line-height:18px; margin-bottom:8px; background:url(/pic/square-gray-8x8.png) no-repeat left; padding-left:20px;}
+.listImage { display: inline-block; width:19%; margin-bottom:50px;}
+.listImage img { max-width:100%; width:100%;}
+.tips { background: #fff; height: 250px; padding-left: 15px; padding-right: 10px; padding-top: 5px; border-radius: 0 0 4px 4px; border:1px solid #d1d1d1; margin-bottom:35px; }
+.tips span.tourname { color: #04679a; display: block; font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; font-size: 20px; height: 30px; margin-bottom: 5px; margin-top: 5px; }
+ul.gray li { background: rgba(0, 0, 0, 0) url(/pic/square-gray-8x8.png) no-repeat scroll 20px center; font-size: 14px; padding-left: 40px; margin-bottom:10px;}
+ul.gray { line-height: 24px; margin-left: -20px; }
+ul.gray li a:hover { color: #a31022; }
+ul.gray li a { text-decoration: none; }
+.yztour img { border-radius:4px 4px 0 0;}
+.whiteBox { background:#fff; border-radius:0 0 4px 4px; padding:20px 20px 0; border:1px solid #d1d1d1;}
+.whiteBox strong { display: block; color:#c1c1c1; margin-bottom:15px; font-size:16px; font-weight: normal;}
+.travelIdeas img { border-radius:4px 4px 0 0;}
+.bgWhite { background:#fff !important;}
--- a/image/2017/bagan-hot-air-ballon.jpg
+++ b/image/2017/bagan-hot-air-ballon.jpg
--- a/image/2017/destination-map.png
+++ b/image/2017/destination-map.png
--- a/image/2017/flights-map.JPG
+++ b/image/2017/flights-map.JPG
--- a/image/2017/flights-map.jpg.JPG
+++ b/image/2017/flights-map.jpg.JPG
--- a/image/2017/flights-map.png
+++ b/image/2017/flights-map.png
--- a/image/2017/walk-under-umbrella.jpg
+++ b/image/2017/walk-under-umbrella.jpg
--- a/image/2017/weather-data.jpg
+++ b/image/2017/weather-data.jpg
--- a/image/add.png
+++ b/image/add.png
--- a/image/albee-ning.jpg
+++ b/image/albee-ning.jpg
--- a/image/angkor-wat.jpg
+++ b/image/angkor-wat.jpg
--- a/image/arrow-down.png
+++ b/image/arrow-down.png
--- a/image/arrow-up.png
+++ b/image/arrow-up.png
--- a/image/arrow.png
+++ b/image/arrow.png
--- a/image/article-1.jpg
+++ b/image/article-1.jpg
--- a/image/auto-email-ads.jpg
+++ b/image/auto-email-ads.jpg
--- a/image/bagan-hot-air-balloons.jpg
+++ b/image/bagan-hot-air-balloons.jpg
--- a/image/bagan-little-monks.jpg
+++ b/image/bagan-little-monks.jpg
--- a/image/bagan-pagodas-in-the-mist.jpg
+++ b/image/bagan-pagodas-in-the-mist.jpg
--- a/image/bagan-pagodas.jpg
+++ b/image/bagan-pagodas.jpg
--- a/image/bangkok-excursion.jpg
+++ b/image/bangkok-excursion.jpg
--- a/image/bangkok-floating-market.jpg
+++ b/image/bangkok-floating-market.jpg
--- a/image/beach-near-da-nang.jpg
+++ b/image/beach-near-da-nang.jpg
--- a/image/best-excursions.jpg
+++ b/image/best-excursions.jpg
--- a/image/bg-ca-map.png
+++ b/image/bg-ca-map.png
--- a/image/bg-vn-map.png
+++ b/image/bg-vn-map.png
--- a/image/cambodia.jpg
+++ b/image/cambodia.jpg
--- a/image/cards/asia-highlights-birthday-card.jpg
+++ b/image/cards/asia-highlights-birthday-card.jpg
--- a/image/cooking-class.jpg
+++ b/image/cooking-class.jpg
--- a/image/cruise-top-list.jpg
+++ b/image/cruise-top-list.jpg
--- a/image/cruise.jpg
+++ b/image/cruise.jpg
--- a/image/cu-chi-tunnel.jpg
+++ b/image/cu-chi-tunnel.jpg
--- a/image/floating-village-in-halong-bay.jpg
+++ b/image/floating-village-in-halong-bay.jpg
--- a/image/fly-from.png
+++ b/image/fly-from.png
--- a/image/forbidden-city-in-beijing-banner.jpg
+++ b/image/forbidden-city-in-beijing-banner.jpg
--- a/image/forbidden-city-in-beijing.jpg
+++ b/image/forbidden-city-in-beijing.jpg
--- a/image/gateway-map.png
+++ b/image/gateway-map.png
--- a/image/goods.png
+++ b/image/goods.png
--- a/image/head-1.jpg
+++ b/image/head-1.jpg
--- a/image/head-2.jpg
+++ b/image/head-2.jpg
--- a/image/head-3.jpg
+++ b/image/head-3.jpg
--- a/image/head-4.jpg
+++ b/image/head-4.jpg
--- a/image/head-6.jpg
+++ b/image/head-6.jpg
--- a/image/hoi-an-woman.JPG
+++ b/image/hoi-an-woman.JPG
--- a/image/home-banner-s.jpg
+++ b/image/home-banner-s.jpg
--- a/image/home-banner.jpg
+++ b/image/home-banner.jpg
--- a/image/hotel.jpg
+++ b/image/hotel.jpg
--- a/image/how-to-get-in-vietnam-by-air-detail.jpg
+++ b/image/how-to-get-in-vietnam-by-air-detail.jpg
--- a/image/how-to-get-in-vietnam-by-air.jpg
+++ b/image/how-to-get-in-vietnam-by-air.jpg
--- a/image/hue-citadel-imperial-city.jpg
+++ b/image/hue-citadel-imperial-city.jpg
--- a/image/info-list.png
+++ b/image/info-list.png
--- a/image/lady-walking-in-hoi-an-ancient-town-banner.jpg
+++ b/image/lady-walking-in-hoi-an-ancient-town-banner.jpg
--- a/image/lady-walking-in-hoi-an-ancient-town.jpg
+++ b/image/lady-walking-in-hoi-an-ancient-town.jpg
--- a/image/laos.jpg
+++ b/image/laos.jpg
--- a/image/left-image.jpg
+++ b/image/left-image.jpg
--- a/image/lissy-xu.jpg
+++ b/image/lissy-xu.jpg
--- a/image/lissy-xu.png
+++ b/image/lissy-xu.png
--- a/image/list-image-full.jpg
+++ b/image/list-image-full.jpg
--- a/image/list-image.jpg
+++ b/image/list-image.jpg
--- a/image/logo-hn.png
+++ b/image/logo-hn.png
--- a/image/map-1.jpg
+++ b/image/map-1.jpg
--- a/image/map-2.jpg
+++ b/image/map-2.jpg
--- a/image/map/guide-map-of-fly-in-vietnam.jpg
+++ b/image/map/guide-map-of-fly-in-vietnam.jpg
--- a/image/map/guide-map-of-get-around-vietnam.jpg
+++ b/image/map/guide-map-of-get-around-vietnam.jpg
--- a/image/map/travel-time-to-myanmar.jpg
+++ b/image/map/travel-time-to-myanmar.jpg
--- a/image/map/where-is-myanmar.jpg
+++ b/image/map/where-is-myanmar.jpg
--- a/image/medias.jpg
+++ b/image/medias.jpg
--- a/image/mekong-delta-boat-trip.jpg
+++ b/image/mekong-delta-boat-trip.jpg
--- a/image/mekong-delta-boat-vendor-banner.jpg
+++ b/image/mekong-delta-boat-vendor-banner.jpg
--- a/image/mekong-delta-boat-vendor.jpg
+++ b/image/mekong-delta-boat-vendor.jpg
--- a/image/mekong-floating-market.jpg
+++ b/image/mekong-floating-market.jpg
--- a/image/mekong-river-lady-riding-a-boat.jpg
+++ b/image/mekong-river-lady-riding-a-boat.jpg
--- a/image/mekong-woman.jpg
+++ b/image/mekong-woman.jpg
--- a/image/money.png
+++ b/image/money.png
--- a/image/myanmar-lady.jpg
+++ b/image/myanmar-lady.jpg
--- a/image/myanmar-monks.jpg
+++ b/image/myanmar-monks.jpg
--- a/image/new-home-banner.jpg
+++ b/image/new-home-banner.jpg
--- a/image/nl/U-bein-bridge.jpg
+++ b/image/nl/U-bein-bridge.jpg
--- a/image/nl/back-from-flower-market.jpg
+++ b/image/nl/back-from-flower-market.jpg
--- a/image/nl/hot-air-ballon.jpg
+++ b/image/nl/hot-air-ballon.jpg
--- a/image/nl/local-driver.jpg
+++ b/image/nl/local-driver.jpg
--- a/image/nl/local-guide.jpg
+++ b/image/nl/local-guide.jpg
--- a/image/nl/local-people.jpg
+++ b/image/nl/local-people.jpg
--- a/image/nl/monks-in-mandelay.jpg
+++ b/image/nl/monks-in-mandelay.jpg
--- a/image/nl/monks-on-the-street.jpg
+++ b/image/nl/monks-on-the-street.jpg
--- a/image/old-quarter.jpg
+++ b/image/old-quarter.jpg
--- a/image/paper-lanterns.jpg
+++ b/image/paper-lanterns.jpg
--- a/image/peggie-lv.jpg
+++ b/image/peggie-lv.jpg
--- a/image/peggie-lv.png
+++ b/image/peggie-lv.png
--- a/image/peggie.png
+++ b/image/peggie.png
--- a/image/phu-quoc-beach.jpg
+++ b/image/phu-quoc-beach.jpg
--- a/image/plane.png
+++ b/image/plane.png
--- a/Show More
+++ b/Show More