diff --git a/database/database.mysql b/database/database.mysql
index b1e9263255ea2687a08845801ce132306dfc58ea..884aa8b358f66e93b7c1c53604ff8bdf42587efb 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -121,9 +121,10 @@ CREATE TABLE blocks (
status tinyint(2) DEFAULT '0' NOT NULL,
weight tinyint(1) DEFAULT '0' NOT NULL,
region tinyint(1) DEFAULT '0' NOT NULL,
- path varchar(255) DEFAULT '' NOT NULL,
custom tinyint(2) DEFAULT '0' NOT NULL,
- throttle tinyint(1) DEFAULT '0' NOT NULL
+ throttle tinyint(1) DEFAULT '0' NOT NULL,
+ visibility tinyint(1) DEFAULT '0' NOT NULL,
+ pages text NOT NULL
) TYPE=MyISAM;
--
diff --git a/database/updates.inc b/database/updates.inc
index 894b825b03f791295f1ae2ef21bc05fda6649b09..444487244927d52fbafeef2716d58586c350cdbc 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -86,7 +86,7 @@
"2004-09-17" => "update_107",
"2004-10-16" => "update_108",
"2004-10-18" => "update_109",
- "2004-10-28: first update since Drupal 4.5.0 release" => "update_110"
+ "2004-10-31: first update since Drupal 4.5.0 release" => "update_110"
);
function update_32() {
@@ -1927,6 +1927,10 @@ function update_110() {
// TODO: needs PGSQL version
if ($GLOBALS['db_type'] == 'mysql') {
+ /*
+ ** Search
+ */
+
$ret[] = update_sql('DROP TABLE {search_index}');
$ret[] = update_sql("CREATE TABLE {search_index} (
word varchar(50) NOT NULL default '',
@@ -1946,8 +1950,18 @@ function update_110() {
) TYPE=MyISAM");
$ret[] = update_sql("DELETE FROM {variable} WHERE name = 'node_cron_last'");
+
+ /*
+ ** Blocks
+ */
+
+ $ret[] = update_sql('ALTER TABLE {blocks} DROP path');
+ $ret[] = update_sql('ALTER TABLE {blocks} ADD visibility tinyint(1) NOT NULL');
+ $ret[] = update_sql('ALTER TABLE {blocks} ADD pages text NOT NULL');
}
+ $ret[] = update_sql('UPDATE {blocks} SET status = 1, custom = 2 WHERE status = 0 AND custom = 1');
+
return $ret;
}
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 730615ea9443ee5541f0c74cd4b6fbe65834a5c3..2de00187ddca427e1f8cac3ee1fcd5d7743778fc 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -231,7 +231,7 @@ function aggregator_block($op, $delta) {
$block['feed:'. $feed->fid]['info'] = t('%title feed latest items', array('%title' => $feed->title));
}
}
- else {
+ else if ($op == 'view') {
list($type, $id) = split(':', $delta);
switch ($type) {
case 'feed':
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 730615ea9443ee5541f0c74cd4b6fbe65834a5c3..2de00187ddca427e1f8cac3ee1fcd5d7743778fc 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -231,7 +231,7 @@ function aggregator_block($op, $delta) {
$block['feed:'. $feed->fid]['info'] = t('%title feed latest items', array('%title' => $feed->title));
}
}
- else {
+ else if ($op == 'view') {
list($type, $id) = split(':', $delta);
switch ($type) {
case 'feed':
diff --git a/modules/archive.module b/modules/archive.module
index bcbd0f0c30d040e3b9939e84fbc2937c2af13b43..e4bc41fd1be839759e782cea17faee86b8331d69 100644
--- a/modules/archive.module
+++ b/modules/archive.module
@@ -182,7 +182,7 @@ function archive_block($op = 'list', $delta = 0) {
$blocks[0]['info'] = t('Calendar to browse archives');
return $blocks;
}
- else if (user_access('access content')) {
+ else if ($op == 'view' && user_access('access content')) {
$block['subject'] = t('Browse archives');
$block['content'] = archive_calendar();
return $block;
diff --git a/modules/archive/archive.module b/modules/archive/archive.module
index bcbd0f0c30d040e3b9939e84fbc2937c2af13b43..e4bc41fd1be839759e782cea17faee86b8331d69 100644
--- a/modules/archive/archive.module
+++ b/modules/archive/archive.module
@@ -182,7 +182,7 @@ function archive_block($op = 'list', $delta = 0) {
$blocks[0]['info'] = t('Calendar to browse archives');
return $blocks;
}
- else if (user_access('access content')) {
+ else if ($op == 'view' && user_access('access content')) {
$block['subject'] = t('Browse archives');
$block['content'] = archive_calendar();
return $block;
diff --git a/modules/block.module b/modules/block.module
index e1958424d25f1e73cbfd8a68a8fe70105a46f9e4..5383f3ac4c609307a8f1cceda0ef84fb5f55c7cc 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -12,20 +12,29 @@
function block_help($section) {
switch ($section) {
case 'admin/help#block':
- return t("
+ return t('
<p>Blocks are the boxes visible in the sidebar(s) of your web site. These are usually generated automatically by modules (e.g. recent forum topics), but you can also create your own blocks.</p>
-<p>The sidebar each block appears in depends on both which theme you're using (some are left-only, some right, some both), and on the settings in block management.</p><p>Whether a block is visible in the first place depends on four things:</p><ul><li>It must have its \"enabled\" box checked in block management.</li><li>If it has its \"custom\" box checked in block management, the user must have chosen to display it in their user preferences.</li><li>If the \"path\" field in block management is set, the visitor must be on a page that matches the path specification (more on this later).</li><li>If the block has its throttle box checked, the user will only see the block if the site throttle level is low.</li></ul>
-<p>The block management screen also lets you specify the vertical sort-order of the blocks within a sidebar. You do this by assigning a <strong>weight</strong> to each block. Lighter blocks (smaller weight) \"float up\" towards the top of the sidebar. Heavier ones \"sink down\" towards the bottom of it.</p>
-<p>The path setting lets you define the pages on which a specific block is visible. If you leave the path blank it will appear on all pages. The path uses a regular expression syntax so remember to escape special characters! The path expression is matched against the relative URL of a Drupal page, e.g. <code>book</code>, <code>node/12</code>, <code>admin</code>.</p>
-<p>In case you do not know what a regular expression is, you should read about them in the PHP manual. The chapter to look at is the one on <a href=\"%pcre\">Perl-Compatible Regular Expressions (PCRE)</a>.</p>
-<p>However, for basic tasks it is sufficient to look at the following examples:</p>
-<p>If the block should only show up on blog pages, use <^blog>. To display on all node views use <^node>. The angular brackets are used as delimiters of the regular expression. To show up on either forum or book pages use <^(forum|book)>. The round brackets form a group of expressions, divided by the | character. It matches if any of the expressions in it match. A more complicated example is <^node/add/(story|blog|image)>. Blocks which have their paths set to this expression will show up on story, block, or image composition pages. If you want to show a block an all pages, but not the search page, use <^(?!search)>.</p>
-<h3>Administrator Defined Blocks</h3>
-<p>An administrator defined block contains content supplied by you (as opposed to being generated automatically by a module). 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.</p>", array('%pcre' => 'http://php.net/pcre/'));
+<p>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.</p>
+<p>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.</p>
+<p>A block\'s visibility depends on:</p>
+<ul>
+<li>Its enabled checkbox. Disabled blocks are never shown.</li>
+<li>Its throttle checkbox. Throttled blocks are hidden during high server loads.</li>
+<li>Its path options. Blocks can be configured to only show/hide on certain pages</li>.
+<li>User settings. You can choose to let your users decide whether to show/hide certain blocks.</li>
+<li>Its function. Dynamic blocks (such as those defined by modules) may be empty on certain pages and will not be shown.</li>
+</ul>
+
+<h3>Administrator defined blocks</h3>
+<p>An administrator defined block contains content supplied by you (as opposed to being generated automatically by a module). 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.</p>');
case 'admin/modules#description':
return t('Controls the boxes that are displayed around the main content.');
case 'admin/block':
- return t("Blocks are the boxes in the left- and right- side bars of the web site, depending on the chosen theme. They are made available active modules or created manually. The \"enabled\" checkbox sets the default status of the block. Only enabled blocks are shown. When the \"custom\" checkbox is checked, your users can show or hide the block using their account settings. In that case, the 'enabled' checkbox signifies the block's default status. You can assign the block's placement by giving it a region and a weight. The region specifies which side of the page the block is on, and the weight sorts blocks within a region. Lighter (smaller weight value) blocks \"float up\" towards the top of the page. The path setting lets you define which pages you want a block to be shown on. Blocks can automatically be temporarily disabled to reduce server load when your site becomes extremely busy by checking throttle. The auto-throttle functionality must be enabled on the <a href=\"%throttle\">throttle configuration page</a> after having enabled the throttle module.", array('%throttle' => url('admin/settings/throttle')));
+ return t("
+<p>Blocks are the boxes in the left and right side bars of the web site. They are made available by modules or created manually.</p>
+<p>Only enabled blocks are shown. You can position the blocks by deciding which side of the page they will show up on (region) and in which order they appear (weight).</p>
+<p>If you want certain blocks to disable themselves temporarily during high server loads, check the 'Throttle' box. You will need to enable the auto-throttle on the <a href=\"%throttle\">throttle configuration page</a> after having enabled the throttle module.
+", 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 <a href=\"%overview\">blocks</a>. The title is used when displaying the block. The description is used in the \"block\" column on the <a href=\"%overview\">blocks</a> page.", array('%overview' => url('admin/block')));
}
@@ -57,13 +66,17 @@ function block_menu($may_cache) {
'callback' => 'block_admin');
$items[] = array('path' => 'admin/block/list', 'title' => t('list'),
'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
- $items[] = array('path' => 'admin/block/edit', 'title' => t('edit block'),
+ $items[] = array('path' => 'admin/block/configure', 'title' => t('configure block'),
'access' => user_access('administer blocks'),
- 'callback' => 'block_box_edit',
+ 'callback' => 'block_admin_configure',
+ 'type' => MENU_CALLBACK);
+ $items[] = array('path' => 'admin/block/delete', 'title' => t('delete block'),
+ 'access' => user_access('administer blocks'),
+ 'callback' => 'block_box_delete',
'type' => MENU_CALLBACK);
$items[] = array('path' => 'admin/block/add', 'title' => t('add'),
'access' => user_access('administer blocks'),
- 'callback' => 'block_box_edit',
+ 'callback' => 'block_box_add',
'type' => MENU_LOCAL_TASK);
}
@@ -75,31 +88,43 @@ function block_menu($may_cache) {
*
* Generates the administrator-defined blocks for display.
*/
-function block_block($op = 'list', $delta = 0) {
- if ($op == 'list') {
- $result = db_query('SELECT bid, title, info FROM {boxes} ORDER BY title');
- while ($block = db_fetch_object($result)) {
- $blocks[$block->bid]['info'] = $block->info;
- }
- return $blocks;
- }
- else {
- $block = db_fetch_object(db_query('SELECT * FROM {boxes} WHERE bid = %d', $delta));
- $data['subject'] = $block->title;
- $data['content'] = check_output($block->body, $block->format);
- return $data;
+function block_block($op = 'list', $delta = 0, $edit = array()) {
+ switch ($op) {
+ case 'list':
+ $result = db_query('SELECT bid, title, info FROM {boxes} ORDER BY title');
+ while ($block = db_fetch_object($result)) {
+ $blocks[$block->bid]['info'] = $block->info;
+ }
+ return $blocks;
+
+ case 'configure':
+ $box = block_box_get($delta);
+ if (filter_access($box['format'])) {
+ return block_box_form($box);
+ }
+ break;
+
+ case 'save':
+ block_box_save($edit, $delta);
+ break;
+
+ case 'view':
+ $block = db_fetch_object(db_query('SELECT * FROM {boxes} WHERE bid = %d', $delta));
+ $data['subject'] = $block->title;
+ $data['content'] = check_output($block->body, $block->format);
+ return $data;
}
}
function block_admin_save($edit) {
foreach ($edit as $module => $blocks) {
foreach ($blocks as $delta => $block) {
- db_query("UPDATE {blocks} SET region = %d, status = %d, custom = %d, path = '%s', weight = %d, throttle = %d WHERE module = '%s' AND delta = '%s'",
- $block['region'], $block['status'], $block['custom'], $block['path'], $block['weight'], $block['throttle'], $module, $delta);
+ db_query("UPDATE {blocks} SET region = %d, status = %d, weight = %d, throttle = %d WHERE module = '%s' AND delta = '%s'",
+ $block['region'], $block['status'], $block['weight'], $block['throttle'], $module, $delta);
}
}
- return t('the block settings have been updated.');
+ return t('The block settings have been updated.');
}
/**
@@ -130,18 +155,19 @@ function _block_rehash($order_by = array('weight')) {
$block['status'] = $old_blocks[$module][$delta]->status;
$block['weight'] = $old_blocks[$module][$delta]->weight;
$block['region'] = $old_blocks[$module][$delta]->region;
- $block['path'] = $old_blocks[$module][$delta]->path;
+ $block['visibility'] = $old_blocks[$module][$delta]->visibility;
+ $block['pages'] = $old_blocks[$module][$delta]->pages;
$block['custom'] = $old_blocks[$module][$delta]->custom;
$block['throttle'] = $old_blocks[$module][$delta]->throttle;
}
else {
$block['status'] = $block['weight'] = $block['region'] = $block['custom'] = 0;
- $block['path'] = '';
+ $block['pages'] = '';
}
// reinsert blocks into table
- db_query("INSERT INTO {blocks} (module, delta, status, weight, region, path, custom, throttle) VALUES ('%s', '%s', %d, %d, %d, '%s', %d, %d)",
- $block['module'], $block['delta'], $block['status'], $block['weight'], $block['region'], $block['path'], $block['custom'], $block['throttle']);
+ db_query("INSERT INTO {blocks} (module, delta, status, weight, region, visibility, pages, custom, throttle) VALUES ('%s', '%s', %d, %d, %d, %d, '%s', %d, %d)",
+ $block['module'], $block['delta'], $block['status'], $block['weight'], $block['region'], $block['visibility'], $block['pages'], $block['custom'], $block['throttle']);
$blocks[] = $block;
@@ -161,27 +187,19 @@ function _block_rehash($order_by = array('weight')) {
* Prepare the main block administration form.
*/
function block_admin_display() {
-
$blocks = _block_rehash();
- // Fetch input formats used by admin-defined boxes.
- $formats = array();
- $result = db_query('SELECT bid, format FROM {boxes}');
- while ($box = db_fetch_object($result)) {
- $formats[$box->bid] = $box->format;
- }
-
- $header = array(t('Block'), t('Enabled'), t('Custom'), t('Throttle'), t('Weight'), t('Region'), t('Path'), array('data' => t('Operations')));
+ $header = array(t('Block'), t('Enabled'), t('Throttle'), t('Weight'), t('Region'), array('data' => t('Operations'), 'colspan' => 2));
foreach ($blocks as $block) {
- if ($block['module'] == 'block' && filter_access($formats[$block['delta']])) {
- $edit = l(t('edit block'), 'admin/block/edit/'. $block['delta']);
+ if ($block['module'] == 'block') {
+ $operation = l(t('delete'), 'admin/block/delete/'. $block['delta']);
}
else {
- $edit = '';
+ $operation = '';
}
- $rows[] = array($block['info'], array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][status', 1, $block['status']), 'align' => 'center'), array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][custom', 1, $block['custom']), 'align' => 'center'), array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][throttle', 1, $block['throttle'], NULL, module_exist('throttle') ? NULL : array('disabled' => 'disabled')), 'align' => 'center'), form_weight(NULL, $block['module'] .']['. $block['delta'] .'][weight', $block['weight']), form_radios(NULL, $block['module'] .']['. $block['delta'] .'][region', $block['region'], array(t('left'), t('right'))), form_textfield(NULL, $block['module'] .']['. $block['delta'] .'][path', $block['path'], 10, 255), $edit);
+ $rows[] = array($block['info'], array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][status', 1, $block['status']), 'align' => 'center'), array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][throttle', 1, $block['throttle'], NULL, module_exist('throttle') ? NULL : array('disabled' => 'disabled')), 'align' => 'center'), form_weight(NULL, $block['module'] .']['. $block['delta'] .'][weight', $block['weight']), form_radios(NULL, $block['module'] .']['. $block['delta'] .'][region', $block['region'], array(t('left'), t('right'))), l(t('configure'), 'admin/block/configure/'. $block['module'] .'/'. $block['delta']), $operation);
}
$output = theme('table', $header, $rows);
@@ -195,39 +213,89 @@ function block_box_get($bid) {
}
/**
- * Menu callback; displays the block editing form.
- *
- * On edit, saves changes and displays the block overview.
+ * Menu callback; displays the block configuration form.
*/
-function block_box_edit($bid = 0) {
+function block_admin_configure($module = NULL, $delta = 0) {
$edit = $_POST['edit'];
$op = $_POST['op'];
switch ($op) {
case t('Save block'):
- drupal_set_message(block_box_save($edit));
+ db_query("UPDATE {blocks} SET visibility = %d, pages = '%s', custom = %d WHERE module = '%s' AND delta = '%s'", $edit['visibility'], $edit['pages'], $edit['custom'], $module, $delta);
+ module_invoke($module, 'block', 'save', $delta, $edit);
+ drupal_set_message('The block configuration has been saved.');
cache_clear_all();
drupal_goto('admin/block');
- case t('Delete block'):
- $form = '<p>'. t('Are you sure you want to delete the block %name?', array('%name' => '<em>'. $edit['info'] .'</em>')) ."</p>\n";
- $form .= form_submit(t('Delete'));
- $output = form($form);
- break;
+ default:
+ // Always evaluates to TRUE, but a validation step may be added later.
+ if (!$edit) {
+ $edit = db_fetch_array(db_query("SELECT pages, visibility, custom FROM {blocks} WHERE module = '%s' AND delta = '%s'", $module, $delta));
+ }
+
+ // Module-specific block configurations.
+ if ($settings = module_invoke($module, 'block', 'configure', $delta)) {
+ $form = form_group(t('Block-specific settings'), $settings);
+ }
+
+ // Get the block subject for the page title.
+ $info = module_invoke($module, 'block', 'list');
+ drupal_set_title(t("'%name' block", array('%name' => $info[$delta]['info'])));
+ // Standard block configurations.
+ $group = form_radios(t('Show on specific pages'), 'visibility', $edit['visibility'], array(t('Show on every page except the listed pages.'), t('Show on only the listed pages.')));
+ $group .= form_textarea(t('Pages'), 'pages', $edit['pages'], 40, 5, t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are '<em>blog</em>' for the blog page and '<em>blog/*</em>' for every personal blog. '<em><front></em>' is the front page. "));
+
+ $group .= form_radios(t('User options'), 'custom', $edit['custom'], array(t('Users may not turn on or off this block.'), t('Users may turn this block on or off, on by default.'), t('Users may turn this block on or off, off by default.')), t('Users can decide which blocks they want on or off on their account editing page.'));
+
+ $form .= form_group(t('Visibility settings'), $group);
+
+ $form .= form_submit(t('Save block'));
+
+ print theme('page', form($form));
+ }
+}
+
+/**
+ * Menu callback; displays the block creation form.
+ */
+function block_box_add() {
+ $edit = $_POST['edit'];
+ $op = $_POST['op'];
+
+ switch ($op) {
+ case t('Save block'):
+ block_box_save($edit);
+ drupal_set_message(t('The new block has been added.'));
+ drupal_goto('admin/block');
+
+ default:
+ $form = block_box_form();
+ $form .= form_submit(t('Save block'));
+ $output .= form($form);
+ }
+
+ print theme('page', $output);
+}
+
+/**
+ * Menu callback; confirm and delete custom blocks.
+ */
+function block_box_delete($bid = 0) {
+ $op = $_POST['op'];
+ $box = block_box_get($bid);
+
+ switch ($op) {
case t('Delete'):
db_query('DELETE FROM {boxes} WHERE bid = %d', $bid);
- drupal_set_message(t('The block has been deleted.'));
+ drupal_set_message(t('The block %name has been deleted.', array('%name' => '<em>'. $box['info'] .'</em>')));
cache_clear_all();
drupal_goto('admin/block');
default:
- if ($bid) {
- $output = block_box_form(block_box_get($bid));
- }
- else {
- $output = block_box_form();
- }
+ $form = '<p>'. t('Are you sure you want to delete the block %name?', array('%name' => '<em>'. $box['info'] .'</em>')) ."</p>\n";
+ $form .= form_submit(t('Delete'));
+ $output = form($form);
}
print theme('page', $output);
@@ -239,30 +307,19 @@ function block_box_form($edit = array()) {
$output .= form_textarea(t('Block body'), 'body', $edit['body'], 70, 10, t('The content of the block as shown to the user.'));
$output .= form_textfield(t('Block description'), 'info', $edit['info'], 50, 64, t('A brief description of your block. Used on the <a href="%overview">block overview page</a>.', array('%overview' => url('admin/block'))));
- if ($edit['bid']) {
- $output .= form_hidden('bid', $edit['bid']);
- }
-
- $output .= form_submit(t('Save block'));
- if ($edit['bid']) {
- $output .= form_submit(t('Delete block'));
- }
-
- return form($output);
+ return $output;
}
-function block_box_save($edit) {
+function block_box_save($edit, $delta = NULL) {
if (!filter_access($edit['format'])) {
$edit['format'] = FILTER_FORMAT_DEFAULT;
}
- if ($edit['bid']) {
- db_query("UPDATE {boxes} SET title = '%s', body = '%s', info = '%s', format = %d WHERE bid = %d", $edit['title'], $edit['body'], $edit['info'], $edit['format'], $edit['bid']);
- return t('The block has been updated.');
+ if (isset($delta)) {
+ db_query("UPDATE {boxes} SET title = '%s', body = '%s', info = '%s', format = %d WHERE bid = %d", $edit['title'], $edit['body'], $edit['info'], $edit['format'], $delta);
}
else {
db_query("INSERT INTO {boxes} (title, body, info, format) VALUES ('%s', '%s', '%s', %d)", $edit['title'], $edit['body'], $edit['info'], $edit['format']);
- return t('The new block has been added.');
}
}
@@ -291,12 +348,12 @@ function block_user($type, $edit, &$user, $category = NULL) {
switch ($type) {
case 'form':
if ($category == 'account') {
- $result = db_query('SELECT * FROM {blocks} WHERE custom = %d ORDER BY module, delta', 1);
+ $result = db_query('SELECT * FROM {blocks} WHERE status = 1 AND custom != 0 ORDER BY weight, module, delta');
while ($block = db_fetch_object($result)) {
$data = module_invoke($block->module, 'block', 'list');
if ($data[$block->delta]['info']) {
- $form .= form_checkbox($data[$block->delta]['info'], "block][$block->module][$block->delta", 1, isset($user->block[$block->module][$block->delta]) ? $user->block[$block->module][$block->delta] : $block->status);
+ $form .= form_checkbox($data[$block->delta]['info'], 'block]['. $block->module .']['. $block->delta, 1, isset($user->block[$block->module][$block->delta]) ? $user->block[$block->module][$block->delta] : ($block->custom == 1));
}
}
@@ -333,35 +390,38 @@ function block_list($region) {
if (!isset($blocks[$region])) {
$blocks[$region] = array();
- $result = db_query('SELECT * FROM {blocks} WHERE (status = 1 OR custom = 1) '. ($region != 'all' ? 'AND region = %d ' : '') .'ORDER BY weight, module', $region == 'left' ? 0 : 1);
+ $result = db_query('SELECT * FROM {blocks} WHERE status = 1 '. ($region != 'all' ? 'AND region = %d ' : '') .'ORDER BY weight, module', $region == 'left' ? 0 : 1);
while ($result && ($block = db_fetch_array($result))) {
- // When the user's account setting is empty, we use the block's regular 'status' (which is the default)
- if ($block['custom'] && $user->uid && !isset($user->block[$block['module']][$block['delta']])) {
- $user->block[$block['module']][$block['delta']] = $block['status'];
+ // Use the user's block visibility setting, if necessary
+ if ($block['custom'] != 0) {
+ if ($user->uid && isset($user->block[$block['module']][$block['delta']])) {
+ $enabled = $user->block[$block['module']][$block['delta']];
+ }
+ else {
+ $enabled = ($block['custom'] == 1);
+ }
+ }
+ else {
+ $enabled = TRUE;
}
-
- // Determine block visibility
- $enabled = $block['status'] && (!$user->uid || !$block['custom']);
- $custom = $block['custom'] && $user->block[$block['module']][$block['delta']];
// Match path if necessary
- if ($block['path']) {
+ if ($block['pages']) {
$base = parse_url($base_url);
$session = session_name() .'='. session_id();
$url = str_replace(array($base['path'], '?'. $session), '', request_uri());
$url = ereg_replace('^/(\?q=)?', '', $url);
- $matched = preg_match($block['path'], $url);
+ $regexp = '/^('. preg_replace(array('/(\r\n?|\n)/', '/\\\\\*/', '/(^|\|)\\\\<front\\\\>($|\|)/'), array('|', '.*', '\1\2'), preg_quote($block['pages'], '/')) .')$/';
+ $matched = !($block['visibility'] xor preg_match($regexp, $url));
}
else {
- $matched = true;
+ $matched = TRUE;
}
- if (($enabled || $custom) && $matched) {
- /*
- ** Check the current throttle status and see if block should be displayed
- ** based on server load.
- */
+ if ($enabled && $matched) {
+ // Check the current throttle status and see if block should be displayed
+ // based on server load.
if (!($block['throttle'] && (module_invoke('throttle', 'status') > 4))) {
$array = module_invoke($block['module'], 'block', 'view', $block['delta']);
if (is_array($array)) {
diff --git a/modules/block/block.module b/modules/block/block.module
index e1958424d25f1e73cbfd8a68a8fe70105a46f9e4..5383f3ac4c609307a8f1cceda0ef84fb5f55c7cc 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -12,20 +12,29 @@
function block_help($section) {
switch ($section) {
case 'admin/help#block':
- return t("
+ return t('
<p>Blocks are the boxes visible in the sidebar(s) of your web site. These are usually generated automatically by modules (e.g. recent forum topics), but you can also create your own blocks.</p>
-<p>The sidebar each block appears in depends on both which theme you're using (some are left-only, some right, some both), and on the settings in block management.</p><p>Whether a block is visible in the first place depends on four things:</p><ul><li>It must have its \"enabled\" box checked in block management.</li><li>If it has its \"custom\" box checked in block management, the user must have chosen to display it in their user preferences.</li><li>If the \"path\" field in block management is set, the visitor must be on a page that matches the path specification (more on this later).</li><li>If the block has its throttle box checked, the user will only see the block if the site throttle level is low.</li></ul>
-<p>The block management screen also lets you specify the vertical sort-order of the blocks within a sidebar. You do this by assigning a <strong>weight</strong> to each block. Lighter blocks (smaller weight) \"float up\" towards the top of the sidebar. Heavier ones \"sink down\" towards the bottom of it.</p>
-<p>The path setting lets you define the pages on which a specific block is visible. If you leave the path blank it will appear on all pages. The path uses a regular expression syntax so remember to escape special characters! The path expression is matched against the relative URL of a Drupal page, e.g. <code>book</code>, <code>node/12</code>, <code>admin</code>.</p>
-<p>In case you do not know what a regular expression is, you should read about them in the PHP manual. The chapter to look at is the one on <a href=\"%pcre\">Perl-Compatible Regular Expressions (PCRE)</a>.</p>
-<p>However, for basic tasks it is sufficient to look at the following examples:</p>
-<p>If the block should only show up on blog pages, use <^blog>. To display on all node views use <^node>. The angular brackets are used as delimiters of the regular expression. To show up on either forum or book pages use <^(forum|book)>. The round brackets form a group of expressions, divided by the | character. It matches if any of the expressions in it match. A more complicated example is <^node/add/(story|blog|image)>. Blocks which have their paths set to this expression will show up on story, block, or image composition pages. If you want to show a block an all pages, but not the search page, use <^(?!search)>.</p>
-<h3>Administrator Defined Blocks</h3>
-<p>An administrator defined block contains content supplied by you (as opposed to being generated automatically by a module). 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.</p>", array('%pcre' => 'http://php.net/pcre/'));
+<p>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.</p>
+<p>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.</p>
+<p>A block\'s visibility depends on:</p>
+<ul>
+<li>Its enabled checkbox. Disabled blocks are never shown.</li>
+<li>Its throttle checkbox. Throttled blocks are hidden during high server loads.</li>
+<li>Its path options. Blocks can be configured to only show/hide on certain pages</li>.
+<li>User settings. You can choose to let your users decide whether to show/hide certain blocks.</li>
+<li>Its function. Dynamic blocks (such as those defined by modules) may be empty on certain pages and will not be shown.</li>
+</ul>
+
+<h3>Administrator defined blocks</h3>
+<p>An administrator defined block contains content supplied by you (as opposed to being generated automatically by a module). 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.</p>');
case 'admin/modules#description':
return t('Controls the boxes that are displayed around the main content.');
case 'admin/block':
- return t("Blocks are the boxes in the left- and right- side bars of the web site, depending on the chosen theme. They are made available active modules or created manually. The \"enabled\" checkbox sets the default status of the block. Only enabled blocks are shown. When the \"custom\" checkbox is checked, your users can show or hide the block using their account settings. In that case, the 'enabled' checkbox signifies the block's default status. You can assign the block's placement by giving it a region and a weight. The region specifies which side of the page the block is on, and the weight sorts blocks within a region. Lighter (smaller weight value) blocks \"float up\" towards the top of the page. The path setting lets you define which pages you want a block to be shown on. Blocks can automatically be temporarily disabled to reduce server load when your site becomes extremely busy by checking throttle. The auto-throttle functionality must be enabled on the <a href=\"%throttle\">throttle configuration page</a> after having enabled the throttle module.", array('%throttle' => url('admin/settings/throttle')));
+ return t("
+<p>Blocks are the boxes in the left and right side bars of the web site. They are made available by modules or created manually.</p>
+<p>Only enabled blocks are shown. You can position the blocks by deciding which side of the page they will show up on (region) and in which order they appear (weight).</p>
+<p>If you want certain blocks to disable themselves temporarily during high server loads, check the 'Throttle' box. You will need to enable the auto-throttle on the <a href=\"%throttle\">throttle configuration page</a> after having enabled the throttle module.
+", 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 <a href=\"%overview\">blocks</a>. The title is used when displaying the block. The description is used in the \"block\" column on the <a href=\"%overview\">blocks</a> page.", array('%overview' => url('admin/block')));
}
@@ -57,13 +66,17 @@ function block_menu($may_cache) {
'callback' => 'block_admin');
$items[] = array('path' => 'admin/block/list', 'title' => t('list'),
'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
- $items[] = array('path' => 'admin/block/edit', 'title' => t('edit block'),
+ $items[] = array('path' => 'admin/block/configure', 'title' => t('configure block'),
'access' => user_access('administer blocks'),
- 'callback' => 'block_box_edit',
+ 'callback' => 'block_admin_configure',
+ 'type' => MENU_CALLBACK);
+ $items[] = array('path' => 'admin/block/delete', 'title' => t('delete block'),
+ 'access' => user_access('administer blocks'),
+ 'callback' => 'block_box_delete',
'type' => MENU_CALLBACK);
$items[] = array('path' => 'admin/block/add', 'title' => t('add'),
'access' => user_access('administer blocks'),
- 'callback' => 'block_box_edit',
+ 'callback' => 'block_box_add',
'type' => MENU_LOCAL_TASK);
}
@@ -75,31 +88,43 @@ function block_menu($may_cache) {
*
* Generates the administrator-defined blocks for display.
*/
-function block_block($op = 'list', $delta = 0) {
- if ($op == 'list') {
- $result = db_query('SELECT bid, title, info FROM {boxes} ORDER BY title');
- while ($block = db_fetch_object($result)) {
- $blocks[$block->bid]['info'] = $block->info;
- }
- return $blocks;
- }
- else {
- $block = db_fetch_object(db_query('SELECT * FROM {boxes} WHERE bid = %d', $delta));
- $data['subject'] = $block->title;
- $data['content'] = check_output($block->body, $block->format);
- return $data;
+function block_block($op = 'list', $delta = 0, $edit = array()) {
+ switch ($op) {
+ case 'list':
+ $result = db_query('SELECT bid, title, info FROM {boxes} ORDER BY title');
+ while ($block = db_fetch_object($result)) {
+ $blocks[$block->bid]['info'] = $block->info;
+ }
+ return $blocks;
+
+ case 'configure':
+ $box = block_box_get($delta);
+ if (filter_access($box['format'])) {
+ return block_box_form($box);
+ }
+ break;
+
+ case 'save':
+ block_box_save($edit, $delta);
+ break;
+
+ case 'view':
+ $block = db_fetch_object(db_query('SELECT * FROM {boxes} WHERE bid = %d', $delta));
+ $data['subject'] = $block->title;
+ $data['content'] = check_output($block->body, $block->format);
+ return $data;
}
}
function block_admin_save($edit) {
foreach ($edit as $module => $blocks) {
foreach ($blocks as $delta => $block) {
- db_query("UPDATE {blocks} SET region = %d, status = %d, custom = %d, path = '%s', weight = %d, throttle = %d WHERE module = '%s' AND delta = '%s'",
- $block['region'], $block['status'], $block['custom'], $block['path'], $block['weight'], $block['throttle'], $module, $delta);
+ db_query("UPDATE {blocks} SET region = %d, status = %d, weight = %d, throttle = %d WHERE module = '%s' AND delta = '%s'",
+ $block['region'], $block['status'], $block['weight'], $block['throttle'], $module, $delta);
}
}
- return t('the block settings have been updated.');
+ return t('The block settings have been updated.');
}
/**
@@ -130,18 +155,19 @@ function _block_rehash($order_by = array('weight')) {
$block['status'] = $old_blocks[$module][$delta]->status;
$block['weight'] = $old_blocks[$module][$delta]->weight;
$block['region'] = $old_blocks[$module][$delta]->region;
- $block['path'] = $old_blocks[$module][$delta]->path;
+ $block['visibility'] = $old_blocks[$module][$delta]->visibility;
+ $block['pages'] = $old_blocks[$module][$delta]->pages;
$block['custom'] = $old_blocks[$module][$delta]->custom;
$block['throttle'] = $old_blocks[$module][$delta]->throttle;
}
else {
$block['status'] = $block['weight'] = $block['region'] = $block['custom'] = 0;
- $block['path'] = '';
+ $block['pages'] = '';
}
// reinsert blocks into table
- db_query("INSERT INTO {blocks} (module, delta, status, weight, region, path, custom, throttle) VALUES ('%s', '%s', %d, %d, %d, '%s', %d, %d)",
- $block['module'], $block['delta'], $block['status'], $block['weight'], $block['region'], $block['path'], $block['custom'], $block['throttle']);
+ db_query("INSERT INTO {blocks} (module, delta, status, weight, region, visibility, pages, custom, throttle) VALUES ('%s', '%s', %d, %d, %d, %d, '%s', %d, %d)",
+ $block['module'], $block['delta'], $block['status'], $block['weight'], $block['region'], $block['visibility'], $block['pages'], $block['custom'], $block['throttle']);
$blocks[] = $block;
@@ -161,27 +187,19 @@ function _block_rehash($order_by = array('weight')) {
* Prepare the main block administration form.
*/
function block_admin_display() {
-
$blocks = _block_rehash();
- // Fetch input formats used by admin-defined boxes.
- $formats = array();
- $result = db_query('SELECT bid, format FROM {boxes}');
- while ($box = db_fetch_object($result)) {
- $formats[$box->bid] = $box->format;
- }
-
- $header = array(t('Block'), t('Enabled'), t('Custom'), t('Throttle'), t('Weight'), t('Region'), t('Path'), array('data' => t('Operations')));
+ $header = array(t('Block'), t('Enabled'), t('Throttle'), t('Weight'), t('Region'), array('data' => t('Operations'), 'colspan' => 2));
foreach ($blocks as $block) {
- if ($block['module'] == 'block' && filter_access($formats[$block['delta']])) {
- $edit = l(t('edit block'), 'admin/block/edit/'. $block['delta']);
+ if ($block['module'] == 'block') {
+ $operation = l(t('delete'), 'admin/block/delete/'. $block['delta']);
}
else {
- $edit = '';
+ $operation = '';
}
- $rows[] = array($block['info'], array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][status', 1, $block['status']), 'align' => 'center'), array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][custom', 1, $block['custom']), 'align' => 'center'), array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][throttle', 1, $block['throttle'], NULL, module_exist('throttle') ? NULL : array('disabled' => 'disabled')), 'align' => 'center'), form_weight(NULL, $block['module'] .']['. $block['delta'] .'][weight', $block['weight']), form_radios(NULL, $block['module'] .']['. $block['delta'] .'][region', $block['region'], array(t('left'), t('right'))), form_textfield(NULL, $block['module'] .']['. $block['delta'] .'][path', $block['path'], 10, 255), $edit);
+ $rows[] = array($block['info'], array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][status', 1, $block['status']), 'align' => 'center'), array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][throttle', 1, $block['throttle'], NULL, module_exist('throttle') ? NULL : array('disabled' => 'disabled')), 'align' => 'center'), form_weight(NULL, $block['module'] .']['. $block['delta'] .'][weight', $block['weight']), form_radios(NULL, $block['module'] .']['. $block['delta'] .'][region', $block['region'], array(t('left'), t('right'))), l(t('configure'), 'admin/block/configure/'. $block['module'] .'/'. $block['delta']), $operation);
}
$output = theme('table', $header, $rows);
@@ -195,39 +213,89 @@ function block_box_get($bid) {
}
/**
- * Menu callback; displays the block editing form.
- *
- * On edit, saves changes and displays the block overview.
+ * Menu callback; displays the block configuration form.
*/
-function block_box_edit($bid = 0) {
+function block_admin_configure($module = NULL, $delta = 0) {
$edit = $_POST['edit'];
$op = $_POST['op'];
switch ($op) {
case t('Save block'):
- drupal_set_message(block_box_save($edit));
+ db_query("UPDATE {blocks} SET visibility = %d, pages = '%s', custom = %d WHERE module = '%s' AND delta = '%s'", $edit['visibility'], $edit['pages'], $edit['custom'], $module, $delta);
+ module_invoke($module, 'block', 'save', $delta, $edit);
+ drupal_set_message('The block configuration has been saved.');
cache_clear_all();
drupal_goto('admin/block');
- case t('Delete block'):
- $form = '<p>'. t('Are you sure you want to delete the block %name?', array('%name' => '<em>'. $edit['info'] .'</em>')) ."</p>\n";
- $form .= form_submit(t('Delete'));
- $output = form($form);
- break;
+ default:
+ // Always evaluates to TRUE, but a validation step may be added later.
+ if (!$edit) {
+ $edit = db_fetch_array(db_query("SELECT pages, visibility, custom FROM {blocks} WHERE module = '%s' AND delta = '%s'", $module, $delta));
+ }
+
+ // Module-specific block configurations.
+ if ($settings = module_invoke($module, 'block', 'configure', $delta)) {
+ $form = form_group(t('Block-specific settings'), $settings);
+ }
+
+ // Get the block subject for the page title.
+ $info = module_invoke($module, 'block', 'list');
+ drupal_set_title(t("'%name' block", array('%name' => $info[$delta]['info'])));
+ // Standard block configurations.
+ $group = form_radios(t('Show on specific pages'), 'visibility', $edit['visibility'], array(t('Show on every page except the listed pages.'), t('Show on only the listed pages.')));
+ $group .= form_textarea(t('Pages'), 'pages', $edit['pages'], 40, 5, t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are '<em>blog</em>' for the blog page and '<em>blog/*</em>' for every personal blog. '<em><front></em>' is the front page. "));
+
+ $group .= form_radios(t('User options'), 'custom', $edit['custom'], array(t('Users may not turn on or off this block.'), t('Users may turn this block on or off, on by default.'), t('Users may turn this block on or off, off by default.')), t('Users can decide which blocks they want on or off on their account editing page.'));
+
+ $form .= form_group(t('Visibility settings'), $group);
+
+ $form .= form_submit(t('Save block'));
+
+ print theme('page', form($form));
+ }
+}
+
+/**
+ * Menu callback; displays the block creation form.
+ */
+function block_box_add() {
+ $edit = $_POST['edit'];
+ $op = $_POST['op'];
+
+ switch ($op) {
+ case t('Save block'):
+ block_box_save($edit);
+ drupal_set_message(t('The new block has been added.'));
+ drupal_goto('admin/block');
+
+ default:
+ $form = block_box_form();
+ $form .= form_submit(t('Save block'));
+ $output .= form($form);
+ }
+
+ print theme('page', $output);
+}
+
+/**
+ * Menu callback; confirm and delete custom blocks.
+ */
+function block_box_delete($bid = 0) {
+ $op = $_POST['op'];
+ $box = block_box_get($bid);
+
+ switch ($op) {
case t('Delete'):
db_query('DELETE FROM {boxes} WHERE bid = %d', $bid);
- drupal_set_message(t('The block has been deleted.'));
+ drupal_set_message(t('The block %name has been deleted.', array('%name' => '<em>'. $box['info'] .'</em>')));
cache_clear_all();
drupal_goto('admin/block');
default:
- if ($bid) {
- $output = block_box_form(block_box_get($bid));
- }
- else {
- $output = block_box_form();
- }
+ $form = '<p>'. t('Are you sure you want to delete the block %name?', array('%name' => '<em>'. $box['info'] .'</em>')) ."</p>\n";
+ $form .= form_submit(t('Delete'));
+ $output = form($form);
}
print theme('page', $output);
@@ -239,30 +307,19 @@ function block_box_form($edit = array()) {
$output .= form_textarea(t('Block body'), 'body', $edit['body'], 70, 10, t('The content of the block as shown to the user.'));
$output .= form_textfield(t('Block description'), 'info', $edit['info'], 50, 64, t('A brief description of your block. Used on the <a href="%overview">block overview page</a>.', array('%overview' => url('admin/block'))));
- if ($edit['bid']) {
- $output .= form_hidden('bid', $edit['bid']);
- }
-
- $output .= form_submit(t('Save block'));
- if ($edit['bid']) {
- $output .= form_submit(t('Delete block'));
- }
-
- return form($output);
+ return $output;
}
-function block_box_save($edit) {
+function block_box_save($edit, $delta = NULL) {
if (!filter_access($edit['format'])) {
$edit['format'] = FILTER_FORMAT_DEFAULT;
}
- if ($edit['bid']) {
- db_query("UPDATE {boxes} SET title = '%s', body = '%s', info = '%s', format = %d WHERE bid = %d", $edit['title'], $edit['body'], $edit['info'], $edit['format'], $edit['bid']);
- return t('The block has been updated.');
+ if (isset($delta)) {
+ db_query("UPDATE {boxes} SET title = '%s', body = '%s', info = '%s', format = %d WHERE bid = %d", $edit['title'], $edit['body'], $edit['info'], $edit['format'], $delta);
}
else {
db_query("INSERT INTO {boxes} (title, body, info, format) VALUES ('%s', '%s', '%s', %d)", $edit['title'], $edit['body'], $edit['info'], $edit['format']);
- return t('The new block has been added.');
}
}
@@ -291,12 +348,12 @@ function block_user($type, $edit, &$user, $category = NULL) {
switch ($type) {
case 'form':
if ($category == 'account') {
- $result = db_query('SELECT * FROM {blocks} WHERE custom = %d ORDER BY module, delta', 1);
+ $result = db_query('SELECT * FROM {blocks} WHERE status = 1 AND custom != 0 ORDER BY weight, module, delta');
while ($block = db_fetch_object($result)) {
$data = module_invoke($block->module, 'block', 'list');
if ($data[$block->delta]['info']) {
- $form .= form_checkbox($data[$block->delta]['info'], "block][$block->module][$block->delta", 1, isset($user->block[$block->module][$block->delta]) ? $user->block[$block->module][$block->delta] : $block->status);
+ $form .= form_checkbox($data[$block->delta]['info'], 'block]['. $block->module .']['. $block->delta, 1, isset($user->block[$block->module][$block->delta]) ? $user->block[$block->module][$block->delta] : ($block->custom == 1));
}
}
@@ -333,35 +390,38 @@ function block_list($region) {
if (!isset($blocks[$region])) {
$blocks[$region] = array();
- $result = db_query('SELECT * FROM {blocks} WHERE (status = 1 OR custom = 1) '. ($region != 'all' ? 'AND region = %d ' : '') .'ORDER BY weight, module', $region == 'left' ? 0 : 1);
+ $result = db_query('SELECT * FROM {blocks} WHERE status = 1 '. ($region != 'all' ? 'AND region = %d ' : '') .'ORDER BY weight, module', $region == 'left' ? 0 : 1);
while ($result && ($block = db_fetch_array($result))) {
- // When the user's account setting is empty, we use the block's regular 'status' (which is the default)
- if ($block['custom'] && $user->uid && !isset($user->block[$block['module']][$block['delta']])) {
- $user->block[$block['module']][$block['delta']] = $block['status'];
+ // Use the user's block visibility setting, if necessary
+ if ($block['custom'] != 0) {
+ if ($user->uid && isset($user->block[$block['module']][$block['delta']])) {
+ $enabled = $user->block[$block['module']][$block['delta']];
+ }
+ else {
+ $enabled = ($block['custom'] == 1);
+ }
+ }
+ else {
+ $enabled = TRUE;
}
-
- // Determine block visibility
- $enabled = $block['status'] && (!$user->uid || !$block['custom']);
- $custom = $block['custom'] && $user->block[$block['module']][$block['delta']];
// Match path if necessary
- if ($block['path']) {
+ if ($block['pages']) {
$base = parse_url($base_url);
$session = session_name() .'='. session_id();
$url = str_replace(array($base['path'], '?'. $session), '', request_uri());
$url = ereg_replace('^/(\?q=)?', '', $url);
- $matched = preg_match($block['path'], $url);
+ $regexp = '/^('. preg_replace(array('/(\r\n?|\n)/', '/\\\\\*/', '/(^|\|)\\\\<front\\\\>($|\|)/'), array('|', '.*', '\1\2'), preg_quote($block['pages'], '/')) .')$/';
+ $matched = !($block['visibility'] xor preg_match($regexp, $url));
}
else {
- $matched = true;
+ $matched = TRUE;
}
- if (($enabled || $custom) && $matched) {
- /*
- ** Check the current throttle status and see if block should be displayed
- ** based on server load.
- */
+ if ($enabled && $matched) {
+ // Check the current throttle status and see if block should be displayed
+ // based on server load.
if (!($block['throttle'] && (module_invoke('throttle', 'status') > 4))) {
$array = module_invoke($block['module'], 'block', 'view', $block['delta']);
if (is_array($array)) {
diff --git a/modules/blog.module b/modules/blog.module
index 805e458e1a9449be9511fc170729b9e8d36209fa..c72cf0ed84561814790b7069fef1beaab9e071e5 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -291,7 +291,7 @@ function blog_block($op = 'list', $delta = 0) {
$block[0]['info'] = t('Recent blog posts');
return $block;
}
- else {
+ else if ($op == 'view') {
if (user_access('access content')) {
$block['content'] = node_title_list(db_query_range('SELECT DISTINCT(n.nid), n.title, n.created FROM {node} n '. node_access_join_sql() ." WHERE n.type = 'blog' AND n.status = 1 AND ". node_access_where_sql() .' ORDER BY n.created DESC', 0, 10));
$block['content'] .= '<div class="more-link">'. l(t('more'), 'blog', array('title' => t('Read the latest blog entries.'))) .'</div>';
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 805e458e1a9449be9511fc170729b9e8d36209fa..c72cf0ed84561814790b7069fef1beaab9e071e5 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -291,7 +291,7 @@ function blog_block($op = 'list', $delta = 0) {
$block[0]['info'] = t('Recent blog posts');
return $block;
}
- else {
+ else if ($op == 'view') {
if (user_access('access content')) {
$block['content'] = node_title_list(db_query_range('SELECT DISTINCT(n.nid), n.title, n.created FROM {node} n '. node_access_join_sql() ." WHERE n.type = 'blog' AND n.status = 1 AND ". node_access_where_sql() .' ORDER BY n.created DESC', 0, 10));
$block['content'] .= '<div class="more-link">'. l(t('more'), 'blog', array('title' => t('Read the latest blog entries.'))) .'</div>';
diff --git a/modules/book.module b/modules/book.module
index ec0b208522dca30ce41d709178a78b5f047f93d3..08fd6f876bb126756899ea5a892672b659b15a1d 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -135,8 +135,9 @@ function book_block($op = 'list', $delta = 0) {
$block = array();
if ($op == 'list') {
$block[0]['info'] = t('Book navigation');
+ return $block;
}
- else {
+ else if ($op == 'view') {
// Only display this block when the user is browsing a book:
if (arg(0) == 'node' && is_numeric(arg(1))) {
$result = db_query('SELECT n.nid, n.title, b.parent FROM {node} n '. node_access_join_sql() .' INNER JOIN {book} b ON n.nid = b.nid WHERE '. node_access_where_sql() .' AND n.nid = %d', arg(1));
@@ -155,9 +156,9 @@ function book_block($op = 'list', $delta = 0) {
$block['content'] = book_tree($expand[0], 5, $expand);
}
}
- }
- return $block;
+ return $block;
+ }
}
/**
diff --git a/modules/book/book.module b/modules/book/book.module
index ec0b208522dca30ce41d709178a78b5f047f93d3..08fd6f876bb126756899ea5a892672b659b15a1d 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -135,8 +135,9 @@ function book_block($op = 'list', $delta = 0) {
$block = array();
if ($op == 'list') {
$block[0]['info'] = t('Book navigation');
+ return $block;
}
- else {
+ else if ($op == 'view') {
// Only display this block when the user is browsing a book:
if (arg(0) == 'node' && is_numeric(arg(1))) {
$result = db_query('SELECT n.nid, n.title, b.parent FROM {node} n '. node_access_join_sql() .' INNER JOIN {book} b ON n.nid = b.nid WHERE '. node_access_where_sql() .' AND n.nid = %d', arg(1));
@@ -155,9 +156,9 @@ function book_block($op = 'list', $delta = 0) {
$block['content'] = book_tree($expand[0], 5, $expand);
}
}
- }
- return $block;
+ return $block;
+ }
}
/**
diff --git a/modules/comment.module b/modules/comment.module
index 1539e2d8051bc70f638ab4c3ea75856f571b4c43..f50dc01d109c8660e72d22d6d8633415b1b359f7 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -156,7 +156,7 @@ function comment_block($op = 'list', $delta = 0) {
$blocks[0]['info'] = t('Recent comments');
return $blocks;
}
- else if (user_access('access comments')) {
+ else if ($op == 'view' && user_access('access comments')) {
$result = db_query_range('SELECT * FROM {comments} WHERE status = 0 ORDER BY timestamp DESC', 0, 10);
$items = array();
while ($comment = db_fetch_object($result)) {
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 1539e2d8051bc70f638ab4c3ea75856f571b4c43..f50dc01d109c8660e72d22d6d8633415b1b359f7 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -156,7 +156,7 @@ function comment_block($op = 'list', $delta = 0) {
$blocks[0]['info'] = t('Recent comments');
return $blocks;
}
- else if (user_access('access comments')) {
+ else if ($op == 'view' && user_access('access comments')) {
$result = db_query_range('SELECT * FROM {comments} WHERE status = 0 ORDER BY timestamp DESC', 0, 10);
$items = array();
while ($comment = db_fetch_object($result)) {
diff --git a/modules/forum.module b/modules/forum.module
index 897e90f1ed48dd701a97d69b9a446048b305c3ae..74baed4335ef02d43a461be311cf974cfccdd753 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -78,9 +78,6 @@ function forum_settings() {
$group .= form_select(t('Topics per page'), 'forum_per_page', variable_get('forum_per_page', 25), drupal_map_assoc(array(10, 25, 50, 75, 100)), t('The default number of topics displayed per page; links to browse older messages are automatically being displayed.'));
$group .= form_radios(t('Default order'), 'forum_order', variable_get('forum_order', '1'), array(1 => t('Date - newest first'), 2 => t('Date - oldest first'), 3 => t('Posts - most active first'), 4=> t('Posts - least active first')), t('The default display order for topics.'));
$output .= form_group(t('Forum viewing options'), $group);
-
- $group = form_select(t('Number of topics in block'), 'forum_block_num', variable_get('forum_block_num', '5'), drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)), t('The number of topics to show in the "Forum topics" block. To enable the block, go to the <a href="%block-administration">block administration</a> page.', array('%block-administration' => url('admin/block'))));
- $output .= form_group(t('"Forum topic" block settings'), $group);
}
}
@@ -114,27 +111,36 @@ function forum_load($node) {
* Generates a block containing the currently active forum topics and the
* most recently added forum topics.
*/
-function forum_block($op = 'list', $delta = 0) {
+function forum_block($op = 'list', $delta = 0, $edit = array()) {
+ switch ($op) {
+ case 'list':
+ $blocks[0]['info'] = t('Forum topics');
+ return $blocks;
+
+ case 'configure':
+ $output = form_select(t('Number of topics in block'), 'forum_block_num', variable_get('forum_block_num', '5'), drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)));
+ return $output;
+
+ case 'save':
+ variable_set('forum_block_num', $edit['forum_block_num']);
+ break;
- if ($op == 'list') {
- $blocks[0]['info'] = t('Forum topics');
- }
- else {
- if (user_access('access content')) {
- $content = node_title_list(db_query_range("SELECT n.nid, n.title, l.last_comment_timestamp FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid ". node_access_join_sql() ." WHERE n.status = 1 AND n.type='forum' AND ". node_access_where_sql() ." ORDER BY l.last_comment_timestamp DESC", 0, variable_get('forum_block_num', '5')), t('Active forum topics:'));
+ case 'view':
+ if (user_access('access content')) {
+ $content = node_title_list(db_query_range("SELECT n.nid, n.title, l.last_comment_timestamp FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid ". node_access_join_sql() ." WHERE n.status = 1 AND n.type='forum' AND ". node_access_where_sql() ." ORDER BY l.last_comment_timestamp DESC", 0, variable_get('forum_block_num', '5')), t('Active forum topics:'));
- $content .= node_title_list(db_query_range("SELECT n.nid, n.title FROM {node} n ". node_access_join_sql() ." WHERE n.type = 'forum' AND n.status = 1 AND ". node_access_where_sql() ." ORDER BY n.nid DESC", 0, variable_get('forum_block_num', '5')), t('New forum topics:'));
+ $content .= node_title_list(db_query_range("SELECT n.nid, n.title FROM {node} n ". node_access_join_sql() ." WHERE n.type = 'forum' AND n.status = 1 AND ". node_access_where_sql() ." ORDER BY n.nid DESC", 0, variable_get('forum_block_num', '5')), t('New forum topics:'));
- if ($content) {
- $content .= '<div class="more-link">'. l(t('more'), 'forum', array('title' => t('Read the latest forum topics.'))) .'</div>';
- }
+ if ($content) {
+ $content .= '<div class="more-link">'. l(t('more'), 'forum', array('title' => t('Read the latest forum topics.'))) .'</div>';
+ }
- $blocks['subject'] = t('Forum topics');
- $blocks['content'] = $content;
- }
- }
+ $block['subject'] = t('Forum topics');
+ $block['content'] = $content;
- return $blocks;
+ return $block;
+ }
+ }
}
/**
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 897e90f1ed48dd701a97d69b9a446048b305c3ae..74baed4335ef02d43a461be311cf974cfccdd753 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -78,9 +78,6 @@ function forum_settings() {
$group .= form_select(t('Topics per page'), 'forum_per_page', variable_get('forum_per_page', 25), drupal_map_assoc(array(10, 25, 50, 75, 100)), t('The default number of topics displayed per page; links to browse older messages are automatically being displayed.'));
$group .= form_radios(t('Default order'), 'forum_order', variable_get('forum_order', '1'), array(1 => t('Date - newest first'), 2 => t('Date - oldest first'), 3 => t('Posts - most active first'), 4=> t('Posts - least active first')), t('The default display order for topics.'));
$output .= form_group(t('Forum viewing options'), $group);
-
- $group = form_select(t('Number of topics in block'), 'forum_block_num', variable_get('forum_block_num', '5'), drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)), t('The number of topics to show in the "Forum topics" block. To enable the block, go to the <a href="%block-administration">block administration</a> page.', array('%block-administration' => url('admin/block'))));
- $output .= form_group(t('"Forum topic" block settings'), $group);
}
}
@@ -114,27 +111,36 @@ function forum_load($node) {
* Generates a block containing the currently active forum topics and the
* most recently added forum topics.
*/
-function forum_block($op = 'list', $delta = 0) {
+function forum_block($op = 'list', $delta = 0, $edit = array()) {
+ switch ($op) {
+ case 'list':
+ $blocks[0]['info'] = t('Forum topics');
+ return $blocks;
+
+ case 'configure':
+ $output = form_select(t('Number of topics in block'), 'forum_block_num', variable_get('forum_block_num', '5'), drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)));
+ return $output;
+
+ case 'save':
+ variable_set('forum_block_num', $edit['forum_block_num']);
+ break;
- if ($op == 'list') {
- $blocks[0]['info'] = t('Forum topics');
- }
- else {
- if (user_access('access content')) {
- $content = node_title_list(db_query_range("SELECT n.nid, n.title, l.last_comment_timestamp FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid ". node_access_join_sql() ." WHERE n.status = 1 AND n.type='forum' AND ". node_access_where_sql() ." ORDER BY l.last_comment_timestamp DESC", 0, variable_get('forum_block_num', '5')), t('Active forum topics:'));
+ case 'view':
+ if (user_access('access content')) {
+ $content = node_title_list(db_query_range("SELECT n.nid, n.title, l.last_comment_timestamp FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid ". node_access_join_sql() ." WHERE n.status = 1 AND n.type='forum' AND ". node_access_where_sql() ." ORDER BY l.last_comment_timestamp DESC", 0, variable_get('forum_block_num', '5')), t('Active forum topics:'));
- $content .= node_title_list(db_query_range("SELECT n.nid, n.title FROM {node} n ". node_access_join_sql() ." WHERE n.type = 'forum' AND n.status = 1 AND ". node_access_where_sql() ." ORDER BY n.nid DESC", 0, variable_get('forum_block_num', '5')), t('New forum topics:'));
+ $content .= node_title_list(db_query_range("SELECT n.nid, n.title FROM {node} n ". node_access_join_sql() ." WHERE n.type = 'forum' AND n.status = 1 AND ". node_access_where_sql() ." ORDER BY n.nid DESC", 0, variable_get('forum_block_num', '5')), t('New forum topics:'));
- if ($content) {
- $content .= '<div class="more-link">'. l(t('more'), 'forum', array('title' => t('Read the latest forum topics.'))) .'</div>';
- }
+ if ($content) {
+ $content .= '<div class="more-link">'. l(t('more'), 'forum', array('title' => t('Read the latest forum topics.'))) .'</div>';
+ }
- $blocks['subject'] = t('Forum topics');
- $blocks['content'] = $content;
- }
- }
+ $block['subject'] = t('Forum topics');
+ $block['content'] = $content;
- return $blocks;
+ return $block;
+ }
+ }
}
/**
diff --git a/modules/menu.module b/modules/menu.module
index 7869524e137206afaca8b5b21665d9b728aab677..ffd29b3cd59117b56ac392aeac4becfae28848aa 100644
--- a/modules/menu.module
+++ b/modules/menu.module
@@ -84,7 +84,7 @@ function menu_block($op = 'list', $delta = 0) {
}
return $blocks;
}
- else {
+ else if ($op == 'view') {
$data['subject'] = $menu['items'][$delta]['title'];
$data['content'] = '<div class="menu">'. theme('menu_tree', $delta) .'</div>' ;
return $data;
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 7869524e137206afaca8b5b21665d9b728aab677..ffd29b3cd59117b56ac392aeac4becfae28848aa 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -84,7 +84,7 @@ function menu_block($op = 'list', $delta = 0) {
}
return $blocks;
}
- else {
+ else if ($op == 'view') {
$data['subject'] = $menu['items'][$delta]['title'];
$data['content'] = '<div class="menu">'. theme('menu_tree', $delta) .'</div>' ;
return $data;
diff --git a/modules/node.module b/modules/node.module
index 389785b7d1baefc7fae873605a35609fd95d2935..9523efee2079eaf9744cb941bfa8fe4cb5969325 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -968,7 +968,7 @@ function node_block($op = 'list', $delta = 0) {
$blocks[0]['info'] = t('Syndicate');
return $blocks;
}
- else {
+ else if ($op == 'view') {
$block['subject'] = t('Syndicate');
$block['content'] = theme('xml_icon', url('node/feed'));
diff --git a/modules/node/node.module b/modules/node/node.module
index 389785b7d1baefc7fae873605a35609fd95d2935..9523efee2079eaf9744cb941bfa8fe4cb5969325 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -968,7 +968,7 @@ function node_block($op = 'list', $delta = 0) {
$blocks[0]['info'] = t('Syndicate');
return $blocks;
}
- else {
+ else if ($op == 'view') {
$block['subject'] = t('Syndicate');
$block['content'] = theme('xml_icon', url('node/feed'));
diff --git a/modules/poll.module b/modules/poll.module
index eaef156eb7d2a3259bed7b6416fe656fd61207f6..2c078f629cb31a7363418e69789b64ce84e7fedb 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -49,7 +49,7 @@ function poll_block($op = 'list', $delta = 0) {
$blocks[0]['info'] = t('Most recent poll');
return $blocks;
}
- else {
+ else if ($op == 'view') {
// Retrieve the latest poll.
$timestamp = db_result(db_query('SELECT MAX(n.created) FROM {node} n '. node_access_join_sql() ." WHERE n.type = 'poll' AND n.status = 1 AND ". node_access_where_sql() .' AND n.moderate = 0'));
if ($timestamp) {
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index eaef156eb7d2a3259bed7b6416fe656fd61207f6..2c078f629cb31a7363418e69789b64ce84e7fedb 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -49,7 +49,7 @@ function poll_block($op = 'list', $delta = 0) {
$blocks[0]['info'] = t('Most recent poll');
return $blocks;
}
- else {
+ else if ($op == 'view') {
// Retrieve the latest poll.
$timestamp = db_result(db_query('SELECT MAX(n.created) FROM {node} n '. node_access_join_sql() ." WHERE n.type = 'poll' AND n.status = 1 AND ". node_access_where_sql() .' AND n.moderate = 0'));
if ($timestamp) {
diff --git a/modules/queue.module b/modules/queue.module
index 5176ef97171027509799e2571648769833830f6a..891457380353dd33d0036f94c2a235e28575a3b0 100644
--- a/modules/queue.module
+++ b/modules/queue.module
@@ -220,7 +220,7 @@ function queue_block($op = 'list', $delta = 0) {
$blocks[0]['info'] = t('Moderation results');
return $blocks;
}
- else {
+ else if ($op == 'view') {
if (user_access('access submission queue') && (arg(0) == 'queue') || arg(0) == 'node') {
if ($user->uid) {
if (arg(0) == 'queue') {
diff --git a/modules/statistics.module b/modules/statistics.module
index 1189610d9f01d51d5affa8949ab0969b621c2ec7..895f0083b8f4500368adbd76f6fcdf2e24e505bb 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -456,13 +456,6 @@ function statistics_settings() {
$group .= form_radios(t('Display counter values'), 'statistics_display_counter', variable_get('statistics_display_counter', 0), array('1' => t('Enabled'), '0' => t('Disabled')), t('Display how many times given content has been viewed. User must have the "access statistics" permissions to be able to view these counts.'));
$output .= form_group(t('Content viewing counter settings'), $group);
- // Popular content block settings
- $numbers = array('0' => t('Disabled')) + drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40));
- $group = form_select(t("Number of day's top views to display"), 'statistics_block_top_day_num', variable_get('statistics_block_top_day_num', 0), $numbers, t('How many content items to display in "day" list. Requires enabled content viewing counters.'));
- $group .= form_select(t('Number of all time views to display'), 'statistics_block_top_all_num', variable_get('statistics_block_top_all_num', 0), $numbers, t('How many content items to display in "all time" list. Requires enabled content viewing counters.'));
- $group .= form_select(t('Number of most recent views to display'), 'statistics_block_top_last_num', variable_get('statistics_block_top_last_num', 0), $numbers, t('How many content items to display in "recently viewed" list. Requires enabled content viewing counters.'));
- $output .= form_group(t('"Popular content" block settings'), $group);
-
// Popular content page settings
$numbers = array('0' => t('Disabled')) + drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25));
$group = form_textfield(t('Name for link to user page'), 'statistics_userpage_link', variable_get('statistics_userpage_link', ''), 20, 40, t("This node generates a user page listing your site's most popular content. If you specify a name here, a link to the \"Popular content\" page will be added automatically."));
@@ -543,16 +536,30 @@ function statistics_get($nid) {
/**
* Implementation of hook_block().
*/
-function statistics_block($op = 'list', $delta = 0) {
- if ($op == 'list') {
- if (variable_get('statistics_count_content_views', 0)) {
- $blocks[0]['info'] = t('Popular content');
- }
- return $blocks;
- }
- else if (user_access('access content')) {
- switch ($delta) {
- case 0:
+function statistics_block($op = 'list', $delta = 0, $edit = array()) {
+ switch ($op) {
+ case 'list':
+ if (variable_get('statistics_count_content_views', 0)) {
+ $blocks[0]['info'] = t('Popular content');
+ }
+ return $blocks;
+
+ case 'configure':
+ // Popular content block settings
+ $numbers = array('0' => t('Disabled')) + drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40));
+ $output = form_select(t("Number of day's top views to display"), 'statistics_block_top_day_num', variable_get('statistics_block_top_day_num', 0), $numbers, t('How many content items to display in "day" list.'));
+ $output .= form_select(t('Number of all time views to display'), 'statistics_block_top_all_num', variable_get('statistics_block_top_all_num', 0), $numbers, t('How many content items to display in "all time" list.'));
+ $output .= form_select(t('Number of most recent views to display'), 'statistics_block_top_last_num', variable_get('statistics_block_top_last_num', 0), $numbers, t('How many content items to display in "recently viewed" list.'));
+ return $output;
+
+ case 'save':
+ variable_set('statistics_block_top_day_num', $edit['statistics_block_top_day_num']);
+ variable_set('statistics_block_top_all_num', $edit['statistics_block_top_all_num']);
+ variable_set('statistics_block_top_last_num', $edit['statistics_block_top_last_num']);
+ break;
+
+ case 'view':
+ if (user_access('access content')) {
$content = array();
$daytop = variable_get('statistics_block_top_day_num', 0);
@@ -571,12 +578,11 @@ function statistics_block($op = 'list', $delta = 0) {
}
$output = implode($content, '<br />');
- $block['subject'] = variable_get('statistics_block_top_title', t('Popular content'));
+ $block['subject'] = t('Popular content');
$block['content'] = $output;
- break;
- }
- return $block;
+ return $block;
+ }
}
}
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index 1189610d9f01d51d5affa8949ab0969b621c2ec7..895f0083b8f4500368adbd76f6fcdf2e24e505bb 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -456,13 +456,6 @@ function statistics_settings() {
$group .= form_radios(t('Display counter values'), 'statistics_display_counter', variable_get('statistics_display_counter', 0), array('1' => t('Enabled'), '0' => t('Disabled')), t('Display how many times given content has been viewed. User must have the "access statistics" permissions to be able to view these counts.'));
$output .= form_group(t('Content viewing counter settings'), $group);
- // Popular content block settings
- $numbers = array('0' => t('Disabled')) + drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40));
- $group = form_select(t("Number of day's top views to display"), 'statistics_block_top_day_num', variable_get('statistics_block_top_day_num', 0), $numbers, t('How many content items to display in "day" list. Requires enabled content viewing counters.'));
- $group .= form_select(t('Number of all time views to display'), 'statistics_block_top_all_num', variable_get('statistics_block_top_all_num', 0), $numbers, t('How many content items to display in "all time" list. Requires enabled content viewing counters.'));
- $group .= form_select(t('Number of most recent views to display'), 'statistics_block_top_last_num', variable_get('statistics_block_top_last_num', 0), $numbers, t('How many content items to display in "recently viewed" list. Requires enabled content viewing counters.'));
- $output .= form_group(t('"Popular content" block settings'), $group);
-
// Popular content page settings
$numbers = array('0' => t('Disabled')) + drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25));
$group = form_textfield(t('Name for link to user page'), 'statistics_userpage_link', variable_get('statistics_userpage_link', ''), 20, 40, t("This node generates a user page listing your site's most popular content. If you specify a name here, a link to the \"Popular content\" page will be added automatically."));
@@ -543,16 +536,30 @@ function statistics_get($nid) {
/**
* Implementation of hook_block().
*/
-function statistics_block($op = 'list', $delta = 0) {
- if ($op == 'list') {
- if (variable_get('statistics_count_content_views', 0)) {
- $blocks[0]['info'] = t('Popular content');
- }
- return $blocks;
- }
- else if (user_access('access content')) {
- switch ($delta) {
- case 0:
+function statistics_block($op = 'list', $delta = 0, $edit = array()) {
+ switch ($op) {
+ case 'list':
+ if (variable_get('statistics_count_content_views', 0)) {
+ $blocks[0]['info'] = t('Popular content');
+ }
+ return $blocks;
+
+ case 'configure':
+ // Popular content block settings
+ $numbers = array('0' => t('Disabled')) + drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40));
+ $output = form_select(t("Number of day's top views to display"), 'statistics_block_top_day_num', variable_get('statistics_block_top_day_num', 0), $numbers, t('How many content items to display in "day" list.'));
+ $output .= form_select(t('Number of all time views to display'), 'statistics_block_top_all_num', variable_get('statistics_block_top_all_num', 0), $numbers, t('How many content items to display in "all time" list.'));
+ $output .= form_select(t('Number of most recent views to display'), 'statistics_block_top_last_num', variable_get('statistics_block_top_last_num', 0), $numbers, t('How many content items to display in "recently viewed" list.'));
+ return $output;
+
+ case 'save':
+ variable_set('statistics_block_top_day_num', $edit['statistics_block_top_day_num']);
+ variable_set('statistics_block_top_all_num', $edit['statistics_block_top_all_num']);
+ variable_set('statistics_block_top_last_num', $edit['statistics_block_top_last_num']);
+ break;
+
+ case 'view':
+ if (user_access('access content')) {
$content = array();
$daytop = variable_get('statistics_block_top_day_num', 0);
@@ -571,12 +578,11 @@ function statistics_block($op = 'list', $delta = 0) {
}
$output = implode($content, '<br />');
- $block['subject'] = variable_get('statistics_block_top_title', t('Popular content'));
+ $block['subject'] = t('Popular content');
$block['content'] = $output;
- break;
- }
- return $block;
+ return $block;
+ }
}
}
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index 6f830d57aabd9bc8b816ac95d4230701e0a07384..ec883830d2a141c2302dad69bef1b77abeeb27c8 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -102,7 +102,7 @@ function taxonomy_block($op = 'list', $delta = 0) {
$blocks[0]['info'] = t('Categories');
return $blocks;
}
- else if (user_access('access content')) {
+ else if ($op == 'view' && user_access('access content')) {
$result = db_query("SELECT d.tid, d.name, MAX(n.created) AS updated, COUNT(*) AS count FROM {term_data} d INNER JOIN {term_node} USING (tid) INNER JOIN {node} n USING (nid) WHERE n.status = 1 GROUP BY d.tid, d.name ORDER BY updated DESC, d.name");
$items = array();
while ($category = db_fetch_object($result)) {
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 6f830d57aabd9bc8b816ac95d4230701e0a07384..ec883830d2a141c2302dad69bef1b77abeeb27c8 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -102,7 +102,7 @@ function taxonomy_block($op = 'list', $delta = 0) {
$blocks[0]['info'] = t('Categories');
return $blocks;
}
- else if (user_access('access content')) {
+ else if ($op == 'view' && user_access('access content')) {
$result = db_query("SELECT d.tid, d.name, MAX(n.created) AS updated, COUNT(*) AS count FROM {term_data} d INNER JOIN {term_node} USING (tid) INNER JOIN {node} n USING (nid) WHERE n.status = 1 GROUP BY d.tid, d.name ORDER BY updated DESC, d.name");
$items = array();
while ($category = db_fetch_object($result)) {
diff --git a/modules/throttle.module b/modules/throttle.module
index 9e98a6278c9f74b3d6a0dd4020f862b39f5f74c9..9b568961a9ca71fefd6d7492696563ac8f1b0f21 100644
--- a/modules/throttle.module
+++ b/modules/throttle.module
@@ -158,7 +158,7 @@ function throttle_block($op = 'list', $delta = 0) {
$blocks[0]['info'] = t('Throttle status');
return $blocks;
}
- else {
+ else if ($op == 'view') {
$block['subject'] = t('Throttle status');
$block['content'] = throttle_display_throttle_block();
return $block;
diff --git a/modules/throttle/throttle.module b/modules/throttle/throttle.module
index 9e98a6278c9f74b3d6a0dd4020f862b39f5f74c9..9b568961a9ca71fefd6d7492696563ac8f1b0f21 100644
--- a/modules/throttle/throttle.module
+++ b/modules/throttle/throttle.module
@@ -158,7 +158,7 @@ function throttle_block($op = 'list', $delta = 0) {
$blocks[0]['info'] = t('Throttle status');
return $blocks;
}
- else {
+ else if ($op == 'view') {
$block['subject'] = t('Throttle status');
$block['content'] = throttle_display_throttle_block();
return $block;
diff --git a/modules/user.module b/modules/user.module
index 716316f06c2ab87e810fb463383d93d155acfaeb..1e30d6f41064058a39156be7ba2daea32ed31e4d 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -471,7 +471,7 @@ function user_user($type, &$edit, &$user, $category = NULL) {
/**
* Implementation of hook_block().
*/
-function user_block($op = 'list', $delta = 0) {
+function user_block($op = 'list', $delta = 0, $edit = array()) {
global $user;
if ($op == 'list') {
@@ -482,7 +482,18 @@ function user_block($op = 'list', $delta = 0) {
return $blocks;
}
- else {
+ else if ($op == 'configure' && $delta == 3) {
+ $period = drupal_map_assoc(array(30, 60, 120, 180, 300, 600, 900, 1800, 2700, 3600, 5400, 7200, 10800, 21600, 43200, 86400), 'format_interval');
+ $output = form_select(t('User activity'), 'user_block_seconds_online', variable_get('user_block_seconds_online', 900), $period, t('A user is considered online for this long after they have last viewed a page.'));
+ $output .= form_select(t('User list length'), 'user_block_max_list_count', variable_get('user_block_max_list_count', 10), drupal_map_assoc(array(0, 5, 10, 15, 20, 25, 30, 40, 50, 75, 100)), t('Maximum number of currently online users to display.'));
+
+ return $output;
+ }
+ else if ($op == 'save' && $delta == 3) {
+ variable_set('user_block_seconds_online', $edit['user_block_seconds_online']);
+ variable_set('user_block_max_list_count', $edit['user_block_max_list_count']);
+ }
+ else if ($op == 'view') {
$block = array();
switch ($delta) {
@@ -1287,12 +1298,6 @@ function user_configure_settings() {
$output .= form_group(t('Pictures'), $group);
- // "Who's online" block settings.
- $period = drupal_map_assoc(array(30, 60, 120, 180, 300, 600, 900, 1800, 2700, 3600, 5400, 7200, 10800, 21600, 43200, 86400), 'format_interval');
- $group = form_select(t('User activity'), 'user_block_seconds_online', variable_get('user_block_seconds_online', 900), $period, t('Affects "Who\'s online" block. A user is considered online for this long after they have last viewed a page.'));
- $group .= form_select(t('User list length'), 'user_block_max_list_count', variable_get('user_block_max_list_count', 10), drupal_map_assoc(array(0, 5, 10, 15, 20, 25, 30, 40, 50, 75, 100)), t('Affects "Who\'s online" block. Maximum number of currently online users to display.'));
- $output .= form_group(t('"Who\'s online" block settings'), $group);
-
return $output;
}
diff --git a/modules/user/user.module b/modules/user/user.module
index 716316f06c2ab87e810fb463383d93d155acfaeb..1e30d6f41064058a39156be7ba2daea32ed31e4d 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -471,7 +471,7 @@ function user_user($type, &$edit, &$user, $category = NULL) {
/**
* Implementation of hook_block().
*/
-function user_block($op = 'list', $delta = 0) {
+function user_block($op = 'list', $delta = 0, $edit = array()) {
global $user;
if ($op == 'list') {
@@ -482,7 +482,18 @@ function user_block($op = 'list', $delta = 0) {
return $blocks;
}
- else {
+ else if ($op == 'configure' && $delta == 3) {
+ $period = drupal_map_assoc(array(30, 60, 120, 180, 300, 600, 900, 1800, 2700, 3600, 5400, 7200, 10800, 21600, 43200, 86400), 'format_interval');
+ $output = form_select(t('User activity'), 'user_block_seconds_online', variable_get('user_block_seconds_online', 900), $period, t('A user is considered online for this long after they have last viewed a page.'));
+ $output .= form_select(t('User list length'), 'user_block_max_list_count', variable_get('user_block_max_list_count', 10), drupal_map_assoc(array(0, 5, 10, 15, 20, 25, 30, 40, 50, 75, 100)), t('Maximum number of currently online users to display.'));
+
+ return $output;
+ }
+ else if ($op == 'save' && $delta == 3) {
+ variable_set('user_block_seconds_online', $edit['user_block_seconds_online']);
+ variable_set('user_block_max_list_count', $edit['user_block_max_list_count']);
+ }
+ else if ($op == 'view') {
$block = array();
switch ($delta) {
@@ -1287,12 +1298,6 @@ function user_configure_settings() {
$output .= form_group(t('Pictures'), $group);
- // "Who's online" block settings.
- $period = drupal_map_assoc(array(30, 60, 120, 180, 300, 600, 900, 1800, 2700, 3600, 5400, 7200, 10800, 21600, 43200, 86400), 'format_interval');
- $group = form_select(t('User activity'), 'user_block_seconds_online', variable_get('user_block_seconds_online', 900), $period, t('Affects "Who\'s online" block. A user is considered online for this long after they have last viewed a page.'));
- $group .= form_select(t('User list length'), 'user_block_max_list_count', variable_get('user_block_max_list_count', 10), drupal_map_assoc(array(0, 5, 10, 15, 20, 25, 30, 40, 50, 75, 100)), t('Affects "Who\'s online" block. Maximum number of currently online users to display.'));
- $output .= form_group(t('"Who\'s online" block settings'), $group);
-
return $output;
}