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 into master

Browse Source
hotfix/paypal-note
candice 3 years ago
parent a53a2ee0af 8da7189944
commit 243a489fd1
3 changed files with 157 additions and 145 deletions
Show Stats Download Patch File Download Diff File

29
application/config/config.php
Unescape Escape View File

@ -36,7 +36,10 @@ switch ($_SERVER['SERVER_NAME']) {
$base_url = 'https://int.mycht.cn';
break;
case 'gh-int.mycht.cn':
$base_url = 'https://gh-int.mycht.cn';
$base_url = 'https://int.mycht.cn';
break;
case 'int.mycht.cn':
$base_url = 'https://int.mycht.cn';
break;
case 'origin-gh.mycht.cn':
$base_url = 'https://gh.mycht.cn';
@ -419,12 +422,12 @@ $config['site'] = array(
);
//静态文件生成路径
$config['cache']['jp']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\arachina.com';
$config['cache']['gm']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\chinarundreisen.com';
$config['cache']['vc']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\voyageschine.com';
$config['cache']['vac']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\viaje-a-china.com';
$config['cache']['ru']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\chinahighlights.ru';
$config['cache']['it']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\viaggio-in-cina.it';
$config['cache']['jp']['cache_path'] = 'D:\wwwcache-intl\arachina.com';
$config['cache']['gm']['cache_path'] = 'D:\wwwcache-intl\chinarundreisen.com';
$config['cache']['vc']['cache_path'] = 'D:\wwwcache-intl\voyageschine.com';
$config['cache']['vac']['cache_path'] = 'D:\wwwcache-intl\viaje-a-china.com';
$config['cache']['ru']['cache_path'] = 'D:\wwwcache-intl\chinahighlights.ru';
$config['cache']['it']['cache_path'] = 'D:\wwwcache-intl\viaggio-in-cina.it';
//静态文件站点域名
$config['cache']['jp']['site_url'] = 'https://www.arachina.com';
@ -722,12 +725,12 @@ $config['css_source_ts'] = 'https://www.trainspread.com/css/bootstrap.min.css';
//静态文件生成路径
$config['cache']['jp']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\arachina.com';
$config['cache']['gm']['cache_path'] = 'C:\Dropbox\wwwcache\chinarundreisen.com';
$config['cache']['vc']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\voyageschine.com';
$config['cache']['vac']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\viaje-a-china.com';
$config['cache']['ru']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\chinahighlights.ru';
$config['cache']['it']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\viaggio-in-cina.it';
$config['cache']['jp']['cache_path'] = 'D:\wwwcache-intl\arachina.com';
$config['cache']['gm']['cache_path'] = 'D:\wwwcache-intl\chinarundreisen.com';
$config['cache']['vc']['cache_path'] = 'D:\wwwcache-intl\voyageschine.com';
$config['cache']['vac']['cache_path'] = 'D:\wwwcache-intl\viaje-a-china.com';
$config['cache']['ru']['cache_path'] = 'D:\wwwcache-intl\chinahighlights.ru';
$config['cache']['it']['cache_path'] = 'D:\wwwcache-intl\viaggio-in-cina.it';
$config['cache']['ch']['cache_path'] = 'D:\wwwcache\chinahighlights.com';
$config['cache']['ah']['cache_path'] = 'D:\wwwcache\asiahighlights.com';
$config['cache']['gh']['cache_path'] = 'D:\wwwcache\globalhighlights.com';

17
media/popselectpicture.php
Unescape Escape View File

@ -1,21 +1,26 @@
<?php header('Cache-Control: no-cache'); ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>China Highlights Media Center</title>
<style type="text/css">
html,body,iframe {
html,
body,
iframe {
height: 100%;
margin: 0;
overflow: hidden;
padding: 0;
width: 100%;
}
iframe {
overflow: auto;
}
</style>
</head>
<body>
<script type="text/javascript">
function SetReturnValue(s) {
@ -28,7 +33,6 @@
window.parent.close();
}
this.opener.callBack = window.opener ? window.opener.CallBack : window.parent.CallBack;
</script>
<?php
$media_site_code = 'ch';
@ -92,7 +96,8 @@ function is_remote_ip()
//print_r($_SERVER);
echo '<!--' . $ip_list . '-->';
if (stripos($ip_list,'202.103.68.34')!==false
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
@ -122,8 +127,11 @@ switch ($_SERVER['SERVER_NAME']){
break;
case 'origin-int.mycht.cn':
$base_url = 'https://int.mycht.cn';
case 'gh-int.mycht.cn':
$base_url = 'https://int.mycht.cn';
break;
default:$base_url='https://'.$_SERVER['HTTP_HOST'];
default:
$base_url = 'https://' . $_SERVER['HTTP_HOST'];
}
?>
@ -139,4 +147,5 @@ switch ($_SERVER['SERVER_NAME']){
<iframe id="test" frameborder="0" src="https://video.chtcdn.com/OutputApp/searchpicture.aspx?<?php echo ($rwidth); ?>webcode=<?php echo $media_site_code; ?>&lgc=<?php echo $_GET['site_lgc']; ?>&apptype=infomation&WebUrl=<?php echo isset($_GET['WebUrl']) ? $_GET['WebUrl'] : false; ?>&redirecturl=<?php echo $base_url; ?>/media/transitval.php"> </iframe>
<?php } ?>
</body>
</html>

2
wysiwyg/ckfinder/config.php
Unescape Escape View File

@ -108,7 +108,7 @@ switch ($sitecode) {
//文件上传目录，使用相对路径，在文件夹中建立虚拟目录指向真实文件夹
//创建指向目录 mklink /D D:\wwwroot\uploader-file\gh\image D:\wwwroot\origin-www.globalhighlights.com\image
//需要移出项目文件夹，防止FTP访问到，防止误删
if ('origin-int.mycht.cn' == $_SERVER["SERVER_NAME"] || 'origin-gm.mycht.cn' == $_SERVER["SERVER_NAME"]) {
if ('gh-int.mycht.cn' == $_SERVER["SERVER_NAME"] || 'origin-gm.mycht.cn' == $_SERVER["SERVER_NAME"]) {
// 国际站和德语站不需要更改目录
$site_upload_dir = dirname(__FILE__) . ('/userfiles/') . $sitecode;
} else {

Write Preview
Loading…
Cancel
Save