Index: sitedoc.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/sitedoc/sitedoc.module,v
retrieving revision 1.46.2.2.2.13
diff -u -r1.46.2.2.2.13 sitedoc.module
--- sitedoc.module	4 Nov 2008 16:40:43 -0000	1.46.2.2.2.13
+++ sitedoc.module	5 Nov 2008 18:27:35 -0000
@@ -159,12 +159,12 @@
 
   // 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,
       '#collapsed' => FALSE,
-      '#value' => sitedoc_drupal($sitedoc_settings['kill_cron']),
+      '#value' => '<div class="sitedoc_section">'. sitedoc_drupal($sitedoc_settings['kill_cron']) .'</div>',
       );  
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -172,12 +172,12 @@
 
   // 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,
       '#collapsed' => FALSE,
-      '#value' => sitedoc_database_overview($sitedoc_settings['optimize_tables'], $sitedoc_settings['show_indexes']),
+      '#value' => '<div class="sitedoc_section">'. sitedoc_database_overview($sitedoc_settings['optimize_tables'], $sitedoc_settings['show_indexes']) .'</div>',
       );  
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -185,12 +185,12 @@
  
   // 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,
       '#collapsed' => FALSE,
-      '#value' => sitedoc_node_summary($sitedoc_settings['include_comment_count'], $sitedoc_settings['node_show_size'], $sitedoc_settings['node_max_size']),
+      '#value' => '<div class="sitedoc_section">'. sitedoc_node_summary($sitedoc_settings['include_comment_count'], $sitedoc_settings['node_show_size'], $sitedoc_settings['node_max_size']) .'</div>',
       );
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -198,12 +198,12 @@
     // 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,
         '#collapsed' => FALSE,
-        '#value' => sitedoc_node_access(),
+        '#value' => '<div class="sitedoc_section">'. sitedoc_node_access() .'</div>',
       );  
       $output .=  theme('fieldset', $fieldset);
       $output .= "</div>\n";
@@ -212,12 +212,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";
@@ -225,12 +225,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' => '<div class="sitedoc_section">'. sitedoc_get_modules($sitedoc_settings['module_suppress'], $sitedoc_settings['module_sort_order']) .'</div>',
       );  
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -238,12 +238,12 @@
 
   // Get themes from the System table.
   if ($sitedoc_settings['theme_section']) {  /* controls themes */
-    $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";
@@ -251,12 +251,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);
 
@@ -267,7 +267,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);
     }
@@ -276,12 +276,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";
@@ -289,26 +289,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">';
+    $output .= '<div class="sitedoc_boxes">';
     $boxes = sitedoc_get_boxes($sitedoc_settings['block_warn'], $sitedoc_settings['block_delete']);
     $fieldset = array(
       '#title' => t('Custom Blocks (Boxes)'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => $boxes ? $boxes : ('<p>'. t('No boxes found.') .'</p>'),
+      '#value' => '<div class="sitedoc_section">'. $boxes ? $boxes : ('<p>'. t('No boxes found.') .'</p>') .'</div>',
       );
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -316,13 +316,13 @@
 
   // Get roles info from Roles table  (how can we get a description of the roles?).
   if ($sitedoc_settings['roles_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_roles">';
+    $output .= '<div class="sitedoc_roles">';
     $rpt .= sitedoc_get_roles($sitedoc_settings['role_perms_list'], $sitedoc_settings['role_users']);
     $fieldset = array(
       '#title' => t('Roles'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => $rpt ? $rpt : (t('No roles found.') .' '. _sitedoc_img_error()),
+      '#value' => '<div class="sitedoc_section">'. $rpt ? $rpt : (t('No roles found.') .' '. _sitedoc_img_error()) .'</div>',
       );
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -330,13 +330,13 @@
 
   // Get contacts info from Contacts table.
   if ($sitedoc_settings['contacts_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_contacts">';
+    $output .= '<div class="sitedoc_contacts">';
     $rpt = sitedoc_get_contacts();
     $fieldset = array(
       '#title' => t('Contacts'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => $rpt ? $rpt : t('No contacts found.'),
+      '#value' => '<div class="sitedoc_section">'. ($rpt ? $rpt : t('No contacts found.')) .'</div>',
       );
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -344,13 +344,13 @@
 
   // Get info from Profile_fields table.
   if ($sitedoc_settings['profile_fields_section']) {
-    $output .= '<div class="sitedoc_section sitedoc_profile_fields">';
+    $output .= '<div class="sitedoc_profile_fields">';
     $rpt = sitedoc_profile_fields();
     $fieldset = array(
       '#title' => t('Profile Fields'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => $rpt ? $rpt : ('<p>'. t('No profile fields found.') .'</p>'),
+      '#value' => '<div class="sitedoc_section">'. ($rpt ? $rpt : ('<p>'. t('No profile fields found.') .'</p>')) .'</div>',
       );
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -358,13 +358,13 @@
 
   // 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'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
-      '#value' => $rpt ? $rpt : t('No aliases found.'),
+      '#value' => '<div class="sitedoc_section">'. ($rpt ? $rpt : t('No aliases found.')) .'</div>',
       );
     $output .=  theme('fieldset', $fieldset);
     $output .= "</div>\n";
@@ -372,12 +372,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";
@@ -599,7 +599,7 @@
     '#title' => t('Drupal'),
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
-    '#value' => theme('table', $header, $rows) ."\n",
+    '#value' => '<div class="sitedoc_subsection">'. theme('table', $header, $rows) .'</div>',
     );
   $output .=  theme('fieldset', $fieldset);
 
@@ -618,7 +618,7 @@
     '#title' => t('Webserver Information'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-    '#value' => theme('table', $header, $rows) ."\n",
+    '#value' => '<div class="sitedoc_subsection">'. theme('table', $header, $rows) .'</div>',
   );
   $output .=  theme('fieldset', $fieldset);
   
@@ -738,7 +738,7 @@
     '#title' => t('PHP Information'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-    '#value' => theme('table', $header, $rows) ."\n",
+    '#value' => '<div class="sitedoc_subsection">'. theme('table', $header, $rows) .'</div>',
   );
   $output .=  theme('fieldset', $fieldset);
 
@@ -774,7 +774,7 @@
       '#title' => $dbname,
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
-      '#value' => _sitedoc_database($dbname, $value, $optimize_tables, $show_index),
+      '#value' => '<div class="sitedoc_subsection">'. _sitedoc_database($dbname, $value, $optimize_tables, $show_index) .'</div>',
       );
     $output .=  theme('fieldset', $fieldset);
     }
@@ -786,6 +786,7 @@
       '#title' => t('Database Information'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
+//      '#value' => '<div class="sitedoc_subsection">'. _sitedoc_database('database', $db_url, $optimize_tables, $show_index) .'</div>',
       '#value' => _sitedoc_database('database', $db_url, $optimize_tables, $show_index),
       );
     $output .=  theme('fieldset', $fieldset);
@@ -828,7 +829,7 @@
   $rows[] = array(t('Database prefix'), empty($db_prefix) ? '- none -' : $db_prefix);
   $grants = db_result(db_query('SHOW GRANTS'));
   $privileges = trim(str_replace('GRANT', ' ', substr($grants, 0, strpos($grants, ' ON'))));
-  $rows[] = array(t('Privileges'), $privileges);
+  $rows[] = array(t('Privileges'), array('data' => $privileges, 'colspan' => 5));
 
   $output .= theme('table', $header, $rows) ."\n";
   $output .= "</td>\n";
@@ -955,7 +956,7 @@
     '#title' => t('Table Status'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-    '#value' => $statrpt,
+    '#value' => '<div class="sitedoc_subsection">'. $statrpt .'</div>',
     );
   $output .=  theme('fieldset', $fieldset);
 
@@ -1294,7 +1295,7 @@
           '#title' => $previous,
           '#collapsible' => TRUE,
           '#collapsed' => TRUE,
-          '#value' => theme('table', $header, $rows),
+          '#value' => '<div class="sitedoc_subsection">'. theme('table', $header, $rows) .'</div>',
           );
         $output .=  theme('fieldset', $fieldset);
       }
@@ -1328,7 +1329,7 @@
       '#title' => $previous,
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
-      '#value' => theme('table', $header, $rows),
+      '#value' => '<div class="sitedoc_subsection">'. theme('table', $header, $rows) .'</div>',
       );
     $output .=  theme('fieldset', $fieldset);
   }
@@ -1418,7 +1419,7 @@
     array('data' => t('Visibility'), 'align' => 'center'),
     t('Pages'),
     );
-  $output = '<h3>'. t('Blocks') .'</h3>';
+  $output = NULL;
 
   $rows = array();
   $missing_theme = FALSE;
@@ -1984,7 +1985,7 @@
       '#title' => t('Large Nodes'),
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
-      '#value' => theme('table', $big_head, $biggies),
+      '#value' => '<div class="sitedoc_subsection">'. theme('table', $big_head, $biggies) .'</div>',
       );
     $output .=  theme('fieldset', $fieldset);
   }
@@ -2505,7 +2506,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_subsection">'. theme('table', array(t('Title'), t('Operation')), $rows) .'</div>',
       );
     $output .=  '<br/>'. theme('fieldset', $fieldset);
   }