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
LiaoYijun 3 years ago
parent 9300b3f81a 10f19aa42a
commit 76031d35e0
13 changed files with 2159 additions and 135 deletions
Show Stats Download Patch File Download Diff File

52
application/config/database.php
Unescape Escape View File

@ -1,52 +0,0 @@
<?php
if (!defined('BASEPATH'))
exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| DATABASE CONNECTIVITY SETTINGS
| -------------------------------------------------------------------
| This file will contain the settings needed to access your database.
|
| For complete instructions please consult the 'Database Connection'
| page of the User Guide.
|
| -------------------------------------------------------------------
| EXPLANATION OF VARIABLES
| -------------------------------------------------------------------
|
| ['hostname'] The hostname of your database server.
| ['username'] The username used to connect to the database
| ['password'] The password used to connect to the database
| ['database'] The name of the database you want to connect to
| ['dbdriver'] The database type. ie: mysql. Currently supported:
mysql, mysqli, postgre, odbc, mssql, sqlite, oci8
| ['dbprefix'] You can add an optional prefix, which will be added
| to the table name when using the Active Record class
| ['pconnect'] TRUE/FALSE - Whether to use a persistent connection
| ['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
| ['cache_on'] TRUE/FALSE - Enables/disables query caching
| ['cachedir'] The path to the folder where cache files should be stored
| ['char_set'] The character set used in communicating with the database
| ['dbcollat'] The character collation used in communicating with the database
| ['swap_pre'] A default table prefix that should be swapped with the dbprefix
| ['autoinit'] Whether or not to automatically initialize the database.
| ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
| - good for ensuring strict SQL while developing
|
| The $active_group variable lets you choose which connection group to
| make active. By default there is only one group (the 'default' group).
|
| The $active_record variables lets you determine whether or not to load
| the active record class
*/
//选择数据库
$active_group = 'HT';
//是否加载
$active_record = TRUE;
require 'C:/database_conn.php';
/* End of file database.php */
/* Location: ./application/config/database.php */

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

@ -828,6 +828,10 @@ class Information extends CI_Controller
$template_TrainSearch = "";
if ($information->ic_url == "/china-trains/hometest.htm" || $information->ic_url == "/china-trains/") {
$template_TrainSearch = $this->load->view($template_path . '-train-index', null, TRUE);
if ($device=="mobile"){
//手机端的搜索框直接显示，不再加背景图，这样可以保证CLS分数。
$template = str_replace('<!--@TOP-BANNER@-->', '<div class="detailtopbanner">' . $template_TrainSearch . '</div>', $template);
}
}
@ -1517,6 +1521,12 @@ class Information extends CI_Controller
//火车票首页
$template_TrainSearch = $this->load->view($template_path . '-train-index', null, TRUE);
$ImgText = "";
//火车票移动端去掉头部图片，保证搜索框CLS
if ($device == 'mobile') {
$meta_addon_picture = "";
$data["TOPBANNER"] = '<div class="banner">' . $template_TrainSearch . '</div>';
}
} else if ($information->ic_url == "/china-flights") {
//机票首页
$template_TrainSearch = $this->load->view($template_path . '-flight-index', null, TRUE);

6
application/third_party/ctmobilefirst/models/api_model.php vendored
Unescape Escape View File

@ -268,7 +268,7 @@ class Api_model extends CI_Model {
inner join infoStructures on ic_id=is_ic_id
where is_id = ? ";
$query = $this->HT->query ($sql ,array($new_pid));
$query = $this->InfoCT->query ($sql ,array($new_pid));
if ($query->num_rows()>0){
$url = $query->row()->ic_url;
@ -299,6 +299,7 @@ class Api_model extends CI_Model {
WHERE is_sitecode='chinatravel'
and ic_status=1
and ic_url like ?
and is_parent_id <> ?
UNION ALL
@ -314,7 +315,8 @@ class Api_model extends CI_Model {
order by sortby
";
$qurey = $this->InfoCT->query($sql,array($url."/%",$new_pid));
$qurey = $this->InfoCT->query($sql,array($url."/%",$new_pid,$new_pid));
return $qurey->result();
}

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

@ -53,85 +53,74 @@
height="83" alt="chinahighlights logo" class="chinahighlightslogo img-responsive"></a>
<div class="p_topnavigation">
<ul class="pctopnavi">
<li class="dropdown"><a href="/tour/" class="p_topnavilink">China Tours</a>
<li class="dropdown"><a href="/tour/" class="p_topnavilink" id="china_tours_2021">China Tours</a>
<div class="chinatourspc dropdown-content">
<div class="menulinkbox">
<ul class="list-reset sidebar">
<li class="start-nav-item"><a href="/tour/top-china-tours/">Top 10 Tours</a></li>
<li class="start-nav-item"><a href="/tour/family-tours/">Family Tours</a></li>
<li class="start-nav-item"><a href="/tour/year.htm">China Tours 2022/2023</a></li>
<li class="start-nav-item"><a href="/tour/china-panda-tours/">Panda Tours</a></li>
<li class="start-nav-item"><a href="/greatwall/hiking.htm">Great Wall Hiking</a></li>
<li class="start-nav-item"><a href="/greatwall/tours/">Great Wall of China Tours</a></li>
<li class="start-nav-item"><a href="/tour/china-hiking-tours/">Hiking Tours</a></li>
<li class="start-nav-item"><a href="/tour/silk-road-tours/">Silk Road Tours</a></li>
<li class="start-nav-item"><a href="/tour/expats-tours.htm">China Expats Tours</a></li>
<li class="start-nav-item"><a href="/yangtzecruise/">Yangtze River Cruise</a></li>
<li class="start-nav-item"><a href="/tour/winter-vacation/">China Winter Tours</a></li>
<li class="start-nav-item"><a href="/winter-olympics/travel-packages/">Winter Olympics Travel</a></li>
<li class="start-nav-item"><a href="/tour/year.htm" id="tours_year_2021">China Tours 2022/2023</a></li>
<li class="start-nav-item"><a href="/tour/expats-tours.htm" id="china_expats_tours_2021">China Expats Tours</a></li>
<li class="start-nav-item"><a href="/tour/winter-vacation/" id="china_winter_tours_2021">China Winter Tours</a></li>
<li class="start-nav-item"><a href="/winter-olympics/travel-packages/" id="china_olympics_tours_2021">Winter Olympics Travel</a></li>
<li class="start-nav-item"><a href="/tour/top-china-tours/" id="china_top_tours_2021">Top 10 Tours</a></li>
<li class="start-nav-item"><a href="/tour/china-panda-tours/" id="china_panda_tours_2021">Panda Tours</a></li>
<li class="start-nav-item"><a href="/greatwall/hiking.htm" id="china_great_wall_hiking_tours_2021">Great Wall Hiking</a></li>
<li class="start-nav-item"><a href="/tour/silk-road-tours/" id="china_silk_road_tours_2021">Silk Road Tours</a></li>
<li class="start-nav-item"><a href="/tour/family-tours/" id="china_family_tours_2021">Family Tours</a></li>
<li class="start-nav-item"><a href="/yangtzecruise/" id="china_yangtze_cruise_2021">Yangtze River Cruise</a></li>
<li class="start-nav-item"><a href="/tour/china-hiking-tours/" id="china_hiking_tours_2021">Hiking Tours</a></li>
<li class="start-nav-item start-nav-item-last"><a href="/greatwall/tours/" id="china_great_wall_tours_2021">Great Wall of China Tours</a></li>
</ul>
</div>
</div>
</li>
<li class="dropdown"><a href="/citytour/" class="p_topnavilink">Destinations</a>
<li class="dropdown"><a href="/citytour/" class="p_topnavilink" id="china_destinations_2021">Destinations</a>
<div class="destinationspc dropdown-content">
<ul class="list-reset sidebar">
<li class="start-nav-item" ><a href="/harbin/tours.htm">Harbin</a></li>
<li class="start-nav-item" ><a href="/tibet/tours.htm">Tibet</a></li>
<li class="start-nav-item" ><a href="/yunnan/tours.htm">Yunnan</a></li>
<li class="start-nav-item" ><a href="/guilin/tours.htm">Guilin</a></li>
<li class="start-nav-item" ><a href="/chengdu/tours.htm">Chengdu</a></li>
<li class="start-nav-item" ><a href="/zhangjiajie/tours.htm">Zhangjiajie</a></li>
<li class="start-nav-item" ><a href="/xinjiang/tours/">Xinjiang</a></li>
<li class="start-nav-item" ><a href="/inner-mongolia/tours/">Inner Mongolia</a></li>
<li class="start-nav-item" ><a href="/huangshan/tours.htm">Huangshan</a></li>
<li class="start-nav-item" ><a href="/beijing/tours.htm">Beijing</a></li>
<li class="start-nav-item" ><a href="/xian/tours.htm">Xi&#39;an</a></li>
<li class="start-nav-item" ><a href="/shanghai/tours.htm">Shanghai</a></li>
<li class="start-nav-item" ><a href="/harbin/tours.htm" id="harbin_tours_2021">Harbin</a></li>
<li class="start-nav-item" ><a href="/tibet/tours.htm" id="tibet_tours_2021">Tibet</a></li>
<li class="start-nav-item" ><a href="/yunnan/tours.htm" id="yunnan_tours_2021">Yunnan</a></li>
<li class="start-nav-item" ><a href="/guilin/tours.htm" id="guilin_tours_2021">Guilin</a></li>
<li class="start-nav-item" ><a href="/chengdu/tours.htm" id="chengdu_tours_2021">Chengdu</a></li>
<li class="start-nav-item" ><a href="/zhangjiajie/tours.htm" id="zhangjiajie_tours_2021">Zhangjiajie</a></li>
<li class="start-nav-item" ><a href="/xinjiang/tours/" id="xinjiang_tours_2021">Xinjiang</a></li>
<li class="start-nav-item" ><a href="/inner-mongolia/tours/" id="inner_mongolia_tours_2021">Inner Mongolia</a></li>
<li class="start-nav-item" ><a href="/huangshan/tours.htm" id="huangshan_tours_2021">Huangshan</a></li>
<li class="start-nav-item" ><a href="/beijing/tours.htm" id="beijing_tours_2021">Beijing</a></li>
<li class="start-nav-item" ><a href="/xian/tours.htm" id="xian_tours_2021">Xi&#39;an</a></li>
<li class="start-nav-item start-nav-item-last" ><a href="/shanghai/tours.htm" id="shanghai_tours_2021">Shanghai</a></li>
</ul>
</div>
</li>
<li class="dropdown"><a href="/travelguide/" class="p_topnavilink">Travel Guide</a>
<li class="dropdown"><a href="/travelguide/" class="p_topnavilink" id="travel_guide_2021">Travel Guide</a>
<div class="travelguidepc dropdown-content">
<ul class="list-reset sidebar">
<li class="start-nav-item"><a href="/map/">China Maps</a></li>
<li class="start-nav-item"><a href="/travelguide/article/">China Tour Planning</a></li>
<li class="start-nav-item"><a href="/travelguide/top-highlights-of-china.htm">Best of China</a>
</li>
<li class="start-nav-item"><a href="/travelguide/visa-application/">China Visas</a></li>
<li class="start-nav-item"><a href="/travelguide/china-travel-city-guide.htm">China Area
Guide</a></li>
<li class="start-nav-item"><a href="/travelguide/china-attraction-guide.htm">China Top
Attractions</a></li>
<li class="start-nav-item"><a href="/weather/">China Weather</a></li>
<li class="start-nav-item"><a href="/map/" id="china_maps_2021">China Maps</a></li>
<li class="start-nav-item"><a href="/travelguide/article/" id="china_tour_planning_2021">China Tour Planning</a></li>
<li class="start-nav-item"><a href="/travelguide/top-highlights-of-china.htm" id="best_of_china_2021">Best of China</a></li>
<li class="start-nav-item"><a href="/travelguide/visa-application/" id="china_visas_2021">China Visas</a></li>
<li class="start-nav-item"><a href="/travelguide/china-travel-city-guide.htm" id="china_area_guide_2021">China Area Guide</a></li>
<li class="start-nav-item"><a href="/travelguide/china-attraction-guide.htm" id="china_top_attractions_2021">China Top Attractions</a></li>
<li class="start-nav-item start-nav-item-last"><a href="/weather/" id="china_weather_2021">China Weather</a></li>
</ul>
</div>
</li>
<li class="dropdown"><a href="/travelguide/culture/" class="p_topnavilink">Culture</a>
<li class="dropdown"><a href="/travelguide/culture/" class="p_topnavilink" id="culture_2021">Culture</a>
<div class="culturepc dropdown-content">
<ul class="list-reset sidebar">
<li class="start-nav-item"><a href="/travelguide/chinese-zodiac/">Chinese Zodiac</a></li>
<li class="start-nav-item"><a href="/travelguide/chinese-food/">Chinese Food</a></li>
<li class="start-nav-item"><a href="/travelguide/culture/china-history.htm">China
History</a></li>
<li class="start-nav-item"><a href="/travelguide/religion.htm">Chinese Religions</a></li>
<li class="start-nav-item"><a href="/festivals/">Chinese Festivals</a></li>
<li class="start-nav-item"><a href="/travelguide/special-report/chinese-new-year/">Chinese
New Year</a></li>
<li class="start-nav-item"><a href="/travelguide/kungfu/">Kung Fu</a></li>
<li class="start-nav-item"><a href="/travelguide/chinese-tea/">Chinese Tea</a></li>
<li class="start-nav-item"><a href="/travelguide/chinese-zodiac/" id="china_zodiac_2021">Chinese Zodiac</a></li>
<li class="start-nav-item"><a href="/travelguide/special-report/chinese-new-year/" id="china_new_year_2021">Chinese New Year</a></li>
<li class="start-nav-item"><a href="/travelguide/culture/china-history.htm" id="china_history_2021">China History</a></li>
<li class="start-nav-item"><a href="/travelguide/religion.htm" id="china_religions_2021">Chinese Religions</a></li>
<li class="start-nav-item"><a href="/festivals/" id="china_festivals_2021">Chinese Festivals</a></li>
<li class="start-nav-item"><a href="/travelguide/chinese-food/" id="china_food_2021">Chinese Food</a></li>
<li class="start-nav-item"><a href="/travelguide/kungfu/" id="china_kungfu_2021">Kung Fu</a></li>
<li class="start-nav-item start-nav-item-last"><a href="/travelguide/chinese-tea/" id="china_tea_2021">Chinese Tea</a></li>
</ul>
</div>
@ -143,7 +132,7 @@
Schedules</a></li>
<li class="start-nav-item"><a href="/china-trains/train-travel.htm">Train Travel</a></li>
<li class="start-nav-item"><a href="/china-flights/">Flight</a></li>
<li class="start-nav-item"><a href="/china-trains/app.htm">Train App Download</a></li>
<li class="start-nav-item start-nav-item-last"><a href="/china-trains/app.htm">Train App Download</a></li>
</ul>
</div>
@ -163,7 +152,7 @@
<li class="start-nav-item"><a href="/day-tours/yunnan/">Yunnan</a></li>
<li class="start-nav-item"><a href="/day-tours/great-wall-hiking/">Great Wall Tours</a></li>
<li class="start-nav-item"><a href="/day-tours/china-food-tours/">Food Tours</a></li>
<li class="start-nav-item"><a href="/day-tours/activities/">Fun Activities</a></li>
<li class="start-nav-item start-nav-item-last"><a href="/day-tours/activities/">Fun Activities</a></li>
</ul>
</div>
</li>
@ -171,7 +160,7 @@
</div>
<div class="pcnavibutton">
<div class="topnavitailor">
<a href="/contactus/">Contact Us</a>
<a href="/contactus/" id="contact_us_2021">Contact Us</a>
</div>
<div class="siteSearch ">
@ -218,14 +207,22 @@
<!--PC底部-->
<div class="infobottom">
<div class="infotailor">
<span class="infotailorword">We are here to help you...<br> start planning your tailor-made China tour with 1-1 help from our travel advisors.
<span class="infotailormade"><a href="/tour/create-my-trip.htm">Create Your Trip </a></span>
</span>
</div>
<div class="infotailor"><div class="form_content_bg"></div>
<div class="form_content">
<div class="formtitle">
<h2>Why Travel with China Highlights</h2>
<ul>
<li class="tailormade"><strong>Your wellbeing is our priority:</strong>1-to-1 travel expert, vaccinated guides, private rides</li>
<li class="worryfree"><strong>Your trip is perfectly planned:</strong>No crowds, exclusive exciting experiences
</li>
<li class="norisk"><strong>Your booking is risk-free:</strong> No cancellation fee, free changes</li>
</ul>
</div>
<span class="infotailorword">We are here to help you...<br> start planning your tailor-made China tour with 1-1 help from our travel advisors.
<span class="infotailormade"><a href="/tour/create-my-trip.htm" id="bottom_tailormade_pc">Create Your Trip </a></span>
</span>
</div>
</div>
<div class="footerbox">
@ -304,14 +301,14 @@
<div class="bottomaboutuslinks">
<div class="bottomlinksleft">
<ul class="withBorder">
<li><a href="/aboutus/" rel="nofollow">About us</a></li>
<li><a href="/contactus/" rel="nofollow">Contact us</a></li>
<li><a href="/feedback/" rel="nofollow">Reviews</a></li>
<li><a href="/aboutus/loyalty-program.htm" rel="nofollow">Loyalty
<li><a href="https://www.chinahighlights.com/aboutus/" rel="nofollow">About us</a></li>
<li><a href="https://www.chinahighlights.com/contactus/" rel="nofollow">Contact us</a></li>
<li><a href="https://www.chinahighlights.com/feedback/" rel="nofollow">Reviews</a></li>
<li><a href="https://www.chinahighlights.com/aboutus/loyalty-program.htm" rel="nofollow">Loyalty
&amp; Referral Program</a></li>
<li><a href="/partner/" rel="nofollow">Partner</a></li>
<li><a href="https://www.chinahighlights.com/partner/" rel="nofollow">Partner</a></li>
<li><a href="/aboutus/jobs-volunteer.htm"
<li><a href="https://www.chinahighlights.com/aboutus/jobs-volunteer.htm"
rel="nofollow">Work for us</a></li>
</ul>
<div class="languageSwitch">
@ -327,8 +324,8 @@
</div>
<div class="bottommembers">
<div class="memberIcons">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy" width="67" height="67"
originalsrc="https://data.chinahighlights.com/image/aboutus/member-icons-2022.png">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy" width="253" height="67"
originalsrc="https://data.chinahighlights.com/image/aboutus/member/member-icons.png">
</div>
</div>
</div>
@ -337,6 +334,7 @@
<div class="bottomlogo">
<div class="footerbox">
<img src="https://data.chinahighlights.com/grey.gif"
originalsrc="https://data.chinahighlights.com/pic/guide/info-template-bottom-logo.jpg"
width="114"
@ -346,6 +344,7 @@
<span class="bottomcopyright">© 1998-2022 China Highlights — Discovery Your Way! </span>
<span class="bottomprivacy"><a href="/privacy.htm">Privacy Policy</a> | <a
href="/aboutus/terms.htm">Terms</a></span>
</div>
</div>
<div class="web_cookie" style='display: none;' id='gotIdArea'><p>China Highlights uses cookies to give you the best

6
application/views/mobile_first/ch-train-index.php
View File

File diff suppressed because one or more lines are too long

12
application/views/mobile_first/ch-weather-forecast.php
Unescape Escape View File

@ -8,7 +8,7 @@
<p id="todayDate">...</p>
<p id="todayTemperature">...</p>
<p id="todayFahrenheit">...</p>
<div class="infoimage weather_img"><img alt="" class="img-responsive" id="todayIcon"
<div class=" weather_img"><img alt="" class="img-responsive" id="todayIcon"
src="https://data.chinahighlights.com/image/weather/icon-weather/50d.png" /></div>
<p id="todayCondition">...</p>
<p id="todayHumidity">Humidity: ...</p>
@ -21,7 +21,7 @@
<p id="forecastTemperature1">...</p>
<p id="forecastFahrenheit1">...</p>
<div class="infoimage weather_img"><img alt="" class="img-responsive" id="forecastIcon1"
<div class=" weather_img"><img alt="" class="img-responsive" id="forecastIcon1"
src="https://data.chinahighlights.com/image/weather/icon-weather/50d.png" /></div>
<p id="forecastCondition1">...</p>
<p id="forecastHumidity1">Humidity: ...</p>
@ -34,7 +34,7 @@
<p id="forecastTemperature2">...</p>
<p id="forecastFahrenheit2">...</p>
<div class="infoimage weather_img"><img alt="" class="img-responsive" id="forecastIcon2"
<div class=" weather_img"><img alt="" class="img-responsive" id="forecastIcon2"
src="https://data.chinahighlights.com/image/weather/icon-weather/50d.png" /></div>
<p id="forecastCondition2">...</p>
<p id="forecastHumidity2">Humidity: ...</p>
@ -47,7 +47,7 @@
<p id="forecastTemperature3">...</p>
<p id="forecastFahrenheit3">...</p>
<div class="infoimage weather_img"><img alt="" class="img-responsive" id="forecastIcon3"
<div class=" weather_img"><img alt="" class="img-responsive" id="forecastIcon3"
src="https://data.chinahighlights.com/image/weather/icon-weather/50d.png" /></div>
<p id="forecastCondition3">...</p>
<p id="forecastHumidity3">Humidity: ...</p>
@ -60,7 +60,7 @@
<p id="forecastTemperature4">...</p>
<p id="forecastFahrenheit4">...</p>
<div class="infoimage weather_img"><img alt="" class="img-responsive" id="forecastIcon4"
<div class=" weather_img"><img alt="" class="img-responsive" id="forecastIcon4"
src="https://data.chinahighlights.com/image/weather/icon-weather/50d.png" /></div>
<p id="forecastCondition4">...</p>
<p id="forecastHumidity4">Humidity: ...</p>
@ -73,7 +73,7 @@
<p id="forecastTemperature5">...</p>
<p id="forecastFahrenheit5">...</p>
<div class="infoimage weather_img"><img alt="" class="img-responsive" id="forecastIcon5"
<div class=" weather_img"><img alt="" class="img-responsive" id="forecastIcon5"
src="https://data.chinahighlights.com/image/weather/icon-weather/50d.png" /></div>
<p id="forecastCondition5">...</p>
<p id="forecastHumidity5">Humidity: ...</p>

2056
icu.htm
View File

File diff suppressed because it is too large Load Diff

2
wysiwyg/ckfinder/userfiles/cht/.ckfinder/cache/thumbs/.htaccess vendored
Unescape Escape View File

@ -0,0 +1,2 @@
Order Deny,Allow
Deny from all

1
wysiwyg/ckfinder/userfiles/it
Unescape Escape View File

@ -0,0 +1 @@
C:/VHD/Dropbox/wwwroot/viaggio-in-cina.it/kcfinder/upload/it

1
wysiwyg/ckfinder/userfiles/jp
Unescape Escape View File

@ -0,0 +1 @@
C:/VHD/Dropbox/wwwroot/arachina.com/kcfinder/upload/jp

1
wysiwyg/ckfinder/userfiles/ru
Unescape Escape View File

@ -0,0 +1 @@
C:/VHD/Dropbox/wwwroot/chinahighlights.ru/kcfinder/upload/ru

1
wysiwyg/ckfinder/userfiles/vac
Unescape Escape View File

@ -0,0 +1 @@
C:/VHD/Dropbox/wwwroot/viaje-a-china.com/kcfinder/upload/vac

1
wysiwyg/ckfinder/userfiles/vc
Unescape Escape View File

@ -0,0 +1 @@
C:/VHD/Dropbox/wwwroot/voyageschine.com/kcfinder/upload/vc
Write Preview
Loading…
Cancel
Save