Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
hotfix/paypal-note
赵鹏 2 years ago
parent 06930a847f 6c2b1c6f67
commit 68d82da7b9
6 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File

8
application/controllers/information.php
Unescape Escape View File

@ -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)) {

3
application/views/mobile_first/ah-pc.php
Unescape Escape View File

@ -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
Days</a></li>
<li><a href="/southeast-asia/tours/from-south-vietnam-to-north-cambodia">8 Days</a></li>
</ul>
</div>

4
application/views/mobile_first/ah.php
Unescape Escape View File

@ -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
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/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

1
application/views/mobile_first/ch-pc.php
Unescape Escape View File

@ -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] || [];

1
application/views/mobile_first/ch.php
Unescape Escape View File

@ -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({

44
media/popselectpicture.php
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save