--- X:/Homepages/drupal/module/_0809/filterbynodetype/filterbynodetype.module	Mon Jun 11 07:55:26 2007
+++ X:/Homepages/drupal/module/_0809/_issues/filterbynodetype_default filter/filterbynodetype.module	Sat Sep 13 18:37:26 2008
@@ -1,5 +1,5 @@
 <?php
-// $Id: filterbynodetype.module,v 1.1.2.1 2007/06/11 05:55:25 crell Exp $
+// $Id: filterbynodetype.module,v 1.1.2.1.x 2007/09/13 05:55:25 crell Exp $
 
 /**
  * Implementation of hook_menu
@@ -23,12 +23,20 @@
   return $items;
 }
 
+/**
+ * Implementation of hook_perm
+ */
+function filterbynodetype_perm() {
+	return array('filterbynodetype: administer filters', 'filterbynodetype: set every filter');
+}
+
 
 /**
  * Implementation of hook_form_alter
  */
 function filterbynodetype_form_alter($form_id, &$form) {
-  if (isset($form['type']) && 'node-form' == $form['#id']) {
+  //Only restrict filters forn non administrative users - permissions set on admin/user/access 
+  if (!user_access('filterbynodetype: set every filter') && isset($form['type']) && 'node-form' == $form['#id']) {
     $type = $form['type']['#value'];
     $formats =& $form['body_filter']['format'];
     foreach (element_children($formats) as $element) {
@@ -77,10 +85,11 @@
   
   $types = node_get_types();
   $formats = filter_formats();
-  
+  $options = array();
   // Switch around to be filter-first.  Row-major order
   
   foreach ($formats as $format) {
+    $options[$format->format] = $format->name; //needed for Format default selection
     $form['format_' . $format->format] = array(
       '#type' => 'fieldset',
       '#title' => t($format->name),
@@ -96,6 +105,23 @@
       );
     }
   }
+  //FORMAT DEFAULT selection
+  $form['format_default'] = array(
+      '#type' => 'fieldset',
+      '#title' => t("Default Format"),
+      '#collapsible' => TRUE,
+      '#collapsed' => FALSE,
+      '#tree' => FALSE,
+    );
+    foreach ($types as $type) {
+      $form['format_default']['filterbynodetype_default_' . $type->type] = array(
+        '#type' => 'select',
+		'#options' => $options,
+        '#title' => t($type->name),
+        '#default_value' => variable_get('filterbynodetype_default_' . $type->type, 0),
+      );
+    }
+
 
   return system_settings_form($form);
 }
@@ -128,4 +154,27 @@
   $output .= drupal_render($form);
 
   return $output;
+}
+
+//Adds Default Filter to Node handling
+function filterbynodetype_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
+
+	if (!$node->format) {
+		
+		//Get Default Format from settings
+		$default = variable_get('filterbynodetype_default_' . $node->type, 0);
+		$formats = filter_formats();
+		if ($default && in_array($default,array_keys($formats))) {
+			$default_format = $default;
+		}
+		//no node-type specific default format set or author is not allowed to use node-type specific default formatter
+		else {
+			//use site wide default formatter
+			$default_format = variable_get('filter_default_format', 1);
+		}
+		//GLOBAL $conf;
+		//$conf['filter_default_format'] = $default_format;
+		$node->format = $default_format;
+	}
+
 }