| block_title; ?> |
region_select; ?> |
weight_select; ?> |
Index: modules/block/block.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v
retrieving revision 1.14
diff -u -p -r1.14 block.admin.inc
--- modules/block/block.admin.inc 22 Dec 2007 23:24:24 -0000 1.14
+++ modules/block/block.admin.inc 11 Apr 2008 16:17:06 -0000
@@ -29,23 +29,23 @@ function block_admin_display_form(&$form
global $theme_key, $custom_theme;
// Add CSS
- drupal_add_css(drupal_get_path('module', 'block') .'/block.css', 'module', 'all', FALSE);
+ drupal_add_css(drupal_get_path('module', 'block') . '/block.css', 'module', 'all', FALSE);
// If non-default theme configuration has been selected, set the custom theme.
$custom_theme = isset($theme) ? $theme : variable_get('theme_default', 'garland');
init_theme();
$throttle = module_exists('throttle');
- $block_regions = system_region_list($theme_key) + array(BLOCK_REGION_NONE => '<'. t('none') .'>');
+ $block_regions = system_region_list($theme_key) + array(BLOCK_REGION_NONE => '<' . t('none') . '>');
// Build form tree
$form = array(
- '#action' => arg(3) ? url('admin/build/block/list/'. $theme_key) : url('admin/build/block'),
+ '#action' => arg(3) ? url('admin/build/block/list/' . $theme_key) : url('admin/build/block'),
'#tree' => TRUE,
);
foreach ($blocks as $i => $block) {
- $key = $block['module'] .'_'. $block['delta'];
+ $key = $block['module'] . '_' . $block['delta'];
$form[$key]['module'] = array(
'#type' => 'value',
'#value' => $block['module'],
@@ -74,9 +74,9 @@ function block_admin_display_form(&$form
if ($throttle) {
$form[$key]['throttle'] = array('#type' => 'checkbox', '#default_value' => isset($block['throttle']) ? $block['throttle'] : FALSE);
}
- $form[$key]['configure'] = array('#value' => l(t('configure'), 'admin/build/block/configure/'. $block['module'] .'/'. $block['delta']));
+ $form[$key]['configure'] = array('#value' => l(t('configure'), 'admin/build/block/configure/' . $block['module'] . '/' . $block['delta']));
if ($block['module'] == 'block') {
- $form[$key]['delete'] = array('#value' => l(t('delete'), 'admin/build/block/delete/'. $block['delta']));
+ $form[$key]['delete'] = array('#value' => l(t('delete'), 'admin/build/block/delete/' . $block['delta']));
}
}
@@ -234,7 +234,7 @@ function block_admin_configure(&$form_st
if ($access) {
$options[] = t('Show if the following PHP code returns TRUE (PHP-mode, experts only).');
- $description .= ' '. t('If the PHP-mode is chosen, enter PHP code between %php. Note that executing incorrect PHP-code can break your Drupal site.', array('%php' => ''));
+ $description .= ' ' . t('If the PHP-mode is chosen, enter PHP code between %php. Note that executing incorrect PHP-code can break your Drupal site.', array('%php' => ''));
}
$form['page_vis_settings']['visibility'] = array(
'#type' => 'radios',
@@ -359,7 +359,7 @@ function template_preprocess_block_admin
foreach ($block_regions as $key => $value) {
// Highlight regions on page to provide visual reference.
- drupal_set_content($key, ''. $value .'
');
+ drupal_set_content($key, '' . $value . '
');
// Initialize an empty array for the region.
$variables['block_listing'][$key] = array();
}
@@ -378,8 +378,8 @@ function template_preprocess_block_admin
$region = $block['region']['#default_value'];
// Set special classes needed for table drag and drop.
- $variables['form'][$i]['region']['#attributes']['class'] = 'block-region-select block-region-'. $region;
- $variables['form'][$i]['weight']['#attributes']['class'] = 'block-weight block-weight-'. $region;
+ $variables['form'][$i]['region']['#attributes']['class'] = 'block-region-select block-region-' . $region;
+ $variables['form'][$i]['weight']['#attributes']['class'] = 'block-weight block-weight-' . $region;
$variables['block_listing'][$region][$i]->row_class = isset($block['#attributes']['class']) ? $block['#attributes']['class'] : '';
$variables['block_listing'][$region][$i]->block_modified = isset($block['#attributes']['class']) && strpos($block['#attributes']['class'], 'block-modified') !== FALSE ? TRUE : FALSE;
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.301
diff -u -p -r1.301 block.module
--- modules/block/block.module 21 Mar 2008 08:41:25 -0000 1.301
+++ modules/block/block.module 11 Apr 2008 16:17:06 -0000
@@ -67,29 +67,29 @@ define('BLOCK_CACHE_GLOBAL', 0x0008);
function block_help($path, $arg) {
switch ($path) {
case 'admin/help#block':
- $output = ''. t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Garland, for example, implements the regions "left sidebar", "right sidebar", "content", "header", and "footer", and a block may appear in any one of these areas. The blocks administration page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array('@blocks' => url('admin/build/block'))) .'
';
- $output .= ''. t('Although blocks are usually generated automatically by modules (like the User login block, for example), administrators can also define custom blocks. Custom blocks have a title, description, and body. The body of the block can be as long as necessary, and can contain content supported by any available input format.', array('@input-format' => url('admin/settings/filters'))) .'
';
- $output .= ''. t('When working with blocks, remember that:') .'
';
- $output .= '- '. t('since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis.') .'
';
- $output .= '- '. t('disabled blocks, or blocks not in a region, are never shown.') .'
';
- $output .= '- '. t('when throttle module is enabled, throttled blocks (blocks with the Throttle checkbox selected) are hidden during high server loads.') .'
';
- $output .= '- '. t('blocks can be configured to be visible only on certain pages.') .'
';
- $output .= '- '. t('blocks can be configured to be visible only when specific conditions are true.') .'
';
- $output .= '- '. t('blocks can be configured to be visible only for certain user roles.') .'
';
- $output .= '- '. t('when allowed by an administrator, specific blocks may be enabled or disabled on a per-user basis using the My account page.') .'
';
- $output .= '- '. t('some dynamic blocks, such as those generated by modules, will be displayed only on certain pages.') .'
';
- $output .= ''. t('For more information, see the online handbook entry for Block module.', array('@block' => 'http://drupal.org/handbook/modules/block/')) .'
';
+ $output = '' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Garland, for example, implements the regions "left sidebar", "right sidebar", "content", "header", and "footer", and a block may appear in any one of these areas. The blocks administration page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array('@blocks' => url('admin/build/block'))) . '
';
+ $output .= '' . t('Although blocks are usually generated automatically by modules (like the User login block, for example), administrators can also define custom blocks. Custom blocks have a title, description, and body. The body of the block can be as long as necessary, and can contain content supported by any available input format.', array('@input-format' => url('admin/settings/filters'))) . '
';
+ $output .= '' . t('When working with blocks, remember that:') . '
';
+ $output .= '- ' . t('since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis.') . '
';
+ $output .= '- ' . t('disabled blocks, or blocks not in a region, are never shown.') . '
';
+ $output .= '- ' . t('when throttle module is enabled, throttled blocks (blocks with the Throttle checkbox selected) are hidden during high server loads.') . '
';
+ $output .= '- ' . t('blocks can be configured to be visible only on certain pages.') . '
';
+ $output .= '- ' . t('blocks can be configured to be visible only when specific conditions are true.') . '
';
+ $output .= '- ' . t('blocks can be configured to be visible only for certain user roles.') . '
';
+ $output .= '- ' . t('when allowed by an administrator, specific blocks may be enabled or disabled on a per-user basis using the My account page.') . '
';
+ $output .= '- ' . t('some dynamic blocks, such as those generated by modules, will be displayed only on certain pages.') . '
';
+ $output .= '' . t('For more information, see the online handbook entry for Block module.', array('@block' => 'http://drupal.org/handbook/modules/block/')) . '
';
return $output;
case 'admin/build/block':
$throttle = module_exists('throttle');
- $output = ''. t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. To change the region or order of a block, grab a drag-and-drop handle under the Block column and drag the block to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the Save blocks button at the bottom of the page.') .'
';
+ $output = '' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. To change the region or order of a block, grab a drag-and-drop handle under the Block column and drag the block to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the Save blocks button at the bottom of the page.') . '
';
if ($throttle) {
- $output .= ''. t('To reduce CPU usage, database traffic or bandwidth, blocks may be automatically disabled during high server loads by selecting their Throttle checkbox. Adjust throttle thresholds on the throttle configuration page.', array('@throttleconfig' => url('admin/settings/throttle'))) .'
';
+ $output .= '' . t('To reduce CPU usage, database traffic or bandwidth, blocks may be automatically disabled during high server loads by selecting their Throttle checkbox. Adjust throttle thresholds on the throttle configuration page.', array('@throttleconfig' => url('admin/settings/throttle'))) . '
';
}
- $output .= ''. t('Click the configure link next to each block to configure its specific title and visibility settings. Use the add block page to create a custom block.', array('@add-block' => url('admin/build/block/add'))) .'
';
+ $output .= '' . t('Click the configure link next to each block to configure its specific title and visibility settings. Use the add block page to create a custom block.', array('@add-block' => url('admin/build/block/add'))) . '
';
return $output;
case 'admin/build/block/add':
- return ''. t('Use this page to create a new custom block. New blocks are disabled by default, and must be moved to a region on the blocks administration page to be visible.', array('@blocks' => url('admin/build/block'))) .'
';
+ return '' . t('Use this page to create a new custom block. New blocks are disabled by default, and must be moved to a region on the blocks administration page to be visible.', array('@blocks' => url('admin/build/block'))) . '
';
}
}
@@ -161,7 +161,7 @@ function block_menu() {
);
$default = variable_get('theme_default', 'garland');
foreach (list_themes() as $key => $theme) {
- $items['admin/build/block/list/'. $key] = array(
+ $items['admin/build/block/list/' . $key] = array(
'title' => check_plain($theme->info['name']),
'page arguments' => array($key),
'type' => $key == $default ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK,
@@ -356,7 +356,7 @@ function block_user($type, $edit, &$acco
case 'form':
if ($category == 'account') {
$rids = array_keys($account->roles);
- $result = db_query("SELECT DISTINCT b.* FROM {blocks} b LEFT JOIN {blocks_roles} r ON b.module = r.module AND b.delta = r.delta WHERE b.status = 1 AND b.custom != 0 AND (r.rid IN (". db_placeholders($rids) .") OR r.rid IS NULL) ORDER BY b.weight, b.module", $rids);
+ $result = db_query("SELECT DISTINCT b.* FROM {blocks} b LEFT JOIN {blocks_roles} r ON b.module = r.module AND b.delta = r.delta WHERE b.status = 1 AND b.custom != 0 AND (r.rid IN (" . db_placeholders($rids) . ") OR r.rid IS NULL) ORDER BY b.weight, b.module", $rids);
$form['block'] = array('#type' => 'fieldset', '#title' => t('Block configuration'), '#weight' => 3, '#collapsible' => TRUE, '#tree' => TRUE);
while ($block = db_fetch_object($result)) {
$data = module_invoke($block->module, 'block', 'list');
@@ -421,7 +421,7 @@ function _block_load_blocks() {
$blocks = array();
$rids = array_keys($user->roles);
- $result = db_query(db_rewrite_sql("SELECT DISTINCT b.* FROM {blocks} b LEFT JOIN {blocks_roles} r ON b.module = r.module AND b.delta = r.delta WHERE b.theme = '%s' AND b.status = 1 AND (r.rid IN (". db_placeholders($rids) .") OR r.rid IS NULL) ORDER BY b.region, b.weight, b.module", 'b', 'bid'), array_merge(array($theme_key), $rids));
+ $result = db_query(db_rewrite_sql("SELECT DISTINCT b.* FROM {blocks} b LEFT JOIN {blocks_roles} r ON b.module = r.module AND b.delta = r.delta WHERE b.theme = '%s' AND b.status = 1 AND (r.rid IN (" . db_placeholders($rids) . ") OR r.rid IS NULL) ORDER BY b.region, b.weight, b.module", 'b', 'bid'), array_merge(array($theme_key), $rids));
while ($block = db_fetch_object($result)) {
if (!isset($blocks[$block->region])) {
$blocks[$block->region] = array();
@@ -560,7 +560,7 @@ function _block_get_cache_id($block) {
// resource drag for sites with many users, so when a module is being
// equivocal, we favor the less expensive 'PER_ROLE' pattern.
if ($block->cache & BLOCK_CACHE_PER_ROLE) {
- $cid_parts[] = 'r.'. implode(',', array_keys($user->roles));
+ $cid_parts[] = 'r.' . implode(',', array_keys($user->roles));
}
elseif ($block->cache & BLOCK_CACHE_PER_USER) {
$cid_parts[] = "u.$user->uid";
Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.300
diff -u -p -r1.300 blog.module
--- modules/blog/blog.module 10 Apr 2008 10:28:22 -0000 1.300
+++ modules/blog/blog.module 11 Apr 2008 16:17:06 -0000
@@ -61,11 +61,11 @@ function blog_user($type, &$edit, &$user
function blog_help($path, $arg) {
switch ($path) {
case 'admin/help#blog':
- $output = ''. t('The blog module allows registered users to maintain an online journal, or blog. Blogs are made up of individual blog entries, and the blog entries are most often displayed in descending order by creation time.') .'
';
- $output .= ''. t('There is an (optional) Blogs menu item added to the Navigation menu, which displays all blogs available on your site, and a My blog item displaying the current user\'s blog entries. The Blog entry menu item under Create content allows new blog entries to be created.') .'
';
- $output .= ''. t('Each blog entry is displayed with an automatic link to other blogs created by the same user. By default, blog entries have comments enabled and are automatically promoted to the site front page. The blog module also creates a Recent blog posts block that may be enabled at the blocks administration page.', array('@blocks' => url('admin/build/block'))) .'
';
- $output .= ''. t('When using the aggregator module an automatic blog it icon is displayed next to the items in a feed\'s latest items block. Clicking this icon populates a blog entry with a title (the title of the feed item) and body (a link to the source item on its original site and illustrative content suitable for use in a block quote). Blog authors can use this feature to easily comment on items of interest that appear in aggregator feeds from other sites. To use this feature, be sure to enable the aggregator module, add and configure a feed from another site, and position the feed\'s latest items block.', array('@modules' => url('admin/build/modules'), '@feeds' => url('admin/content/aggregator'), '@blocks' => url('admin/build/block'))) .'
';
- $output .= ''. t('For more information, see the online handbook entry for Blog module.', array('@blog' => 'http://drupal.org/handbook/modules/blog/')) .'
';
+ $output = '' . t('The blog module allows registered users to maintain an online journal, or blog. Blogs are made up of individual blog entries, and the blog entries are most often displayed in descending order by creation time.') . '
';
+ $output .= '' . t('There is an (optional) Blogs menu item added to the Navigation menu, which displays all blogs available on your site, and a My blog item displaying the current user\'s blog entries. The Blog entry menu item under Create content allows new blog entries to be created.') . '
';
+ $output .= '' . t('Each blog entry is displayed with an automatic link to other blogs created by the same user. By default, blog entries have comments enabled and are automatically promoted to the site front page. The blog module also creates a Recent blog posts block that may be enabled at the blocks administration page.', array('@blocks' => url('admin/build/block'))) . '
';
+ $output .= '' . t('When using the aggregator module an automatic blog it icon is displayed next to the items in a feed\'s latest items block. Clicking this icon populates a blog entry with a title (the title of the feed item) and body (a link to the source item on its original site and illustrative content suitable for use in a block quote). Blog authors can use this feature to easily comment on items of interest that appear in aggregator feeds from other sites. To use this feature, be sure to enable the aggregator module, add and configure a feed from another site, and position the feed\'s latest items block.', array('@modules' => url('admin/build/modules'), '@feeds' => url('admin/content/aggregator'), '@blocks' => url('admin/build/block'))) . '
';
+ $output .= '' . t('For more information, see the online handbook entry for Blog module.', array('@blog' => 'http://drupal.org/handbook/modules/blog/')) . '
';
return $output;
}
}
@@ -83,13 +83,13 @@ function blog_form(&$node) {
// If the user clicked a "blog it" link, we load the data from the
// database and quote it in the blog.
if ($nid && $blog = node_load($nid)) {
- $node->body = ''. $blog->body .' ['. l($blog->name, "node/$nid") .']';
+ $node->body = '' . $blog->body . ' [' . l($blog->name, "node/$nid") . ']';
}
if ($iid && $item = db_fetch_object(db_query('SELECT i.*, f.title as ftitle, f.link as flink FROM {aggregator_item} i, {aggregator_feed} f WHERE i.iid = %d AND i.fid = f.fid', $iid))) {
$node->title = $item->title;
// Note: $item->description has been validated on aggregation.
- $node->body = ''. check_plain($item->title) .' - '. $item->description .' ['. check_plain($item->ftitle) ."]\n";
+ $node->body = '' . check_plain($item->title) . ' - ' . $item->description . ' [' . check_plain($item->ftitle) . "]\n";
}
}
@@ -105,7 +105,7 @@ function blog_form(&$node) {
function blog_view($node, $teaser = FALSE, $page = FALSE) {
if ($page) {
// Breadcrumb navigation
- drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Blogs'), 'blog'), l(t("@name's blog", array('@name' => $node->name)), 'blog/'. $node->uid)));
+ drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Blogs'), 'blog'), l(t("@name's blog", array('@name' => $node->name)), 'blog/' . $node->uid)));
}
return node_prepare($node, $teaser);
}
Index: modules/blog/blog.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.pages.inc,v
retrieving revision 1.7
diff -u -p -r1.7 blog.pages.inc
--- modules/blog/blog.pages.inc 10 Feb 2008 18:58:28 -0000 1.7
+++ modules/blog/blog.pages.inc 11 Apr 2008 16:17:07 -0000
@@ -44,7 +44,7 @@ function blog_page_user($account) {
drupal_set_message(t('!author has not created any blog entries.', array('!author' => theme('username', $account))));
}
}
- drupal_add_feed(url('blog/'. $account->uid .'/feed'), t('RSS - !title', array('!title' => $title)));
+ drupal_add_feed(url('blog/' . $account->uid . '/feed'), t('RSS - !title', array('!title' => $title)));
return $output;
}
@@ -88,8 +88,8 @@ function blog_page_last() {
*/
function blog_feed_user($account) {
$result = db_query_range(db_rewrite_sql("SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.uid = %d AND n.status = 1 ORDER BY n.created DESC"), $account->uid, 0, variable_get('feed_default_items', 10));
- $channel['title'] = $account->name ."'s blog";
- $channel['link'] = url('blog/'. $account->uid, array('absolute' => TRUE));
+ $channel['title'] = $account->name . "'s blog";
+ $channel['link'] = url('blog/' . $account->uid, array('absolute' => TRUE));
$items = array();
while ($row = db_fetch_object($result)) {
@@ -103,7 +103,7 @@ function blog_feed_user($account) {
*/
function blog_feed_last() {
$result = db_query_range(db_rewrite_sql("SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, variable_get('feed_default_items', 10));
- $channel['title'] = variable_get('site_name', 'Drupal') .' blogs';
+ $channel['title'] = variable_get('site_name', 'Drupal') . ' blogs';
$channel['link'] = url('blog', array('absolute' => TRUE));
$items = array();
Index: modules/blogapi/blogapi.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.install,v
retrieving revision 1.1
diff -u -p -r1.1 blogapi.install
--- modules/blogapi/blogapi.install 9 Jan 2008 09:51:34 -0000 1.1
+++ modules/blogapi/blogapi.install 11 Apr 2008 16:17:07 -0000
@@ -10,7 +10,7 @@
* Inform users about the new permission.
*/
function blogapi_update_6000() {
- drupal_set_message("Blog API module does not depend on blog module's permissions anymore, but provides its own 'administer content with blog api' permission instead. Until 'module-blogapi')) .'">this permission is assigned to at least one user role, only the site administrator will be able to use Blog API features.');
+ drupal_set_message("Blog API module does not depend on blog module's permissions anymore, but provides its own 'administer content with blog api' permission instead. Until 'module-blogapi')) . '">this permission is assigned to at least one user role, only the site administrator will be able to use Blog API features.');
return array();
}
Index: modules/blogapi/blogapi.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v
retrieving revision 1.117
diff -u -p -r1.117 blogapi.module
--- modules/blogapi/blogapi.module 20 Feb 2008 13:46:39 -0000 1.117
+++ modules/blogapi/blogapi.module 11 Apr 2008 16:17:07 -0000
@@ -12,10 +12,10 @@
function blogapi_help($path, $arg) {
switch ($path) {
case 'admin/help#blogapi':
- $output = ''. t("The Blog API module allows your site's users to access and post to their blogs from external blogging clients. External blogging clients are available for a wide range of desktop operating systems, and generally provide a feature-rich graphical environment for creating and editing posts.") .'
';
- $output .= ''. t('Ecto, a blogging client available for both Mac OS X and Microsoft Windows, can be used with Blog API. Blog API also supports Blogger API, MetaWeblog API, and most of the Movable Type API. Blogging clients and other services (e.g. Flickr\'s "post to blog") that support these APIs may also be compatible.', array('@ecto-link' => url('http://infinite-sushi.com/software/ecto/'), '@blogger-api' => url('http://www.blogger.com/developers/api/1_docs/'), '@metaweblog-api' => url('http://www.xmlrpc.com/metaWeblogApi'), '@movabletype-api' => url('http://www.movabletype.org/docs/mtmanual_programmatic.html'), '@flickr' => url('http://www.flickr.com'))) .'
';
- $output .= ''. t('Select the content types available to external clients on the Blog API settings page. If supported and available, each content type will be displayed as a separate "blog" by the external client.', array('@blogapi-settings' => url('admin/settings/blogapi'))) .'
';
- $output .= ''. t('For more information, see the online handbook entry for Blog API module.', array('@blogapi' => url('http://drupal.org/handbook/modules/blogapi/'))) .'
';
+ $output = '' . t("The Blog API module allows your site's users to access and post to their blogs from external blogging clients. External blogging clients are available for a wide range of desktop operating systems, and generally provide a feature-rich graphical environment for creating and editing posts.") . '
';
+ $output .= '' . t('Ecto, a blogging client available for both Mac OS X and Microsoft Windows, can be used with Blog API. Blog API also supports Blogger API, MetaWeblog API, and most of the Movable Type API. Blogging clients and other services (e.g. Flickr\'s "post to blog") that support these APIs may also be compatible.', array('@ecto-link' => url('http://infinite-sushi.com/software/ecto/'), '@blogger-api' => url('http://www.blogger.com/developers/api/1_docs/'), '@metaweblog-api' => url('http://www.xmlrpc.com/metaWeblogApi'), '@movabletype-api' => url('http://www.movabletype.org/docs/mtmanual_programmatic.html'), '@flickr' => url('http://www.flickr.com'))) . '
';
+ $output .= '' . t('Select the content types available to external clients on the Blog API settings page. If supported and available, each content type will be displayed as a separate "blog" by the external client.', array('@blogapi-settings' => url('admin/settings/blogapi'))) . '
';
+ $output .= '' . t('For more information, see the online handbook entry for Blog API module.', array('@blogapi' => url('http://drupal.org/handbook/modules/blogapi/'))) . '
';
return $output;
}
}
@@ -147,7 +147,7 @@ function blogapi_blogger_get_users_blogs
$types = _blogapi_get_node_types();
$structs = array();
foreach ($types as $type) {
- $structs[] = array('url' => url('blog/'. $user->uid, array('absolute' => TRUE)), 'blogid' => $type, 'blogName' => $user->name .": ". $type);
+ $structs[] = array('url' => url('blog/' . $user->uid, array('absolute' => TRUE)), 'blogid' => $type, 'blogName' => $user->name . ": " . $type);
}
return $structs;
}
@@ -170,7 +170,7 @@ function blogapi_blogger_get_user_info($
'firstname' => $name[0],
'nickname' => $user->name,
'email' => $user->mail,
- 'url' => url('blog/'. $user->uid, array('absolute' => TRUE)));
+ 'url' => url('blog/' . $user->uid, array('absolute' => TRUE)));
}
else {
return blogapi_error($user);
@@ -194,11 +194,11 @@ function blogapi_blogger_new_post($appke
$edit = array();
$edit['type'] = $blogid;
// get the node type defaults
- $node_type_default = variable_get('node_options_'. $edit['type'], array('status', 'promote'));
+ $node_type_default = variable_get('node_options_' . $edit['type'], array('status', 'promote'));
$edit['uid'] = $user->uid;
$edit['name'] = $user->name;
$edit['promote'] = in_array('promote', $node_type_default);
- $edit['comment'] = variable_get('comment_'. $edit['type'], 2);
+ $edit['comment'] = variable_get('comment_' . $edit['type'], 2);
$edit['revision'] = in_array('revision', $node_type_default);
$edit['format'] = FILTER_FORMAT_DEFAULT;
$edit['status'] = $publish;
@@ -405,7 +405,7 @@ function blogapi_metaweblog_get_category
foreach ($terms as $term) {
$term_name = $term->name;
foreach (module_invoke('taxonomy', 'get_parents', $term->tid, 'tid') as $parent) {
- $term_name = $parent->name .'/'. $term_name;
+ $term_name = $parent->name . '/' . $term_name;
}
$categories[] = array('categoryName' => $term_name, 'categoryId' => $term->tid);
}
@@ -442,7 +442,7 @@ function blogapi_mt_get_post_categories(
foreach ($terms as $term) {
$term_name = $term->name;
foreach (module_invoke('taxonomy', 'get_parents', $term->tid, 'tid') as $parent) {
- $term_name = $parent->name .'/'. $term_name;
+ $term_name = $parent->name . '/' . $term_name;
}
$categories[] = array('categoryName' => $term_name, 'categoryId' => $term->tid, 'isPrimary' => TRUE);
}
@@ -604,7 +604,7 @@ function blogapi_init() {
function blogapi_rsd() {
global $base_url;
- $xmlrpc = $base_url .'/xmlrpc.php';
+ $xmlrpc = $base_url . '/xmlrpc.php';
$base = url('', array('absolute' => TRUE));
$blogid = 1; # until we figure out how to handle multiple bloggers
@@ -653,10 +653,10 @@ function _blogapi_mt_extra(&$node, $stru
// merge the 3 body sections (description, mt_excerpt, mt_text_more) into
// one body
if ($struct['mt_excerpt']) {
- $node->body = $struct['mt_excerpt'] .''. $node->body;
+ $node->body = $struct['mt_excerpt'] . '' . $node->body;
}
if ($struct['mt_text_more']) {
- $node->body = $node->body .''. $struct['mt_text_more'];
+ $node->body = $node->body . '' . $struct['mt_text_more'];
}
// mt_convert_breaks
@@ -680,8 +680,8 @@ function _blogapi_get_post($node, $bodie
'dateCreated' => xmlrpc_date($node->created),
'title' => $node->title,
'postid' => $node->nid,
- 'link' => url('node/'. $node->nid, array('absolute' => TRUE)),
- 'permaLink' => url('node/'. $node->nid, array('absolute' => TRUE)),
+ 'link' => url('node/' . $node->nid, array('absolute' => TRUE)),
+ 'permaLink' => url('node/' . $node->nid, array('absolute' => TRUE)),
);
if ($bodies) {
if ($node->comment == 1) {
Index: modules/book/book.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.admin.inc,v
retrieving revision 1.8
diff -u -p -r1.8 book.admin.inc
--- modules/book/book.admin.inc 8 Jan 2008 10:35:41 -0000 1.8
+++ modules/book/book.admin.inc 11 Apr 2008 16:17:07 -0000
@@ -12,7 +12,7 @@
function book_admin_overview() {
$rows = array();
foreach (book_get_books() as $book) {
- $rows[] = array(l($book['title'], $book['href'], $book['options']), l(t('edit order and titles'), "admin/content/book/". $book['nid']));
+ $rows[] = array(l($book['title'], $book['href'], $book['options']), l(t('edit order and titles'), "admin/content/book/" . $book['nid']));
}
$headers = array(t('Book'), t('Operations'));
@@ -115,7 +115,7 @@ function book_admin_edit_submit($form, &
$node->revision = 1;
$node->log = t('Title changed from %original to %current.', array('%original' => $node->title, '%current' => $values['title']));
node_save($node);
- watchdog('content', 'book: updated %title.', array('%title' => $node->title), WATCHDOG_NOTICE, l(t('view'), 'node/'. $node->nid));
+ watchdog('content', 'book: updated %title.', array('%title' => $node->title), WATCHDOG_NOTICE, l(t('view'), 'node/' . $node->nid));
}
}
}
@@ -212,14 +212,14 @@ function theme_book_admin_table($form) {
drupal_render($form[$key]['weight']),
drupal_render($form[$key]['plid']) . drupal_render($form[$key]['mlid']),
l(t('view'), $href),
- $access ? l(t('edit'), 'node/'. $nid .'/edit', array('query' => $destination)) : ' ',
- $access ? l(t('delete'), 'node/'. $nid .'/delete', array('query' => $destination) ) : ' ',
+ $access ? l(t('edit'), 'node/' . $nid . '/edit', array('query' => $destination)) : ' ',
+ $access ? l(t('delete'), 'node/' . $nid . '/delete', array('query' => $destination) ) : ' ',
);
$row = array('data' => $data);
if (isset($form[$key]['#attributes'])) {
$row = array_merge($row, $form[$key]['#attributes']);
}
- $row['class'] = empty($row['class']) ? 'draggable' : $row['class'] .' draggable';
+ $row['class'] = empty($row['class']) ? 'draggable' : $row['class'] . ' draggable';
$rows[] = $row;
}
Index: modules/book/book.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.install,v
retrieving revision 1.20
diff -u -p -r1.20 book.install
--- modules/book/book.install 10 Jan 2008 18:13:42 -0000 1.20
+++ modules/book/book.install 11 Apr 2008 16:17:07 -0000
@@ -212,9 +212,9 @@ function book_update_6000() {
$book += array(
'module' => 'book',
- 'link_path' => 'node/'. $book['nid'],
+ 'link_path' => 'node/' . $book['nid'],
'router_path' => 'node/%',
- 'menu_name' => 'book-toc-'. $book['bid'],
+ 'menu_name' => 'book-toc-' . $book['bid'],
);
$book = array_merge($book, db_fetch_array(db_query("SELECT title AS link_title FROM {node} WHERE nid = %d", $book['nid'])));
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.459
diff -u -p -r1.459 book.module
--- modules/book/book.module 10 Apr 2008 10:28:22 -0000 1.459
+++ modules/book/book.module 11 Apr 2008 16:17:07 -0000
@@ -60,14 +60,14 @@ function book_link($type, $node = NULL,
if ((user_access('add content to books') || user_access('administer book outlines')) && node_access('create', $child_type) && $node->status == 1 && $node->book['depth'] < MENU_MAX_DEPTH) {
$links['book_add_child'] = array(
'title' => t('Add child page'),
- 'href' => "node/add/". str_replace('_', '-', $child_type),
- 'query' => "parent=". $node->book['mlid'],
+ 'href' => "node/add/" . str_replace('_', '-', $child_type),
+ 'query' => "parent=" . $node->book['mlid'],
);
}
if (user_access('access printer-friendly version')) {
$links['book_printer'] = array(
'title' => t('Printer-friendly version'),
- 'href' => 'book/export/html/'. $node->nid,
+ 'href' => 'book/export/html/' . $node->nid,
'attributes' => array('title' => t('Show a printer-friendly version of this book page and its sub-pages.'))
);
}
@@ -169,7 +169,7 @@ function _book_outline_remove_access($no
* Implementation of hook_init(). Add's the book module's CSS.
*/
function book_init() {
- drupal_add_css(drupal_get_path('module', 'book') .'/book.css');
+ drupal_add_css(drupal_get_path('module', 'book') . '/book.css');
}
/**
@@ -269,7 +269,7 @@ function book_get_books() {
$nids[] = $book['bid'];
}
if ($nids) {
- $result2 = db_query(db_rewrite_sql("SELECT n.type, n.title, b.*, ml.* FROM {book} b INNER JOIN {node} n on b.nid = n.nid INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE n.nid IN (". implode(',', $nids) .") AND n.status = 1 ORDER BY ml.weight, ml.link_title"));
+ $result2 = db_query(db_rewrite_sql("SELECT n.type, n.title, b.*, ml.* FROM {book} b INNER JOIN {node} n on b.nid = n.nid INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE n.nid IN (" . implode(',', $nids) . ") AND n.status = 1 ORDER BY ml.weight, ml.link_title"));
while ($link = db_fetch_array($result2)) {
$link['href'] = $link['link_path'];
$link['options'] = unserialize($link['options']);
@@ -288,7 +288,7 @@ function book_get_books() {
*/
function book_form_alter(&$form, $form_state, $form_id) {
- if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id) {
+ if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] . '_node_form' == $form_id) {
// Add elements to the node form
$node = $form['#node'];
@@ -339,14 +339,14 @@ function _book_parent_select($book_link)
if ($book_link['nid'] === $book_link['bid']) {
// This is a book - at the top level.
if ($book_link['original_bid'] === $book_link['bid']) {
- $form['#prefix'] .= ''. t('This is the top-level page in this book.') .'';
+ $form['#prefix'] .= '' . t('This is the top-level page in this book.') . '';
}
else {
- $form['#prefix'] .= ''. t('This will be the top-level page in this book.') .'';
+ $form['#prefix'] .= '' . t('This will be the top-level page in this book.') . '';
}
}
elseif (!$book_link['bid']) {
- $form['#prefix'] .= ''. t('No book selected.') .'';
+ $form['#prefix'] .= '' . t('No book selected.') . '';
}
else {
$form = array(
@@ -410,11 +410,11 @@ function _book_add_form_elements(&$form,
if (user_access('create new books') && ($nid == 'new' || ($nid != $node->book['original_bid']))) {
// The node can become a new book, if it is not one already.
- $options = array($nid => '<'. t('create a new book') .'>') + $options;
+ $options = array($nid => '<' . t('create a new book') . '>') + $options;
}
if (!$node->book['mlid']) {
// The node is not currently in a the hierarchy.
- $options = array(0 => '<'. t('none') .'>') + $options;
+ $options = array(0 => '<' . t('none') . '>') + $options;
}
// Add a drop-down to select the destination book.
@@ -447,7 +447,7 @@ function _book_update_outline(&$node) {
}
$new = empty($node->book['mlid']);
- $node->book['link_path'] = 'node/'. $node->nid;
+ $node->book['link_path'] = 'node/' . $node->nid;
$node->book['link_title'] = $node->title;
$node->book['parent_mismatch'] = FALSE; // The normal case.
@@ -494,14 +494,14 @@ function book_update_bid($book_link) {
$match[] = "p$i = %d";
$args[] = $book_link["p$i"];
}
- $result = db_query("SELECT mlid FROM {menu_links} WHERE ". implode(' AND ', $match), $args);
+ $result = db_query("SELECT mlid FROM {menu_links} WHERE " . implode(' AND ', $match), $args);
$mlids = array();
while ($a = db_fetch_array($result)) {
$mlids[] = $a['mlid'];
}
if ($mlids) {
- db_query("UPDATE {book} SET bid = %d WHERE mlid IN (". implode(',', $mlids) .")", $book_link['bid']);
+ db_query("UPDATE {book} SET bid = %d WHERE mlid IN (" . implode(',', $mlids) . ")", $book_link['bid']);
}
}
@@ -616,7 +616,7 @@ function book_children($book_link) {
* Generate the corresponding menu name from a book ID.
*/
function book_menu_name($bid) {
- return 'book-toc-'. $bid;
+ return 'book-toc-' . $bid;
}
/**
@@ -765,7 +765,7 @@ function book_form_node_delete_confirm_a
if (isset($node->book) && $node->book['has_children']) {
$form['book_warning'] = array(
- '#value' => ''. t('%title is part of a book outline, and has associated child pages. If you proceed with deletion, the child pages will be relocated automatically.', array('%title' => $node->title)) .'
',
+ '#value' => '' . t('%title is part of a book outline, and has associated child pages. If you proceed with deletion, the child pages will be relocated automatically.', array('%title' => $node->title)) . '
',
'#weight' => -10,
);
}
@@ -792,7 +792,7 @@ function template_preprocess_book_naviga
// Provide extra variables for themers. Not needed by default.
$variables['book_id'] = $book_link['bid'];
$variables['book_title'] = check_plain($book_link['link_title']);
- $variables['book_url'] = 'node/'. $book_link['bid'];
+ $variables['book_url'] = 'node/' . $book_link['bid'];
$variables['current_depth'] = $book_link['depth'];
$variables['tree'] = '';
@@ -844,9 +844,9 @@ function _book_toc_recurse($tree, $inden
break;
}
if (!in_array($data['link']['mlid'], $exclude)) {
- $toc[$data['link']['mlid']] = $indent .' '. truncate_utf8($data['link']['title'], 30, TRUE, TRUE);
+ $toc[$data['link']['mlid']] = $indent . ' ' . truncate_utf8($data['link']['title'], 30, TRUE, TRUE);
if ($data['below']) {
- _book_toc_recurse($data['below'], $indent .'--', $toc, $exclude, $depth_limit);
+ _book_toc_recurse($data['below'], $indent . '--', $toc, $exclude, $depth_limit);
}
}
}
@@ -1008,17 +1008,17 @@ function book_node_type($op, $type) {
function book_help($path, $arg) {
switch ($path) {
case 'admin/help#book':
- $output = ''. t('The book module is suited for creating structured, multi-page hypertexts such as site resource guides, manuals, and Frequently Asked Questions (FAQs). It permits a document to have chapters, sections, subsections, etc. Authors with suitable permissions can add pages to a collaborative book, placing them into the existing document by adding them to a table of contents menu.') .'
';
- $output .= ''. t('Pages in the book hierarchy have navigation elements at the bottom of the page for moving through the text. These links lead to the previous and next pages in the book, and to the level above the current page in the book\'s structure. More comprehensive navigation may be provided by enabling the book navigation block on the blocks administration page.', array('@admin-block' => url('admin/build/block'))) .'
';
- $output .= ''. t('Users can select the printer-friendly version link visible at the bottom of a book page to generate a printer-friendly display of the page and all of its subsections. ') .'
';
- $output .= ''. t("Users with the administer book outlines permission can add a post of any content type to a book, by selecting the appropriate book while editing the post or by using the interface available on the post's outline tab.") .'
';
- $output .= ''. t('Administrators can view a list of all books on the book administration page. The Outline page for each book allows section titles to be edited or rearranged.', array('@admin-node-book' => url('admin/content/book'))) .'
';
- $output .= ''. t('For more information, see the online handbook entry for Book module.', array('@book' => 'http://drupal.org/handbook/modules/book/')) .'
';
+ $output = '' . t('The book module is suited for creating structured, multi-page hypertexts such as site resource guides, manuals, and Frequently Asked Questions (FAQs). It permits a document to have chapters, sections, subsections, etc. Authors with suitable permissions can add pages to a collaborative book, placing them into the existing document by adding them to a table of contents menu.') . '
';
+ $output .= '' . t('Pages in the book hierarchy have navigation elements at the bottom of the page for moving through the text. These links lead to the previous and next pages in the book, and to the level above the current page in the book\'s structure. More comprehensive navigation may be provided by enabling the book navigation block on the blocks administration page.', array('@admin-block' => url('admin/build/block'))) . '
';
+ $output .= '' . t('Users can select the printer-friendly version link visible at the bottom of a book page to generate a printer-friendly display of the page and all of its subsections. ') . '
';
+ $output .= '' . t("Users with the administer book outlines permission can add a post of any content type to a book, by selecting the appropriate book while editing the post or by using the interface available on the post's outline tab.") . '
';
+ $output .= '' . t('Administrators can view a list of all books on the book administration page. The Outline page for each book allows section titles to be edited or rearranged.', array('@admin-node-book' => url('admin/content/book'))) . '
';
+ $output .= '' . t('For more information, see the online handbook entry for Book module.', array('@book' => 'http://drupal.org/handbook/modules/book/')) . '
';
return $output;
case 'admin/content/book':
- return ''. t('The book module offers a means to organize a collection of related posts, collectively known as a book. When viewed, these posts automatically display links to adjacent book pages, providing a simple navigation system for creating and reviewing structured content.') .'
';
+ return '' . t('The book module offers a means to organize a collection of related posts, collectively known as a book. When viewed, these posts automatically display links to adjacent book pages, providing a simple navigation system for creating and reviewing structured content.') . '
';
case 'node/%/outline':
- return ''. t('The outline feature allows you to include posts in the book hierarchy, as well as move them within the hierarchy or to reorder an entire book.', array('@book' => url('book'), '@book-admin' => url('admin/content/book'))) .'
';
+ return '' . t('The outline feature allows you to include posts in the book hierarchy, as well as move them within the hierarchy or to reorder an entire book.', array('@book' => url('book'), '@book-admin' => url('admin/content/book'))) . '
';
}
}
@@ -1050,7 +1050,7 @@ function book_menu_subtree_data($item) {
static $tree = array();
// Generate a cache ID (cid) specific for this $menu_name and $item.
- $cid = 'links:'. $item['menu_name'] .':subtree-cid:'. $item['mlid'];
+ $cid = 'links:' . $item['menu_name'] . ':subtree-cid:' . $item['mlid'];
if (!isset($tree[$cid])) {
$cache = cache_get($cid, 'cache_menu');
@@ -1076,14 +1076,14 @@ function book_menu_subtree_data($item) {
SELECT b.*, m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.title, m.title_callback, m.title_arguments, m.type, ml.*
FROM {menu_links} ml INNER JOIN {menu_router} m ON m.path = ml.router_path
INNER JOIN {book} b ON ml.mlid = b.mlid
- WHERE ". implode(' AND ', $match) ."
+ WHERE " . implode(' AND ', $match) . "
ORDER BY p1 ASC, p2 ASC, p3 ASC, p4 ASC, p5 ASC, p6 ASC, p7 ASC, p8 ASC, p9 ASC";
$data['tree'] = menu_tree_data(db_query($sql, $args), array(), $item['depth']);
$data['node_links'] = array();
menu_tree_collect_node_links($data['tree'], $data['node_links']);
// Compute the real cid for book subtree data.
- $tree_cid = 'links:'. $menu_name .':subtree-data:'. md5(serialize($data));
+ $tree_cid = 'links:' . $menu_name . ':subtree-data:' . md5(serialize($data));
// Cache the data, if it is not already in the cache.
if (!cache_get($tree_cid, 'cache_menu')) {
cache_set($tree_cid, $data, 'cache_menu');
Index: modules/book/book.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.pages.inc,v
retrieving revision 1.5
diff -u -p -r1.5 book.pages.inc
--- modules/book/book.pages.inc 22 Dec 2007 23:24:24 -0000 1.5
+++ modules/book/book.pages.inc 11 Apr 2008 16:17:07 -0000
@@ -43,7 +43,7 @@ function book_export($type, $nid) {
$type = drupal_strtolower($type);
- $export_function = 'book_export_'. $type;
+ $export_function = 'book_export_' . $type;
if (function_exists($export_function)) {
print call_user_func($export_function, $nid);
@@ -144,7 +144,7 @@ function book_outline_form(&$form_state,
* @see book_outline_form()
*/
function book_remove_button_submit($form, &$form_state) {
- $form_state['redirect'] = 'node/'. $form['#node']->nid .'/outline/remove';
+ $form_state['redirect'] = 'node/' . $form['#node']->nid . '/outline/remove';
}
/**
@@ -154,7 +154,7 @@ function book_remove_button_submit($form
*/
function book_outline_form_submit($form, &$form_state) {
$node = $form['#node'];
- $form_state['redirect'] = "node/". $node->nid;
+ $form_state['redirect'] = "node/" . $node->nid;
$book_link = $form_state['values']['book'];
if (!$book_link['bid']) {
drupal_set_message(t('No changes were made'));
@@ -167,7 +167,7 @@ function book_outline_form_submit($form,
if ($node->book['parent_mismatch']) {
// This will usually only happen when JS is disabled.
drupal_set_message(t('The post has been added to the selected book. You may now position it relative to other pages.'));
- $form_state['redirect'] = "node/". $node->nid ."/outline";
+ $form_state['redirect'] = "node/" . $node->nid . "/outline";
}
else {
drupal_set_message(t('The book outline has been updated.'));
@@ -196,7 +196,7 @@ function book_remove_form(&$form_state,
$description = t('%title may be added to hierarchy again using the Outline tab.', $title);
}
- return confirm_form($form, t('Are you sure you want to remove %title from the book hierarchy?', $title), 'node/'. $node->nid, $description, t('Remove'));
+ return confirm_form($form, t('Are you sure you want to remove %title from the book hierarchy?', $title), 'node/' . $node->nid, $description, t('Remove'));
}
/**
@@ -212,7 +212,7 @@ function book_remove_form_submit($form,
db_query('DELETE FROM {book} WHERE nid = %d', $node->nid);
drupal_set_message(t('The post has been removed from the book.'));
}
- $form_state['redirect'] = 'node/'. $node->nid;
+ $form_state['redirect'] = 'node/' . $node->nid;
}
/**
@@ -231,7 +231,7 @@ function book_remove_form_submit($form,
* Prints the replacement HTML in JSON format.
*/
function book_form_update() {
- $cid = 'form_'. $_POST['form_build_id'];
+ $cid = 'form_' . $_POST['form_build_id'];
$bid = $_POST['book']['bid'];
$cache = cache_get($cid, 'cache_form');
if ($cache) {
Index: modules/color/color.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/color/color.module,v
retrieving revision 1.39
diff -u -p -r1.39 color.module
--- modules/color/color.module 23 Jan 2008 09:43:25 -0000 1.39
+++ modules/color/color.module 11 Apr 2008 16:17:07 -0000
@@ -7,10 +7,10 @@
function color_help($path, $arg) {
switch ($path) {
case 'admin/help#color':
- $output = ''. t('The color module allows a site administrator to quickly and easily change the color scheme of certain themes. Although not all themes support color module, both Garland (the default theme) and Minnelli were designed to take advantage of its features. By using color module with a compatible theme, you can easily change the color of links, backgrounds, text, and other theme elements. Color module requires that your file download method be set to public.', array('@url' => url('admin/settings/file-system'))) .'
';
- $output .= ''. t("It is important to remember that color module saves a modified copy of the theme's specified stylesheets in the files directory. This means that if you make any manual changes to your theme's stylesheet, you must save your color settings again, even if they haven't changed. This causes the color module generated version of the stylesheets in the files directory to be recreated using the new version of the original file.") .'
';
- $output .= ''. t('To change the color settings for a compatible theme, select the "configure" link for the theme on the themes administration page.', array('@themes' => url('admin/build/themes'))) .'
';
- $output .= ''. t('For more information, see the online handbook entry for Color module.', array('@color' => 'http://drupal.org/handbook/modules/color/')) .'
';
+ $output = '' . t('The color module allows a site administrator to quickly and easily change the color scheme of certain themes. Although not all themes support color module, both Garland (the default theme) and Minnelli were designed to take advantage of its features. By using color module with a compatible theme, you can easily change the color of links, backgrounds, text, and other theme elements. Color module requires that your file download method be set to public.', array('@url' => url('admin/settings/file-system'))) . '
';
+ $output .= '' . t("It is important to remember that color module saves a modified copy of the theme's specified stylesheets in the files directory. This means that if you make any manual changes to your theme's stylesheet, you must save your color settings again, even if they haven't changed. This causes the color module generated version of the stylesheets in the files directory to be recreated using the new version of the original file.") . '
';
+ $output .= '' . t('To change the color settings for a compatible theme, select the "configure" link for the theme on the themes administration page.', array('@themes' => url('admin/build/themes'))) . '
';
+ $output .= '' . t('For more information, see the online handbook entry for Color module.', array('@color' => 'http://drupal.org/handbook/modules/color/')) . '
';
return $output;
}
}
@@ -54,7 +54,7 @@ function color_form_alter(&$form, $form_
if ($form_id == 'system_theme_select_form' || $form_id == 'system_themes') {
$themes = list_themes();
foreach (element_children($form) as $theme) {
- if ($screenshot = variable_get('color_'. $theme .'_screenshot', NULL)) {
+ if ($screenshot = variable_get('color_' . $theme . '_screenshot', NULL)) {
if (isset($form[$theme]['screenshot'])) {
$form[$theme]['screenshot']['#value'] = theme('image', $screenshot, '', '', array('class' => 'screenshot'), FALSE);
}
@@ -70,7 +70,7 @@ function _color_page_alter(&$vars) {
global $language, $theme_key;
// Override stylesheets.
- $color_paths = variable_get('color_'. $theme_key .'_stylesheets', array());
+ $color_paths = variable_get('color_' . $theme_key . '_stylesheets', array());
if (!empty($color_paths)) {
// Loop over theme CSS files and try to rebuild CSS array with rewritten
// stylesheets. Keep the orginal order intact for CSS cascading.
@@ -110,8 +110,8 @@ function _color_page_alter(&$vars) {
}
// Override logo.
- $logo = variable_get('color_'. $theme_key .'_logo', NULL);
- if ($logo && $vars['logo'] && preg_match('!'. $theme_key .'/logo.png$!', $vars['logo'])) {
+ $logo = variable_get('color_' . $theme_key . '_logo', NULL);
+ if ($logo && $vars['logo'] && preg_match('!' . $theme_key . '/logo.png$!', $vars['logo'])) {
$vars['logo'] = base_path() . $logo;
}
}
@@ -121,7 +121,7 @@ function _color_page_alter(&$vars) {
*/
function color_get_info($theme) {
$path = drupal_get_path('theme', $theme);
- $file = $path .'/color/color.inc';
+ $file = $path . '/color/color.inc';
if ($path && file_exists($file)) {
include $file;
return $info;
@@ -141,7 +141,7 @@ function color_get_palette($theme, $defa
}
// Load variable
- return $default ? $palette : variable_get('color_'. $theme .'_palette', $palette);
+ return $default ? $palette : variable_get('color_' . $theme . '_palette', $palette);
}
/**
@@ -156,14 +156,14 @@ function color_scheme_form(&$form_state,
drupal_add_js('misc/farbtastic/farbtastic.js');
// Add custom CSS/JS
- drupal_add_css($base .'/color.css', 'module', 'all', FALSE);
- drupal_add_js($base .'/color.js');
+ drupal_add_css($base . '/color.css', 'module', 'all', FALSE);
+ drupal_add_js($base . '/color.js');
drupal_add_js(array('color' => array(
'reference' => color_get_palette($theme, true)
)), 'setting');
// See if we're using a predefined scheme
- $current = implode(',', variable_get('color_'. $theme .'_palette', array()));
+ $current = implode(',', variable_get('color_' . $theme . '_palette', array()));
// Note: we use the original theme when the default scheme is chosen.
$current = isset($info['schemes'][$current]) ? $current : ($current == '' ? reset($info['schemes']) : '');
@@ -209,7 +209,7 @@ function theme_color_scheme_form($form)
// Include stylesheet
$theme = $form['theme']['#value'];
$info = $form['info']['#value'];
- $path = drupal_get_path('theme', $theme) .'/';
+ $path = drupal_get_path('theme', $theme) . '/';
drupal_add_css($path . $info['preview_css']);
$output = '';
// Wrapper
@@ -227,8 +227,8 @@ function theme_color_scheme_form($form)
// Preview
$output .= drupal_render($form);
- $output .= ''. t('Preview') .'
';
- $output .= 'Lorem ipsum dolor
Sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
' . t('Preview') . '
';
+ $output .= 'Lorem ipsum dolor
Sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
'. t('The comment module allows visitors to comment on your posts, creating ad hoc discussion boards. Any content type may have its Default comment setting set to Read/Write to allow comments, or Disabled, to prevent comments. Comment display settings and other controls may also be customized for each content type (some display settings are customizable by individual users).', array('@content-type' => url('admin/build/types'))) .'
';
- $output .= ''. t('Comment permissions are assigned to user roles, and are used to determine whether anonymous users (or other roles) are allowed to comment on posts. If anonymous users are allowed to comment, their individual contact information may be retained in cookies stored on their local computer for use in later comment submissions. When a comment has no replies, it may be (optionally) edited by its author. The comment module uses the same input formats and HTML tags available when creating other forms of content.') .'
';
- $output .= ''. t('For more information, see the online handbook entry for Comment module.', array('@comment' => 'http://drupal.org/handbook/modules/comment/')) .'
';
+ $output = '' . t('The comment module allows visitors to comment on your posts, creating ad hoc discussion boards. Any content type may have its Default comment setting set to Read/Write to allow comments, or Disabled, to prevent comments. Comment display settings and other controls may also be customized for each content type (some display settings are customizable by individual users).', array('@content-type' => url('admin/build/types'))) . '
';
+ $output .= '' . t('Comment permissions are assigned to user roles, and are used to determine whether anonymous users (or other roles) are allowed to comment on posts. If anonymous users are allowed to comment, their individual contact information may be retained in cookies stored on their local computer for use in later comment submissions. When a comment has no replies, it may be (optionally) edited by its author. The comment module uses the same input formats and HTML tags available when creating other forms of content.') . '
';
+ $output .= '' . t('For more information, see the online handbook entry for Comment module.', array('@comment' => 'http://drupal.org/handbook/modules/comment/')) . '
';
return $output;
case 'admin/content/comment':
- return ''. t("Below is a list of the latest comments posted to your site. Click on a subject to see the comment, the author's name to edit the author's user information, 'edit' to modify the text, and 'delete' to remove their submission.") .'
';
+ return '' . t("Below is a list of the latest comments posted to your site. Click on a subject to see the comment, the author's name to edit the author's user information, 'edit' to modify the text, and 'delete' to remove their submission.") . '
';
case 'admin/content/comment/approval':
- return ''. t("Below is a list of the comments posted to your site that need approval. To approve a comment, click on 'edit' and then change its 'moderation status' to Approved. Click on a subject to see the comment, the author's name to edit the author's user information, 'edit' to modify the text, and 'delete' to remove their submission.") .'
';
+ return '' . t("Below is a list of the comments posted to your site that need approval. To approve a comment, click on 'edit' and then change its 'moderation status' to Approved. Click on a subject to see the comment, the author's name to edit the author's user information, 'edit' to modify the text, and 'delete' to remove their submission.") . '
';
}
}
@@ -261,7 +261,7 @@ function comment_node_type($op, $info) {
switch ($op) {
case 'delete':
foreach ($settings as $setting) {
- variable_del($setting .'_'. $info->type);
+ variable_del($setting . '_' . $info->type);
}
break;
}
@@ -343,7 +343,7 @@ function comment_get_recent($number = 10
if (!empty($nids)) {
// From among the comments on the nodes selected in the first query,
// find the $number most recent comments.
- $result = db_query_range('SELECT c.nid, c.subject, c.cid, c.timestamp FROM {comments} c INNER JOIN {node} n ON n.nid = c.nid WHERE c.nid IN ('. implode(',', $nids) .') AND n.status = 1 AND c.status = %d ORDER BY c.cid DESC', COMMENT_PUBLISHED, 0, $number);
+ $result = db_query_range('SELECT c.nid, c.subject, c.cid, c.timestamp FROM {comments} c INNER JOIN {node} n ON n.nid = c.nid WHERE c.nid IN (' . implode(',', $nids) . ') AND n.status = 1 AND c.status = %d ORDER BY c.cid DESC', COMMENT_PUBLISHED, 0, $number);
while ($comment = db_fetch_object($result)) {
$comments[] = $comment;
}
@@ -386,20 +386,20 @@ function comment_new_page_count($num_com
// Newest first: find the last thread with new comment
$result = db_query('(SELECT thread FROM {comments} WHERE nid = %d AND status = 0 ORDER BY timestamp DESC LIMIT %d) ORDER BY thread DESC LIMIT 1', $node->nid, $new_replies);
$thread = db_result($result);
- $result_count = db_query("SELECT COUNT(*) FROM {comments} WHERE nid = %d AND status = 0 AND thread > '". $thread ."'", $node->nid);
+ $result_count = db_query("SELECT COUNT(*) FROM {comments} WHERE nid = %d AND status = 0 AND thread > '" . $thread . "'", $node->nid);
}
else {
// Oldest first: find the first thread with new comment
$result = db_query('(SELECT thread FROM {comments} WHERE nid = %d AND status = 0 ORDER BY timestamp DESC LIMIT %d) ORDER BY SUBSTRING(thread, 1, (LENGTH(thread) - 1)) LIMIT 1', $node->nid, $new_replies);
$thread = substr(db_result($result), 0, -1);
- $result_count = db_query("SELECT COUNT(*) FROM {comments} WHERE nid = %d AND status = 0 AND SUBSTRING(thread, 1, (LENGTH(thread) - 1)) < '". $thread ."'", $node->nid);
+ $result_count = db_query("SELECT COUNT(*) FROM {comments} WHERE nid = %d AND status = 0 AND SUBSTRING(thread, 1, (LENGTH(thread) - 1)) < '" . $thread . "'", $node->nid);
}
$count = db_result($result_count);
}
$pageno = $count / $comments_per_page;
}
if ($pageno >= 1) {
- $pagenum = "page=". intval($pageno);
+ $pagenum = "page=" . intval($pageno);
}
return $pagenum;
}
@@ -415,7 +415,7 @@ function theme_comment_block() {
$items = array();
$number = variable_get('comment_block_count', 10);
foreach (comment_get_recent($number) as $comment) {
- $items[] = l($comment->subject, 'node/'. $comment->nid, array('fragment' => 'comment-'. $comment->cid)) .'
'. t('@time ago', array('@time' => format_interval(time() - $comment->timestamp)));
+ $items[] = l($comment->subject, 'node/' . $comment->nid, array('fragment' => 'comment-' . $comment->cid)) . '
' . t('@time ago', array('@time' => format_interval(time() - $comment->timestamp)));
}
if ($items) {
return theme('item_list', $items);
@@ -479,7 +479,7 @@ function comment_link($type, $node = NUL
if ($node->comment == COMMENT_NODE_READ_WRITE) {
if (user_access('post comments')) {
- if (variable_get('comment_form_location_'. $node->type, COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) {
+ if (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) {
$links['comment_add'] = array(
'title' => t('Add new comment'),
'href' => "comment/reply/$node->nid",
@@ -519,35 +519,35 @@ function comment_form_alter(&$form, $for
$form['comment']['comment'] = array(
'#type' => 'radios',
'#title' => t('Default comment setting'),
- '#default_value' => variable_get('comment_'. $form['#node_type']->type, COMMENT_NODE_READ_WRITE),
+ '#default_value' => variable_get('comment_' . $form['#node_type']->type, COMMENT_NODE_READ_WRITE),
'#options' => array(t('Disabled'), t('Read only'), t('Read/Write')),
'#description' => t('Users with the administer comments permission will be able to override this setting.'),
);
$form['comment']['comment_default_mode'] = array(
'#type' => 'radios',
'#title' => t('Default display mode'),
- '#default_value' => variable_get('comment_default_mode_'. $form['#node_type']->type, COMMENT_MODE_THREADED_EXPANDED),
+ '#default_value' => variable_get('comment_default_mode_' . $form['#node_type']->type, COMMENT_MODE_THREADED_EXPANDED),
'#options' => _comment_get_modes(),
'#description' => t('The default view for comments. Expanded views display the body of the comment. Threaded views keep replies together.'),
);
$form['comment']['comment_default_order'] = array(
'#type' => 'radios',
'#title' => t('Default display order'),
- '#default_value' => variable_get('comment_default_order_'. $form['#node_type']->type, COMMENT_ORDER_NEWEST_FIRST),
+ '#default_value' => variable_get('comment_default_order_' . $form['#node_type']->type, COMMENT_ORDER_NEWEST_FIRST),
'#options' => _comment_get_orders(),
'#description' => t('The default sorting for new users and anonymous users while viewing comments. These users may change their view using the comment control panel. For registered users, this change is remembered as a persistent user preference.'),
);
$form['comment']['comment_default_per_page'] = array(
'#type' => 'select',
'#title' => t('Default comments per page'),
- '#default_value' => variable_get('comment_default_per_page_'. $form['#node_type']->type, 50),
+ '#default_value' => variable_get('comment_default_per_page_' . $form['#node_type']->type, 50),
'#options' => _comment_per_page(),
'#description' => t('Default number of comments for each page: more comments are distributed in several pages.'),
);
$form['comment']['comment_controls'] = array(
'#type' => 'radios',
'#title' => t('Comment controls'),
- '#default_value' => variable_get('comment_controls_'. $form['#node_type']->type, COMMENT_CONTROLS_HIDDEN),
+ '#default_value' => variable_get('comment_controls_' . $form['#node_type']->type, COMMENT_CONTROLS_HIDDEN),
'#options' => array(
t('Display above the comments'),
t('Display below the comments'),
@@ -558,7 +558,7 @@ function comment_form_alter(&$form, $for
$form['comment']['comment_anonymous'] = array(
'#type' => 'radios',
'#title' => t('Anonymous commenting'),
- '#default_value' => variable_get('comment_anonymous_'. $form['#node_type']->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT),
+ '#default_value' => variable_get('comment_anonymous_' . $form['#node_type']->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT),
'#options' => array(
COMMENT_ANONYMOUS_MAYNOT_CONTACT => t('Anonymous posters may not enter their contact information'),
COMMENT_ANONYMOUS_MAY_CONTACT => t('Anonymous posters may leave their contact information'),
@@ -571,26 +571,26 @@ function comment_form_alter(&$form, $for
$form['comment']['comment_subject_field'] = array(
'#type' => 'radios',
'#title' => t('Comment subject field'),
- '#default_value' => variable_get('comment_subject_field_'. $form['#node_type']->type, 1),
+ '#default_value' => variable_get('comment_subject_field_' . $form['#node_type']->type, 1),
'#options' => array(t('Disabled'), t('Enabled')),
'#description' => t('Can users provide a unique subject for their comments?'),
);
$form['comment']['comment_preview'] = array(
'#type' => 'radios',
'#title' => t('Preview comment'),
- '#default_value' => variable_get('comment_preview_'. $form['#node_type']->type, COMMENT_PREVIEW_REQUIRED),
+ '#default_value' => variable_get('comment_preview_' . $form['#node_type']->type, COMMENT_PREVIEW_REQUIRED),
'#options' => array(t('Optional'), t('Required')),
'#description' => t("Forces a user to look at their comment by clicking on a 'Preview' button before they can actually add the comment"),
);
$form['comment']['comment_form_location'] = array(
'#type' => 'radios',
'#title' => t('Location of comment submission form'),
- '#default_value' => variable_get('comment_form_location_'. $form['#node_type']->type, COMMENT_FORM_SEPARATE_PAGE),
+ '#default_value' => variable_get('comment_form_location_' . $form['#node_type']->type, COMMENT_FORM_SEPARATE_PAGE),
'#options' => array(t('Display on separate page'), t('Display below post or comments')),
);
}
elseif (isset($form['type']) && isset($form['#node'])) {
- if ($form['type']['#value'] .'_node_form' == $form_id) {
+ if ($form['type']['#value'] . '_node_form' == $form_id) {
$node = $form['#node'];
$form['comment_settings'] = array(
'#type' => 'fieldset',
@@ -638,7 +638,7 @@ function comment_nodeapi(&$node, $op, $a
$text = '';
$comments = db_query('SELECT subject, comment, format FROM {comments} WHERE nid = %d AND status = %d', $node->nid, COMMENT_PUBLISHED);
while ($comment = db_fetch_object($comments)) {
- $text .= ''. check_plain($comment->subject) .'
'. check_markup($comment->comment, $comment->format, FALSE);
+ $text .= '' . check_plain($comment->subject) . '
' . check_markup($comment->comment, $comment->format, FALSE);
}
return $text;
@@ -648,7 +648,7 @@ function comment_nodeapi(&$node, $op, $a
case 'rss item':
if ($node->comment != COMMENT_NODE_DISABLED) {
- return array(array('key' => 'comments', 'value' => url('node/'. $node->nid, array('fragment' => 'comments', 'absolute' => TRUE))));
+ return array(array('key' => 'comments', 'value' => url('node/' . $node->nid, array('fragment' => 'comments', 'absolute' => TRUE))));
}
else {
return array();
@@ -696,7 +696,7 @@ function comment_access($op, $comment) {
* The 0th and the 1st path components joined by a slash.
*/
function comment_node_url() {
- return arg(0) .'/'. arg(1);
+ return arg(0) . '/' . arg(1);
}
/**
@@ -727,7 +727,7 @@ function comment_save($edit) {
comment_invoke_comment($edit, 'update');
// Add an entry to the watchdog log.
- watchdog('content', 'Comment: updated %subject.', array('%subject' => $edit['subject']), WATCHDOG_NOTICE, l(t('view'), 'node/'. $edit['nid'], array('fragment' => 'comment-'. $edit['cid'])));
+ watchdog('content', 'Comment: updated %subject.', array('%subject' => $edit['subject']), WATCHDOG_NOTICE, l(t('view'), 'node/' . $edit['nid'], array('fragment' => 'comment-' . $edit['cid'])));
}
else {
// Add the comment to database.
@@ -742,7 +742,7 @@ function comment_save($edit) {
$max = rtrim($max, '/');
// Finally, build the thread field for this new comment.
- $thread = int2vancode(vancode2int($max) + 1) .'/';
+ $thread = int2vancode(vancode2int($max) + 1) . '/';
}
else {
// This is comment with a parent comment: we increase
@@ -759,7 +759,7 @@ function comment_save($edit) {
if ($max == '') {
// First child of this parent.
- $thread = $parent->thread .'.'. int2vancode(0) .'/';
+ $thread = $parent->thread . '.' . int2vancode(0) . '/';
}
else {
// Strip the "/" at the end of the thread.
@@ -771,7 +771,7 @@ function comment_save($edit) {
$last = $parts[$parent_depth];
// Finally, build the thread field for this new comment.
- $thread = $parent->thread .'.'. int2vancode(vancode2int($last) + 1) .'/';
+ $thread = $parent->thread . '.' . int2vancode(vancode2int($last) + 1) . '/';
}
}
@@ -788,7 +788,7 @@ function comment_save($edit) {
comment_invoke_comment($edit, 'insert');
// Add an entry to the watchdog log.
- watchdog('content', 'Comment: added %subject.', array('%subject' => $edit['subject']), WATCHDOG_NOTICE, l(t('view'), 'node/'. $edit['nid'], array('fragment' => 'comment-'. $edit['cid'])));
+ watchdog('content', 'Comment: added %subject.', array('%subject' => $edit['subject']), WATCHDOG_NOTICE, l(t('view'), 'node/' . $edit['nid'], array('fragment' => 'comment-' . $edit['cid'])));
}
_comment_update_node_statistics($edit['nid']);
@@ -1014,7 +1014,7 @@ function comment_render($node, $cid = 0)
$divs = 0;
$num_rows = FALSE;
$comments = '';
- drupal_add_css(drupal_get_path('module', 'comment') .'/comment.css');
+ drupal_add_css(drupal_get_path('module', 'comment') . '/comment.css');
while ($comment = db_fetch_object($result)) {
$comment = drupal_unpack($comment);
$comment->name = $comment->uid ? $comment->registered_name : $comment->name;
@@ -1052,7 +1052,7 @@ function comment_render($node, $cid = 0)
$comments .= '';
}
- $comment_controls = variable_get('comment_controls_'. $node->type, COMMENT_CONTROLS_HIDDEN);
+ $comment_controls = variable_get('comment_controls_' . $node->type, COMMENT_CONTROLS_HIDDEN);
if ($num_rows && ($comment_controls == COMMENT_CONTROLS_ABOVE || $comment_controls == COMMENT_CONTROLS_ABOVE_BELOW)) {
$output .= drupal_get_form('comment_controls', $mode, $order, $comments_per_page);
}
@@ -1067,7 +1067,7 @@ function comment_render($node, $cid = 0)
// If enabled, show new comment form if it's not already being displayed.
$reply = arg(0) == 'comment' && arg(1) == 'reply';
- if (user_access('post comments') && node_comment_mode($nid) == COMMENT_NODE_READ_WRITE && (variable_get('comment_form_location_'. $node->type, COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_BELOW) && !$reply) {
+ if (user_access('post comments') && node_comment_mode($nid) == COMMENT_NODE_READ_WRITE && (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_BELOW) && !$reply) {
$output .= comment_form_box(array('nid' => $nid), t('Post new comment'));
}
@@ -1089,20 +1089,20 @@ function comment_render($node, $cid = 0)
function comment_operations($action = NULL) {
if ($action == 'publish') {
$operations = array(
- 'publish' => array(t('Publish the selected comments'), 'UPDATE {comments} SET status = '. COMMENT_PUBLISHED .' WHERE cid = %d'),
+ 'publish' => array(t('Publish the selected comments'), 'UPDATE {comments} SET status = ' . COMMENT_PUBLISHED . ' WHERE cid = %d'),
'delete' => array(t('Delete the selected comments'), '')
);
}
else if ($action == 'unpublish') {
$operations = array(
- 'unpublish' => array(t('Unpublish the selected comments'), 'UPDATE {comments} SET status = '. COMMENT_NOT_PUBLISHED .' WHERE cid = %d'),
+ 'unpublish' => array(t('Unpublish the selected comments'), 'UPDATE {comments} SET status = ' . COMMENT_NOT_PUBLISHED . ' WHERE cid = %d'),
'delete' => array(t('Delete the selected comments'), '')
);
}
else {
$operations = array(
- 'publish' => array(t('Publish the selected comments'), 'UPDATE {comments} SET status = '. COMMENT_PUBLISHED .' WHERE cid = %d'),
- 'unpublish' => array(t('Unpublish the selected comments'), 'UPDATE {comments} SET status = '. COMMENT_NOT_PUBLISHED .' WHERE cid = %d'),
+ 'publish' => array(t('Publish the selected comments'), 'UPDATE {comments} SET status = ' . COMMENT_PUBLISHED . ' WHERE cid = %d'),
+ 'unpublish' => array(t('Unpublish the selected comments'), 'UPDATE {comments} SET status = ' . COMMENT_NOT_PUBLISHED . ' WHERE cid = %d'),
'delete' => array(t('Delete the selected comments'), '')
);
}
@@ -1218,7 +1218,7 @@ function comment_validate($edit) {
// Check validity of name, mail and homepage (if given)
if (!$user->uid || isset($edit['is_anonymous'])) {
$node = node_load($edit['nid']);
- if (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) > COMMENT_ANONYMOUS_MAYNOT_CONTACT) {
+ if (variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) > COMMENT_ANONYMOUS_MAYNOT_CONTACT) {
if ($edit['name']) {
$taken = db_result(db_query("SELECT COUNT(uid) FROM {users} WHERE LOWER(name) = '%s'", $edit['name']));
@@ -1227,7 +1227,7 @@ function comment_validate($edit) {
}
}
- else if (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) {
+ else if (variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) {
form_set_error('name', t('You have to leave your name.'));
}
@@ -1236,7 +1236,7 @@ function comment_validate($edit) {
form_set_error('mail', t('The e-mail address you specified is not valid.'));
}
}
- else if (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) {
+ else if (variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) {
form_set_error('mail', t('You have to leave an e-mail address.'));
}
@@ -1266,8 +1266,8 @@ function comment_form(&$form_state, $edi
$op = isset($_POST['op']) ? $_POST['op'] : '';
$node = node_load($edit['nid']);
- if (!$user->uid && variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) != COMMENT_ANONYMOUS_MAYNOT_CONTACT) {
- drupal_add_js(drupal_get_path('module', 'comment') .'/comment.js');
+ if (!$user->uid && variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) != COMMENT_ANONYMOUS_MAYNOT_CONTACT) {
+ drupal_add_js(drupal_get_path('module', 'comment') . '/comment.js');
}
$edit += array('name' => '', 'mail' => '', 'homepage' => '');
if ($user->uid) {
@@ -1359,7 +1359,7 @@ function comment_form(&$form_state, $edi
$form['author'] = array('#type' => 'value', '#value' => $user->name);
}
}
- else if (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MAY_CONTACT) {
+ else if (variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MAY_CONTACT) {
$form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', t('Anonymous'))
);
@@ -1368,7 +1368,7 @@ function comment_form(&$form_state, $edi
$form['homepage'] = array('#type' => 'textfield', '#title' => t('Homepage'), '#maxlength' => 255, '#size' => 30, '#default_value' => $edit['homepage']);
}
- else if (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) {
+ else if (variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) {
$form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', t('Anonymous')), '#required' => TRUE);
$form['mail'] = array('#type' => 'textfield', '#title' => t('E-mail'), '#maxlength' => 64, '#size' => 30, '#default_value' => $edit['mail'], '#description' => t('The content of this field is kept private and will not be shown publicly.'), '#required' => TRUE);
@@ -1376,7 +1376,7 @@ function comment_form(&$form_state, $edi
$form['homepage'] = array('#type' => 'textfield', '#title' => t('Homepage'), '#maxlength' => 255, '#size' => 30, '#default_value' => $edit['homepage']);
}
- if (variable_get('comment_subject_field_'. $node->type, 1) == 1) {
+ if (variable_get('comment_subject_field_' . $node->type, 1) == 1) {
$form['subject'] = array('#type' => 'textfield', '#title' => t('Subject'), '#maxlength' => 64, '#default_value' => !empty($edit['subject']) ? $edit['subject'] : '');
}
@@ -1407,19 +1407,19 @@ function comment_form(&$form_state, $edi
// Only show save button if preview is optional or if we are in preview mode.
// We show the save button in preview mode even if there are form errors so that
// optional form elements (e.g., captcha) can be updated in preview mode.
- if (!form_get_errors() && ((variable_get('comment_preview_'. $node->type, COMMENT_PREVIEW_REQUIRED) == COMMENT_PREVIEW_OPTIONAL) || ($op == t('Preview')) || ($op == t('Save')))) {
+ if (!form_get_errors() && ((variable_get('comment_preview_' . $node->type, COMMENT_PREVIEW_REQUIRED) == COMMENT_PREVIEW_OPTIONAL) || ($op == t('Preview')) || ($op == t('Save')))) {
$form['submit'] = array('#type' => 'submit', '#value' => t('Save'), '#weight' => 19);
}
$form['preview'] = array('#type' => 'button', '#value' => t('Preview'), '#weight' => 20);
- $form['#token'] = 'comment'. $edit['nid'] . (isset($edit['pid']) ? $edit['pid'] : '');
+ $form['#token'] = 'comment' . $edit['nid'] . (isset($edit['pid']) ? $edit['pid'] : '');
if ($op == t('Preview')) {
$form['#after_build'] = array('comment_form_add_preview');
}
if (empty($edit['cid']) && empty($edit['pid'])) {
- $form['#action'] = url('comment/reply/'. $edit['nid']);
+ $form['#action'] = url('comment/reply/' . $edit['nid']);
}
return $form;
@@ -1511,7 +1511,7 @@ function comment_form_validate($form, &$
foreach (array('name', 'homepage', 'mail') as $field) {
// Set cookie for 365 days.
if (isset($form_state['values'][$field])) {
- setcookie('comment_info_'. $field, $form_state['values'][$field], time() + 31536000, '/');
+ setcookie('comment_info_' . $field, $form_state['values'][$field], time() + 31536000, '/');
}
}
}
@@ -1560,7 +1560,7 @@ function comment_form_submit($form, &$fo
if ($cid = comment_save($form_state['values'])) {
$node = node_load($form_state['values']['nid']);
$page = comment_new_page_count($node->comment_count, 1, $node);
- $form_state['redirect'] = array('node/'. $node->nid, $page, "comment-$cid");
+ $form_state['redirect'] = array('node/' . $node->nid, $page, "comment-$cid");
return;
}
}
@@ -1660,7 +1660,7 @@ function theme_comment_controls($form) {
$output = '';
$output .= drupal_render($form);
$output .= '
';
- $output .= ''. t('Select your preferred way to display the comments and click "Save settings" to activate your changes.') .'
';
+ $output .= '' . t('Select your preferred way to display the comments and click "Save settings" to activate your changes.') . '
';
return theme('box', t('Comment viewing options'), $output);
}
@@ -1708,7 +1708,7 @@ function template_preprocess_comment(&$v
$variables['signature'] = $comment->signature;
$variables['submitted'] = theme('comment_submitted', $comment);
$variables['title'] = l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid"));
- $variables['template_files'][] = 'comment-'. $node->type;
+ $variables['template_files'][] = 'comment-' . $node->type;
// set status to a string representation of comment->status.
if (isset($comment->preview)) {
$variables['status'] = 'comment-preview';
@@ -1729,7 +1729,7 @@ function template_preprocess_comment_fol
$variables['author'] = theme('username', $comment);
$variables['date'] = format_date($comment->timestamp);
$variables['new'] = $comment->new ? t('new') : '';
- $variables['title'] = l($comment->subject, comment_node_url() .'/'. $comment->cid, array('fragment' => "comment-$comment->cid"));
+ $variables['title'] = l($comment->subject, comment_node_url() . '/' . $comment->cid, array('fragment' => "comment-$comment->cid"));
}
/**
@@ -1805,11 +1805,11 @@ function theme_comment_post_forbidden($n
if ($authenticated_post_comments) {
// We cannot use drupal_get_destination() because these links
// sometimes appear on /node and taxonomy listing pages.
- if (variable_get('comment_form_location_'. $node->type, COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) {
- $destination = 'destination='. drupal_urlencode("comment/reply/$node->nid#comment-form");
+ if (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) {
+ $destination = 'destination=' . drupal_urlencode("comment/reply/$node->nid#comment-form");
}
else {
- $destination = 'destination='. drupal_urlencode("node/$node->nid#comment-form");
+ $destination = 'destination=' . drupal_urlencode("node/$node->nid#comment-form");
}
if (variable_get('user_register', 1)) {
@@ -1834,8 +1834,8 @@ function template_preprocess_comment_wra
// Provide contextual information.
$variables['display_mode'] = _comment_get_display_setting('mode', $variables['node']);
$variables['display_order'] = _comment_get_display_setting('sort', $variables['node']);
- $variables['comment_controls_state'] = variable_get('comment_controls_'. $variables['node']->type, COMMENT_CONTROLS_HIDDEN);
- $variables['template_files'][] = 'comment-wrapper-'. $variables['node']->type;
+ $variables['comment_controls_state'] = variable_get('comment_controls_' . $variables['node']->type, COMMENT_CONTROLS_HIDDEN);
+ $variables['template_files'][] = 'comment-wrapper-' . $variables['node']->type;
}
/**
@@ -1907,15 +1907,15 @@ function _comment_get_display_setting($s
// get the setting's site default
switch ($setting) {
case 'mode':
- $default = variable_get('comment_default_mode_'. $node->type, COMMENT_MODE_THREADED_EXPANDED);
+ $default = variable_get('comment_default_mode_' . $node->type, COMMENT_MODE_THREADED_EXPANDED);
break;
case 'sort':
- $default = variable_get('comment_default_order_'. $node->type, COMMENT_ORDER_NEWEST_FIRST);
+ $default = variable_get('comment_default_order_' . $node->type, COMMENT_ORDER_NEWEST_FIRST);
break;
case 'comments_per_page':
- $default = variable_get('comment_default_per_page_'. $node->type, 50);
+ $default = variable_get('comment_default_per_page_' . $node->type, 50);
}
- if (variable_get('comment_controls_'. $node->type, COMMENT_CONTROLS_HIDDEN) == COMMENT_CONTROLS_HIDDEN) {
+ if (variable_get('comment_controls_' . $node->type, COMMENT_CONTROLS_HIDDEN) == COMMENT_CONTROLS_HIDDEN) {
// if comment controls are disabled use site default
$value = $default;
}
@@ -1924,8 +1924,8 @@ function _comment_get_display_setting($s
if (isset($user->$setting) && $user->$setting) {
$value = $user->$setting;
}
- else if (isset($_SESSION['comment_'. $setting]) && $_SESSION['comment_'. $setting]) {
- $value = $_SESSION['comment_'. $setting];
+ else if (isset($_SESSION['comment_' . $setting]) && $_SESSION['comment_' . $setting]) {
+ $value = $_SESSION['comment_' . $setting];
}
else {
$value = $default;
@@ -1974,7 +1974,7 @@ function _comment_update_node_statistics
function comment_invoke_comment(&$comment, $op) {
$return = array();
foreach (module_implements('comment') as $name) {
- $function = $name .'_comment';
+ $function = $name . '_comment';
$result = $function($comment, $op);
if (isset($result) && is_array($result)) {
$return = array_merge($return, $result);
@@ -2090,7 +2090,7 @@ function comment_unpublish_by_keyword_ac
$form['keywords'] = array(
'#title' => t('Keywords'),
'#type' => 'textarea',
- '#description' => t('The comment will be unpublished if it contains any of the character sequences above. Use a comma-separated list of character sequences. Example: funny, bungee jumping, "Company, Inc.". Character sequences are case-sensitive.'),
+ '#description' => t('The comment will be unpublished if it contains any of the character sequences above. Use a comma-separated list of character sequences. Example: funny, bungee jumping, "Company, Inc." . Character sequences are case-sensitive.'),
'#default_value' => isset($context['keywords']) ? drupal_implode_tags($context['keywords']) : '',
);
return $form;
Index: modules/comment/comment.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.pages.inc,v
retrieving revision 1.2
diff -u -p -r1.2 comment.pages.inc
--- modules/comment/comment.pages.inc 16 Dec 2007 21:01:44 -0000 1.2
+++ modules/comment/comment.pages.inc 11 Apr 2008 16:17:08 -0000
@@ -50,7 +50,7 @@ function comment_edit($cid) {
*/
function comment_reply($node, $pid = NULL) {
// Set the breadcrumb trail.
- drupal_set_breadcrumb(array(l(t('Home'), NULL), l($node->title, 'node/'. $node->nid)));
+ drupal_set_breadcrumb(array(l(t('Home'), NULL), l($node->title, 'node/' . $node->nid)));
$op = isset($_POST['op']) ? $_POST['op'] : '';
$output = '';
Index: modules/comment/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.tpl.php,v
retrieving revision 1.5
diff -u -p -r1.5 comment.tpl.php
--- modules/comment/comment.tpl.php 10 Mar 2008 18:25:48 -0000 1.5
+++ modules/comment/comment.tpl.php 11 Apr 2008 16:17:08 -0000
@@ -26,7 +26,7 @@
* @see theme_comment()
*/
?>
-