[gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php

[Tom Knight (tomk)]

tomk        11/11/30 10:33:44

  Modified:             functions.php
  Log:
  Make piwik site id configurable

Revision  Changes    Path
1.33                 forums/htdocs/includes/functions.php

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.32&r2=1.33

Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- functions.php	27 Nov 2011 14:42:56 -0000	1.32
+++ functions.php	30 Nov 2011 10:33:44 -0000	1.33
@@ -7,7 +7,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: functions.php,v 1.32 2011/11/27 14:42:56 tomk Exp $
+ *   $Id: functions.php,v 1.33 2011/11/30 10:33:44 tomk Exp $
  *
  *
  ***************************************************************************/
@@ -1194,7 +1194,7 @@
 
 	$piwik_code = "";
 
-	if (isset($board_config['enable_piwik']) && !empty($board_config['enable_piwik'] == '1')) {
+	if (isset($board_config['enable_piwik']) && $board_config['enable_piwik'] == '1' && intval($board_config['piwik_site_id']) > 0) {
 		$piwik_code = <<<EOD
 <!-- Piwik -->
 <script type="text/javascript">
@@ -1202,11 +1202,11 @@
 document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
 </script><script type="text/javascript">
 try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 3);
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", $board_config['piwik_site_id']);
 piwikTracker.trackPageView();
 piwikTracker.enableLinkTracking();
 } catch( err ) {}
-</script><noscript><p><img src="http://piwik.gentoo.org/piwik.php?idsite=3" style="border:0" alt="" /></p></noscript>
+</script><noscript><p><img src="http://piwik.gentoo.org/piwik.php?idsite=" . $board_config['piwik_site_id'] style="border:0" alt="" /></p></noscript>
 <!-- End Piwik Tracking Code -->
 EOD;
 	}