Index: omniture.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/omniture/omniture.module,v
retrieving revision 1.6.4.6
diff -u -p -r1.6.4.6 omniture.module
--- omniture.module	18 Feb 2010 16:33:36 -0000	1.6.4.6
+++ omniture.module	20 Jan 2011 16:14:34 -0000
@@ -100,12 +100,27 @@ function omniture_footer($main = 0) {
         $extra_variables_formatted .= "\n". $variable .'="'. $value .'";';
       }
     }
-
+	
+    // Check whether we are on an SSL page or not.
+    $protocol = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ? 'https://' : 'http://';
+    $omniture_js_file_location = check_plain(variable_get("omniture_js_file_location", 'www.example.com/js/s_code_remote_h.js'));
+    // Make sure the js file location specified in settings doesn\'t already
+    // include the protocol before adding the correct protocol for this page.
+    if (strpos($omniture_js_file_location, 'http://') === FALSE && strpos($omniture_js_file_location, 'https://') === FALSE) {
+      $omniture_js_file_location = $protocol . $omniture_js_file_location;
+    }
+    $omniture_image_file_location = check_plain(variable_get("omniture_image_file_location", 'examplecom.112.2O7.net/b/ss/examplecom/1/H.13--NS/0'));
+    // Make sure the image file location specified in settings doesn\'t already
+    // include the protocol before adding the correct protocol for this page.
+    if (strpos($omniture_image_file_location, 'http://') === FALSE && strpos($omniture_image_file_location, 'https://') === FALSE) {
+      $omniture_image_file_location = $protocol . $omniture_image_file_location;
+    }
+	
     $header = "<!-- SiteCatalyst code version: ";
     $header .=  check_plain(variable_get("omniture_version", 'H.13.'));
     $header .= " Copyright 1997-2009 Omniture, Inc. More info available at http://www.omniture.com -->\n";
     $header .= "<script type=\"text/javascript\" language=\"JavaScript\" src=\"";
-    $header .=  check_plain(variable_get("omniture_js_file_location", 'http://www.example.com/js/s_code_remote_h.js'));
+    $header .=  $omniture_js_file_location;
     $header .= "\"></script>\n";
     $header .= "<script type=\"text/javascript\" language=\"JavaScript\"><!--\n";
 
@@ -114,7 +129,7 @@ function omniture_footer($main = 0) {
     $footer .= '<script language="JavaScript" type="text/javascript"><!--' . "\n";
     $footer .= "if(navigator.appVersion.indexOf('MSIE')>=0)document.write(unescape('%3C')+'\!-'+'-')" . "\n";
     $footer .= '//--></script><noscript><a href="http://www.omniture.com" title="Web Analytics"><img src="';
-    $footer .= check_plain(variable_get("omniture_image_file_location", 'http://examplecom.112.2O7.net/b/ss/examplecom/1/H.13--NS/0'));
+    $footer .= $omniture_image_file_location;
     $footer .= '/' . rand(0, 10000000) . '"' . "\n";
     $footer .= 'height="1" width="1" border="0" alt="" /></a></noscript><!--/DO NOT REMOVE/-->' . "\n";
     $footer .= '<!-- End SiteCatalyst code version: ';
@@ -167,13 +182,15 @@ function omniture_admin_settings() {
   $form['general']['omniture_js_file_location'] = array(
       '#type' => 'textfield',
       '#title' => t("Complete path to SiteCatalyst Javascript file"),
-      '#default_value' => check_plain(variable_get("omniture_js_file_location", 'http://www.example.com/js/s_code_remote_h.js')),
+      '#default_value' => check_plain(variable_get("omniture_js_file_location", 'www.example.com/js/s_code_remote_h.js')),
+      '#description' => t('Leave off the protocol (http://) to allow the js to be served correctly on SSL pages'), 
   );
 
   $form['general']['omniture_image_file_location'] = array(
       '#type' => 'textfield',
       '#title' => t("Complete path to SiteCatalyst Image file"),
-      '#default_value' => check_plain(variable_get("omniture_image_file_location", 'http://examplecom.112.2O7.net/b/ss/examplecom/1/H.13--NS/0')),
+      '#default_value' => check_plain(variable_get("omniture_image_file_location", 'examplecom.112.2O7.net/b/ss/examplecom/1/H.13--NS/0')),
+      '#description' => t('Leave off the protocol (http://) to allow the js to be served correctly on SSL pages'),
   );
 
   $form['general']['omniture_version'] = array(