Updated Analytics

system/includes/functions.php

@@ -859,9 +859,8 @@ function social($imgDir = null) {
     $google = config('social.google');
     $tumblr = config('social.tumblr');
     $rss = site_url() . 'feed/rss';
-    
-    if($imgDir === null)
-    {
+
+    if ($imgDir === null) {
         $imgDir = "default/img/";
     }
 
@@ -986,16 +985,15 @@ function publisher() {
 function analytics() {
     $analytics = config('google.analytics.id');
     $script = <<<EOF
-	<script type="text/javascript">
-		var _gaq = _gaq || [];
-		_gaq.push(['_setAccount', '{$analytics}']);
-		_gaq.push(['_trackPageview']);
-		(function() {
-			var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-		})();
-	</script>
+<script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', '{$analytics}', 'auto');
+    ga('send', 'pageview');
+</script>
 EOF;
     if (!empty($analytics)) {
         return $script;
@@ -1305,7 +1303,7 @@ function get_static_path() {
 function generate_sitemap($str) {
 
     header('X-Robots-Tag: noindex');
-    
+
     echo '<?xml version="1.0" encoding="UTF-8"?>';
 
     if ($str == 'index') {