Update of /cvsroot/fink/web
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv11923

Modified Files:
        footer.inc header.inc 
Added Files:
        analytics.inc 
Log Message:
rework the analytics stuff to use the new google analytics api, also make a 
better php api for our own use

Index: header.inc
===================================================================
RCS file: /cvsroot/fink/web/header.inc,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- header.inc  4 Dec 2007 21:34:25 -0000       1.114
+++ header.inc  13 Dec 2007 19:47:07 -0000      1.115
@@ -48,6 +48,8 @@
        
         return("");
 }      
+
+include_once "analytics.inc";
  
 // Language Code (from phpLang.inc.php)
 include_once dirname(__FILE__) . "/phpLang.inc.php";

--- NEW FILE: analytics.inc ---
<?php

$has_analytics     = true;
$analytics_account = "UA-305132-6";

function analytics_print($virtual_page=null, $account=null) {
        /*
         * first, the feedburner stuff
         * login went to fink-core-private, 02/23/2007
         */
        print "<script src=\"http://feeds.feedburner.com/~s/FinkProjectNews\"; 
type=\"text/javascript\" charset=\"utf-8\"></script>\n";

        if ($account == null) {
                global $analytics_account;
                $account = $analytics_account;
        }

        // next, google analytics
        print "<script type=\"text/javascript\">\n";
        print "  var gaJsHost = ((\"https:\" == document.location.protocol)? 
\"https://ssl.\":\"http://www.\";);\n";
        print "  document.write(\"\\<script src='\" + gaJsHost + 
\"google-analytics.com/ga.js' type='text/javascript'>\\<\\/script>\");\n";
        print "</script>\n";

        print "<script type=\"text/javascript\">\n";
        print "  var pageTracker = _gat._getTracker(\"$account\");\n";
        print "  pageTracker._initData();\n";
        if ($virtual_page != null) {
                print "  pageTracker._trackPageview(\"$virtual_page\");\n";
        } else {
                print "  pageTracker._trackPageview();\n";
        }
        print "</script>\n";
}

function analytics_download_link($href, $contents, $analytics_name) {
        print "<a href=\"$href\" onClick=\"pageTracker._trackPageview('" . 
str_replace(array("'", "\""), array("\\'", "\&quot;"), $analytics_name) . 
"');\">" . $contents . '</a>';
}

?>

Index: footer.inc
===================================================================
RCS file: /cvsroot/fink/web/footer.inc,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- footer.inc  20 Apr 2007 02:04:35 -0000      1.39
+++ footer.inc  13 Dec 2007 19:47:06 -0000      1.40
@@ -1,9 +1,4 @@
-<?
-/* $Id$ */
-if (!$urchin_account) {
-       $urchin_account = "UA-305132-6";
-}
-?>
+<? /* $Id$ */ ?>
 
 <? /* end content table */ ?>
 </div>
@@ -43,14 +38,10 @@
                }
        ?>
 </div>
-<!-- BMR 02/23/2007 - feedburner login went to fink-core-private -->
-<script src="http://feeds.feedburner.com/~s/FinkProjectNews"; 
type="text/javascript" charset="utf-8"></script>
-<!-- BMR 02/24/2007 - added back in, got a login  :) -->
-<script src="http://www.google-analytics.com/urchin.js"; type="text/javascript">
-</script>
-<script type="text/javascript">
-_uacct = "<? echo $urchin_account ?>";
-urchinTracker();
-</script> 
+<?
+       if ($has_analytics && !$skip_analytics) {
+               analytics_print();
+       }
+?>
 </body>
 </html>


-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to