'. t('Blocks are the boxes of related/grouped data that are visible in the sidebar(s) of your web site. These are usually generated automatically by modules (e.g. recent forum topics), but administrators can also create their own defined blocks.') .'
'; - $output .= ''. t('The sidebar each block appears in depends on both which theme you are using (some are left-only, some right, some both), and on the settings in block management.') .'
'; - $output .= ''. t('The block management screen lets you specify the vertical sort-order of the blocks within a sidebar. You do this by assigning a weight to each block. Lighter blocks (smaller weight) "float up" towards the top of the sidebar. Heavier ones "sink down" towards the bottom of it.') .'
'; + $output = ''. t('Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. Blocks are usually generated automatically by modules (e.g., Recent Forum Topics), but administrators can also define custom blocks.') .'
'; + $output .= ''. t('The region each block appears in depends on both which theme you are using (some themes allow greater control over block placement than others), and on the settings in the block administration section.') .'
'; + $output .= ''. t('The block administration screen lets you specify the vertical placement of the blocks within a region. You do this by assigning a weight to each block. Lighter blocks (those having a smaller weight) "float up" towards the top of the region; heavier ones "sink".') .'
'; $output .= t('A block\'s visibility depends on:
'. t('Module blocks are available when modules are enabled. These blocks can be administered in block administration.') .'
'; + $output .= ''. t('Some modules generate blocks that become available when the modules are enabled. These blocks can be administered from the block administration screen (administer >> blocks)', array('%admin-block' => url('admin/block'))) .'
'; $output .= ''. t('An administrator defined block contains content supplied by the administrator. Each admin-defined block consists of a title, a description, and a body which can be as long as you wish. The Drupal engine will render the content of the block.') .'
'; + $output .= ''. t('An administrator-defined block contains content defined by the administrator. Each such block consists of a title, a description, and a body, which can be as long as you wish. Blocks content can be in any of the input formats supported for other content.') .'
'; $output .= t('You can
'. t('For more information please read the configuration and customization handbook Block page.', array('%block' => 'http://drupal.org/handbook/modules/block/')) .'
'; @@ -40,9 +42,10 @@ return t('Controls the boxes that are displayed around the main content.'); case 'admin/block': return t(" -Blocks are content rendered into regions, often boxes in the left and right side bars of the web site. They are made available by modules or created manually.
-Only enabled blocks are shown. You can position the blocks by deciding which area of the page they will show up on (e.g., a sidebar) and in which order they appear (weight). Highlighting on this page shows the regions where content will be rendered.
+Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. They are usually generated automatically by modules, but administrators can create blocks manually.
+Only enabled blocks are shown. You can position blocks by specifying which area of the page they should appear in (e.g., a sidebar). Highlighted labels on this page show the regions into which blocks can be rendered. You can specify where within a region a block will appear by adjusting its weight.
If you want certain blocks to disable themselves temporarily during high server loads, check the 'Throttle' box. You can configure the auto-throttle on the throttle configuration page after having enabled the throttle module.
+You can configure the behaviour of each block (e.g., specifying on which pages and for what users it will appear) by clicking the 'configure' link for each block.
", array('%throttle' => url('admin/settings/throttle'))); case 'admin/block/add': return t('Here you can create a new block. Once you have created this block you must make it active and give it a place on the page using blocks. The title is used when displaying the block. The description is used in the "block" column on the blocks page.
', array('%overview' => url('admin/block'))); @@ -181,7 +184,7 @@ } // Otherwise, use any set values, or else substitute defaults. else { - $properties = array ('status' => 0, 'weight' => 0, 'region' => 'left', 'pages' => '', 'custom' => 0); + $properties = array('status' => 0, 'weight' => 0, 'region' => 'left', 'pages' => '', 'custom' => 0); foreach ($properties as $property => $default) { if (!isset ($block[$property])) { $block[$property] = $default; @@ -191,7 +194,16 @@ // reinsert blocks into table db_query("INSERT INTO {blocks} (module, delta, theme, status, weight, region, visibility, pages, custom, throttle) VALUES ('%s', '%s', '%s', %d, %d, '%s', %d, '%s', %d, %d)", - $block['module'], $block['delta'], $theme_key, $block['status'], $block['weight'], $block['region'], $block['visibility'], $block['pages'], $block['custom'], $block['throttle']); + $block['module'], + $block['delta'], + $theme_key, + $block['status'], + $block['weight'], + $block['region'], + $block['visibility'], + $block['pages'], + $block['custom'], + $block['throttle']); $blocks[] = $block; // build array to sort on @@ -286,7 +298,7 @@ $rows = array(); if (count($regions)) { foreach ($regions as $region => $row) { - $region_title = t('%region', array ('%region' => ucfirst($block_regions[$region]))); + $region_title = t('%region', array('%region' => ucfirst($block_regions[$region]))); $rows[] = array(array('data' => $region_title, 'class' => 'region', 'colspan' => ($throttle ? 7 : 6))); $rows = array_merge($rows, $row); } @@ -319,13 +331,26 @@ $edit = db_fetch_array(db_query("SELECT pages, visibility, custom FROM {blocks} WHERE module = '%s' AND delta = '%s'", $module, $delta)); + $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; + } + + // get array of permitted roles + if (!count($default_role_options)) { + // nothing is set; make default 'visible to anonymous and authenticated users' + $default_role_options = array(1, 2); + } + // Module-specific block configurations. if ($settings = module_invoke($module, 'block', 'configure', $delta)) { - $form['block_settings'] = array( - '#type' => 'fieldset', - '#title' => t('Block specific settings'), - '#collapsible' => true, - ); + $form['block_settings'] = + array( + '#type' => 'fieldset', + '#title' => t('Block specific settings'), + '#collapsible' => true, + ); foreach ($settings as $k => $v) { $form['block_settings'][$k] = $v; @@ -346,7 +371,10 @@ $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'], ); @@ -355,6 +383,27 @@ '#title' => t('Page specific visibility settings'), '#collapsible' => true, ); + + $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('Block visibility by role'), + '#default_value' => $default_role_options, + '#options' => $role_options, + '#weight' => -15, + '#description' => t('Show this block only for the selected role(s). You may select multiple roles. If you select no roles, the block will be visible to all users.'), + ); + $access = user_access('use PHP for block visibility'); if ($edit['visibility'] == 2 && !$access) { @@ -402,7 +451,19 @@ 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("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 $selection => $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(); @@ -573,9 +634,15 @@ global $user, $theme_key; static $blocks = array(); + static $user_roles = array(); + + if (!count($user_roles)) { + // get the user's role (as rids) + $user_roles = array_keys($user->roles); + } 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 OUTER 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(',', $user_roles)); while ($block = db_fetch_object($result)) { if (!isset($blocks[$block->region])) { $blocks[$block->region] = array(); @@ -631,5 +698,3 @@ } return $blocks[$region]; } - -