From ae5bc4263186882180102e69553c42f80fe91fd1 Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Thu, 24 Dec 2020 16:11:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A4=BE=E5=AA=92=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E6=8C=89=E9=92=AE=E5=92=8C=E7=A4=BE=E5=AA=92=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/config/config.php                  |  2 +-
 application/controllers/information.php        | 18 ++++++++++++++----
 .../views/bootstrap3/information_edit.php      |  4 +++-
 application/views/mobile_first/ch-pc.php       |  1 +
 application/views/mobile_first/ch.php          |  3 ++-
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/application/config/config.php b/application/config/config.php
index e5f81d6c..6178b762 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -388,7 +388,7 @@ $config['proxy_ips'] = '';
 //各站信息组和人员权限分配
 $config['site'] = array(
     'cht' => array('site_code' => 'cht', 'site_id' => 14, 'site_lgc' => '1', 'site_url' => 'https://www.chinahighlights.com', 'site_image_url' => '//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' => '//images.chinahighlights.com', 'site_authors' => array('TDJ','ycc'), 'site_user' => ',ycc,'),
+	'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,'),
     '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,'),
     '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,'),
diff --git a/application/controllers/information.php b/application/controllers/information.php
index c50b5548..a1f15585 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -485,8 +485,8 @@ class Information extends CI_Controller
                 $update_info_log = $this->update_cache($ic_url, true);
             }else if (strcasecmp($site_code, "ch") == 0 && !empty($auto_update_cache)) {
 				//读取模板生成PC和移动优先文件
-				$this->make_mobile_html();
-				$this->make_pc_html();
+				$this->make_mobile_html($information);
+				$this->make_pc_html($information);
             } else if (strcasecmp($site_code, "cht") == 0 && !empty($auto_update_cache)) {
                 $update_info_log = $this->update_cache($ic_url);
             } else if (strcasecmp($site_code, "ah") == 0 && !empty($auto_update_cache)) {
@@ -558,7 +558,7 @@ class Information extends CI_Controller
         return true;
     }
 	
-	 function make_mobile_html(){
+	 function make_mobile_html($information){
          $data=array();
 		//获取移动优先的模板，如果有的话
 		$mobile_first_template_path='mobile_first/'.$this->config->item('site_code');
@@ -576,6 +576,11 @@ class Information extends CI_Controller
 		$mobile_template=str_replace('<!--@CUSTOM-CONENT@-->', $this->input->post('ic_content'), $mobile_template);
         $template_NEXT=$this->call_mobile_template_NEXT($mobile_first_template_path,$this->input->post('is_id'));
         $mobile_template=str_replace('<!--@ARTICLENEXT@-->', $template_NEXT, $mobile_template);
+        //社媒分享图片
+         if(!empty($information->ic_photo)){
+             $full_ic_photo=$this->config->item('site_image_url').$information->ic_photo;
+             $mobile_template=str_replace('<!--@OG:IMAGE@-->', '<meta property="og:image" content="$full_ic_photo"><meta property="og:image:secure_url" content="$full_ic_photo"><meta property="og:image:width" content="800"><meta property="og:image:height" content="450">', $mobile_template);
+         }
 		// /travelguide/chinese-zodiac/monthly-fortune-for-dog.htm
 		$mobile_html=$this->config->item('cache')[$this->config->item('site_code')]['cache_path'].$this->input->post('ic_url');
 		$mobile_html=str_replace("\\", "/", $mobile_html);
@@ -588,7 +593,7 @@ class Information extends CI_Controller
 	}
 
 
-    function make_pc_html(){
+    function make_pc_html($information){
         $data=array();
         //获取PC的模板，如果有的话
         $template_path='mobile_first/'.$this->config->item('site_code');
@@ -606,6 +611,11 @@ class Information extends CI_Controller
         $template=str_replace('<!--@CUSTOM-CONENT@-->', $this->input->post('ic_content'), $template);
         $template_NEXT=$this->call_mobile_template_NEXT($template_path,$this->input->post('is_id'));
         $template=str_replace('<!--@ARTICLENEXT@-->', $template_NEXT, $template);
+        //社媒分享图片
+        if(!empty($information->ic_photo)){
+            $full_ic_photo=$this->config->item('site_image_url').$information->ic_photo;
+            $template=str_replace('<!--@OG:IMAGE@-->', '<meta property="og:image" content="'.$full_ic_photo.'"><meta property="og:image:secure_url" content="'.$full_ic_photo.'"><meta property="og:image:width" content="800"><meta property="og:image:height" content="450">', $template);
+        }
         // /travelguide/chinese-zodiac/monthly-fortune-for-dog.htm
         $html_path=$this->config->item('cache')[$this->config->item('site_code')]['cache_path'].$this->input->post('ic_url');
         $html_path=str_replace("\\", "/", $html_path);
diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index c39741dc..8a0d71cd 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -247,7 +247,9 @@
       for (var key in result.Pinfo) {
         if ('<?php echo $this->config->item('site_code') ?>' == 'cht') {
           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>');
-        } else {
+        } 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 {
           editor.insertHtml('<img src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' + result.Pinfo[key].PName + '" width="' + result.Pinfo[key].Width + '" height="' + result.Pinfo[key].Height + '" />');
         }
         use_pictures = use_pictures + result.Pinfo[key].ID + ':' + result.Pinfo[key].PUrl + ':' + result.Pinfo[key].wh + ',';
diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index b611f2b7..dd137aa6 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -9,6 +9,7 @@
     <meta name="apple-mobile-web-app-title" content="China Highlights - Since 1998!">
     <meta name="keywords" content="<!--@KEYWORDS@-->">
     <meta name="description" content="<!--@DESCRIPTION@-->">
+    <!--@OG:IMAGE@-->
     <link rel="canonical" href="<!--@CANONICAL@-->">
     <link rel="shortcut icon" href="/favicon.ico">
     <link rel="preconnect" href="//data.chinahighlights.com">
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 01f78e31..47ca6189 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -7,6 +7,7 @@
     <meta name="description" content="<!--@DESCRIPTION@-->">
     <link rel="canonical" href="<!--@CANONICAL@-->">
     <meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
+    <!--@OG:IMAGE@-->
     <link rel="shortcut icon" href="//data.chinahighlights.com/favicon.ico">
     <link href="https://proxy-data.chinahighlights.com/css/mobile-first.css?v=321" rel="stylesheet">
     <!-- Google Tag Manager -->
@@ -242,7 +243,7 @@
 </footer>
 
 
-<script>
+<script>/* memu js https://data.chinahighlights.com/js/mobile-menu.js */
     (function(window){function classReg(className){return new RegExp("(^|\\s+)"+className+"(\\s+|$)")}var hasClass,addClass,removeClass;if("classList" in document.documentElement){hasClass=function(elem,c){return elem.classList.contains(c)};addClass=function(elem,c){elem.classList.add(c)};removeClass=function(elem,c){elem.classList.remove(c)}}else{hasClass=function(elem,c){return classReg(c).test(elem.className)};addClass=function(elem,c){if(!hasClass(elem,c)){elem.className=elem.className+" "+c}};removeClass=function(elem,c){elem.className=elem.className.replace(classReg(c)," ")}}function toggleClass(elem,c){var fn=hasClass(elem,c)?removeClass:addClass;fn(elem,c)}var classie={hasClass:hasClass,addClass:addClass,removeClass:removeClass,toggleClass:toggleClass,has:hasClass,add:addClass,remove:removeClass,toggle:toggleClass};if(typeof define==="function"&&define.amd){define(classie)}else{if(typeof exports==="object"){module.exports=classie}else{window.classie=classie}}})(window);
     !function(e,n,t){function r(e,n){return typeof e===n}function o(){var e,n,t,o,i,s,a;for(var f in C){if(C.hasOwnProperty(f)){if(e=[],n=C[f],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length)){for(t=0;t<n.options.aliases.length;t++){e.push(n.options.aliases[t].toLowerCase())}}for(o=r(n.fn,"function")?n.fn():n.fn,i=0;i<e.length;i++){s=e[i],a=s.split("."),1===a.length?Modernizr[a[0]]=o:(!Modernizr[a[0]]||Modernizr[a[0]] instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=o),g.push((o?"":"no-")+a.join("-"))}}}}function i(e){var n=w.className,t=Modernizr._config.classPrefix||"";if(x&&(n=n.baseVal),Modernizr._config.enableJSClass){var r=new RegExp("(^|\\s)"+t+"no-js(\\s|$)");n=n.replace(r,"$1"+t+"js$2")}Modernizr._config.enableClasses&&(n+=" "+t+e.join(" "+t),x?w.className.baseVal=n:w.className=n)}function s(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^-/,"")}function a(e,n){return !!~(""+e).indexOf(n)}function f(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):x?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function l(e,n){return function(){return e.apply(n,arguments)}}function u(e,n,t){var o;for(var i in e){if(e[i] in n){return t===!1?e[i]:(o=n[e[i]],r(o,"function")?l(o,t||n):o)}}return !1}function p(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function d(){var e=n.body;return e||(e=f(x?"svg":"body"),e.fake=!0),e}function c(e,t,r,o){var i,s,a,l,u="modernizr",p=f("div"),c=d();if(parseInt(r,10)){for(;r--;){a=f("div"),a.id=o?o[r]:u+(r+1),p.appendChild(a)}}return i=f("style"),i.type="text/css",i.id="s"+u,(c.fake?c:p).appendChild(i),c.appendChild(p),i.styleSheet?i.styleSheet.cssText=e:i.appendChild(n.createTextNode(e)),p.id=u,c.fake&&(c.style.background="",c.style.overflow="hidden",l=w.style.overflow,w.style.overflow="hidden",w.appendChild(c)),s=t(p,e),c.fake?(c.parentNode.removeChild(c),w.style.overflow=l,w.offsetHeight):p.parentNode.removeChild(p),!!s}function m(n,r){var o=n.length;if("CSS" in e&&"supports" in e.CSS){for(;o--;){if(e.CSS.supports(p(n[o]),r)){return !0}}return !1}if("CSSSupportsRule" in e){for(var i=[];o--;){i.push("("+p(n[o])+":"+r+")")}return i=i.join(" or "),c("@supports ("+i+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return t}function v(e,n,o,i){function l(){p&&(delete z.style,delete z.modElem)}if(i=r(i,"undefined")?!1:i,!r(o,"undefined")){var u=m(e,o);if(!r(u,"undefined")){return u}}for(var p,d,c,v,h,y=["modernizr","tspan"];!z.style;){p=!0,z.modElem=f(y.shift()),z.style=z.modElem.style}for(c=e.length,d=0;c>d;d++){if(v=e[d],h=z.style[v],a(v,"-")&&(v=s(v)),z.style[v]!==t){if(i||r(o,"undefined")){return l(),"pfx"==n?v:!0}try{z.style[v]=o}catch(g){}if(z.style[v]!=h){return l(),"pfx"==n?v:!0}}}return l(),!1}function h(e,n,t,o,i){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+b.join(s+" ")+s).split(" ");return r(n,"string")||r(n,"undefined")?v(a,n,o,i):(a=(e+" "+N.join(s+" ")+s).split(" "),u(a,n,t))}function y(e,n,r){return h(e,t,t,n,r)}var g=[],C=[],_={_version:"3.2.0",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){C.push({name:e,fn:n,options:t})},addAsyncTest:function(e){C.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=_,Modernizr=new Modernizr;var w=n.documentElement,x="svg"===w.nodeName.toLowerCase(),S="Moz O ms Webkit",b=_._config.usePrefixes?S.split(" "):[];
         _._cssomPrefixes=b;var E=function(n){var r,o=prefixes.length,i=e.CSSRule;if("undefined"==typeof i){return t}if(!n){return !1}if(n=n.replace(/^@/,""),r=n.replace(/-/g,"_").toUpperCase()+"_RULE",r in i){return"@"+n}for(var s=0;o>s;s++){var a=prefixes[s],f=a.toUpperCase()+"_"+r;if(f in i){return"@-"+a.toLowerCase()+"-"+n}}return !1};_.atRule=E;var N=_._config.usePrefixes?S.toLowerCase().split(" "):[];_._domPrefixes=N;var P={elem:f("modernizr")};Modernizr._q.push(function(){delete P.elem});var z={style:P.elem.style};Modernizr._q.unshift(function(){delete z.style}),_.testAllProps=h;_.prefixed=function(e,n,t){return 0===e.indexOf("@")?E(e):(-1!=e.indexOf("-")&&(e=s(e)),n?h(e,n,t):h(e,"pfx"))};_.testAllProps=y,Modernizr.addTest("cssanimations",y("animationName","a",!0)),o(),i(g),delete _.addTest,delete _.addAsyncTest;for(var T=0;T<Modernizr._q.length;T++){Modernizr._q[T]()}e.Modernizr=Modernizr}(window,document);(function(window){var support={animations:Modernizr.cssanimations},animEndEventNames={"WebkitAnimation":"webkitAnimationEnd","OAnimation":"oAnimationEnd","msAnimation":"MSAnimationEnd","animation":"animationend"},animEndEventName=animEndEventNames[Modernizr.prefixed("animation")],onEndAnimation=function(el,callback){var onEndCallbackFn=function(ev){if(support.animations){if(ev.target!=this){return}this.removeEventListener(animEndEventName,onEndCallbackFn)}if(callback&&typeof callback==="function"){callback.call()}};if(support.animations){el.addEventListener(animEndEventName,onEndCallbackFn)}else{onEndCallbackFn()}};function extend(a,b){for(var key in b){if(b.hasOwnProperty(key)){a[key]=b[key]}}return a}function MLMenu(el,options){this.el=el;this.options=extend({},this.options);extend(this.options,options);this.menus=[].slice.call(this.el.querySelectorAll(".menu__level"));this.current_menu=0;var current_menu;this.menus.forEach(function(menuEl,pos){var items=menuEl.querySelectorAll(".menu__item");items.forEach(function(itemEl,iPos){var currentLink=itemEl.querySelector(".menu__link--current");if(currentLink){current_menu=pos}})});if(current_menu){this.current_menu=current_menu}this._init()}MLMenu.prototype.options={breadcrumbsCtrl:true,initialBreadcrumb:"all",backCtrl:true,itemsDelayInterval:60,direction:"r2l",onItemClick:function(ev,itemName){return false}};MLMenu.prototype._init=function(){this.menusArr=[];this.breadCrumbs=false;var self=this;var submenus=[];this.menus.forEach(function(menuEl,pos){var menu={menuEl:menuEl,menuItems:[].slice.call(menuEl.querySelectorAll(".menu__item"))};self.menusArr.push(menu);if(pos===self.current_menu){classie.add(menuEl,"menu__level--current")}var menu_x=menuEl.getAttribute("data-menu");var links=menuEl.querySelectorAll(".menu__link");links.forEach(function(linkEl,lPos){var submenu=linkEl.getAttribute("data-submenu");if(submenu){var pushMe={"menu":submenu,"name":linkEl.innerHTML};if(submenus[pos]){submenus[pos].push(pushMe)}else{submenus[pos]=[];submenus[pos].push(pushMe)}}})});this.menus.forEach(function(menuEl,pos){var menu_x=menuEl.getAttribute("data-menu");submenus.forEach(function(subMenuEl,menu_root){subMenuEl.forEach(function(subMenuItem,subPos){if(subMenuItem.menu==menu_x){self.menusArr[pos].backIdx=menu_root;self.menusArr[pos].name=subMenuItem.name}})})});if(self.options.breadcrumbsCtrl){this.breadcrumbsCtrl=document.createElement("nav");this.breadcrumbsCtrl.className="menu__breadcrumbs";this.breadcrumbsCtrl.setAttribute("aria-label","You are here");this.el.insertBefore(this.breadcrumbsCtrl,this.el.firstChild);this._addBreadcrumb(0);if(self.menusArr[self.current_menu].backIdx!=0&&self.current_menu!=0){this._crawlCrumbs(self.menusArr[self.current_menu].backIdx,self.menusArr);this.breadCrumbs=true}if(self.current_menu!=0){this._addBreadcrumb(self.current_menu);this.breadCrumbs=true}}if(this.options.backCtrl){this.backCtrl=document.createElement("button");if(this.breadCrumbs){this.backCtrl.className="menu__back"}else{this.backCtrl.className="menu__back menu__back--hidden"}this.backCtrl.setAttribute("aria-label","Go back");this.backCtrl.innerHTML='<span class="icon icon--arrow-left"></span>';this.el.insertBefore(this.backCtrl,this.el.firstChild)}this._initEvents()};MLMenu.prototype._initEvents=function(){var self=this;for(var i=0,len=this.menusArr.length;i<len;++i){this.menusArr[i].menuItems.forEach(function(item,pos){item.querySelector("a").addEventListener("click",function(ev){var submenu=ev.target.getAttribute("data-submenu"),itemName=ev.target.innerHTML,subMenuEl=self.el.querySelector('ul[data-menu="'+submenu+'"]');if(submenu&&subMenuEl){ev.preventDefault();self._openSubMenu(subMenuEl,pos,itemName)}else{var currentlink=self.el.querySelector(".menu__link--current");if(currentlink){classie.remove(self.el.querySelector(".menu__link--current"),"menu__link--current")}classie.add(ev.target,"menu__link--current");self.options.onItemClick(ev,itemName)}})})}if(this.options.backCtrl){this.backCtrl.addEventListener("click",function(){self._back()})}};MLMenu.prototype._openSubMenu=function(subMenuEl,clickPosition,subMenuName){if(this.isAnimating){return false