Index: piwik.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/piwik/piwik.module,v
retrieving revision 1.1.2.10
diff -u -p -r1.1.2.10 piwik.module
--- piwik.module	1 Oct 2008 07:14:11 -0000	1.1.2.10
+++ piwik.module	16 Dec 2008 15:06:57 -0000
@@ -70,9 +70,9 @@ function piwik_init() {
 function piwik_footer($main = 0) {
   global $user;
 
-  $id = variable_get('piwik_site_id', '');
+  $site_id = (int) variable_get('piwik_site_id', '');
 
-  if (!empty($id) && _piwik_visibility_pages() && _piwik_visibility_user($user)) {
+  if (!empty($site_id) && _piwik_visibility_pages() && _piwik_visibility_user($user)) {
 
     $piwik_vars = array();
 
@@ -121,10 +121,10 @@ function piwik_footer($main = 0) {
     // Add any custom code snippets if specified.
     $codesnippet = variable_get('piwik_codesnippet', '');
 
-    // Build settings code. See http://piwik.org/javascript-tag-documentation/
+    // Build settings code. See http://piwik.org/docs/javascript-tracking/
     $script = '';
     $script .= 'piwik_action_name = document.title;';
-    $script .= 'piwik_site_id = '. drupal_to_js(variable_get('piwik_site_id', '')) .';';
+    $script .= 'piwik_site_id = '. drupal_to_js($site_id) .';';
     $script .= 'piwik_url = pkBaseURL + "/piwik.php";';
 
     // Add link tracking.
@@ -161,6 +161,13 @@ function piwik_footer($main = 0) {
     $script .= 'piwik_log(piwik_action_name, piwik_site_id, piwik_url, piwik_vars);';
 
     drupal_add_js($script, 'inline', 'footer');
+    
+    $url_http = variable_get('piwik_url_http', '');
+           
+    if ($url_https = variable_get('piwik_url_https', '') && (!empty($_SERVER['HTTPS']) || ($_SERVER['HTTPS'] != 'off'))) {
+      return '<noscript><img src="'. $url_https .'/piwik.php?idsite='. $site_id .'" style="border:0" alt=""/></noscript>';    
+    }
+    return '<noscript><img src="'. $url_http .'/piwik.php?idsite='. $site_id .'" style="border:0" alt=""/></noscript>';    
   }
 }