diff options
Diffstat (limited to 'modules/block.module')
| -rw-r--r-- | modules/block.module | 51 |
1 files changed, 42 insertions, 9 deletions
diff --git a/modules/block.module b/modules/block.module index 9d48ca777..588bb2918 100644 --- a/modules/block.module +++ b/modules/block.module @@ -22,6 +22,7 @@ function block_help($section) { <li>Its page visibility settings. Blocks can be configured to be visible/hidden on certain pages.</li> <li>Its custom visibility settings. Blocks can be configured to be visible only when specific conditions are true.</li> <li>Its user visibility settings. Administrators can choose to let users decide whether to show/hide certain blocks.</li> +<li>Its user-role visibility settings. Administrators can choose to let blocks be visible only for certain user roles.</li> <li>Its function. Some dynamic blocks, such as those generated by modules, will be displayed only on certain pages.</li> </ul> '); @@ -365,7 +366,7 @@ function block_admin_configure($module = NULL, $delta = 0) { $form['block_settings'] = array( '#type' => 'fieldset', '#title' => t('Block specific settings'), - '#collapsible' => true, + '#collapsible' => TRUE, ); foreach ($settings as $k => $v) { @@ -382,19 +383,48 @@ function block_admin_configure($module = NULL, $delta = 0) { $form['user_vis_settings'] = array( '#type' => 'fieldset', '#title' => t('User specific visibility settings'), - '#collapsible' => true, + '#collapsible' => TRUE, ); $form['user_vis_settings']['custom'] = array( '#type' => 'radios', '#title' => t('Custom visibility settings'), - '#options' => array(t('Users cannot control whether or not they see this block.'), t('Show this block by default, but let individual users hide it.'), t('Hide this block by default but let individual users show it.')), + '#options' => array( + t('Users cannot control whether or not they see this block.'), + t('Show this block by default, but let individual users hide it.'), + t('Hide this block by default but let individual users show it.') + ), '#description' => t('Allow individual users to customize the visibility of this block in their account settings.'), '#default_value' => $edit['custom'], ); + + // Role-based visibility settings + $default_role_options = array(); + $result = db_query("SELECT rid FROM {blocks_roles} WHERE module = '%s' AND delta = '%s'", $module, $delta); + while ($role = db_fetch_object($result)) { + $default_role_options[] = $role->rid; + } + $result = db_query('SELECT rid, name FROM {role} ORDER BY name'); + $role_options = array(); + while ($role = db_fetch_object($result)) { + $role_options[$role->rid] = $role->name; + } + $form['role_vis_settings'] = array( + '#type' => 'fieldset', + '#title' => t('Role specific visibility settings'), + '#collapsible' => TRUE, + ); + $form['role_vis_settings']['roles'] = array( + '#type' => 'checkboxes', + '#title' => t('Show block for specific roles'), + '#default_value' => $default_role_options, + '#options' => $role_options, + '#description' => t('Show this block only for the selected role(s). If you select no roles, the block will be visible to all users.'), + ); + $form['page_vis_settings'] = array( '#type' => 'fieldset', '#title' => t('Page specific visibility settings'), - '#collapsible' => true, + '#collapsible' => TRUE, ); $access = user_access('use PHP for block visibility'); @@ -444,6 +474,10 @@ function block_admin_configure_validate($form_id, $form_values) { function block_admin_configure_submit($form_id, $form_values) { if (!form_get_errors()) { db_query("UPDATE {blocks} SET visibility = %d, pages = '%s', custom = %d WHERE module = '%s' AND delta = '%s'", $form_values['visibility'], $form_values['pages'], $form_values['custom'], $form_values['module'], $form_values['delta']); + db_query("DELETE FROM {blocks_roles} WHERE module = '%s' AND delta = '%s'", $form_values['module'], $form_values['delta']); + foreach (array_filter($form_values['roles']) as $rid) { + db_query("INSERT INTO {blocks_roles} (rid, module, delta) VALUES (%d, '%s', '%s')", $rid, $form_values['module'], $form_values['delta']); + } module_invoke($form_values['module'], 'block', 'save', $form_values['delta'], $form_values); drupal_set_message(t('The block configuration has been saved.')); cache_clear_all(); @@ -540,7 +574,7 @@ function block_box_save($edit, $delta = NULL) { else { db_query("INSERT INTO {boxes} (title, body, info, format) VALUES ('%s', '%s', '%s', %d)", $edit['title'], $edit['body'], $edit['info'], $edit['format']); } - return true; + return TRUE; } /** @@ -550,10 +584,11 @@ function block_box_save($edit, $delta = NULL) { * the site. */ function block_user($type, $edit, &$user, $category = NULL) { + global $user; switch ($type) { case 'form': if ($category == 'account') { - $result = db_query('SELECT * FROM {blocks} WHERE status = 1 AND custom != 0 ORDER BY weight, module, delta'); + $result = db_query("SELECT DISTINCT b.* FROM {blocks} b LEFT JOIN {blocks_roles} r ON b.module = r.module AND b.delta = r.delta WHERE b.status = 1 AND b.custom != 0 AND (r.rid IN (%s) OR r.rid IS NULL) ORDER BY b.weight, b.module", implode(',', array_keys($user->roles))); $form['block'] = array('#type' => 'fieldset', '#title' => t('Block configuration'), '#weight' => 3, '#collapsible' => TRUE, '#tree' => TRUE); while ($block = db_fetch_object($result)) { $data = module_invoke($block->module, 'block', 'list'); @@ -600,7 +635,7 @@ function block_list($region) { static $blocks = array(); if (!count($blocks)) { - $result = db_query("SELECT * FROM {blocks} WHERE theme = '%s' AND status = 1 ORDER BY region, weight, module", $theme_key); + $result = db_query("SELECT DISTINCT b.* FROM {blocks} b LEFT JOIN {blocks_roles} r ON b.module = r.module AND b.delta = r.delta WHERE b.theme = '%s' AND b.status = 1 AND (r.rid IN (%s) OR r.rid IS NULL) ORDER BY b.region, b.weight, b.module", $theme_key, implode(',', array_keys($user->roles))); while ($block = db_fetch_object($result)) { if (!isset($blocks[$block->region])) { $blocks[$block->region] = array(); @@ -656,5 +691,3 @@ function block_list($region) { } return $blocks[$region]; } - - |