#76 更新 analytics tag

happyman · Sep 30, 2023 · 116629c · 116629c
1 parent ec201a2
commit 116629c
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 47 deletions.
diff --git a/twmap3/about.php b/twmap3/about.php
@@ -32,6 +32,16 @@
                 $('#openwin').html('<a href="<?php echo $site_html_root; ?>" target=_top>獨立視窗</a>');
         }
 });
+
+</script>
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-Q1DHK68EH5"></script>
+<script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+      gtag('config', 'G-Q1DHK68EH5');
+
 </script>
 <body><hr>
                 <div id="footer" title="About"  name="footer">

diff --git a/twmap3/index.php b/twmap3/index.php
@@ -302,9 +302,6 @@ function gtag(){dataLayer.push(arguments);}
 	<div id="msg" style="background-color: white;">
 	</div>
 <script>
-	var _gaq = _gaq || [];
-	_gaq.push(['_setAccount', 'UA-19949015-1']);
-	_gaq.push(['_trackPageview']);
 	$(function() {
 	$.getScript( "js/main.js?ts=<?php echo time();?>" ).done(function() {
 		initialize();
@@ -325,6 +322,14 @@ function gtag(){dataLayer.push(arguments);}
 	});
 
 });
+</script>
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-Q1DHK68EH5"></script>
+<script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+      gtag('config', 'G-Q1DHK68EH5');
 
 </script>
 </body>

diff --git a/twmap_gen/api/poi_search.php b/twmap_gen/api/poi_search.php
@@ -18,7 +18,15 @@
 <!--// https://datatables.net/download/  include jquery 3 -->
 <link href="https://cdn.datatables.net/v/dt/jq-3.6.0/dt-1.13.4/datatables.min.css" rel="stylesheet"/> 
 <script src="https://cdn.datatables.net/v/dt/jq-3.6.0/dt-1.13.4/datatables.min.js"></script>
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-Q1DHK68EH5"></script>
+<script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+      gtag('config', 'G-Q1DHK68EH5');
 
+</script>
 <style>
 html {
   font-size: 17px;

diff --git a/twmap_gen/mapform.php b/twmap_gen/mapform.php
@@ -57,7 +57,7 @@
 
 $smarty->assign("title", "產生地圖");
 echo $smarty->fetch('mapform.html');
-
+echo $smarty->fetch('analytics.html');
 ?>
 
 <script type="text/javascript">

diff --git a/twmap_gen/pages/about.html b/twmap_gen/pages/about.html
@@ -161,3 +161,5 @@
 2004/4/10 v1.0 第一版可以抓出地圖, 加上座標, 需手動切圖 -- thanx to hsunwei
 2004/4/2 beta 存入 sorted index, 以加速搜尋.
 </pre>
+
+{include "analytics.html"}
diff --git a/twmap_gen/pages/analytics.html b/twmap_gen/pages/analytics.html
diff --git a/twmap_gen/pages/list.html b/twmap_gen/pages/list.html
@@ -122,3 +122,4 @@
 	}
 }
 </script>
+{include "analytics.html"}
diff --git a/twmap_gen/pages/main.html b/twmap_gen/pages/main.html
@@ -43,7 +43,7 @@
 	<!-- build:js js/twmap.js -->
 	<script src="js/twmap.js"></script>
 	<!-- endbuild -->
-
+	{include "analytics.html"}
 
 </body>
 	</html>
diff --git a/twmap_gen/pages/mapform.html b/twmap_gen/pages/mapform.html
@@ -172,4 +172,4 @@
 	請將此圖加上敘述
 </div>
 <div id="makeprogress" style="width: 100%"><span class="psLabel" style="color: black;font-weight: bold; text-shadow: 1px 1px 0 #fff; position: absolute; left: 50%;"></span>
-</div>
+</div>
diff --git a/twmap_gen/show.php b/twmap_gen/show.php
@@ -39,38 +39,30 @@
 	$smarty->assign("site_root_url", $site_url . $site_html_root);
 // $smarty->assign("ogimage", array("thumb.php?mid=$mid&size=s", "thumb.php?mid=$mid&size=m", "thumb.php?mid=$mid&size=l"));
 	$smarty->assign("html_head", $html_head);
-if ($html_head == 1 ) {
-        echo $smarty->fetch("header.html");
-        if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] == 1 ) {
-                $smarty->assign("user_icon", 'imgs/icon_'.$_SESSION['mylogin']['type']. '.png');
-                $smarty->assign("user_email", $_SESSION['mylogin']['email'] );
-                $smarty->assign("user_nickname", $_SESSION['mylogin']['nick'] );
-                $smarty->assign("lastest_mid", "&mid=$mid" );
-                $smarty->assign("initial_tab", 3 );
-                $smarty->assign("browser_url", $TWMAP3URL );
-                $smarty->assign("loggedin", 1);
-        } else { // 沒有登入
-                // require_once('lib/fb/facebook.php');
-                //require_once('lib/xuite.php');
-                $smarty->assign("lastest_mid", "&mid=$mid" );
-                $smarty->assign("initial_tab", 2 );
-                $smarty->assign("showing", true );
-                $smarty->assign("browser_url", $TWMAP3URL );
-                $smarty->assign("loggedin", 0);
-                // $smarty->assign("login_xuite", $xuite->getLoginUrl());
-                /* $smarty->assign("login_fb",
-                        $facebook->getLoginUrl(  array(
-                                'canvas'    => 0,
-                                'fbconnect' => 1,
-                                'req_perms' => 'email'
+	if ($html_head == 1 ) {
+			echo $smarty->fetch("header.html");
+			if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] == 1 ) {
+					$smarty->assign("user_icon", 'imgs/icon_'.$_SESSION['mylogin']['type']. '.png');
+					$smarty->assign("user_email", $_SESSION['mylogin']['email'] );
+					$smarty->assign("user_nickname", $_SESSION['mylogin']['nick'] );
+					$smarty->assign("lastest_mid", "&mid=$mid" );
+					$smarty->assign("initial_tab", 3 );
+					$smarty->assign("browser_url", $TWMAP3URL );
+					$smarty->assign("loggedin", 1);
+			} else { // 沒有登入
+					// require_once('lib/fb/facebook.php');
+					//require_once('lib/xuite.php');
+					$smarty->assign("lastest_mid", "&mid=$mid" );
+					$smarty->assign("initial_tab", 2 );
+					$smarty->assign("showing", true );
+					$smarty->assign("browser_url", $TWMAP3URL );
+					$smarty->assign("loggedin", 0);
 
-                        )));
-		*/
-                $smarty->assign("user_icon", "imgs/icon-map.png");
-        }
-        echo $smarty->fetch("main.html");
-        exit;
-}
+					$smarty->assign("user_icon", "imgs/icon-map.png");
+			}
+			echo $smarty->fetch("main.html");
+			exit;
+	}
 
 	$smarty->assign('map',$map);
 	$gpx_link = $site_url . str_replace($out_root,$out_html_root,sprintf("%s%d/%s_p.gpx",$map['path'],$map['tid'],$map['md5name']));
@@ -88,8 +80,10 @@
 	$links['page'] = pagelink($map);
 	$smarty->assign('links',$links);
 	$smarty->display('show_track.html');
+	echo $smarty->fetch("analytics.html");
 	exit(0);
-}
+} // end of mid < 0
+
 // 3. 顯示地圖
 // $html_root = $out_html_root . sprintf("/%06d/%d", $map['uid'],$mid);
 $html_root = $out_html_root . str_replace($out_root, "", dirname($map['filename']));
@@ -123,15 +117,6 @@
 		$smarty->assign("showing", true );
 		$smarty->assign("browser_url", $TWMAP3URL );
 		$smarty->assign("loggedin", 0);
-		// $smarty->assign("login_xuite", $xuite->getLoginUrl());
-		/* $smarty->assign("login_fb",
-			$facebook->getLoginUrl(  array(
-				'canvas'    => 0,
-				'fbconnect' => 1,
-				'req_perms' => 'email'
-
-			)));
- 		*/
 		$smarty->assign("user_icon", "imgs/icon-map.png");
 	} 
 	echo $smarty->fetch("main.html");
@@ -144,6 +129,7 @@
 	map_accessed($mid);
 	$smarty->assign('map',$map);
 	$smarty->display('show_deleted.html');
+	echo $smarty->fetch("analytics.html");
 	exit;
 	break;
 case 1:
@@ -158,6 +144,7 @@
 	$smarty->assign('map',$map);
 	$smarty->assign('links',$links);
 	$smarty->display('show_expired.html');
+	echo $smarty->fetch("analytics.html");
 	exit;
 	break;
 case 0:
@@ -237,6 +224,7 @@
 	$smarty->assign("map",$map);
 	$smarty->assign("links",$links);
 	$smarty->display("show_ok.html");
+	echo $smarty->fetch("analytics.html");
 	exit;
 	// ad();
 	//footer();