Index: woopra.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/woopra/woopra.info,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 woopra.info
--- woopra.info	23 Apr 2008 08:44:51 -0000	1.1.2.2
+++ woopra.info	14 Feb 2011 00:32:00 -0000
@@ -2,4 +2,7 @@
 name = Woopra
 description = Adds support for the Woopra web analytics system
 package = Other
-core = 6.x
+core = 7.x
+
+files[] = woopra.install
+files[] = woopra.module
Index: woopra.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/woopra/woopra.install,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 woopra.install
--- woopra.install	21 Apr 2009 08:31:27 -0000	1.1.2.2
+++ woopra.install	14 Feb 2011 00:32:00 -0000
@@ -1,6 +1,17 @@
 <?php
+/**
+ * @file
+ * Install, update and uninstall functions for the woopra module.
+ *
+ */
  // $iD: woopra.install,v 1.1 2008/04/21 15:04:08 tomdeb Exp $
 
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
 function woopra_uninstall() {
-  db_query('DELETE FROM {variable} WHERE name LIKE "woopra\_%"');
+  db_delete('variable')
+    ->condition('name', "woopra\_%", 'LIKE')
+    ->execute();
 }
Index: woopra.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/woopra/woopra.module,v
retrieving revision 1.1.2.9
diff -u -r1.1.2.9 woopra.module
--- woopra.module	11 Jan 2010 21:07:14 -0000	1.1.2.9
+++ woopra.module	14 Feb 2011 00:32:00 -0000
@@ -10,22 +10,22 @@
  */
 
 /**
- * Implementation of hook_help
+ * Implements hook_help().
  */
 function woopra_help($path, $arg) {
   switch ($path) {
-    case 'admin/settings/woopra':
+    case 'admin/config/woopra':
       return t('Woopra is a realtime tracking and statistics system.');
   }
 }
 
 /**
- * Implementation of hook_menu
+ * Implements hook_menu().
  */
 function woopra_menu($may_cache = TRUE) {
   $items = array();
   if ($may_cache) {
-    $items['admin/settings/woopra'] = array(
+    $items['admin/config/system/woopra'] = array(
       'title' => t('Woopra'),
       'description' => t('Change Woopra integration settings'),
       'page callback' => 'drupal_get_form',
@@ -39,12 +39,12 @@
 /**
  * admin/settings/woopra form
  */
-function woopra_settings_form() {
+function woopra_settings_form($form, &$form_state) {
 
   $form['info'] = array(
     '#type' => 'fieldset',
     '#title' => t('User Information'),
-    '#description' => t('Woopra can display all sorts of information for real-time tracking of users.'), 
+    '#description' => t('Woopra can display all sorts of information for real-time tracking of users.'),
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
   );
@@ -52,22 +52,22 @@
     '#type' => 'checkbox',
     '#title' => t('Email address'),
     '#default_value' => variable_get('woopra_email', FALSE),
-  ); 
+  );
   $form['info']['woopra_avatar'] = array(
     '#type' => 'checkbox',
     '#title' => t('Avatar'),
     '#default_value' => variable_get('woopra_avatar', FALSE),
-  ); 
+  );
 
   if (module_exists('profile')) {
     foreach (profile_categories() as $category) {
       $fields = _profile_get_fields($category['name']);
       while ($field = db_fetch_object($fields)) {
-        $form['info']['woopra_'. $field->name] = array(
+        $form['info']['woopra_' . $field->name] = array(
           '#type' => 'checkbox',
           '#title' => $field->title,
-          '#default_value' => variable_get('woopra_'. $field->name, FALSE),
-         ); 
+          '#default_value' => variable_get('woopra_' . $field->name, FALSE),
+        );
       }
     }
   }
@@ -79,21 +79,21 @@
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
   );
-  
-  $admin = user_load(array('uid' => '1'));
-  
+
+  $admin = user_load('1');
+
   $form['roles']['woopra_track_user1'] = array(
     '#type' => 'checkbox',
     '#title' => t("%admin (user #1)", array('%admin' => $admin->name)),
     '#default_value' => variable_get('woopra_track_user1', FALSE),
-  ); 
-  
+  );
+
   $roles = user_roles();
   foreach (array_keys($roles) as $rid) {
-    $form['roles']['woopra_track_rid_'. $rid] = array(
+    $form['roles']['woopra_track_rid_' . $rid] = array(
       '#type' => 'checkbox',
       '#title' => $roles[$rid],
-      '#default_value' => variable_get('woopra_track_rid_'. $rid, TRUE),
+      '#default_value' => variable_get('woopra_track_rid_' . $rid, TRUE),
     );
   }
 
@@ -101,24 +101,36 @@
 }
 
 /**
- * Implementation of hook_footer
+ * Implements hook_page_alter().
  */
-function woopra_footer($main = 0) {
-  global $user;
+function woopra_page_alter(&$page) {
+ 	global $user;
   global $base_url;
-  $script = '';
   if (arg(0) != 'admin') {
     if ((_woopra_track($user))) {
-      $woopra_js = '//static.woopra.com/js/woopra.v2.js';
-      $script .= "<script type=\"text/javascript\" src=\"$woopra_js\"></script>\n";
-      $script .= "<script type=\"text/javascript\">\n  woopraTracker.track();\n</script>\n";
+      $script = '<script type="text/javascript">';
+      if ($user->uid) {
+        $script .= _woopra_user($user);
+      }
+      if (variable_get('woopra_cache', FALSE)) {
+        $woopra_js = '/'. _woopra_cache('http://static.woopra.com/js/woopra.js');
+      }
+      elseif ( preg_match('/^https:\/\//', $base_url) ) {  
+        $woopra_js = 'https://sec1.woopra.com/js/woopra.js';
+      }
+      else {
+        $woopra_js = 'http://static.woopra.com/js/woopra.js';
+      }
+      $script .= "</script>\n";
+      $script .= "<script src=\"$woopra_js\" type=\"text/javascript\"></script>\n";
+      $page['page_bottom']['woopra'] = array(
+        '#markup' => $script,
+      );
     }
   }
-  return $script;
 }
-
 /**
- * Build the user tracking variable 
+ * Build the user tracking variable
  * @param $user
  *   The user object
  * @return string
@@ -142,8 +154,8 @@
     profile_load_profile($user);
     $fields = db_query('SELECT * FROM {profile_fields}');
     while ($field = db_fetch_array($fields)) {
-      if (variable_get('woopra_'. $field['name'], FALSE)) { 
-        $script .= "woopra_array['". $field['title'] ."'] = '". $user->$field['name'] ."';\n";
+      if (variable_get('woopra_' . $field['name'], FALSE)) {
+        $script .= "woopra_array['" . $field['title'] . "'] = '" . $user->$field['name'] . "';\n";
       }
     }
   }
@@ -159,14 +171,14 @@
  *   TRUE if page should be tracked, FALSE if not
  */
 function _woopra_track($user) {
-  $track = TRUE; 
+  $track = TRUE;
 
   foreach (array_keys($user->roles) as $rid) {
-    if (!variable_get('woopra_track_rid_'. $rid, TRUE)) {
+    if (!variable_get('woopra_track_rid_' . $rid, TRUE)) {
       $track = FALSE;
     }
   }
-  
+
   if ($user->uid == '1') {
     $track = variable_get('woopra_track_user1', FALSE);
   }