summaryrefslogtreecommitdiff
path: root/modules/aggregator
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-01-26 14:08:44 +0000
committerDries Buytaert <dries@buytaert.net>2009-01-26 14:08:44 +0000
commit6d3d75fe4b8fb1c862010cc87839f1d9ede43265 (patch)
treeb801374bf914048d8659cb8df8f014f1486ee5ec /modules/aggregator
parent8851b57acf1391fe1dbfab4877c1fdc7d63aac63 (diff)
downloadbrdo-6d3d75fe4b8fb1c862010cc87839f1d9ede43265.tar.gz
brdo-6d3d75fe4b8fb1c862010cc87839f1d9ede43265.tar.bz2
- Removing whitespace.
Diffstat (limited to 'modules/aggregator')
-rw-r--r--modules/aggregator/aggregator.admin.inc12
-rw-r--r--modules/aggregator/aggregator.api.php132
-rw-r--r--modules/aggregator/aggregator.fetcher.inc2
-rw-r--r--modules/aggregator/aggregator.module6
-rw-r--r--modules/aggregator/aggregator.processor.inc22
5 files changed, 87 insertions, 87 deletions
diff --git a/modules/aggregator/aggregator.admin.inc b/modules/aggregator/aggregator.admin.inc
index afafc3b56..6d9c94044 100644
--- a/modules/aggregator/aggregator.admin.inc
+++ b/modules/aggregator/aggregator.admin.inc
@@ -393,10 +393,10 @@ function aggregator_admin_refresh_feed($feed) {
* @ingroup forms
*/
function aggregator_admin_form($form_state) {
-
+
// Make sure configuration is sane.
aggregator_sanitize_configuration();
-
+
// Get all available fetchers.
$fetchers = module_implements('aggregator_fetch');
foreach ($fetchers as $k => $module) {
@@ -409,7 +409,7 @@ function aggregator_admin_form($form_state) {
unset($fetchers[$k]);
$fetchers[$module] = $label;
}
-
+
// Get all available parsers.
$parsers = module_implements('aggregator_parse');
foreach ($parsers as $k => $module) {
@@ -422,7 +422,7 @@ function aggregator_admin_form($form_state) {
unset($parsers[$k]);
$parsers[$module] = $label;
}
-
+
// Get all available processors.
$processors = module_implements('aggregator_process');
foreach ($processors as $k => $module) {
@@ -435,7 +435,7 @@ function aggregator_admin_form($form_state) {
unset($processors[$k]);
$processors[$module] = $label;
}
-
+
// Only show basic configuration if there are actually options.
$basic_conf = array();
if (count($fetchers) > 1) {
@@ -475,7 +475,7 @@ function aggregator_admin_form($form_state) {
);
$form['basic_conf'] += $basic_conf;
}
-
+
// Implementing modules will expect an array at $form['modules'].
$form['modules'] = array();
diff --git a/modules/aggregator/aggregator.api.php b/modules/aggregator/aggregator.api.php
index e68fcb51c..5903cf862 100644
--- a/modules/aggregator/aggregator.api.php
+++ b/modules/aggregator/aggregator.api.php
@@ -13,21 +13,21 @@
/**
* Implement this hook to create an alternative fetcher for aggregator module.
- *
- * A fetcher downloads feed data to a Drupal site. The fetcher is called
- * at the first of the three aggregation stages: data is downloaded by the
- * active fetcher, it is converted to a common format by the active parser and
- * finally, it is passed to all active processors which manipulate or store the
+ *
+ * A fetcher downloads feed data to a Drupal site. The fetcher is called
+ * at the first of the three aggregation stages: data is downloaded by the
+ * active fetcher, it is converted to a common format by the active parser and
+ * finally, it is passed to all active processors which manipulate or store the
* data.
- *
- * Modules that define this hook can be set as active fetcher on
+ *
+ * Modules that define this hook can be set as active fetcher on
* admin/content/aggregator/settings. Only one fetcher can be active at a time.
- *
+ *
* @param $feed
- * The $feed object that describes the resource to be downloaded.
- * $feed->url contains the link to the feed. Download the data at the URL
+ * The $feed object that describes the resource to be downloaded.
+ * $feed->url contains the link to the feed. Download the data at the URL
* and expose it to other modules by attaching it to $feed->source_string.
- *
+ *
* @see hook_aggregator_fetch_info()
* @see hook_aggregator_parse()
* @see hook_aggregator_process()
@@ -39,19 +39,19 @@ function hook_aggregator_fetch($feed) {
}
/**
- * Implement this hook to expose the title and a short description of your
+ * Implement this hook to expose the title and a short description of your
* fetcher.
- *
- * The title and the description provided are shown on
+ *
+ * The title and the description provided are shown on
* admin/content/aggregator/settings among other places. Use as title the human
* readable name of the fetcher and as description a brief (40 to 80 characters)
* explanation of the fetcher's functionality.
- *
+ *
* This hook is only called if your module implements hook_aggregator_fetch().
* If this hook is not implemented aggregator will use your module's file name
* as title and there will be no description.
- *
- * @return
+ *
+ * @return
* An associative array defining a title and a description string.
*
* @see hook_aggregator_fetch()
@@ -67,25 +67,25 @@ function hook_aggregator_fetch_info() {
/**
* Implement this hook to create an alternative parser for aggregator module.
- *
- * A parser converts feed item data to a common format. The parser is called
- * at the second of the three aggregation stages: data is downloaded by the
- * active fetcher, it is converted to a common format by the active parser and
- * finally, it is passed to all active processors which manipulate or store the
+ *
+ * A parser converts feed item data to a common format. The parser is called
+ * at the second of the three aggregation stages: data is downloaded by the
+ * active fetcher, it is converted to a common format by the active parser and
+ * finally, it is passed to all active processors which manipulate or store the
* data.
- *
- * Modules that define this hook can be set as active parser on
+ *
+ * Modules that define this hook can be set as active parser on
* admin/content/aggregator/settings. Only one parser can be active at a time.
- *
+ *
* @param $feed
- * The $feed object that describes the resource to be parsed.
- * $feed->source_string contains the raw feed data as a string. Parse data
- * from $feed->source_string and expose it to other modules as an array of
- * data items on $feed->items.
- *
+ * The $feed object that describes the resource to be parsed.
+ * $feed->source_string contains the raw feed data as a string. Parse data
+ * from $feed->source_string and expose it to other modules as an array of
+ * data items on $feed->items.
+ *
* By convention, the common format for a single feed item is:
* $item[key-name] = value;
- *
+ *
* Recognized keys:
* TITLE (string) - the title of a feed item
* DESCRIPTION (string) - the description (body text) of a feed item
@@ -97,7 +97,7 @@ function hook_aggregator_fetch_info() {
* @see hook_aggregator_parse_info()
* @see hook_aggregator_fetch()
* @see hook_aggregator_process()
- *
+ *
* @ingroup aggregator
*/
function hook_aggregator_parse($feed) {
@@ -105,19 +105,19 @@ function hook_aggregator_parse($feed) {
}
/**
- * Implement this hook to expose the title and a short description of your
+ * Implement this hook to expose the title and a short description of your
* parser.
- *
- * The title and the description provided are shown on
+ *
+ * The title and the description provided are shown on
* admin/content/aggregator/settings among other places. Use as title the human
* readable name of the parser and as description a brief (40 to 80 characters)
* explanation of the parser's functionality.
- *
+ *
* This hook is only called if your module implements hook_aggregator_parse().
* If this hook is not implemented aggregator will use your module's file name
* as title and there will be no description.
- *
- * @return
+ *
+ * @return
* An associative array defining a title and a description string.
*
* @see hook_aggregator_parse()
@@ -133,22 +133,22 @@ function hook_aggregator_parse_info() {
/**
* Implement this hook to create a processor for aggregator module.
- *
- * A processor acts on parsed feed data. Active processors are called at the
+ *
+ * A processor acts on parsed feed data. Active processors are called at the
* third and last of the aggregation stages: data is downloaded by the active
- * fetcher, it is converted to a common format by the active parser and
+ * fetcher, it is converted to a common format by the active parser and
* finally, it is passed to all active processors which manipulate or store the
* data.
- *
- * Modules that define this hook can be activated as processor on
+ *
+ * Modules that define this hook can be activated as processor on
* admin/content/aggregator/settings.
- *
+ *
* @param $feed
* The $feed object that describes the resource to be processed. $feed->items
- * contains an array of feed items downloaded and parsed at the parsing
- * stage. See hook_aggregator_parse() for the basic format of a single item
- * in the $feed->items array. For the exact format refer to the particular
- * parser in use.
+ * contains an array of feed items downloaded and parsed at the parsing
+ * stage. See hook_aggregator_parse() for the basic format of a single item
+ * in the $feed->items array. For the exact format refer to the particular
+ * parser in use.
*
* @see hook_aggregator_process_info()
* @see hook_aggregator_fetch()
@@ -162,20 +162,20 @@ function hook_aggregator_process($feed) {
}
}
-/**
- * Implement this hook to expose the title and a short description of your
+/**
+ * Implement this hook to expose the title and a short description of your
* processor.
- *
- * The title and the description provided are shown most importantly on
- * admin/content/aggregator/settings . Use as title the natural name of the
- * processor and as description a brief (40 to 80 characters) explanation of
+ *
+ * The title and the description provided are shown most importantly on
+ * admin/content/aggregator/settings . Use as title the natural name of the
+ * processor and as description a brief (40 to 80 characters) explanation of
* the functionality.
*
- * This hook is only called if your module implements
- * hook_aggregator_process(). If this hook is not implemented aggregator
+ * This hook is only called if your module implements
+ * hook_aggregator_process(). If this hook is not implemented aggregator
* will use your module's file name as title and there will be no description.
- *
- * @return
+ *
+ * @return
* An associative array defining a title and a description string.
*
* @see hook_aggregator_process()
@@ -190,16 +190,16 @@ function hook_aggregator_process_info($feed) {
}
/**
- * Implement this hook to remove stored data if a feed is being deleted or a
- * feed's items are being removed.
- *
- * Aggregator calls this hook if either a feed is deleted or a user clicks on
- * "remove items".
- *
+ * Implement this hook to remove stored data if a feed is being deleted or a
+ * feed's items are being removed.
+ *
+ * Aggregator calls this hook if either a feed is deleted or a user clicks on
+ * "remove items".
+ *
* If your module stores feed items for example on hook_aggregator_process() it
- * is recommended to implement this hook and to remove data related to $feed
+ * is recommended to implement this hook and to remove data related to $feed
* when called.
- *
+ *
* @param $feed
* The $feed object whose items are being removed.
*
diff --git a/modules/aggregator/aggregator.fetcher.inc b/modules/aggregator/aggregator.fetcher.inc
index 026389815..9d1f8f580 100644
--- a/modules/aggregator/aggregator.fetcher.inc
+++ b/modules/aggregator/aggregator.fetcher.inc
@@ -21,7 +21,7 @@ function aggregator_aggregator_fetch_info() {
*/
function aggregator_aggregator_fetch($feed) {
$feed->source_string = FALSE;
-
+
// Generate conditional GET headers.
$headers = array();
if ($feed->etag) {
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index dd3a14f5a..5791a9358 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -601,7 +601,7 @@ function theme_aggregator_block_item($item, $feed = 0) {
// Display the external link to the item.
return '<a href="' . check_url($item->link) . '">' . check_plain($item->title) . "</a>\n";
-
+
}
/**
@@ -618,10 +618,10 @@ function aggregator_filter_xss($value) {
/**
* Check and sanitize aggregator configuration.
- *
+ *
* Goes through all fetchers, parsers and processors and checks whether they are available.
* If one is missing resets to standard configuration.
- *
+ *
* @return
* TRUE if this function reset the configuration FALSE if not.
*/
diff --git a/modules/aggregator/aggregator.processor.inc b/modules/aggregator/aggregator.processor.inc
index 42fe606f0..22028fae3 100644
--- a/modules/aggregator/aggregator.processor.inc
+++ b/modules/aggregator/aggregator.processor.inc
@@ -57,13 +57,13 @@ function aggregator_aggregator_remove($feed) {
db_delete('aggregator_item')
->condition('fid', $feed->fid)
->execute();
-
+
drupal_set_message(t('The news items from %site have been removed.', array('%site' => $feed->title)));
}
/**
* Implementation of hook_form_aggregator_admin_form_alter().
- *
+ *
* Form alter aggregator module's own form to keep processor functionality
* separate from aggregator API functionality.
*/
@@ -86,28 +86,28 @@ function aggregator_form_aggregator_admin_form_alter(&$form, $form_state) {
else {
$form['modules']['aggregator'] = array();
}
-
+
$form['modules']['aggregator']['aggregator_summary_items'] = array(
- '#type' => 'select',
+ '#type' => 'select',
'#title' => t('Items shown in sources and categories pages') ,
- '#default_value' => variable_get('aggregator_summary_items', 3),
+ '#default_value' => variable_get('aggregator_summary_items', 3),
'#options' => $items,
'#description' => t('Number of feed items displayed in feed and category summary pages.'),
);
$form['modules']['aggregator']['aggregator_clear'] = array(
- '#type' => 'select',
+ '#type' => 'select',
'#title' => t('Discard items older than'),
- '#default_value' => variable_get('aggregator_clear', 9676800),
+ '#default_value' => variable_get('aggregator_clear', 9676800),
'#options' => $period,
'#description' => t('The length of time to retain feed items before discarding. (Requires a correctly configured <a href="@cron">cron maintenance task</a>.)', array('@cron' => url('admin/reports/status'))),
);
$form['modules']['aggregator']['aggregator_category_selector'] = array(
- '#type' => 'radios',
- '#title' => t('Category selection type'),
+ '#type' => 'radios',
+ '#title' => t('Category selection type'),
'#default_value' => variable_get('aggregator_category_selector', 'checkboxes'),
- '#options' => array('checkboxes' => t('checkboxes'),
+ '#options' => array('checkboxes' => t('checkboxes'),
'select' => t('multiple selector')),
'#description' => t('The type of category selection widget displayed on categorization pages. (For a small number of categories, checkboxes are easier to use, while a multiple selector works well with large numbers of categories.)'),
);
@@ -158,7 +158,7 @@ function aggregator_save_item($edit) {
/**
* Expire feed items on $feed that are older than aggregator_clear.
- *
+ *
* @param $feed
* Object describing feed.
*/