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

# Conflicts:
#	application/controllers/information.php

application/config/config.php

@@ -430,6 +430,7 @@ $config['site'] = [
   'trainspread' => ['site_code' => 'trainspread', 'site_id' => 149, 'site_lgc' => '1', 'site_url' => 'https://www.trainspread.com', 'site_image_url' => 'https://images.trainspread.com', 'site_authors' => ['ll', 'D'], 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'],
   'guilin' => ['site_code' => 'guilin', 'site_id' => 90, 'site_lgc' => '103', 'site_url' => 'https://www.guilinchina.net/', 'site_image_url' => 'https://images.guilinchina.net', 'site_authors' => ['ll', 'D'], 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'],
   'hly' => ['site_code' => 'hly', 'site_id' => 151, 'site_lgc' => '2', 'site_url' => 'https://www.hualiyingtravel.com/', 'site_image_url' => 'https://images.hualiyingtravel.com', 'site_authors' => ['ll', 'D'], 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'],
+  'hlyen' => ['site_code' => 'hlyen', 'site_id' => 151, 'site_lgc' => '1', 'site_url' => 'https://www.chiangmaiyipengfestival.com/', 'site_image_url' => 'https://images.chiangmaiyipengfestival.com', 'site_authors' => ['ll', 'D'], 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'],
   'cht' => ['site_code' => 'cht', 'site_id' => 14, 'site_lgc' => '1', 'site_url' => 'https://www.chinahighlights.com', 'site_image_url' => 'https://images.chinahighlights.com', 'site_authors' => ['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'],
 ];
 
@@ -572,6 +573,8 @@ $config['cache']['beijing']['cache_path'] = 'D:\wwwcache\mobile-first\mybeijingc
 $config['cache']['trainspread']['cache_path'] = 'D:\wwwcache\mobile-first\trainspread.com';
 $config['cache']['guilin']['cache_path'] = 'D:\wwwcache\mobile-first\guilinchina.net';
 $config['cache']['hly']['cache_path'] = 'D:\wwwcache\mobile-first\hualiyingtravel.com';
+$config['cache']['hlyen']['cache_path'] = 'D:\wwwcache\mobile-first\chiangmaiyipengfestival.com';
+
 
 //本地测试用 - lmr
 if (isset($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] == '202.103.68.62:9999') {

application/helpers/info_helper.php

@@ -103,7 +103,7 @@ function is_mobile_first()
 {
     $CI = &get_instance();
     $sitecode = $CI->config->item('site_code');
-    if ($sitecode == 'ch' || $sitecode == 'ah' || $sitecode == 'htravel' || $sitecode == 'chinatravel' || $sitecode == 'gh' || $sitecode == 'jh' || $sitecode == 'shanghai' || $sitecode=='beijing' || $sitecode == "trainspread" || $sitecode=="guilin" || $sitecode=="hly") {
+    if ($sitecode == 'ch' || $sitecode == 'ah' || $sitecode == 'htravel' || $sitecode == 'chinatravel' || $sitecode == 'gh' || $sitecode == 'jh' || $sitecode == 'shanghai' || $sitecode=='beijing' || $sitecode == "trainspread" || $sitecode=="guilin" || $sitecode=="hly" || $sitecode=="hlyen") {
         return true;
     } else {
         return false;

application/third_party/ctmobilefirst/controllers/api.php

@@ -407,6 +407,15 @@ class Api extends CI_Controller {
             'imagesUrl'=>'www.hualiyingtravel.com',
         ];
 
+        $hlyen = [
+            'dei_sn' => '31',
+            'LGC' =>'1',
+            'WebCode'=>'hlyen',
+            'WebUrl'=>'www.chiangmaiyipengfestival.com',
+            'WebCdn'=>'www.chiangmaiyipengfestival.com',
+            'imagesUrl'=>'www.chiangmaiyipengfestival.com',
+        ];
+
 
         $localeMap = [
             'chinatravel' => $chinatravel,
@@ -415,6 +424,7 @@ class Api extends CI_Controller {
             'trainspread' => $trainspread,
             'guilin' =>$guilin,
             'hly'  =>$hly,
+            'hlyen'  =>$hlyen,
         ];
 
         if (isset($_GET["webcode"])){

application/views/bootstrap3/information_edit.php

@@ -825,7 +825,7 @@
 
             </div>
           </div>
-          <?php if (in_array($this->config->item('site_code'), ['ct', 'chinatravel', 'shanghai', 'beijing', 'trainspread', 'guilin', 'hly'])) {
+          <?php if (in_array($this->config->item('site_code'), ['ct', 'chinatravel', 'shanghai', 'beijing', 'trainspread', 'guilin', 'hly','hlyen'])) {
             ?>
             <div>
               <div class="col-sm-8">
@@ -1021,7 +1021,7 @@
           <p></p>
           <div class="col-xs-24">
             <label><a href="javascript:void(0);" onclick="$('#customize').toggle();">自定义选项</a>　</label>
-            <?php if ($information->ic_sitecode == "trippest" || $information->ic_sitecode == "trainspread" || $information->ic_sitecode == "hly") {?>
+            <?php if ($information->ic_sitecode == "trippest" || $information->ic_sitecode == "trainspread" || $information->ic_sitecode == "hly" || $information->ic_sitecode == "hlyen") {?>
               <label><a class="btn default" data-toggle="modal" id="aBokunData"> 管理TPBokun数据 </a> </label>
             <?php }?>
           </div>
@@ -2000,7 +2000,7 @@
                 <input type="text" name="meta_trippest_delayday" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_trippest_delayday'); ?>" id="meta_trippest_delayday" />
               </div>
             </div>
-            <?php if ($information->ic_sitecode == "trainspread" || $information->ic_sitecode == "hly") {?>
+            <?php if ($information->ic_sitecode == "trainspread" || $information->ic_sitecode == "hly" || $information->ic_sitecode == "hlyen") {?>
               <div class="row">
                 <div class="col-sm-8">
                   <label>产品关联这里做
@@ -2226,7 +2226,7 @@
             <input type="checkbox" name="ignore_url_check" id="ignore_url_check" />忽略URL重复
           </label>
           <div class="clearfix"></div>
-          <?php if (in_array($this->config->item('site_code'), ['ch', 'cht', 'gm', 'htravel', 'jh', 'gh', 'ct', 'chinatravel', 'shanghai', 'beijing', 'trainspread', 'guilin', 'hly'])) {?>
+          <?php if (in_array($this->config->item('site_code'), ['ch', 'cht', 'gm', 'htravel', 'jh', 'gh', 'ct', 'chinatravel', 'shanghai', 'beijing', 'trainspread', 'guilin', 'hly' ,'hlyen'])) {?>
             <label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
               <input type="checkbox" name="auto_update_cache_checkbox" id="auto_update_cache_checkbox" onclick="get_update_cache_url();" value="<?php echo $information->ic_url; ?>" />静态更新
             </label>

application/views/bootstrap3/welcome.php

@@ -26,7 +26,7 @@
             <?php } ?>
         </div>
         <div class="col-md-16">
-            <?php if ($this->config->item("site_code")=="chinatravel" || $this->config->item("site_code")=="shanghai" || $this->config->item("site_code")=="beijing" || $this->config->item("site_code")=="trainspread" || $this->config->item("site_code")=="guilin" || $this->config->item("site_code")=="hly"  ){ ?>
+            <?php if ($this->config->item("site_code")=="chinatravel" || $this->config->item("site_code")=="shanghai" || $this->config->item("site_code")=="beijing" || $this->config->item("site_code")=="trainspread" || $this->config->item("site_code")=="guilin" || $this->config->item("site_code")=="hly"  || $this->config->item("site_code")=="hlyen"  ){ ?>
                 <div class="row">
                         <div class="col-md-24">
                             <div class="panel panel-default">