diff --git a/.gitignore b/.gitignore index a286a2b9..6f1c4033 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /kcfinder/cache/* */cache/* /author/document/* +*/settlement_files/* */statement_files/* */paypal_activities/* /author/document/* diff --git a/application/config/config.php b/application/config/config.php index c0f48d97..df4278d6 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -392,11 +392,17 @@ $config['site'] = array( 'cht' => array('site_code' => 'cht', 'site_id' => 14, 'site_lgc' => '1', 'site_url' => 'https://www.chinahighlights.com', 'site_image_url' => 'https://images.chinahighlights.com', 'site_authors' => array('zzy', 'spt', 'yl', 'gavin', 'sw', 'zl', 'wbl', 'yqw', 'lf', 'zhm', 'pkl'), 'site_user' => ',ycc,lmr, zyh,J,shw,B,zzy,WJJ,Tony,pcf,zxy,wst,wz,v,S,yyg,yxd,wj,sw,yl,hx,spt,wmr,zl,syt,gavin,zm,htc,yqw,bhn,lmj,wbl,yqw,LYY,zhm,si'), 'ch' => array('site_code' => 'ch', 'site_id' => 14, 'site_lgc' => '1', 'site_url' => 'https://www.chinahighlights.com', 'site_image_url' => 'https://images.chinahighlights.com', 'site_authors' => array('TDJ', 'ycc'), 'site_user' => ',ycc,'), 'gm' => array('site_code' => 'gm', 'site_id' => 22, 'site_lgc' => '4', 'site_url' => 'https://www.chinarundreisen.com', 'site_image_url' => '//bilder.chinarundreisen.com', 'site_authors' => array('DX', 'X', 'K', 'Lan', 'lmr', 'zyh', 'ZYHL', 'TDJ'), 'site_user' => ',ycc,lmr,B,zyh,DX,X,K,htc,zm,bhn,Lan,Tony,zyh,J,v,ZYHL,TDJ,LYY,shw,'), + 'gh_gm' => array('site_code' => 'gh_gm', 'site_id' => 178, 'site_lgc' => '4', 'site_url' => 'https://www.globalhighlights.de', 'site_image_url' => '//www.globalhighlights.de', 'site_authors' => array('DX', 'X', 'K', 'Lan', 'lmr', 'zyh', 'ZYHL', 'TDJ'), 'site_user' => ',ycc,lmr,B,zyh,DX,X,K,htc,zm,bhn,Lan,Tony,zyh,J,v,ZYHL,TDJ,LYY,shw,'), 'vc' => array('site_code' => 'vc', 'site_id' => 30, 'site_lgc' => '5', 'site_url' => 'https://www.voyageschine.com', 'site_image_url' => '//images.voyageschine.com', 'site_authors' => array('JE', 'kq', 'lya', 'lyz', 'zyh'), 'site_user' => ',ycc,lmr, zyh,JE,htc,kq,lya,bhn,Tony,zyh,B,J,lyz,LYY,'), + 'gh_vc' => array('site_code' => 'gh_vc', 'site_id' => 180, 'site_lgc' => '5', 'site_url' => 'https://www.globalhighlights.fr', 'site_image_url' => '//www.globalhighlights.fr', 'site_authors' => array('JE', 'kq', 'lya', 'lyz', 'zyh'), 'site_user' => ',ycc,lmr, zyh,JE,htc,kq,lya,bhn,Tony,zyh,B,J,lyz,LYY,'), 'jp' => array('site_code' => 'jp', 'site_id' => 88, 'site_lgc' => '3', 'site_url' => 'https://www.arachina.com', 'site_image_url' => '//images.arachina.com', 'site_authors' => array('hql', 'LLM', 'SHX', 'lmr', 'zyh', 'zb'), 'site_user' => ',ycc,lmr, zyh,hql,LLM,SHX,htc,zpl,Tony,zyh,J,B,zb,LYY,'), + 'gh_jp' => array('site_code' => 'gh_jp', 'site_id' => 179, 'site_lgc' => '3', 'site_url' => 'https://www.globalhighlights.jp', 'site_image_url' => '//www.globalhighlights.jp', 'site_authors' => array('hql', 'LLM', 'SHX', 'lmr', 'zyh', 'zb'), 'site_user' => ',ycc,lmr, zyh,hql,LLM,SHX,htc,zpl,Tony,zyh,J,B,zb,LYY,'), 'vac' => array('site_code' => 'vac', 'site_id' => 95, 'site_lgc' => '6', 'site_url' => 'https://www.viaje-a-china.com', 'site_image_url' => '//imagenes.viaje-a-china.com', 'site_authors' => array('I', 'cyt', 'lmr', 'zyh', 'LLM'), 'site_user' => ',ycc,lmr, zyh,I,cyt,htc,bhn,Tony,zyh,B,J,LLM,LYY,'), + 'gh_vac' => array('site_code' => 'gh_vac', 'site_id' => 181, 'site_lgc' => '6', 'site_url' => 'https://www.globalhighlights.es', 'site_image_url' => '//www.globalhighlights.es', 'site_authors' => array('I', 'cyt', 'lmr', 'zyh', 'LLM'), 'site_user' => ',ycc,lmr, zyh,I,cyt,htc,bhn,Tony,zyh,B,J,LLM,LYY,'), 'it' => array('site_code' => 'it', 'site_id' => 168, 'site_lgc' => '8', 'site_url' => 'https://www.viaggio-in-cina.it', 'site_image_url' => '//images.viaggio-in-cina.it', 'site_authors' => array('LZY', 'ZQQ', 'lmr', 'zyh'), 'site_user' => ',ycc,lmr, zyh,LZY,htc,ZQQ,Tony,zyh,B,J,LYY,'), + 'gh_it' => array('site_code' => 'gh_it', 'site_id' => 183, 'site_lgc' => '8', 'site_url' => 'https://www.globalhighlights.it', 'site_image_url' => '//www.globalhighlights.it', 'site_authors' => array('LZY', 'ZQQ', 'lmr', 'zyh'), 'site_user' => ',ycc,lmr, zyh,LZY,htc,ZQQ,Tony,zyh,B,J,LYY,'), 'ru' => array('site_code' => 'ru', 'site_id' => 102, 'site_lgc' => '7', 'site_url' => 'https://www.chinahighlights.ru', 'site_image_url' => '//images.chinahighlights.ru', 'site_authors' => array('xjj', 'zyy'), 'site_user' => ',ycc,lmr, zyh,xjj,htc,DX,zyy,bhn,Tony,zyh,B,J,LYY,'), + 'gh_ru' => array('site_code' => 'gh_ru', 'site_id' => 182, 'site_lgc' => '7', 'site_url' => 'https://www.globalhighlights.ru', 'site_image_url' => '//www.globalhighlights.ru', 'site_authors' => array('xjj', 'zyy'), 'site_user' => ',ycc,lmr, zyh,xjj,htc,DX,zyy,bhn,Tony,zyh,B,J,LYY,'), 'wt' => array('site_code' => 'wt', 'site_id' => 172, 'site_lgc' => '2', 'site_url' => 'https://www.iiiyooo.com', 'site_image_url' => '', 'site_authors' => array('ylh', 'lfj', 'wx', 'lzh', 'shw', 'lx'), 'site_user' => ',ycc,lmr, zyh,ylh,lfj,wx,lzh,shw,lx,bhn,B,J,'), 'tbt' => array('site_code' => 'tbt', 'site_id' => 169, 'site_lgc' => '1', 'site_url' => 'https://www.tibettravel.info', 'site_image_url' => '/images', 'site_authors' => array('wj', 'sfx'), 'site_user' => ',ycc,wj,bhn,wx,lzh,lfj,hwt,thf,sfx,J,ZP,'), 'sht' => array('site_code' => 'sht', 'site_id' => 96, 'site_lgc' => '1', 'site_url' => 'https://www.shanghaihighlights.com', 'site_image_url' => '//images.shanghaihighlights.com', 'site_authors' => array('vz', 'sfx'), 'site_user' => ',ycc,wj,bhn,wx,lzh,lfj,hwt,thf,vz,sfx,J,ZP,LYY,'), diff --git a/application/controllers/information.php b/application/controllers/information.php index 8d39c8b3..b69108cc 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -171,7 +171,6 @@ class Information extends CI_Controller $data['informationList'] = $this->Information_model->StructureList($rootStructure_ID); //增加一项，属于这个区域，但是结构数据层次不准确的也要列出来 - //todo: //信息内容 $data['information'] = $this->Information_model->Detail($is_id); @@ -447,7 +446,7 @@ class Information extends CI_Controller $information_new = $this->Information_model->Detail($this->input->post('is_id')); $this->make_www_cache_ct($information_new); // $this->make_www_cache_ct('pc', $information_new); - } else if (strcasecmp($site_code, "shanghai") == 0 && !empty($auto_update_cache)){ + } else if (strcasecmp($site_code, "shanghai") == 0 && !empty($auto_update_cache)) { $information_new = $this->Information_model->Detail($this->input->post('is_id')); $this->make_www_cache_sh($information_new); } else if (strcasecmp($site_code, "cht") == 0 && !empty($auto_update_cache)) { @@ -928,40 +927,40 @@ class Information extends CI_Controller // /day-tours/(278008224) 节点不使用推荐信息 if ($information->is_parent_id == '278008224') { } else { - // 右侧列表广告 - $tips_right_a = []; - $tips_right_b = []; - $tips_right_c = []; - for ($i = 1; $i <= 12; $i++) { - $key = 'List Tips Right A_' . $i; - if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { - $tips_right_a[] = $recommand_information[$key]; - } - } - for ($i = 1; $i <= 12; $i++) { - $key = 'List Tips Right B_' . $i; - if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { - $tips_right_b[] = $recommand_information[$key]; - } - } - for ($i = 1; $i <= 12; $i++) { - $key = 'List Tips Right C_' . $i; - if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { - $tips_right_c[] = $recommand_information[$key]; - } - } - - $tips_right_list_content = $this->load->view( - 'mobile_first/ch-tips-right-list', - array( - 'tips_right_a' => $tips_right_a, - 'tips_right_b' => $tips_right_b, - 'tips_right_c' => $tips_right_c - ), - true - ); - - $template = str_replace('', $tips_right_list_content, $template); + // 右侧列表广告 + $tips_right_a = []; + $tips_right_b = []; + $tips_right_c = []; + for ($i = 1; $i <= 12; $i++) { + $key = 'List Tips Right A_' . $i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_a[] = $recommand_information[$key]; + } + } + for ($i = 1; $i <= 12; $i++) { + $key = 'List Tips Right B_' . $i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_b[] = $recommand_information[$key]; + } + } + for ($i = 1; $i <= 12; $i++) { + $key = 'List Tips Right C_' . $i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_c[] = $recommand_information[$key]; + } + } + + $tips_right_list_content = $this->load->view( + 'mobile_first/ch-tips-right-list', + array( + 'tips_right_a' => $tips_right_a, + 'tips_right_b' => $tips_right_b, + 'tips_right_c' => $tips_right_c + ), + true + ); + + $template = str_replace('', $tips_right_list_content, $template); } //文中的信息推荐 @@ -2460,7 +2459,7 @@ class Information extends CI_Controller $ic_content = $information->ic_content; /** 替换H1加面包屑,加作者 */ - $ic_content = preg_replace('/

(.*)<\/h1>/i', $crumb . "\r\n" . '

$1

' . "\r\n" . $str_author . "\r\n", $ic_content, 1); + $ic_content = preg_replace('/

(.*)<\/h1>/i', $crumb . "\r\n" . '

$1

' . "\r\n" . $str_author . "\r\n", $ic_content, 1); //图片加延迟 $ic_content = $this->html_optimize_lib->set_lazy_loader($ic_content, 'https://data.shanghaihighlights.com/image/grey.gif'); @@ -2597,10 +2596,10 @@ class Information extends CI_Controller $data["ADDONCSS"] .= ''; //一日游表单的替换 - $DayTripData["productCode"]=$productCode; - $template_form_daydetail = $this->load->view($template_path.'-daydetail-form',$DayTripData,true); //模板内容 + $DayTripData["productCode"] = $productCode; + $template_form_daydetail = $this->load->view($template_path . '-daydetail-form', $DayTripData, true); //模板内容 //使用simple_html_dom_lib库来进行表单添加 - $ic_content = $this->html_optimize_lib->add_htmlcode($ic_content,"#maincontent",$template_form_daydetail); + $ic_content = $this->html_optimize_lib->add_htmlcode($ic_content, "#maincontent", $template_form_daydetail); } if ($meta_ct_page_type == "tourdetail") { //线路 @@ -2631,7 +2630,7 @@ class Information extends CI_Controller $data["ADDONCSS"] .= ''; } - if ($meta_ct_page_type=="daytripform"){ + if ($meta_ct_page_type == "daytripform") { $productType = $meta_ct_page_type; $addonJs .= ''; $data["ADDONCSS"] .= ''; @@ -2828,7 +2827,7 @@ class Information extends CI_Controller $exclude_ids = array($information->is_id); //需要排除的is_id，防止通过页面显示相同内容，默认排除本身，每个推荐内容都需要排除已经推荐过的 foreach ($root_recommands as $item) { if ($this->config->item('site_code') == 'ah') { //如果是AH的页面，取消重复检测 - $exclude_ids=array(0); + $exclude_ids = array(0); } $result = $this->recommand_information_rule($information, $root_detail, $item, $exclude_ids); if (!empty($result)) { @@ -2837,8 +2836,8 @@ class Information extends CI_Controller } foreach ($group_recommands as $item) { - if ($this->config->item('site_code') == 'ah' or $this->config->item('site_code') == 'ch' or $this->config->item('site_code') == 'gh' ) { //如果是AH CH GH的页面，取消重复检测 - $exclude_ids=array(0); + if ($this->config->item('site_code') == 'ah' or $this->config->item('site_code') == 'ch' or $this->config->item('site_code') == 'gh') { //如果是AH CH GH的页面，取消重复检测 + $exclude_ids = array(0); } if (empty($data[$item->ir_name])) { $result = $this->recommand_information_rule($information, $root_detail, $item, $exclude_ids); diff --git a/application/helpers/info_helper.php b/application/helpers/info_helper.php index afa24dfb..3f98988e 100644 --- a/application/helpers/info_helper.php +++ b/application/helpers/info_helper.php @@ -77,7 +77,7 @@ function is_series_site() { $CI = &get_instance(); $sitecode = $CI->config->item('site_code'); - if ($sitecode == 'vc' || $sitecode == 'ru' || $sitecode == 'jp' || $sitecode == 'vac' || $sitecode == 'it') { + if (in_array($sitecode, array('jp', 'vc', 'vac', 'ru', 'it', 'gh_jp', 'gh_vc', 'gh_vac', 'gh_ru', 'gh_it', 'gh_gm'))) { return true; } else { return false; @@ -103,7 +103,7 @@ function is_mobile_first() { $CI = &get_instance(); $sitecode = $CI->config->item('site_code'); - if ($sitecode == 'ch' || $sitecode == 'ah' || $sitecode=='chinatravel' || $sitecode == 'gh' || $sitecode=='shanghai') { + if ($sitecode == 'ch' || $sitecode == 'ah' || $sitecode == 'chinatravel' || $sitecode == 'gh' || $sitecode == 'shanghai') { return true; } else { return false; @@ -222,7 +222,7 @@ function get_task_count_by_status() function get_author_photo($author_code_id = false) { $CI = &get_instance(); - $root_url = '';//'http://data.chtcdn.com'; + $root_url = ''; //'http://data.chtcdn.com'; $avatar = $root_url . '/css/images/avatar.jpg'; if ($author_code_id && is_numeric($author_code_id)) { $CI->load->model('Infoauthors_model'); @@ -237,7 +237,7 @@ function get_author_photo($author_code_id = false) //补全图片路径 function get_photo_url($photo) { - $root_url = '';//'http://data.chtcdn.com'; + $root_url = ''; //'http://data.chtcdn.com'; if ($photo == '') { $avatar = $root_url . '/css/images/uploadPic.jpg'; } else { @@ -275,7 +275,8 @@ function show_page($page) } $html = ''; - if ($nowview > 1) $befor--; + if ($nowview > 1) + $befor--; if ($pageSize <= $total) { for ($i = $befor; $i <= $after; $i++) { if ($i == $currentPage) { @@ -338,7 +339,7 @@ function GET_HTTP($url, $data = '', $method = 'GET') curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回 $tmpInfo = curl_exec($curl); // 执行操作 $httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE); - if ($httpCode >= 400) {//页面状态，如果大于400说明页面打不开 + if ($httpCode >= 400) { //页面状态，如果大于400说明页面打不开 log_message('error', " curl {$httpCode} {$url} "); return false; } @@ -371,7 +372,8 @@ function compress_css($buffer) } //把临时多媒体中心预览图片地址替换为网前地址 -function replace_image_url($ic_content){ +function replace_image_url($ic_content) +{ $CI = &get_instance(); - return str_replace($CI->config->item('media_image_url'), $CI->config->item('site_image_url'),$ic_content); + return str_replace($CI->config->item('media_image_url'), $CI->config->item('site_image_url'), $ic_content); } \ No newline at end of file diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index 49fbb4b2..2a5075f7 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -55,53 +55,7 @@ alt="Asiahighlights logo" class="asiahighlightslogo img-responsive">
-
  • Itinerary Ideas -
    -
    -
    - 7-12 Days Itinerary -
    - -
    -
    - -
    - 2-Week Itinerary -
    - -
    -
    - - -
    - 3-Week Itinerary - -
    - -
    - 4-Week Itinerary - -
    -
    -
    -
    • +
  • Itinerary Ideas
  • About Us
    diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index 40b90e9a..985cfc96 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -77,8 +77,8 @@
    - + - - - - - - - - - - - -