/[drupal]/contributions/modules/omniture/omniture.module

Diff of /contributions/modules/omniture/omniture.module

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.6.4.2,
Wed Aug 19 09:23:16 2009 UTC
+revision 1.6.4.3,
Wed Sep 23 23:18:18 2009 UTC
 Line 1
  <?php
- // $Id: omniture.module,v 1.6.4.1 2009/08/19 09:22:00 cytefx Exp $
+ // $Id: omniture.module,v 1.6.4.2 2009/08/19 09:23:16 cytefx Exp $
  /*
   * @file
   * Drupal Module: Omniture SiteCatalyst Stats
 Line 9
   *
   * @author: Greg Knaddison
   * @co-maintainer: Matthew Tucker
   *
   */
  function omniture_help($path, $arg) {
 Line 57 
 function omniture_footer($main = 0) {
    // Don't track page views in the admin sections, or for certain roles
    if (arg(0) != 'admin' && $track > 0) {
      // Add any custom code snippets if specified
      $codesnippet = variable_get('omniture_codesnippet', '');
 Line 117 
 function omniture_footer($main = 0) {
      $footer .= '<!-- End SiteCatalyst code version: ';
      $footer .=  check_plain(variable_get("omniture_version", 'H.13.'));
      $footer .= ' -->'."\n";
+     // Get variables other modules have set.
+     $extra_variables = omniture_get_variables();
      if ($omniture_hooked_vars = module_invoke_all('omniture_variables', $main)) {
        if (isset($omniture_hooked_vars['header'])) {
          $header = $omniture_hooked_vars['header'];
        }
        if (isset($omniture_hooked_vars['variables'])) {
+         // We need to merge some variables here.
          foreach ($omniture_hooked_vars['variables'] as $k => $v) {
+           if (is_array($v)) {
+             $v = $v[count($v)-1];
+           }
+           if (isset($extra_variables[$k])) {
+             $v = $extra_variables[$k];
+           }
            $extra_variables_formatted .= "$k=\"$v\";\n";
          }
        }
-Line 218 
 function omniture_admin_settings() {
+Line 227 
 function omniture_admin_settings() {
          '#collapsed' => TRUE,
          '#description' => t('You can add custom SiteCatalyst code here.')
    );
    $form['advanced']['omniture_codesnippet'] = array(
        '#type' => 'textarea',
        '#title' => t('JavaScript Code'),
        '#default_value' => variable_get('omniture_codesnippet', ''),
        '#rows' => 15,
        '#description' => t('Paste <a href="@snippets">custom code snippets here</a>. These will be added to every page that SiteCatalyst appears on. For help with this feature see the <a href="@blog">cutroni.com blog</a>. <strong>Do not include the &lt;script&gt; tags</strong>, and always end your code with a semicolon (;).', array('@snippets' => 'http://drupal.org/node/39282', '@blog' => 'http://cutroni.com/blog/') )
    );
    return system_settings_form($form);
  }
+ /**
+  * Builds up a set of properties and values ot add to the JS of the page.
+  *
+  * @param string $name
+  *  The property.
+  * @param string $value
+  *  The value for the property.
+  */
+ function omniture_set_variable($name = NULL, $value = NULL) {
+   static $variables;
+   if (empty($name)) {
+     return $variables;
+   }
+   else {
+     $variables[$name] = $value;
+   }
+ }
+ function omniture_get_variables() {
+   return omniture_set_variable();
+ }
  /**
   * Example output from the omniture.com site itself.
-Line 241 
 function omniture_admin_settings() {
+Line 271 
 function omniture_admin_settings() {
  <!-- SITECATALYST CODE -->
  <script language="javascript" src="/js/s_code_remote_h.js" type="text/javascript"></script>
  <script language="javascript" type="text/javascript">
  <!--
  // Copyright 1997-2004 Omniture, Inc.
  // PAGE SPECIFIC VIA ISOL G & H
  var s_pageName='Omniture: Homepage';
  var s_channel='Home';
-Line 253 
 s.pageName='Omniture: Homepage';
+Line 283 
 s.pageName='Omniture: Homepage';
  s.channel='Home';
  s.prop6='English';
  // END PAGE SPECIFIC VIA ISOL
  // SiteCatalyst code version: G.7.
  var s_server="www.omniture.com"
-Line 275 
 var s_server="www.omniture.com"
+Line 305 
 var s_server="www.omniture.com"
    var s_eVar13 = ""
    var s_eVar14 = ""
    var s_eVar15 = ""
    // END G.7 CODE IMPLEMENTATION
    // H.1 CODE BEGIN
    s.server="www.omniture.com"
    s.campaign=""
    s.events=""
    s.products=""
    s.prop1="Non-Customer"
    s.prop3="Natural Search (All Other Engines)|"+s.pageName
    s.prop5="Untracked"
    s.prop14=""
    s.prop15=""
    s.prop16=""
-Line 313 
 var s_server="www.omniture.com"
+Line 343 
 var s_server="www.omniture.com"
    s.eVar13=""
    s.eVar28=""
    s.eVar33=""
    // H.1 CODE END
    var s_code=s.t();if(s_code)document.write(s_code)
           //-->
           </script>
-Line 323 
 var s_server="www.omniture.com"
+Line 353 
 var s_server="www.omniture.com"
           <img src="http://omniturecom.112.2O7.net/b/ss/omniturecom/1/H.7--NS/0" height="1" width="1" border="0" alt="" />
           </noscript>
           <!-- BANNER TRACKING IF ANY -->
           <script language="javascript" src="/js/functions.js"></script>
           <script language="javascript" src="/js/banner_track.js"></script>

 Legend:



Removed from v.1.6.4.2
 


changed lines


 
Added in v.1.6.4.3
 Legend:



Removed from v.1.6.4.2
 


changed lines


 
Added in v.1.6.4.3
-Removed from v.1.6.4.2
+Added in v.1.6.4.3

	ViewVC Help
Powered by ViewVC 1.1.2