summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/comment/comment.module35
-rw-r--r--modules/menu/menu.module3
-rw-r--r--modules/node/node.module50
-rw-r--r--modules/path/path.module3
-rw-r--r--modules/upload/upload.module3
5 files changed, 50 insertions, 44 deletions
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 7aaed2fc7..4bb83df6c 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -281,27 +281,20 @@ function comment_form_alter($form_id, &$form) {
elseif (isset($form['type'])) {
if ($form['type']['#value'] .'_node_form' == $form_id) {
$node = $form['#node'];
- if (user_access('administer comments')) {
- $form['comment_settings'] = array(
- '#type' => 'fieldset',
- '#title' => t('Comment settings'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#weight' => 30,
- );
- $form['comment_settings']['comment'] = array(
- '#type' => 'radios',
- '#parents' => array('comment'),
- '#default_value' => $node->comment,
- '#options' => array(t('Disabled'), t('Read only'), t('Read/Write')),
- );
- }
- else {
- $form['comment_settings']['comment'] = array(
- '#type' => 'value',
- '#value' => $node->comment,
- );
- }
+ $form['comment_settings'] = array(
+ '#type' => 'fieldset',
+ '#access' => user_access('administer comments'),
+ '#title' => t('Comment settings'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#weight' => 30,
+ );
+ $form['comment_settings']['comment'] = array(
+ '#type' => 'radios',
+ '#parents' => array('comment'),
+ '#default_value' => $node->comment,
+ '#options' => array(t('Disabled'), t('Read only'), t('Read/Write')),
+ );
}
}
}
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index cac6dd2ee..e8c413585 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -187,7 +187,7 @@ function menu_perm() {
* Add menu item fields to the node form.
*/
function menu_form_alter($form_id, &$form) {
- if (user_access('administer menu') && isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
+ if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
$edit = isset($_POST['edit']) ? $_POST['edit'] : '';
$edit['nid'] = $form['nid']['#value'];
@@ -201,6 +201,7 @@ function menu_form_alter($form_id, &$form) {
$form['menu'] = array('#type' => 'fieldset',
'#title' => t('Menu settings'),
+ '#access' => user_access('administer menu'),
'#collapsible' => TRUE,
'#collapsed' => empty($item['title']),
'#tree' => TRUE,
diff --git a/modules/node/node.module b/modules/node/node.module
index 3f02171e7..b8ed3c4e2 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1899,28 +1899,38 @@ function node_form($node) {
}
$form['#node'] = $node;
- if (user_access('administer nodes')) {
- // Node author information
- $form['author'] = array('#type' => 'fieldset', '#title' => t('Authoring information'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => 20);
- $form['author']['name'] = array('#type' => 'textfield', '#title' => t('Authored by'), '#maxlength' => 60, '#autocomplete_path' => 'user/autocomplete', '#default_value' => $node->name ? $node->name : '', '#weight' => -1, '#description' => t('Leave blank for %anonymous.', array('%anonymous' => variable_get('anonymous', 'Anonymous'))));
- $form['author']['date'] = array('#type' => 'textfield', '#title' => t('Authored on'), '#maxlength' => 25, '#description' => t('Format: %time. Leave blank to use the time of form submission.', array('%time' => $node->date)));
-
- if (isset($node->nid)) {
- $form['author']['date']['#default_value'] = $node->date;
- }
+ // Node author information for administrators
+ $form['author'] = array(
+ '#type' => 'fieldset',
+ '#access' => user_access('administer nodes'),
+ '#title' => t('Authoring information'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#weight' => 20,
+ );
+ $form['author']['name'] = array('#type' => 'textfield', '#title' => t('Authored by'), '#maxlength' => 60, '#autocomplete_path' => 'user/autocomplete', '#default_value' => $node->name ? $node->name : '', '#weight' => -1, '#description' => t('Leave blank for %anonymous.', array('%anonymous' => variable_get('anonymous', 'Anonymous'))));
+ $form['author']['date'] = array('#type' => 'textfield', '#title' => t('Authored on'), '#maxlength' => 25, '#description' => t('Format: %time. Leave blank to use the time of form submission.', array('%time' => $node->date)));
- // Node options for administrators
- $form['options'] = array('#type' => 'fieldset', '#title' => t('Publishing options'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => 25);
- $form['options']['status'] = array('#type' => 'checkbox', '#title' => t('Published'), '#default_value' => $node->status);
- $form['options']['promote'] = array('#type' => 'checkbox', '#title' => t('Promoted to front page'), '#default_value' => $node->promote);
- $form['options']['sticky'] = array('#type' => 'checkbox', '#title' => t('Sticky at top of lists'), '#default_value' => $node->sticky);
- $form['options']['revision'] = array('#type' => 'checkbox', '#title' => t('Create new revision'), '#default_value' => $node->revision);
+ if (isset($node->nid)) {
+ $form['author']['date']['#default_value'] = $node->date;
}
- else {
- // Put all of these through as values if the user doesn't have access to them.
- foreach (array('uid', 'created') as $key) {
- $form[$key] = array('#type' => 'value', '#value' => $node->$key);
- }
+
+ // Node options for administrators
+ $form['options'] = array(
+ '#type' => 'fieldset',
+ '#access' => user_access('administer nodes'),
+ '#title' => t('Publishing options'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#weight' => 25,
+ );
+ $form['options']['status'] = array('#type' => 'checkbox', '#title' => t('Published'), '#default_value' => $node->status);
+ $form['options']['promote'] = array('#type' => 'checkbox', '#title' => t('Promoted to front page'), '#default_value' => $node->promote);
+ $form['options']['sticky'] = array('#type' => 'checkbox', '#title' => t('Sticky at top of lists'), '#default_value' => $node->sticky);
+ $form['options']['revision'] = array('#type' => 'checkbox', '#title' => t('Create new revision'), '#default_value' => $node->revision);
+ // These values are used when the user has no administrator accesss.
+ foreach (array('uid', 'created') as $key) {
+ $form[$key] = array('#type' => 'value', '#value' => $node->$key);
}
// Add the buttons.
diff --git a/modules/path/path.module b/modules/path/path.module
index 23457f940..2a4b10ee7 100644
--- a/modules/path/path.module
+++ b/modules/path/path.module
@@ -255,13 +255,14 @@ function path_nodeapi(&$node, $op, $arg) {
* Implementation of hook_form_alter().
*/
function path_form_alter($form_id, &$form) {
- if (user_access('create url aliases') && isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
+ if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
$path = $form['#node']->path;
$form['path'] = array(
'#type' => 'fieldset',
'#title' => t('URL path settings'),
'#collapsible' => TRUE,
'#collapsed' => empty($path),
+ '#access' => user_access('create url aliases'),
'#weight' => 30,
);
$form['path']['path'] = array(
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index 38f1398da..83427e717 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -360,13 +360,14 @@ function upload_form_alter($form_id, &$form) {
if (isset($form['type'])) {
$node = $form['#node'];
- if ($form['type']['#value'] .'_node_form' == $form_id && variable_get("upload_$node->type", TRUE) && user_access('upload files')) {
+ if ($form['type']['#value'] .'_node_form' == $form_id && variable_get("upload_$node->type", TRUE)) {
drupal_add_js('misc/progress.js');
drupal_add_js('misc/upload.js');
// Attachments fieldset
$form['attachments'] = array(
'#type' => 'fieldset',
+ '#access' => user_access('upload files'),
'#title' => t('File attachments'),
'#collapsible' => TRUE,
'#collapsed' => empty($node->files),
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 07:31:00 +0000