--- C:/Documents and Settings/John/Desktop/New Folder (2)/sitedoc-5.x-1.x-dev1.tar/sitedoc/sitedoc.module	Tue Nov 04 16:41:00 2008
+++ C:/Documents and Settings/John/Desktop/New Folder (2)/sitedoc.module-web-081108	Sat Nov 08 21:24:28 2008
@@ -455,7 +455,7 @@
     '#type' => 'submit',
     '#value' => t('Save configuration'),
     '#weight' => 5,
-    '#prefix' => '</div><div class="clear-block"></div>'
+    '#suffix' => '</div><div class="clear-block"></div>',
     );
 
   return $form;
@@ -601,7 +601,7 @@
 
   // Get basic Drupal info.
   if ($sitedoc_settings['drupal_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_drupal">';
+    $output .= '<div class="sitedoc_drupal">';
     $fieldset = array(
       '#title' => t('Drupal Section'),
       '#collapsible' => TRUE,
@@ -614,7 +614,7 @@
 
   // Get database info.
   if ($sitedoc_settings['table_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_database_overview">';
+    $output .= '<div class="sitedoc_database_overview">';
     $fieldset = array(
       '#title' => t('Table Section'),
       '#collapsible' => TRUE,
@@ -627,20 +627,20 @@
  
    // Get info from the sequences table (last used item number).
   if ($sitedoc_settings['sequences_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_sequences">';
+    $output .= '<div class="sitedoc_sequences">';
     $fieldset = array(
       '#title' => t('Sequences Section'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => sitedoc_sequences(),
+      '#value' => '<div class="sitedoc_section">'.sitedoc_sequences().'</div>',
       );  
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
   }
- 
+
   // Get summary of all nodes (this is VERY expensive!).
   if ($sitedoc_settings['node_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_node_summary">';
+    $output .= '<div class="sitedoc_node_summary">';
     $fieldset = array(
       '#title' => t('Node Summary'),
       '#collapsible' => TRUE,
@@ -653,7 +653,7 @@
     // Get node access summary (this is expensive!).
     // Runs only if the node summary section is selected.
     if ($sitedoc_settings['include_node_access']) {
-      $output .= '<div class="sitedoc_section sitedoc_node_access">';
+      $output .= '<div class="sitedoc_node_access">';
       $fieldset = array(
         '#title' => t('Node Access'),
         '#collapsible' => TRUE,
@@ -667,12 +667,12 @@
 
   // Get content type info from node module along with workflow options from system variables.
   if ($sitedoc_settings['content_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_content_types">';
+    $output .= '<div class="sitedoc_content_types">';
     $fieldset = array(
       '#title' => t('Content Types'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => sitedoc_content_types(),
+      '#value' => '<div class="sitedoc_section">'.sitedoc_content_types().'</div>',
       );  
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -680,12 +680,12 @@
 
   // Get modules from the System module functions.
   if ($sitedoc_settings['module_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_modules">';
+    $output .= '<div class="sitedoc_modules">';
     $fieldset = array(
       '#title' => t('Modules'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => sitedoc_get_modules($sitedoc_settings['module_suppress'], $sitedoc_settings['module_sort_order']),
+      '#value' => sitedoc_get_modules($sitedoc_settings['module_suppress'],$sitedoc_settings['module_sort_order']),
       );  
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -693,22 +693,22 @@
 
   // Get themes and theme_engines from the System table.
   if ($sitedoc_settings['theme_section']) {  /* controls themes and theme engines */
-    $output .= '<div class="sitedoc_section sitedoc_themes">';
+    $output .= '<div class="sitedoc_themes">';
     $fieldset = array(
       '#title' => t('Themes'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => sitedoc_get_system('theme'),
+      '#value' => '<div class="sitedoc_section">'.sitedoc_get_system('theme').'</div>',
       );  
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
 
-    $output .= '<div class="sitedoc_section sitedoc_theme_engines">';
+    $output .= '<div class="sitedoc_theme_engines">';
     $fieldset = array(
       '#title' => t('Theme Engines'),
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
-      '#value' => sitedoc_get_system('theme_engine'),
+      '#value' => '<div class="sitedoc_section">'.sitedoc_get_system('theme_engine').'</div>',
     );  
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -716,12 +716,12 @@
 
   // Get vocabularies and their definitions.
   if ($sitedoc_settings['vocabulary_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_vocabularies">';
+    $output .= '<div class="sitedoc_vocabularies">';
     $fieldset = array(
       '#title' => t('Vocabularies'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => sitedoc_get_vocabularies(),
+      '#value' => '<div class="sitedoc_section">'.sitedoc_get_vocabularies().'</div>',
       );  
     $output .=  theme('fieldset', $fieldset);
 
@@ -732,7 +732,7 @@
         '#title' => t('Orphan Term_nodes'),
         '#collapsible' => TRUE,
         '#collapsed' => ($orphans == '<p>'. t('No orphan term_nodes found.') .'</p>'),
-        '#value' => $orphans,
+        '#value' => '<div class="sitedoc_section">'.$orphans.'</div>',
       );  
     $output .=  theme('fieldset', $fieldset);
     }
@@ -741,12 +741,12 @@
 
   // Get system variable info from cache.
   if ($sitedoc_settings['variables_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_variables">';
+    $output .= '<div class="sitedoc_variables">';
     $fieldset = array(
       '#title' => t('Variables'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => sitedoc_get_variables(),
+      '#value' => '<div class="sitedoc_section">'.sitedoc_get_variables().'</div>',
       );  
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -754,26 +754,26 @@
 
   // Get blocks info from Blocks table.
   if ($sitedoc_settings['block_section']) {  // Controls block and boxes.
-    $output .= '<div class="sitedoc_section sitedoc_blocks">';
+    $output .= '<div class="sitedoc_blocks">';
       // Use the setting to decide on a warning for missing themes.
     $fieldset = array(
       '#title' => t('Blocks'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => sitedoc_get_blocks($sitedoc_settings['block_warn'], $sitedoc_settings['block_delete']),
+      '#value' =>  '<div class="sitedoc_section">'.sitedoc_get_blocks($sitedoc_settings['block_warn'], $sitedoc_settings['block_delete']).'</div>',
     );  
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
 
     // Get boxes (custom blocks) info from Boxes table.
     // Runs only if the blocks section is selected.
-    $output .= '<div class="sitedoc_section sitedoc_boxes">';
-    $boxes = sitedoc_get_boxes($sitedoc_settings['block_warn'], $sitedoc_settings['block_delete']);
+    $output .= '<div class="sitedoc_boxes">';
+    $boxes = '<div class="sitedoc_section">'.sitedoc_get_boxes($sitedoc_settings['block_warn'], $sitedoc_settings['block_delete']).'</div>';
     $fieldset = array(
       '#title' => t('Custom Blocks (Boxes)'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => $boxes ? $boxes : ('<p>'. t('No boxes found.') .'</p>'),
+      '#value' =>  $boxes ? $boxes : ('<p>'. t('No boxes found.') .'</p>'),
       );
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -781,8 +781,8 @@
 
   // Get roles info from Roles table.
   if ($sitedoc_settings['roles_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_roles">';
-    $rpt .= sitedoc_get_roles($sitedoc_settings['role_perms_list'], $sitedoc_settings['role_users']);
+    $output .= '<div class="sitedoc_roles">';
+    $rpt .= '<div class="sitedoc_section">'.sitedoc_get_roles($sitedoc_settings['role_perms_list'], $sitedoc_settings['role_users']).'</div>';
     $fieldset = array(
       '#title' => t('Roles'),
       '#collapsible' => TRUE,
@@ -795,8 +795,8 @@
 
   // Get contacts info from Contacts table.
   if ($sitedoc_settings['contacts_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_contacts">';
-    $rpt = sitedoc_get_contacts();
+    $output .= '<div class="sitedoc_contacts">';
+    $rpt = '<div class="sitedoc_section">'.sitedoc_get_contacts().'</div>';
     $fieldset = array(
       '#title' => t('Contacts'),
       '#collapsible' => TRUE,
@@ -809,8 +809,8 @@
 
   // Get info from Profile_fields table.
   if ($sitedoc_settings['profile_fields_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_profile_fields">';
-    $rpt = sitedoc_profile_fields();
+    $output .= '<div class="sitedoc_profile_fields">';
+    $rpt = '<div class="sitedoc_section">'.sitedoc_profile_fields().'</div>';
     $fieldset = array(
       '#title' => t('Profile Fields'),
       '#collapsible' => TRUE,
@@ -823,7 +823,7 @@
 
   // Get info from URL Alias table and cross-check it.
   if ($sitedoc_settings['url_alias_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_url_alias">';
+    $output .= '<div class="sitedoc_url_alias">';
     $rpt = sitedoc_url_alias();
     $fieldset = array(
       '#title' => t('URL Aliases'),
@@ -837,12 +837,12 @@
 
   // Get info from Filter and Filter_format tables.
   if ($sitedoc_settings['input_format_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_input_format">';
+    $output .= '<div class="sitedoc_input_format">';
     $fieldset = array(
       '#title' => t('Input Formats and Filters'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => sitedoc_filters(),
+      '#value' => '<div class="sitedoc_section">'.sitedoc_filters().'</div>',
       );
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -1062,7 +1062,7 @@
     '#title' => t('Drupal'),
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
-    '#value' => theme('table', $header, $rows) ."\n",
+    '#value' => '<div class="sitedoc_section">'.theme('table', $header, $rows).'</div>'."\n",
     );
   $output .=  theme('fieldset', $fieldset);
 
@@ -1081,7 +1081,7 @@
     '#title' => t('Webserver Information'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-    '#value' => theme('table', $header, $rows) ."\n",
+    '#value' => '<div class="sitedoc_section">'.theme('table', $header, $rows).'</div>'."\n",
   );
   $output .=  theme('fieldset', $fieldset);
   
@@ -1201,7 +1201,7 @@
     '#title' => t('PHP Information'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-    '#value' => theme('table', $header, $rows) ."\n",
+    '#value' => '<div class="sitedoc_section">'.theme('table', $header, $rows).'</div>'."\n",
   );
   $output .=  theme('fieldset', $fieldset);
 
@@ -1268,7 +1268,7 @@
                     'postgres' => 'Postgres',
                 );
         
-  $output .= '<table cellpadding="5"><tr>'."\n";        
+  $output .= '<div class="sitedoc_section"><table cellpadding="5"><tr>'."\n";        
 
   $output .= '<td valign="top">'."\n";
   $output .= '<h5>'. t('Overview') ."</h5>\n";
@@ -1336,7 +1336,7 @@
       );
     $output .= _sitedoc_dbvars_list('STATUS', t('Selected Status'), $variables_list, $database_version);
 
-    $output .= "</tr></table>\n";
+    $output .= "</tr></table></div>\n";
   } /* end MySql check */
   
 //  $output .= '<h5>'. t('Table Status') ."</h5>\n";
@@ -1418,7 +1418,7 @@
     '#title' => t('Table Status'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-    '#value' => $statrpt,
+    '#value' => '<div class="sitedoc_section">'.$statrpt.'</div>',
     );
   $output .=  theme('fieldset', $fieldset);
 
@@ -1757,7 +1757,7 @@
           '#title' => $previous,
           '#collapsible' => TRUE,
           '#collapsed' => TRUE,
-          '#value' => theme('table', $header, $rows),
+          '#value' => '<div class="sitedoc_section">'.theme('table', $header, $rows),'</div>',
           );
         $output .=  theme('fieldset', $fieldset);
       }
@@ -1791,7 +1791,7 @@
       '#title' => $previous,
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
-      '#value' => theme('table', $header, $rows),
+      '#value' => '<div class="sitedoc_section">'.theme('table', $header, $rows).'</div>',
       );
     $output .=  theme('fieldset', $fieldset);
   }
@@ -1883,7 +1883,7 @@
     array('data' => t('Visibility'), 'align' => 'center'),
     t('Pages'),
     );
-  $output = '<h3>'. t('Blocks') .'</h3>';
+
 
   $rows = array();
   $missing_theme = FALSE;
@@ -2329,7 +2329,7 @@
       );
   } /* end while */
 
-  $output .= theme('table', $header, $rows);
+  $output .= '<div class="sitedoc_section">'.theme('table', $header, $rows).'</div>';
   return $output ."\n";
 }
 
@@ -2455,7 +2455,7 @@
     array('data' => $mod, 'class' => 'sitedoc_right'),
     $comment ? array('data' => $com, 'class' => 'sitedoc_right') : NULL,
     );
-  $output .= theme('table', $header, $rows);
+  $output .= '<div class="sitedoc_section">'.theme('table', $header, $rows).'</div>';
 
   if ($toobig) {
     $output .= '<p>'. _sitedoc_img_warning(). ' '
@@ -2471,7 +2471,7 @@
       '#title' => t('Large Nodes'),
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
-      '#value' => theme('table', $big_head, $biggies),
+      '#value' => '<div class="sitedoc_section">'.theme('table', $big_head, $biggies).'</div>',
       );
     $output .=  theme('fieldset', $fieldset);
   }
@@ -2991,7 +2991,7 @@
   
   $howmany = count($rows);
   if ($howmany > 0) {
-    $output .= theme('table', $header, $rows);
+    $output .= '<div class="sitedoc_section">'.theme('table', $header, $rows).'</div>';
   }
   
   //  Now run through the nodes to see if they have an alias.
@@ -3010,7 +3010,7 @@
       '#title' => t('Nodes without URL Alias'),
       '#collapsible' => TRUE,
       '#collapsed' => count($rows) > 10,
-      '#value' => theme('table', array(t('Title'), t('Operation')), $rows),
+      '#value' => '<div class="sitedoc_section">'.theme('table', array(t('Title'), t('Operation')), $rows).'</div>',
       );
     $output .=  '<br/>'. theme('fieldset', $fieldset);
   }
@@ -3044,7 +3044,7 @@
  *  This function gets the Input Format and Filter information.
  */
 function sitedoc_filters() {
-  $output = "\n<h2>". t('Filters and Input Formats') .'</h2>';
+
   $filter_list = array();
   $default_format = variable_get('filter_default_format', 1);