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

application/third_party/ctmobilefirst/models/api_model.php

@@ -172,6 +172,18 @@ class Api_model extends CI_Model {
                 WHERE (p2.PAG2_LGC = 104) 
                     AND (p1.pag_dei_sn = 17) 
                     AND (p2.PAG2_Check = 2) 
+                    AND (PAG_Code not in(
+                        SELECT  convert(varchar(100),(
+                            SELECT TOP 1 im_value
+                            FROM infoMetas
+                            WHERE im_key = 'meta_product_code'
+                                AND im_ic_id = ic_id
+                            )) AS code			
+                            FROM dbo.infoContents
+                            INNER JOIN infoStructures ON ic_id = is_ic_id
+                            WHERE is_sitecode = 'chinatravel'".$whereInfo."
+                                AND ic_status = 1
+                    ))
                     AND (isnull(P1.DeleteFlag,0) <>1) ".$whereHT."
              ) Tmp 		 
             
@@ -186,13 +198,13 @@ class Api_model extends CI_Model {
                 FROM dbo.infoContents
                 inner join infoStructures on ic_id=is_ic_id
                  WHERE   is_sitecode='chinatravel' ".$whereInfo."
-                --and ic_status=1            
+                and ic_status=1            
              ) as t
           )  tball
           where 1=1
           ORDER BY tball.sortBy ASC
           ";
-
+     
           $query = $this->HT->query($sql);
           return $query->result();
     }

application/third_party/recommend/controllers/tips.php

@@ -26,7 +26,7 @@ class Tips extends CI_Controller
         $infoTip = new StdClass;
         $infoTip->it_title = '新广告';
         $infoTip->it_expires = time();
-        $infoTip->it_content = '';
+        $infoTip->it_content = $this->load->view('templates', false,true);;
         $infoTip->it_code = '<!--@TIPS--@-->';
         $infoTip->it_datetime = time();
         $infoTip->it_sitecode = $this->config->item('site_code');

application/third_party/recommend/views/templates.php

@@ -0,0 +1,17 @@
+<p>完整的文中广告代码：</p>
+
+<div class="info_ad_title">Recommended Itinerary</div>
+
+<div class="info_ad"><a href="/myanmar/tours/myanmar-essence" rel="nofollow"><img alt="7-Day Myanmar Essence Tour" class="img-responsive" src="https://data.asiahighlights.com/image/tour/pagodas-of-bagan-at-sunset.jpg" /> </a>
+
+    <div class="info_ad_content">
+        <div class="info_ad_name"><a href="/myanmar/tours/myanmar-essence"><strong>7-Day Myanmar Essence Tour</strong> Yangon, Mandalay, Bagan Tour with e-Visa </a></div>
+
+        <div class="info_ad_button"><a href="/myanmar/tours/myanmar-essence" rel="nofollow"><i aria-hidden="true" class="fa fa-angle-right"></i></a></div>
+    </div>
+</div>
+
+<hr />
+<p>完整的右侧广告代码：</p>
+
+<div><a href="/cambodia/tours/siem-reap-tour-in-depth"><img alt="5-Day Siem Reap Tour" class="img-responsive" height="750" src="https://images.asiahighlights.com/allpicture/2021/05/444b0236c1d9447da9328119_cut_600x750_10.jpg" width="600" /></a></div>

application/third_party/recommend/views/welcome.php

@@ -4,7 +4,7 @@
 
         </div>
         <div class="col-md-9">
-            <h4>广告管理</h4>
+            <h4>广告管理   <small><a href="<?php echo site_url('thirdparty/recommend/tips/add'); ?>">添加广告</a></small></h4>
             <table class="table table-striped">
 
                 <thead>
@@ -16,8 +16,9 @@
                 </tr>
                 </thead>
                 <tbody>
+
                 <?php foreach ($tipsList as $key=>$item){ ?>
-                <tr>
+                <tr class="<?php if($item->it_expires<time()){echo 'danger';} ?>">
                     <td><?php echo ++$key; ?></td>
                     <td>
                         <a href="<?php echo site_url('thirdparty/recommend/tips/edit/'.$item->it_id); ?>"><?php echo $item->it_title; ?></a>
@@ -26,13 +27,7 @@
                     <td><?php echo date('m/d/Y', $item->it_expires); ?></td>
                 </tr>
             <?php } ?>
-                <tr>
+
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td><a href="<?php echo site_url('thirdparty/recommend/tips/add'); ?>">添加广告</a></td>
-                </tr>
-                <tr>
 
 
                 </tbody>

application/views/bootstrap3/header.php

@@ -89,8 +89,8 @@
             var use_pictures = $("#use_pictures").val();
             if (result != null) {
                 for (var key in result.Pinfo) {
-                    if ('<?php echo $this->config->item('site_code') ?>' == 'cht') {
+                    if ('<?php echo $this->config->item('site_code') ?>' == 'ah') {
-                        editor.insertHtml('<div class="photoBlock300 autowidht" id="yonglaidingweitupian"> <img class="img-responsive" src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' + result.Pinfo[key].Sinfo + '" width="' + result.Pinfo[key].Width + '" height="' + result.Pinfo[key].Height + '" />' + result.Pinfo[key].Sinfo + '</div>');
+                        editor.insertHtml('<div class="infoimage"> <img alt="' + result.Pinfo[key].Sinfo + '" class="img-responsive"  src="' + site_image_url + result.Pinfo[key].PUrl + '"  /> <span class="photoTxt">' + result.Pinfo[key].Sinfo + '</span></div>');
                     } else if ('<?php echo $this->config->item('site_code') ?>' == 'ch') {
                         editor.insertHtml('<div class="infoimage"><img src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' + result.Pinfo[key].Sinfo + '" class="img-responsive" width="' + result.Pinfo[key].Width + '" height="' + result.Pinfo[key].Height + '"><span class="infoimagetitle">' + result.Pinfo[key].Sinfo + '</span></div>');
                     } else {

application/views/mobile_first/ch-inquiry-form.php

@@ -50,6 +50,4 @@
                 Inquiry <i aria-hidden="true" class="fa fa-angle-right"></i></button>
         </div>
     </form>
-</div>
+</div>
-
-<script async src="https://www.recaptcha.net/recaptcha/api.js?render=6Lf4bfAaAAAAAEZZ9rX0ZIYfPAqACtRldSOFzl9b"></script>

application/views/mobile_first/ch-pc.php

@@ -152,7 +152,7 @@
                 <input type="hidden" value="FORID:9" name="cof">
                 <input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search" name="q">
                 <input type="image" class="submits" src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png" width="25px">
-                <input type="hidden" name="__ftoken__" value="MTU5ODMzNDc2NDQ0NA==.3664784f0395175e7de44382781cd7f7cb647e2a"></form>
+            </form>
         </div>
 
         <div class="topnavitailor">

application/views/mobile_first/ch.php

@@ -49,8 +49,7 @@
             <input type="hidden" value="FORID:9" name="cof">
             <input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search" name="q">
             <input type="image" class="submits" src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png">
-            <input type="hidden" name="__ftoken__"
+        </form>
-                   value="MTU5ODMzNDc2NDQ0NA==.3664784f0395175e7de44382781cd7f7cb647e2a"></form>
     </div>
 
 

wysiwyg/config.js

@@ -42,8 +42,8 @@ CKEDITOR.editorConfig = function( config ) {
 		{ name: 'others', groups: [ 'others' ] },
 		{ name: 'about', groups: [ 'about' ] }
 	];
-//,NumberedList,BulletedList,SpecialChar
+//,NumberedList,BulletedList,SpecialChar ,Templates
-	config.removeButtons = 'Print,Preview,NewPage,Save,Templates,SelectAll,TextField,Textarea,Select,Button,HiddenField,Form,Checkbox,Radio,CreateDiv,Language,Anchor,Flash,HorizontalRule,Smiley,PageBreak,Iframe,ShowBlocks,About,BidiLtr,BidiRtl,searchCode,Copy,Cut';
+	config.removeButtons = 'Print,Preview,NewPage,Save,SelectAll,TextField,Textarea,Select,Button,HiddenField,Form,Checkbox,Radio,CreateDiv,Language,Anchor,Flash,HorizontalRule,Smiley,PageBreak,Iframe,ShowBlocks,About,BidiLtr,BidiRtl,searchCode,Copy,Cut';