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 4 years ago
parent 78af537cec bd003b4326
commit e86d909ffa
2 changed files with 117 additions and 125 deletions
Show Stats Download Patch File Download Diff File

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

@ -514,11 +514,11 @@ class Information extends CI_Controller
$recommand_information = $this->recommand_information($information); $recommand_information = $this->recommand_information($information);
//用于批量更新,CH和chinatravel分开 ，20210317 zp //用于批量更新,CH和chinatravel分开 ，20210317 zp
if ($this->config->item('site_code') == 'ch') { if ($this->config->item('site_code') == 'ch') {
$this->make_www_cache('pc', $information,$recommand_information); $this->make_www_cache('pc', $information, $recommand_information);
$this->make_www_cache('mobile', $information,$recommand_information); $this->make_www_cache('mobile', $information, $recommand_information);
} else if ($this->config->item('site_code') == 'ah') { } else if ($this->config->item('site_code') == 'ah') {
$this->make_www_cache_ah('pc', $information,$recommand_information); $this->make_www_cache_ah('pc', $information, $recommand_information);
$this->make_www_cache_ah('mobile', $information,$recommand_information); $this->make_www_cache_ah('mobile', $information, $recommand_information);
} else if ($this->config->item('site_code') == 'chinatravel') { } else if ($this->config->item('site_code') == 'chinatravel') {
$this->make_www_cache_ct($information); $this->make_www_cache_ct($information);
// $this->make_www_cache_ct('mobile', $information); // $this->make_www_cache_ct('mobile', $information);
@ -936,7 +936,7 @@ class Information extends CI_Controller
$template); $template);
$tour_form_content = $this->load->view( $tour_form_content = $this->load->view(
$template_path . '-gh-tour-form', $template_path . '-tour-form',
array('information' => $information), array('information' => $information),
true); true);
$template = str_replace( $template = str_replace(
@ -957,10 +957,7 @@ class Information extends CI_Controller
$meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture'); $meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture');
} }
//非产品页面
$meta_product_code = get_meta($information->ic_id, 'meta_product_code'); $meta_product_code = get_meta($information->ic_id, 'meta_product_code');
if (empty($meta_product_code)) {
$ads_by_google = !empty(get_meta($information->ic_id, 'meta_google_ad_article')); $ads_by_google = !empty(get_meta($information->ic_id, 'meta_google_ad_article'));
//H1模板替换 //H1模板替换
$data_H1 = array(); $data_H1 = array();
@ -982,14 +979,6 @@ class Information extends CI_Controller
array('information' => $information, 'author' => $author), array('information' => $information, 'author' => $author),
true); true);
$template = str_replace('<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->', $article_structured_data_content, $template); $template = str_replace('<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->', $article_structured_data_content, $template);
} else {
// $template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.chinahighlights.com/js/flatpickr.js"></script>', $template);
// $inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code' => $meta_product_code), true);
// $information->ic_content = str_replace('<!--@INQUIRY-FORM@-->', $inquiry_form_template, $information->ic_content);
//
// $breadcrumb_content = $this->load->view($template_path . '-breadcrumb', array('breadcrumb_data' => $breadcrumb_data), true);
// $information->ic_content = str_replace('<!--@BREADCRUMB-BLOCK@-->', $breadcrumb_content, $information->ic_content);
}
//信息推荐 //信息推荐
$template_recommand = $recommand_information; //$this->recommand_information($information); 从外面传进来，pc和移动只需要查一次，减少数据库负担 $template_recommand = $recommand_information; //$this->recommand_information($information); 从外面传进来，pc和移动只需要查一次，减少数据库负担
@ -1023,7 +1012,6 @@ class Information extends CI_Controller
} }
if (is_file('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')) {//主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速 if (is_file('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')) {//主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速
$main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')); $main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css'));
} else { } else {
@ -1276,12 +1264,12 @@ class Information extends CI_Controller
//面包屑 //面包屑
$crumb = ""; $crumb = "";
$crumb_data = $this->Information_model->get_path_exclude_ct($information->is_id, $information->is_path); $crumb_data = $this->Information_model->get_path_exclude_ct($information->is_id, $information->is_path);
if (count($crumb_data)>0){ //至少有一个父类面包屑才显示 if (count($crumb_data) > 0) { //至少有一个父类面包屑才显示
$crumb = "<div class=\"crumb\"><a href=\"/\">Home</a>"; $crumb = "<div class=\"crumb\"><a href=\"/\">Home</a>";
foreach ($crumb_data as $index => $item) { foreach ($crumb_data as $index => $item) {
$crumb .= '<a href="'.$item['ic_url'].'" data-index="'.$index.'" data-is-id="'.$item['is_id'].'">'.$item['ic_url_title'].'</a>'; $crumb .= '<a href="' . $item['ic_url'] . '" data-index="' . $index . '" data-is-id="' . $item['is_id'] . '">' . $item['ic_url_title'] . '</a>';
} }
$crumb .="</div>"; $crumb .= "</div>";
} }
$data["crumb"] = $crumb; $data["crumb"] = $crumb;
/* 详细内容 */ /* 详细内容 */
@ -1303,7 +1291,7 @@ class Information extends CI_Controller
// },$ic_content); // },$ic_content);
/** 替换H1加面包屑 */ /** 替换H1加面包屑 */
$ic_content = preg_replace('/<h1>(.*)<\/h1>/i',$crumb."\r\n".'<H1>$1</H1>',$ic_content,1); $ic_content = preg_replace('/<h1>(.*)<\/h1>/i', $crumb . "\r\n" . '<H1>$1</H1>', $ic_content, 1);
//图片加延迟 //图片加延迟
$ic_content = $this->html_optimize_lib->set_lazy_loader($ic_content, 'https://data.chinatravel.com/images/mobile-first/grey.gif'); $ic_content = $this->html_optimize_lib->set_lazy_loader($ic_content, 'https://data.chinatravel.com/images/mobile-first/grey.gif');
@ -1460,7 +1448,7 @@ class Information extends CI_Controller
} }
//表单页 //表单页
if (in_array($meta_ct_page_type, array("customize", "contactus","pagewithform"))) { if (in_array($meta_ct_page_type, array("customize", "contactus", "pagewithform"))) {
$productType = $meta_ct_page_type; $productType = $meta_ct_page_type;
$addonJs .= '<script src="' . $apiweb . '/js/mobile-first/form.js" defer></script>'; $addonJs .= '<script src="' . $apiweb . '/js/mobile-first/form.js" defer></script>';
$data["ADDONCSS"] .= '<link href="' . $apiweb . '/css/newcss3/flatpickr.css" rel="preload" as="style" onload="this.rel=\'stylesheet\'" />'; $data["ADDONCSS"] .= '<link href="' . $apiweb . '/css/newcss3/flatpickr.css" rel="preload" as="style" onload="this.rel=\'stylesheet\'" />';

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

@ -62,53 +62,57 @@ $config['images'] = array(
/*=================================== Backends ========================================*/ /*=================================== Backends ========================================*/
// https://ckeditor.com/docs/ckfinder/ckfinder3-php/configuration.html#configuration_options_backends // https://ckeditor.com/docs/ckfinder/ckfinder3-php/configuration.html#configuration_options_backends
$sitecode='empty'; $sitecode = 'empty';
if(!empty($_GET['sitecode'])){ if (!empty($_GET['sitecode'])) {
$sitecode=$_GET['sitecode']; $sitecode = $_GET['sitecode'];
} }
switch ($sitecode){ switch ($sitecode) {
case 'cht': case 'cht':
$site_url='https://data.chinahighlights.com'; $site_url = 'https://data.chinahighlights.com';
break; break;
case 'ch': case 'ch':
$site_url='https://data.chinahighlights.com'; $site_url = 'https://data.chinahighlights.com';
break; break;
case 'gm': case 'gm':
$site_url='https://data.chinarundreisen.com'; $site_url = 'https://data.chinarundreisen.com';
break;
case 'gh':
$site_url = 'https://data.globalhighlights.com';
break; break;
case 'ah': case 'ah':
$site_url='https://data.asiahighlights.com'; $site_url = 'https://data.asiahighlights.com';
break; break;
case 'vc': case 'vc':
$site_url='https://data.voyageschine.com/kcfinder/upload/vc'; $site_url = 'https://data.voyageschine.com/kcfinder/upload/vc';
break; break;
case 'jp': case 'jp':
$site_url='https://data.arachina.com/kcfinder/upload/jp'; $site_url = 'https://data.arachina.com/kcfinder/upload/jp';
break; break;
case 'vac': case 'vac':
$site_url='https://data.viaje-a-china.com/kcfinder/upload/vac'; $site_url = 'https://data.viaje-a-china.com/kcfinder/upload/vac';
break; break;
case 'it': case 'it':
$site_url='https://data.viaggio-in-cina.it/kcfinder/upload/it'; $site_url = 'https://data.viaggio-in-cina.it/kcfinder/upload/it';
break; break;
case 'ru': case 'ru':
$site_url='https://data.chinahighlights.ru/kcfinder/upload/ru'; $site_url = 'https://data.chinahighlights.ru/kcfinder/upload/ru';
break; break;
case 'ct': case 'ct':
$site_url='https://data.chinatravel.com'; $site_url = 'https://data.chinatravel.com';
break; break;
default: default:
$site_url=''; $site_url = '';
} }
//文件上传目录，使用相对路径，在文件夹中建立虚拟目录指向真实文件夹 //文件上传目录，使用相对路径，在文件夹中建立虚拟目录指向真实文件夹
//创建指向目录 mklink /D D:\wwwroot\uploader-file\gh\image D:\wwwroot\origin-www.globalhighlights.com\image
//需要移出项目文件夹，防止FTP访问到，防止误删 //需要移出项目文件夹，防止FTP访问到，防止误删
if ('origin-int.mycht.cn' == $_SERVER["SERVER_NAME"] || 'origin-gm.mycht.cn' == $_SERVER["SERVER_NAME"]) { if ('origin-int.mycht.cn' == $_SERVER["SERVER_NAME"] || 'origin-gm.mycht.cn' == $_SERVER["SERVER_NAME"]) {
// 国际站和德语站不需要更改目录 // 国际站和德语站不需要更改目录
$site_upload_dir = dirname(__FILE__).('/userfiles/').$sitecode; $site_upload_dir = dirname(__FILE__) . ('/userfiles/') . $sitecode;
} else { } else {
$site_upload_dir = dirname(dirname(dirname(dirname(__FILE__)))).'/uploader-file/'.$sitecode; $site_upload_dir = dirname(dirname(dirname(dirname(__FILE__)))) . '/uploader-file/' . $sitecode;
} }
$config['backends'][] = array( $config['backends'][] = array(
@ -119,7 +123,7 @@ $config['backends'][] = array(
'chmodFiles' => 0777, 'chmodFiles' => 0777,
'chmodFolders' => 0755, 'chmodFolders' => 0755,
'filesystemEncoding' => 'UTF-8', 'filesystemEncoding' => 'UTF-8',
'followSymlinks'=>true, 'followSymlinks' => true,
); );
/*================================ Resource Types =====================================*/ /*================================ Resource Types =====================================*/

Write Preview
Loading…
Cancel
Save