? private_settings_configuration.patch
Index: private.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/private/Attic/private.module,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 private.module
--- private.module	28 Jan 2007 21:31:40 -0000	1.1.2.2
+++ private.module	3 Mar 2007 17:13:52 -0000
@@ -2,55 +2,30 @@
 // $Id: private.module,v 1.1.2.2 2007/01/28 21:31:40 eaton Exp $
 
 /**
- * @file
- * This is an example illustrating how to restrict access to nodes based on 
- * some criterion associated with the user.
- *
- * This example module will simply set a single flag on a node: 'private'. If
- * the flag is set, only users with the 'view private content' flag can see
- * the node, and all users with 'edit private content' can edit (but not 
- * delete) the node.
- *
- * Additionally we will ensure that the node author can always view, edit,
- * and delete the node by providing an additional access realm that grants
- * privileges to the node's author.
- *
- * Database definition:
- * @code
- *   CREATE TABLE private (
- *     nid int(10) unsigned NOT NULL default '0' PRIMARY KEY,
- *     private int,
- *     KEY `node_example_nid` (nid)
- *   )
- * @endcode
- */
-
-
-/**
- * Implementation of hook_enable().
- *
- * A node access module needs to force a rebuild of the node access table
- * when it is enabled to ensure that things are set up.
- */
+* Implementation of hook_enable().
+*
+* A node access module needs to force a rebuild of the node access table
+* when it is enabled to ensure that things are set up.
+*/
 function private_enable() {
   node_access_rebuild();
 }
 
 /**
- * Implementation of hook_disable().
- *
- * A node access module needs to force a rebuild of the node access table
- * when it is disabled to ensure that its entries are removed from the table.
- */
+* Implementation of hook_disable().
+*
+* A node access module needs to force a rebuild of the node access table
+* when it is disabled to ensure that its entries are removed from the table.
+*/
 function private_disable() {
   private_disabling(TRUE);
   node_access_rebuild();
 }
 
 /**
- * Simple function to make sure we don't respond with grants when disabling
- * ourselves.
- */
+* Simple function to make sure we don't respond with grants when disabling
+* ourselves.
+*/
 function private_disabling($set = NULL) {
   static $disabling = false;
   if ($set !== NULL) {
@@ -60,136 +35,187 @@
 }
 
 /**
- * Implementation of hook_perm().
- *
- * In this example, we will use a simple permission to determine whether a user
- * has access to "private" content. This permission is defined here.
- */
+* Implementation of hook_perm().
+*
+* In this example, we will use a simple permission to determine whether a user
+* has access to "private" content. This permission is defined here.
+*/
 function private_perm() {
   return array('mark content as private', 'access private content', 'edit private content');
 }
 
 /**
- * Implementation of hook_node_grants().
- *
- * Tell the node access system what GIDs the user belongs to for each realm.
- * In this example, we are providing two realms: the example realm, which
- * has just one group id (1) and the user is either a member or not depending
- * upon the operation and the access permission set.
- *
- * We are also setting up a realm for the node author, though, to give it
- * special privileges. That has 1 GID for every UID, and each user is
- * automatically a member of the group where GID == UID.
- *
- */
+* Implementation of hook_menu().
+*/
+function private_menu($may_cache) {
+  global $user;
+  $items = array();
+  if ($may_cache) {
+    $items[] = array('path' => 'admin/content/private', 
+      'callback' => 'drupal_get_form', 
+      'callback arguments' => array('private_admin_settings'), 
+      'title' => t('Private configuration'), 
+      'description' => t('Configure the private module'), 
+      'weight' => 0,);
+  }
+  else {
+  }
+  return $items;
+}
+
+/**
+* Implementation of hook_admin_sttings().
+*/
+function private_admin_settings() {
+  // Add a setting for private priority level control in admin/content/node-settings
+  $form['private_priority'] = array('#type' => 'fieldset', '#title' => t('Priority control'), '#collapsible' => TRUE, '#collapsed' => FALSE);
+  $form['private_priority']['private_priority_level'] = array(
+    '#title' => t('Priority level control'),
+    '#type' => 'weight',
+    '#default_value' => variable_get('private_priority_level', 0),
+    '#delta' => 10,
+    '#description' => t('Private priority over other access control modules. Leave it at 0 to bypass the priority system'),
+    );
+  
+  // Add a selectbox to define which content-types can be set as private
+  $form['private_content_types'] = array('#type' => 'fieldset', '#title' => t('Content types control'), '#description' => '', '#collapsible' => TRUE, '#collapsed' => FALSE);
+  $types = node_get_types();
+  foreach ($types as $type) {
+    $options[$type->type] = t($type->name);
+  }
+  $form['private_content_types']['private_enabled_content_types'] = array(
+    '#type' => 'select', 
+    '#multiple' => TRUE,
+    '#title' => t('Enabled content types'), 
+    '#default_value' => variable_get('private_enabled_content_types', array()),
+    '#options' => $options,
+    '#description' => t('Let authors set posts of theese content types to %p.', array('%p' => 'private')),
+    );
+  return system_settings_form($form);
+}
+
+/**
+* Implementation of hook_node_grants().
+*
+* Tell the node access system what GIDs the user belongs to for each realm.
+* In this example, we are providing two realms: the private realm, which
+* has just one group id (1) and the user is either a member or not depending
+* upon the operation and the access permission set.
+*
+* We are also setting up a realm for the node author, though, to give it
+* special privileges. That has 1 GID for every UID, and each user is
+* automatically a member of the group where GID == UID.
+*
+*/
 function private_node_grants($account, $op) {
   if ($op == 'view' && user_access('access private content', $account)) {
-    $grants['example'] = array(1);
+    $grants['private'] = array(1);
   }
-
+  
   if (($op == 'update' || $op == 'delete') && user_access('edit private content', $account)) {
-    $grants['example'] = array(1);
+    $grants['private'] = array(1);
   }
-
-  $grants['example_author'] = array($account->uid);
+  
+  $grants['private_author'] = array($account->uid);
   return $grants;
 }
 
 /**
- * Implementation of hook_node_access_records().
- *
- * All node access modules must implement this hook. If the module is
- * interested in the privacy of the node passed in, return a list
- * of node access values for each grant ID we offer. Since this
- * example module only offers 1 grant ID, we will only ever be
- * returning one record.
- */
+* Implementation of hook_node_access_records().
+*
+* All node access modules must implement this hook. If the module is
+* interested in the privacy of the node passed in, return a list
+* of node access values for each grant ID we offer. Since this
+* example module only offers 1 grant ID, we will only ever be
+* returning one record.
+*/
 function private_node_access_records($node) {
   if (private_disabling()) {
     return;
   }
-
+  
   // We only care about the node if it's been marked private. If not, it is
   // treated just like any other node and we completely ignore it.
   if ($node->private) {
     $grants = array();
     $grants[] = array(
-      'realm' => 'example', 
+      'realm' => 'private', 
       'gid' => TRUE, 
       'grant_view' => TRUE, 
       'grant_update' => FALSE, 
       'grant_delete' => FALSE,
-      'priority' => 0,
-    );
-
+      'priority' => variable_get('private_priority_level', 0),
+      );
+    
     // For the example_author array, the GID is equivalent to a UID, which
     // means there are many many groups of just 1 user. 
     $grants[] = array(
-      'realm' => 'example_author', 
+      'realm' => 'private_author', 
       'gid' => $node->uid, 
       'grant_view' => TRUE, 
       'grant_update' => TRUE, 
       'grant_delete' => TRUE,
-      'priority' => 0,
-    );
+      'priority' => variable_get('private_priority_level', 0),
+      );
     return $grants;
   }
 }
 
 /**
- * Implementation of hook_form_alter()
- *
- * This module adds a simple checkbox to the node form labeled private. If the
- * checkbox is labelled, only the node author and users with 'access private content' 
- * privileges may see it. 
- */
+* Implementation of hook_form_alter()
+*
+* This module adds a simple checkbox to the node form labeled private. If the
+* checkbox is labelled, only the node author and users with 'access private content' 
+* privileges may see it. 
+*/
 function private_form_alter($form_id, &$form) {
   if ($form['#id'] == 'node-form') {
-    if (user_access('mark content as private')) {
+    if (user_access('mark content as private') && in_array($form['type']['#value'], variable_get('private_enabled_content_types', array()))) {
       $form['private'] = array(
         '#type' => 'checkbox',
         '#title' => t('Private'),
         '#return_value' => 1,
         '#description' => t('Check here if this content should be set private and only shown to authorized users.'),
         '#default_value' => $form['#node']->private,
-      );
+        );
     }
     else {
       $form['private'] = array(
         '#type' => 'hidden',
         '#value' => $form['#node']->private,
-      );
+        );
     }
   }
 }
 
+
 /**
- * Implementation of hook_nodeapi().
- *
- * - "delete", "insert", and "update":
- * The module must track the access status of the node.
- */
+* Implementation of hook_nodeapi().
+*
+* - "delete", "insert", and "update":
+* The module must track the access status of the node.
+*/
 function private_nodeapi(&$node, $op, $arg = 0) {
   switch ($op) {
-    case 'load':
-      $result = db_fetch_object(db_query('SELECT * FROM {private} WHERE nid = %d', $node->nid));
-      $node->private = $result->private;
-      break;
-    case 'delete':
-      db_query('DELETE FROM {private} WHERE nid = %d', $node->nid);
-      break;
-    case 'insert':
+  case 'load':
+    $result = db_fetch_object(db_query('SELECT * FROM {private} WHERE nid = %d', $node->nid));
+    $node->private = $result->private;
+    break;
+  case 'delete':
+    db_query('DELETE FROM {private} WHERE nid = %d', $node->nid);
+    break;
+  case 'insert':
+    db_query('INSERT INTO {private} (nid, private) VALUES (%d, %d)', $node->nid, $node->private);
+    break;
+  case 'update':
+    $already_exists = db_result(db_query('SELECT 1 FROM {private} WHERE nid = %d', $node->nid));
+    if ($already_exists) {
+      db_query('UPDATE {private} SET private = %d WHERE nid = %d', $node->private, $node->nid);
+    }
+    elseif ($node->private) {
       db_query('INSERT INTO {private} (nid, private) VALUES (%d, %d)', $node->nid, $node->private);
-      break;
-    case 'update':
-      $already_exists = db_result(db_query('SELECT 1 FROM {private} WHERE nid = %d', $node->nid));
-      if ($already_exists) {
-        db_query('UPDATE {private} SET private = %d WHERE nid = %d', $node->private, $node->nid);
-      }
-      elseif ($node->private) {
-        db_query('INSERT INTO {private} (nid, private) VALUES (%d, %d)', $node->nid, $node->private);
-      }
-      break;
+    }
+    break;
   }
 }
 
@@ -202,10 +228,10 @@
   if ($file = db_fetch_object($result)) {
     $node = node_load($file->nid);
     if ($node->private == 1) {
-        if (node_access('view', $node) == FALSE) {
-            return -1;
-        }
+      if (node_access('view', $node) == FALSE) {
+        return -1;
       }
+    }
   }
 }