Index: modr8_admin.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/modr8/modr8_admin.inc,v retrieving revision 1.2.2.11 diff -u -r1.2.2.11 modr8_admin.inc --- modr8_admin.inc 13 Dec 2007 00:58:46 -0000 1.2.2.11 +++ modr8_admin.inc 29 Jan 2008 09:39:20 -0000 @@ -13,6 +13,17 @@ ), '#default_value' => variable_get('modr8_default_option', 'nada'), ); + + $form['modr8_visibility'] = array( + '#type' => 'radios', + '#title' => t('Default view mode'), + '#options' => array( + 1 => t('display'), + 0 => t('hide'), + ), + '#default_value' => variable_get('modr8_visibility', 0), + '#description' => t('Choose if you want to hide or display content in moderation.') + ); $form['modr8_nodes_per_page'] = array( '#type' => 'select', Index: modr8.module =================================================================== RCS file: /cvs/drupal/contributions/modules/modr8/modr8.module,v retrieving revision 1.5.2.12 diff -u -r1.5.2.12 modr8.module --- modr8.module 16 Aug 2007 02:58:04 -0000 1.5.2.12 +++ modr8.module 29 Jan 2008 09:39:20 -0000 @@ -113,6 +113,8 @@ * Implementation of hook_nodeapi */ function modr8_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) { + $visible = variable_get('modr8_visibility', 0); + // add messages here.. switch ($op) { case 'load': @@ -124,7 +126,7 @@ } break; case 'view': - if ($node->moderate && empty($node->modr8_form_teaser) && empty($node->in_preview)) { + if ($node->moderate && empty($node->modr8_form_teaser) && empty($node->in_preview) && !$visible) { $node->content['modr8_message'] = array( '#value' => theme('modr8_message', $teaser, $node->type, 'view'), '#weight' => -100, @@ -150,6 +152,7 @@ } function modr8_form_alter($form_id, &$form){ + $visible = variable_get('modr8_visibility', 0); if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) { @@ -171,7 +174,7 @@ '#type' => 'value', '#value' => $form['#node']->moderate, ); - if ($form['#node']->moderate) { + if ($form['#node']->moderate && !$visible) { $form['modr8_message'] = array( '#value' => theme('modr8_message', FALSE, $form['#node']->type, 'node_form'), '#weight' => -100, @@ -214,10 +217,12 @@ * Implementation of hook_db_rewrite_sql(). */ function modr8_db_rewrite_sql($query, $primary_table, $primary_field, $args) { + $invisible = variable_get('modr8_visibility', 0); + switch ($primary_field) { case 'nid': // this query deals with node objects - $access = (user_access('administer nodes') || user_access('moderate content')); + $access = ((user_access('administer nodes') || user_access('moderate content')) OR $invisible); if (!$access) { global $user; $return = array();