--- /home/lestat/public_html/dru/modules/node_privacy_byrole/node_privacy_byrole.module-bak	2005-06-03 10:30:43.276366280 -0500
+++ node_privacy_byrole.module	2005-06-03 11:12:20.192777288 -0500
@@ -339,6 +339,9 @@
   $formitems_view = '';
   $formitems_edit = '';
   
+  $rows = array();
+  $header = array(t('Role'), t('View'), t('Edit'));
+
   $roles_array = user_roles();
   $roleids_array = array_keys($roles_array);
   // if the node already exists, return a form where the permissions already granted are already marked in checkboxes,
@@ -353,29 +356,36 @@
     }
 
     foreach ($roleids_array as $roleid) {
-      $formitems_view .= form_checkbox(t($roles_array[$roleid]), 'node_privacy_byrole_forview_'. $roleid, 1, $already_permitted_forview_rids[$roleid]);
-      $formitems_edit .= form_checkbox(t($roles_array[$roleid]), 'node_privacy_byrole_foredit_'. $roleid, 1, $already_permitted_foredit_rids[$roleid]);
+      $row = array(t($roles_array[$roleid]),
+        form_checkbox(NULL, 'node_privacy_byrole_forview_'. $roleid, 1, $already_permitted_forview_rids[$roleid]),
+        form_checkbox(NULL, 'node_privacy_byrole_foredit_'. $roleid, 1, $already_permitted_foredit_rids[$roleid]));
+      $rows[] = $row;
     }
   }
   else { // the following generates the form based on the assumption that the node is being created or previewed
     if ($op == t('Preview')) { // case where node is being previewed
       $edit = $_POST['edit'];
       foreach ($roleids_array as $roleid) {
-        $formitems_view .= form_checkbox(t($roles_array[$roleid]), 'node_privacy_byrole_forview_'. $roleid, 1, $edit['node_privacy_byrole_forview_'. $roleid]);
-        $formitems_edit .= form_checkbox(t($roles_array[$roleid]), 'node_privacy_byrole_foredit_'. $roleid, 1, $edit['node_privacy_byrole_foredit_'. $roleid]);
+        $row = array(t($roles_array[$roleid]),
+          form_checkbox(NULL, 'node_privacy_byrole_forview_'. $roleid, 1, $edit['node_privacy_byrole_forview_'. $roleid]),
+          form_checkbox(NULL, 'node_privacy_byrole_foredit_'. $roleid, 1, $edit['node_privacy_byrole_foredit_'. $roleid]));
+	$rows[] = $row;
       }
     }
     else { // case where node is being created
+
       foreach ($roleids_array as $roleid) {
-        $formitems_view .= form_checkbox(t($roles_array[$roleid]), 'node_privacy_byrole_forview_'. $roleid, 1, variable_get('npbr_forview_'. $node->type .'_default_'. $roleid, 0));
-        $formitems_edit .= form_checkbox(t($roles_array[$roleid]), 'node_privacy_byrole_foredit_'. $roleid, 1, variable_get('npbr_foredit_'. $node->type .'_default_'. $roleid, 0));
+        $row = array(t($roles_array[$roleid]),
+	form_checkbox(NULL, 'node_privacy_byrole_forview_'. $roleid, 1, variable_get('npbr_forview_'. $node->type .'_default_'. $roleid, 0)),
+        form_checkbox(NULL, 'node_privacy_byrole_foredit_'. $roleid, 1, variable_get('npbr_foredit_'. $node->type .'_default_'. $roleid, 0)));
+	$rows[] = $row;
       }
     }
   }
 
-  $formgroup_view = form_group('View Permissions', $formitems_view, 'Select which users can view your post based on their role.');
-  $formgroup_edit = form_group('Edit Permissions', $formitems_edit, 'Select which users can edit your post based on their role.');
-  return ($formgroup_view . $formgroup_edit);
+  $perms_table = theme('table', $header, $rows);
+  $formgroup_perms = form_group('View/Edit Permissions', $perms_table, 'Select which users can view/edit your post based on their role.');
+  return ($formgroup_perms);
 }
 
 function node_privacy_byrole_settings() {
@@ -446,4 +456,4 @@
   }
 }
 
-?>
\ No newline at end of file
+?>