### Eclipse Workspace Patch 1.0
#P komimo
Index: sites/all/modules/contrib/override_node_options/override_node_options.module
===================================================================
--- sites/all/modules/contrib/override_node_options/override_node_options.module	(revision 74)
+++ sites/all/modules/contrib/override_node_options/override_node_options.module	(working copy)
@@ -47,83 +47,81 @@
  * These settings are to control the collapsed and collapsible settings.
  */
 function override_node_options_admin_settings() {
-	    if(module_exists(upload)){
-	    $form['attachments'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('File attachments'),
-        '#description' => t('Options for the File attachments fieldset on the node form.'),
-         );
+  if (module_exists('upload')) {
+    $form['attachments'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('File attachments'),
+      '#description' => t('Options for the File attachments fieldset on the node form.'),
+    );
 
-	    $form['attachments']['override_node_options_facollapsible'] = array(
-		'#type' => 'checkbox',
-		'#title' => t('File attachments collapsible'),
-		'#default_value' => variable_get('override_node_options_facollapsible', 1),
-		);
-		$form['attachments']['override_node_options_facollapsed'] = array(
-		'#type' => 'checkbox',
-		'#title' => t('File attachments collapsed by default'),
-		'#default_value' => variable_get('override_node_options_facollapsed', 1),
-		);
-	    }
-		if(module_exists(scheduler)){
-		$form['scheduler_settings'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Scheduler settings'),
-        '#description' => t('Options for the Scheduler settings fieldset on the node form.'),
-         );
+    $form['attachments']['override_node_options_facollapsible'] = array(
+	  '#type' => 'checkbox',
+	  '#title' => t('File attachments collapsible'),
+	  '#default_value' => variable_get('override_node_options_facollapsible', 1),
+	);
+	$form['attachments']['override_node_options_facollapsed'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('File attachments collapsed by default'),
+      '#default_value' => variable_get('override_node_options_facollapsed', 1),
+	);
+  }
+  
+  if (module_exists('scheduler')) {
+    $form['scheduler_settings'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Scheduler settings'),
+      '#description' => t('Options for the Scheduler settings fieldset on the node form.'),
+     );
+    
+    $form['scheduler_settings']['override_node_options_sscollapsible'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Scheduler settings collapsible'),
+      '#default_value' => variable_get('override_node_options_sscollapsible', 1),
+    );
+    $form['scheduler_settings']['override_node_options_sscollapsed'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Scheduler settings collapsed by default'),
+      '#default_value' => variable_get('override_node_options_sscollapsed', 1),
+    );
+  }
 
-	    $form['scheduler_settings']['override_node_options_sscollapsible'] = array(
-		'#type' => 'checkbox',
-		'#title' => t('Scheduler settings collapsible'),
-		'#default_value' => variable_get('override_node_options_sscollapsible', 1),
-		);
-		$form['scheduler_settings']['override_node_options_sscollapsed'] = array(
-		'#type' => 'checkbox',
-		'#title' => t('Scheduler settings collapsed by default'),
-		'#default_value' => variable_get('override_node_options_sscollapsed', 1),
-		);
-		}
-		
-		if(module_exists(node)){	
-        $form['authoring_information'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Authoring information'),
-        '#description' => t('Options for the Authoring information fieldset on the node form.'),
-         );
+  if(module_exists('node')){	
+    $form['authoring_information'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Authoring information'),
+      '#description' => t('Options for the Authoring information fieldset on the node form.'),
+     );
+    
+    $form['authoring_information']['override_node_options_aicollapsible'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Authoring information collapsible'),
+      '#default_value' => variable_get('override_node_options_aicollapsible', 1),
+    );
+    $form['authoring_information']['override_node_options_aicollapsed'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Authoring information collapsed by default'),
+      '#default_value' => variable_get('override_node_options_aicollapsed', 1),
+    );
+  }
 
-	    $form['authoring_information']['override_node_options_aicollapsible'] = array(
-		'#type' => 'checkbox',
-		'#title' => t('Authoring information collapsible'),
-		'#default_value' => variable_get('override_node_options_aicollapsible', 1),
-		);
-		$form['authoring_information']['override_node_options_aicollapsed'] = array(
-		'#type' => 'checkbox',
-		'#title' => t('Authoring information collapsed by default'),
-		'#default_value' => variable_get('override_node_options_aicollapsed', 1),
-		);
-		}
-		
-		if(module_exists(node)){	
-        $form['publishing_options'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Publishing options'),
-        '#description' => t('Options for the Publishing options fieldset on the node form.'),
-         );
-
-	    $form['publishing_options']['override_node_options_pocollapsible'] = array(
-		'#type' => 'checkbox',
-		'#title' => t('Publishing options collapsible'),
-		'#default_value' => variable_get('override_node_options_pocollapsible', 1),
-		);
-		$form['publishing_options']['override_node_options_pocollapsed'] = array(
-		'#type' => 'checkbox',
-		'#title' => t('Publishing options collapsed by default'),
-		'#default_value' => variable_get('override_node_options_pocollapsed', 1),
-		);
-		}
-		
-		return system_settings_form($form);
-		
+  if(module_exists('node')){	
+    $form['publishing_options'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Publishing options'),
+      '#description' => t('Options for the Publishing options fieldset on the node form.'),
+     );
+    $form['publishing_options']['override_node_options_pocollapsible'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Publishing options collapsible'),
+      '#default_value' => variable_get('override_node_options_pocollapsible', 1),
+    );
+    $form['publishing_options']['override_node_options_pocollapsed'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Publishing options collapsed by default'),
+      '#default_value' => variable_get('override_node_options_pocollapsed', 1),
+    );
+  }
+  return system_settings_form($form);	
 }
 
 /**
@@ -133,93 +131,102 @@
   if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id && !user_access('administer nodes')) {
     $node = $form['#node'];
     
-    if(user_access('override ' . $form['type']['#value'] . ' published option') || user_access('override ' . $form['type']['#value'] . ' promote to front page option') || user_access('override ' . $form['type']['#value'] . ' sticky option') || user_access('override ' . $form['type']['#value'] . ' revision option')){
+    if (user_access('override ' . $form['type']['#value'] . ' published option') || 
+    user_access('override ' . $form['type']['#value'] . ' promote to front page option') || 
+    user_access('override ' . $form['type']['#value'] . ' sticky option') || 
+    user_access('override ' . $form['type']['#value'] . ' revision option')) {
     
-    $form['options'] = array(
-          '#type' => 'fieldset',
-          '#title' => t('Publishing options'),
-          '#collapsible' => variable_get('override_node_options_collapsible', 1),
-          '#collapsed' => variable_get('override_node_options_collapsed', 1), '#weight' => 25);
+      $form['options'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Publishing options'),
+        '#collapsible' => variable_get('override_node_options_collapsible', 1),
+        '#collapsed' => variable_get('override_node_options_collapsed', 1), '#weight' => 25,
+      );
     }
-    if(user_access('override ' . $form['type']['#value'] . ' published option')){
-          $form['options']['override_publishing_status']   = array(
-          '#type' => 'checkbox',
-          '#title' => t('Published'),
-          '#default_value' => $node->status);
+    if (user_access('override ' . $form['type']['#value'] . ' published option')) {
+      $form['options']['override_publishing_status']   = array(
+        '#type' => 'checkbox',
+        '#title' => t('Published'),
+        '#default_value' => $node->status,
+      );
     }
     
-    if(user_access('override ' . $form['type']['#value'] . ' promote to front page option')){
-          $form['options']['override_publishing_promote']  = array(
-          '#type' => 'checkbox',
-          '#title' => t('Promoted to front page'),
-          '#default_value' => $node->promote);
+    if (user_access('override ' . $form['type']['#value'] . ' promote to front page option')) {
+      $form['options']['override_publishing_promote']  = array(
+      '#type' => 'checkbox',
+      '#title' => t('Promoted to front page'),
+      '#default_value' => $node->promote,
+      );
     }
     
-    if(user_access('override ' . $form['type']['#value'] . ' sticky option')){
-          $form['options']['override_publishing_sticky']   = array(
-          '#type' => 'checkbox', '#title' => t('Sticky at top of lists'),
-          '#default_value' => $node->sticky);
+    if (user_access('override ' . $form['type']['#value'] . ' sticky option')) {
+      $form['options']['override_publishing_sticky']   = array(
+      '#type' => 'checkbox', '#title' => t('Sticky at top of lists'),
+      '#default_value' => $node->sticky,
+      );
     }
     
-    if(user_access('override ' . $form['type']['#value'] . ' revision option')){
-          $form['options']['override_publishing_revision'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Create new revision'),
-          '#default_value' => $node->revision);
+    if (user_access('override ' . $form['type']['#value'] . ' revision option')) {
+      $form['options']['override_publishing_revision'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Create new revision'),
+      '#default_value' => $node->revision,
+      );
     }
-    if(user_access('override ' . $form['type']['#value'] . ' authored by option') || user_access('override ' . $form['type']['#value'] . ' authored on option')){
-    $form['author'] = array(
-          '#type' => 'fieldset',
-          '#title' => t('Authoring information'),
-          '#collapsible' => variable_get('override_node_options_collapsible', 1),
-          '#collapsed' => variable_get('override_node_options_collapsed', 1), '#weight' => 20);
+    
+    if (user_access('override ' . $form['type']['#value'] . ' authored by option') || 
+    user_access('override ' . $form['type']['#value'] . ' authored on option')) {
+      $form['author'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Authoring information'),
+        '#collapsible' => variable_get('override_node_options_collapsible', 1),
+        '#collapsed' => variable_get('override_node_options_collapsed', 1), '#weight' => 20,
+      );
     }
-    if(user_access('override ' . $form['type']['#value'] . ' authored by option')){
-          $form['author']['override_authored_by'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Authored by'),
-          '#maxlength' => 60,
-          '#default_value' => $node->name ? $node->name : '',
-          '#weight' => -1,
-          '#description' => t('Leave blank for %anonymous.', array('%anonymous' => variable_get('anonymous', t('Anonymous')))),
-          );
-          
-          // User must have permission 'access user profiles' for autocomplete
-        if (user_access('access user profiles')) {
-          $form['author']['override_authored_by']['#autocomplete_path'] = 'user/autocomplete';
-        }
+    if (user_access('override ' . $form['type']['#value'] . ' authored by option')) {
+      $form['author']['override_authored_by'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Authored by'),
+        '#maxlength' => 60,
+        '#default_value' => $node->name ? $node->name : '',
+        '#weight' => -1,
+        '#description' => t('Leave blank for %anonymous.', array('%anonymous' => variable_get('anonymous', t('Anonymous')))),
+      );   
+      // User must have permission 'access user profiles' for autocomplete
+      if (user_access('access user profiles')) {
+        $form['author']['override_authored_by']['#autocomplete_path'] = 'user/autocomplete';
+      }
 
-        }
+    }
     
-    if(user_access('override ' . $form['type']['#value'] . ' authored on option')){
-          $form['author']['override_authored_on'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Authored on'),
-          '#maxlength' => 25,
-          '#default_value' => $node->date,
-          '#description' => t('Format: %time. Leave blank to use the time of form submission.', array('%time' => !empty($node->date) ? $node->date : format_date($node->created, 'custom', 'Y-m-d H:i:s O'))),
-        );
-
+    if (user_access('override ' . $form['type']['#value'] . ' authored on option')) {
+      $form['author']['override_authored_on'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Authored on'),
+        '#maxlength' => 25,
+        '#default_value' => $node->date,
+        '#description' => t('Format: %time. Leave blank to use the time of form submission.', array('%time' => !empty($node->date) ? $node->date : format_date($node->created, 'custom', 'Y-m-d H:i:s O'))),
+      );
     }
   }
 
-   if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
-  	if(module_exists(node)){ 	
-  		$form['options']['#collapsible'] = variable_get('override_node_options_pocollapsible', 1);
-  		$form['options']['#collapsed'] = variable_get('override_node_options_pocollapsed', 1);
-  	}
-  	if(module_exists(node)){ 	
-  		$form['options']['#collapsible'] = variable_get('override_node_options_aicollapsible', 1);
-  		$form['options']['#collapsed'] = variable_get('override_node_options_aicollapsed', 1);
-  	}
-  	if(module_exists(upload)){
-  		$form['attachments']['#collapsible'] = variable_get('override_node_options_facollapsible', 1);
-  		$form['attachments']['#collapsed'] = variable_get('override_node_options_facollapsed', 1);
-  	}
-  	if(module_exists(scheduler)){
-  		$form['scheduler_settings']['#collapsible'] = variable_get('override_node_options_sscollapsible', 1);
-  		$form['scheduler_settings']['#collapsed'] = variable_get('override_node_options_sscollapsed', 1);
-  	}
+  if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
+    if(module_exists('node')){ 	
+      $form['options']['#collapsible'] = variable_get('override_node_options_pocollapsible', 1);
+      $form['options']['#collapsed'] = variable_get('override_node_options_pocollapsed', 1);
+    }
+    if(module_exists('node')){ 	
+      $form['options']['#collapsible'] = variable_get('override_node_options_aicollapsible', 1);
+      $form['options']['#collapsed'] = variable_get('override_node_options_aicollapsed', 1);
+    }
+    if(module_exists('upload')){
+      $form['attachments']['#collapsible'] = variable_get('override_node_options_facollapsible', 1);
+      $form['attachments']['#collapsed'] = variable_get('override_node_options_facollapsed', 1);
+    }
+    if(module_exists('scheduler')){
+      $form['scheduler_settings']['#collapsible'] = variable_get('override_node_options_sscollapsible', 1);
+      $form['scheduler_settings']['#collapsed'] = variable_get('override_node_options_sscollapsed', 1);
+    }
   }
 }
 
@@ -245,13 +252,13 @@
             $node->$real_key = $node->$override_key;
           }
         }
-        if(user_access('override authored on option')){
-        // Node creation date override
-        if ($node->date !== $node->override_authored_on || !empty($node->override_authored_on)) {
-         $node->created = !empty($node->override_authored_on) ? strtotime($node->override_authored_on) : time();
+        if (user_access('override ' . $node->type . ' authored on option')) {
+          // Node creation date override
+          if ($node->date !== $node->override_authored_on || !empty($node->override_authored_on)) {
+           $node->created = !empty($node->override_authored_on) ? strtotime($node->override_authored_on) : time();
+          }
         }
-        }
-        if ($node->name !== $node->override_authored_by) {
+        if (isset($node->override_authored_by) && ($node->name !== $node->override_authored_by)) {
           if (!empty($node->override_authored_by)) {
             $account = user_load(array('name' => $node->override_authored_by));
             $node->uid = $account->uid;
@@ -260,10 +267,7 @@
             $node->uid = 0;
           }
         }
-
-        
-        
       }
-      break;
+    break;
   }
 }