--- webform_report/webform_report.module	2008-09-13 21:06:49.000000000 +0200
+++ webform_report_old/webform_report.module	2008-09-13 20:40:10.000000000 +0200
@@ -13,7 +13,7 @@
  */
 
 /**
- * Implementation of hook_help().
+ * Implementation of hook_help
  */
 function onthisdate_help($path, $arg) {
   $output = '';
@@ -26,10 +26,10 @@ function onthisdate_help($path, $arg) {
       break;
   }
   return $output;
-}
+} // function hook_help
 
 /**
- * Implementation of hook_node_info().
+ * Implementation of hook_node_info
  */
 function webform_report_node_info() {
   return array(
@@ -39,43 +39,43 @@ function webform_report_node_info() {
       'description' => t('A webform report is a dynamic page that contains user-specified data collected by the Webform module. The data can be sorted by a particular field, and fields can be included/excluded as needed.')
     )
   );
-}
+} // function webform_report_node_info
 
 /**
- * Implementation of hook_perm().
+ * Implementation of hook_perm
  */
 function webform_report_perm() {
   return array('access webform reports', 'create webform reports', 'edit webform reports', 'edit own webform reports');
-}
+} //function webform_report_perm
 
 /**
- * Implementation of hook_access().
+ * Implementation of hook_access
  */
 function webform_report_access($op, $node) {
   global $user;
 
   switch ($op) {
     case "view":
-      if (user_access('access webform reports')) {
+      if(user_access("access webform reports")) {
         return TRUE;
       }
       break;
     case "create":
-      return user_access('create webform reports');
+      return user_access("create webform reports");
       break;
     case "update":
     case "delete":
-      if ((user_access('edit own webform reports') && ($user->uid == $node->uid)) ||
-        (user_access('edit webform reports'))) {
+      if ((user_access("edit own webform reports") && ($user->uid == $node->uid)) ||
+        (user_access("edit webform reports"))) {
         return TRUE;
       }
       break;
   }
-}
+} // function webform_report_access
 
 /**
- * Implementation of hook_db_rewrite_sql().
- */
+* Implementation of hook_db_rewrite_sql().
+*/
 function webform_report_db_rewrite_sql($query, $primary_table, $primary_field, $args) {
   switch ($primary_field) {
     case 'nid':
@@ -99,7 +99,7 @@ function webform_report_db_rewrite_sql($
 }
 
 /**
- * Implementation of hook_menu().
+ * Implementation of hook_menu
  */
 function webform_report_menu() {
   $items['admin/content/webform_report'] = array(
@@ -113,11 +113,11 @@ function webform_report_menu() {
 }
 
 /**
- * Implementation of hook_load().
+ * Implementation of hook_load
  */
 function webform_report_load($node) {
   $webform_report = NULL;
-  if (!isset($_POST['wnid'])) {
+  if(!isset($_POST['wnid'])) {
     $result = db_query("SELECT r.nid, r.wnid, rc.cid, c.name, r.kcid, r.description, r.sort, r.filter_type, r.filter_value,
                         r.options, r.results_per_page FROM {webform_report} r LEFT JOIN {webform_report_component} rc
                         ON r.nid = rc.nid LEFT JOIN {webform_component} c ON rc.cid = c.cid WHERE rc.nid = '$node->nid' ORDER BY
@@ -174,7 +174,7 @@ function webform_report_load($node) {
 }
 
 /**
- * Implementation of hook_prepare().
+ * Implementation of hook_prepare
  */
 function webform_report_prepare(&$node) {
   if (!isset($node->wnid)) {
@@ -210,7 +210,7 @@ function webform_report_prepare(&$node) 
 }
 
 /**
- * Implementation of hook_view().
+ * Implementation of hook_view
  */
 function webform_report_view($node, $teaser = 0, $page = 0) {
   if (arg(0) == "comment" || $teaser) {
@@ -219,7 +219,7 @@ function webform_report_view($node, $tea
   }
 
   $data = _webform_report_get_data($node);
-  $output = '<p>'. $node->description;
+  $output = "<p>" . $node->description;
   $output .= _webform_report_get_body_content($data, $node);
   $node->content['body'] = array('#value' => check_markup($node->body, $node->format, FALSE));
   $node->content['webform_report'] = array('#value' => $output, '#weight' => 10);
@@ -227,21 +227,18 @@ function webform_report_view($node, $tea
 }
 
 /**
- * Implementation of hook_validate().
+ * Implementation of hook_validate
  */
 function webform_report_validate($form, &$form_state) {
   if ($_POST['wnid'] == 0) {
     form_set_error('wnid', t('You must select a form'));
-  } 
-  else {
+  } else {
     if ($_POST['kcid'] == 0) {
       form_set_error('kcid', t('You must select a field'));
-    } 
-    else {
-      if ($_POST['filter_type'] != 0 && $_POST['filter_value'] == '') {
+    } else {
+      if($_POST['filter_type'] != 0 && $_POST['filter_value'] == '') {
         form_set_error('filter_value', t('You must specify a filter value'));
-      } 
-      else {
+      } else {
         if ($_POST['components'] == '') {
           form_set_error('components', t('You must select at least one component  '));
         }
@@ -251,7 +248,7 @@ function webform_report_validate($form, 
 }
 
 /**
- * Implementation of hook_insert().
+ * Implementation of hook_insert
  */
 function webform_report_insert($node, $log = TRUE) {
   webform_report_prepare($node);
@@ -259,7 +256,7 @@ function webform_report_insert($node, $l
             VALUES (%d, %d, %d, '%s', %d, '%s', '%s', '%s', %d)", $node->nid, $node->wnid, $node->kcid, $node->description, $node->sort,
             $node->filter_type, $node->filter_value, serialize($node->options), $node->results_per_page);
   foreach ($node->components as $cid) {
-    if ($cid != 0) { // omit unselected components
+    if($cid != 0) { // omit unselected components
       db_query("INSERT INTO {webform_report_component} (nid, cid) VALUES ('$node->nid', '$cid')");
     } 
   }
@@ -269,7 +266,7 @@ function webform_report_insert($node, $l
 }
 
 /**
- * Implementation of hook_update().
+ * Implementation of hook_update
  */
 function webform_report_update($node, $log = TRUE) {
   webform_report_delete($node, FALSE);
@@ -280,18 +277,18 @@ function webform_report_update($node, $l
 }
 
 /**
- * Implementation of hook_delete().
+ * Implementation of hook_delete
  */
 function webform_report_delete($node, $log = TRUE) {
-  db_query("DELETE FROM {webform_report} WHERE nid = %d", $node->nid);
-  db_query("DELETE FROM {webform_report_component} WHERE nid = %d", $node->nid);
+  db_query ("DELETE FROM {webform_report} WHERE nid = '$node->nid'");
+  db_query ("DELETE FROM {webform_report_component} WHERE nid = '$node->nid'");
   if ($log) {
     watchdog('webform_report', 'Webform report "'.$node->title.'" deleted', WATCHDOG_NOTICE);
   }
 }
 
 /**
- * Implementation of hook_form().
+ * Implementation of hook_form
  */
 function webform_report_form(&$node) {
   $form['webform_report'] = array(
@@ -310,7 +307,7 @@ function webform_report_form(&$node) {
     '#description' => t('Enter a title for your Webform report page')
   );
 
-  if ($_POST['description']) {
+  if($_POST['description']) {
     $value = $_POST['description'];
   }
   else {
@@ -523,7 +520,7 @@ function _webform_report_get_data($node)
 
     $result = db_query("SELECT c.name, c.cid, c.type, d.nid, d.sid, d.data, s.uid, u.name as user, s.submitted, s.remote_addr
                         FROM {webform_submitted_data} d LEFT JOIN {webform_component} c ON d.cid = c.cid LEFT JOIN {webform_submissions} s
-                        ON d.sid = s.sid LEFT JOIN {users} u ON s.uid = u.uid WHERE (%s) ORDER BY d.sid, c.cid, c.name, d.data", $query);
+                        ON d.sid = s.sid LEFT JOIN {users} u ON s.uid = u.uid WHERE (" . $query . ") ORDER BY d.sid, c.cid, c.name, d.data");
   }
   return $result;  
 }
@@ -543,16 +540,16 @@ function _webform_report_get_body_conten
     $last_value = 0;
 
     // begin fields
-    if ($node->options['show_edit']) {
+    if($node->options['show_edit']) {
       $fields['edit'] = array('data' => t('Edit'), 'field' => 'edit', 'sort' => $_GET['sort']);
     }
-    if ($node->options['show_date'] || $node->options['show_time']) {
+    if($node->options['show_date'] || $node->options['show_time']) {
       $fields['date'] = array('data' => t('Submitted'), 'field' => 'date', 'sort' => $_GET['sort']);
     }
-    if ($node->options['show_user']) {
+    if($node->options['show_user']) {
       $fields['user'] = array('data' => t('User'), 'field' => 'user', 'sort' => $_GET['sort']);
     }
-    if ($node->options['show_ip']) {
+    if($node->options['show_ip']) {
       $fields['remote_addr'] = array('data' => t('IP Address'), 'field' => 'remote_addr', 'sort' => $_GET['sort']);
     }
 
@@ -560,37 +557,35 @@ function _webform_report_get_body_conten
       if (!isset($fields[$row->cid])) { // load fields once only
         $fields[$row->cid] = array('data' => $row->name, 'field' => $row->cid, 'sort' => $_GET['sort']);
       } // end fields
-      if ($node->options['show_edit']) {
+      if($node->options['show_edit']) {
         $values[$row->sid]['edit'] = array('data' => '<a href="' . url('node/'. $row->nid . '/submission/' . $row->sid . '/edit') . '">' . t('edit') . '</a>');
       }
-      if ($node->options['show_date'] || $node->options['show_time']) {
-        if ($node->options['show_date']) {
+      if($node->options['show_date'] || $node->options['show_time']) {
+        if($node->options['show_date']) {
           $dateformat = 'Y-m-d';
-          if ($node->options['show_time']) {
+          if($node->options['show_time']) {
             $dateformat .= ' H:m';
           }
-        } 
-        else if ($node->options['show_time']) {
+        } else if($node->options['show_time']) {
           $dateformat = 'H:m';
         }
         $values[$row->sid]['date'] = array('data' => date($dateformat, $row->submitted));
       }
-      if ($node->options['show_user']) {
-        if ($row->user == '') {
+      if($node->options['show_user']) {
+        if($row->user == '') {
           $row->user = t('anonymous');
         }
         $values[$row->sid]['user'] = array('data' => $row->user);
       }
-      if ($node->options['show_ip']) {
+      if($node->options['show_ip']) {
         $values[$row->sid]['remote_addr'] = array('data' => $row->remote_addr);
       }
       if ($row->data != '0') { // checkbox, not selected
-        if ($row->cid == $last_cid && $last_value != 0) { // will comma-separate multiple selections
-          $row->data = ", ". $row->data;
+        if($row->cid == $last_cid && $last_value != 0) { // will comma-separate multiple selections
+          $row->data = ", " . $row->data;
         }
         $values[$row->sid][$row->cid] = array('data' => $row->data);
-      } 
-      else {
+      } else {
           $values[$row->sid][$row->cid] = array('data' => '&nbsp;'); // prevents the table cell from being omitted
       }
 
@@ -602,7 +597,7 @@ function _webform_report_get_body_conten
       }
       else {
         // no table sort link has been clicked yet
-        switch ($node->kcid) {
+        switch($node->kcid) {
           case $row->cid:
             $_GET['order'] = $row->name; // make the sort arrow marker appear in the table column header
             break;
@@ -657,7 +652,7 @@ function _webform_report_get_body_conten
     }
 
     // handle the sorting of optional, non-component fields
-    switch ($_GET['order']) {
+    switch($_GET['order']) {
       case t('IP Address'):
         $node->kcid = 'remote_addr';
         $sort = SORT_REGULAR;
@@ -678,14 +673,14 @@ function _webform_report_get_body_conten
     array_multisort($column[$node->kcid], (int)$node->sort, $values);        
 
     // filter the table values
-    if ($node->filter_type != 0) {
+    if($node->filter_type != 0) {
       $values = _webform_report_filter_values($values, $node);
     }
 
     $values = _webform_report_add_data_links($fields, $values);
 
     // display number of rows after description
-    $output .= " (". count($values) ." ". t('results') .")</p>";
+    $output .= " (" . count($values) . " " . t('results') . ")</p>";
 
     $output .= _webform_report_pager($fields, $values, $node);
   }
@@ -705,19 +700,17 @@ function _webform_report_get_body_conten
  * @return an array of table values
  */
 function _webform_report_add_data_links($fields, $values) {
-  foreach ($fields as $fkey => $field) {
-    foreach ($values as $vkey => $value) {
+  foreach($fields as $fkey => $field) {
+    foreach($values as $vkey => $value) {
       $data = &$values[$vkey][$fkey]['data']; // shorten access to the data element
 
-      if ($fkey == 'user') {
+      if($fkey == 'user') {
         $data = '<a href="' . url('user/' . _webform_report_get_uid_for_user($data)) . '">' . $data . '</a>';
-      } 
-      else {
-        if (valid_email_address($data)) {
+      } else {
+        if(valid_email_address($data)) {
           $data = '<a href="mailto:' . $data . '">' . $data . '</a>';
-        } 
-        else {
-          if (valid_url($data, TRUE)) {
+        } else {
+          if(valid_url($data, TRUE)) {
             $data = '<a href="' . $data . '">' . $data . '</a>';
           }
         }
@@ -733,25 +726,25 @@ function _webform_report_add_data_links(
  */
 function _webform_report_filter_values($values, $node) {
   $filtered_values = array();
-  foreach ($values as $key => $value) {
-    switch ($node->filter_type) {
+  foreach($values as $key => $value) {
+    switch($node->filter_type) {
       case 1: // begins with
-        if (substr(strtolower(trim($value[$node->kcid]['data'])), 0, strlen($node->filter_value)) == strtolower($node->filter_value)) {
+        if(substr(strtolower(trim($value[$node->kcid]['data'])), 0, strlen($node->filter_value)) == strtolower($node->filter_value)) {
           $filtered_values[] = $value;
         }
         break;
       case 2: // does not begin with
-        if (substr(strtolower(trim($value[$node->kcid]['data'])), 0, strlen($node->filter_value)) != strtolower($node->filter_value)) {
+        if(substr(strtolower(trim($value[$node->kcid]['data'])), 0, strlen($node->filter_value)) != strtolower($node->filter_value)) {
           $filtered_values[] = $value;
         }
         break;
       case 3: // contains
-        if (strpos(strtolower(trim($value[$node->kcid]['data'])), strtolower($node->filter_value)) !== FALSE) {
+        if(strpos(strtolower(trim($value[$node->kcid]['data'])), strtolower($node->filter_value)) !== FALSE) {
           $filtered_values[] = $value;
         }
         break;
       case 4: // does not contain
-        if (strpos(strtolower(trim($value[$node->kcid]['data'])), strtolower($node->filter_value)) === FALSE) {
+        if(strpos(strtolower(trim($value[$node->kcid]['data'])), strtolower($node->filter_value)) === FALSE) {
           $filtered_values[] = $value;
         }
         break;
@@ -767,7 +760,7 @@ function _webform_report_filter_values($
  * @return a uid for the specified user
  */
 function _webform_report_get_uid_for_user($name) {
-  $result = db_query("SELECT uid FROM users WHERE name = '%s'", $name);
+  $result = db_query("SELECT uid FROM users WHERE name = '" . $name . "'");
   $user = db_fetch_object($result);
   return $user->uid;
 } // function webform_report_get_uid_for_user
@@ -788,8 +781,8 @@ function _webform_report_page() {
     $result = db_query("SELECT nid, title FROM {node} WHERE type='webform_report'");
    
     while ($node = db_fetch_object($result)) {
-      $rows[] = array(l($node->title, 'node/'. $node->nid),
-                    l(t('edit'), 'node/'. $node->nid .'/edit'));
+      $rows[] = array(l($node->title,'node/' . $node->nid),
+                    l(t('edit'), 'node/'.$node->nid.'/edit'));
 
     }
   
@@ -805,10 +798,9 @@ function _webform_report_page() {
  */
 function _webform_report_pager($fields, $values, $node) {
   // for backward compatibility
-  if (!$node->results_per_page) {
+  if(!$node->results_per_page) {
     $results_per_page = 20;
-  } 
-  else {
+  } else {
     $results_per_page = $node->results_per_page;
   }
   // Add the css file for form display.
@@ -816,42 +808,40 @@ function _webform_report_pager($fields, 
 
   // break the array into chunks for pagination 
   $pages = array_chunk($values, $results_per_page, TRUE); 
-  if (!$_GET['page']) {
+  if(!$_GET['page']) {
     $_GET['page'] = '1';
   }
-  $page = $_GET['page'] - 1;
-  $output = theme('table', $fields, $pages[$page], array('class' => 'webform_report'));
+  $output = theme_table($fields, $pages[($_GET['page'] - 1)], array('class' => 'webform_report'));
   $output .= '<div class="pager">';
-  if ($_GET['page'] > 1) {
+  if($_GET['page'] > 1) {
     $output .= '<a class="pager-first active" title="' . t('Go to first page') . '" href="?sort=' . $_GET['sort'] . '&order=' . $_GET['order'] . '&page=1">' . t('« first') .'</a>';
     $output .= '<a class="pager-first active" title="' . t('Go to previous page') . '" href="?sort=' . $_GET['sort'] . '&order=' . $_GET['order'] . '&page=' . ($_GET['page'] - 1) . '">' . t('‹ previous') .'</a>';
   }
   $output .= '<span class="pager-list">';
   $css_class = 'pager-next-active';
-  foreach ($pages as $key => $page) {
-    switch ($_GET['page']) {
-      case $key + 1:
+  foreach($pages as $key => $page) {
+    switch($_GET['page']) {
+      case($key + 1):
         $css_class = 'pager-current';
         break;
-      case 1:
+      case(1):
         $css_class = 'pager-first active';
         break;
-      case count($pages):
+      case(count($pages)):
         $css_class = 'pager-last active';
         break;
       default:
         $css_class = 'pager-next active';
         break;
     }
-    if ($css_class == 'pager-current') {
+    if($css_class == 'pager-current') {
       $output .= '<strong class="' . $css_class . '">' . ($key + 1) . '</strong>';
-    } 
-    else {
+    } else {
       $output .= '<a class="' . $css_class . '" href="?sort=' . $_GET['sort'] . '&order=' . $_GET['order'] . '&page=' .($key + 1) . '">' . ($key + 1) . '</a>';
     }
   }
   $output .= '</span>';
-  if ($_GET['page'] < count($pages)) {
+  if($_GET['page'] < count($pages)) {
     $output .= '<a class="pager-last active" title="' . t('Go to next page') . '" href="?sort=' . $_GET['sort'] . '&order=' . $_GET['order'] . '&page=' . ($_GET['page'] + 1) . '">' . t('next ›') .'</a>';
     $output .= '<a class="pager-last active" title="' . t('Go to last page') . '" href="?sort=' . $_GET['sort'] . '&order=' . $_GET['order'] . '&page=' . count($pages) . '">' . t('last »') .'</a>';
   }