diff --git a/feeds.module b/feeds.module
index 06fcda677f3f07695e0289644dc61d62c9371d9e..52fddb9619f001b2dd110f57bdb9f45732982b91 100644
--- a/feeds.module
+++ b/feeds.module
@@ -12,8 +12,7 @@ define('FEEDS_REQUEST_TIME', time());
// Do not schedule a feed for refresh.
define('FEEDS_SCHEDULE_NEVER', -1);
// Never expire feed items.
-// @todo:
-// Use FEEDS_NEVER instead of FEEDS_SCHEDULE_NEVER and FEEDS_EXPIRE_NEVER.
+// @todo Use FEEDS_NEVER instead of FEEDS_SCHEDULE_NEVER and FEEDS_EXPIRE_NEVER.
define('FEEDS_EXPIRE_NEVER', -1);
// An object is not persistent at all. Compare to EXPORT_IN_DATABASE OR
// EXPORT_IN_CODE.
@@ -185,7 +184,7 @@ function feeds_access($action, $param) {
/**
* Menu access callback.
*
- * @todo: Create cached function that returns available configurations
+ * @todo Create cached function that returns available configurations
* and use it for enumerating feed configuration ids.
*/
function feeds_page_access() {
@@ -221,11 +220,6 @@ function feeds_ctools_plugin_api($owner, $api) {
/**
* Implementation of hook_feeds_plugins().
- *
- * @todo: Document API. Uses CTools plugin handling, extra keys:
- * 'description', 'hidden'
- *
- * @todo: Also declare and load include/ files with CTools plugins?
*/
function feeds_feeds_plugins() {
module_load_include('inc', 'feeds', 'feeds.plugins');
@@ -253,7 +247,7 @@ function feeds_nodeapi(&$node, $op, $form) {
if (trim($node->title) == '') {
try {
$source->addConfig($node->feeds);
- // @todo: Too many indirections. Clean up.
+ // @todo Too many indirections. Clean up.
$feed = $source->importer->fetcher->fetch($source);
$source->importer->parser->parse($feed, $source);
if (!$feed->getTitle()) {
@@ -440,7 +434,7 @@ function feeds_importer_enabled($id) {
/**
* Get a an enabled importer configuration by content type.
*
- * @todo: speed this up by DB caching the result.
+ * @todo speed this up by DB caching the result.
*
* @param $content_type
* A node type string.
@@ -537,7 +531,7 @@ function feeds_scheduler() {
* @defgroup plugins Plugin functions
* @{
*
- * @todo: Encapsulate this in a FeedsPluginHandler class, move it to includes/
+ * @todo Encapsulate this in a FeedsPluginHandler class, move it to includes/
* and only load it if we're manipulating plugins.
*/
@@ -612,7 +606,7 @@ function feeds_plugin_instance($plugin, $id) {
}
// Return FeedsMissingPlugin if no plugin was found.
- // @todo: better error handling.
+ // @todo Better error handling.
drupal_set_message(t('Missing Feeds plugin. Check whether all required libraries and modules are installed properly.'), 'error');
$class = ctools_plugin_load_class('feeds', 'plugins', 'FeedsMissingPlugin', 'handler');
return FeedsConfigurable::instance($class, $id);
@@ -621,7 +615,7 @@ function feeds_plugin_instance($plugin, $id) {
/**
* Determines whether given plugin is derived from given base plugin.
*
- * @todo: update variable names. Should be $plugin_key if it is a key string.
+ * @todo Update variable names. Should be $plugin_key if it is a key string.
*
* @param $plugin
* String that identifies a Feeds plugin key.
diff --git a/feeds.pages.inc b/feeds.pages.inc
index 3e7d3218238f264fc847d6d8d79a07c5409375c0..d7fba550375b65ff492b32a86bfb984a63a946e9 100644
--- a/feeds.pages.inc
+++ b/feeds.pages.inc
@@ -9,7 +9,7 @@
/**
* Render a page of available feed configuration.
*
- * @todo: respect permissions.
+ * @todo Respect permissions.
*/
function feeds_page() {
$rows = array();
@@ -47,7 +47,7 @@ function feeds_import_form(&$form_state, $importer_id) {
$form = array();
$form['#importer_id'] = $importer_id;
- // @todo: Move this into fetcher?
+ // @todo Move this into fetcher?
$form['#attributes']['enctype'] = 'multipart/form-data';
$form['feeds'] = array(
'#type' => 'fieldset',
@@ -67,7 +67,7 @@ function feeds_import_form(&$form_state, $importer_id) {
* Has to live in feeds.module, needs to be callable from node form.
*/
function feeds_import_form_validate($form, &$form_state) {
- // @todo: this may be a problem here, as we don't have a feed_nid at this point.
+ // @todo This may be a problem here, as we don't have a feed_nid at this point.
feeds_source($form['#importer_id'])->configFormValidate($form_state['values']['feeds']);
}
diff --git a/feeds_ui/feeds_ui.admin.inc b/feeds_ui/feeds_ui.admin.inc
index 8f27285523f3a451a78aedfab4933a1c84ce3458..dd909ff493826a1f376a5e48173041a990e53436 100644
--- a/feeds_ui/feeds_ui.admin.inc
+++ b/feeds_ui/feeds_ui.admin.inc
@@ -388,8 +388,6 @@ function feeds_ui_edit_page($importer, $active = 'help', $plugin_key = '') {
if (feeds_get_config_form($importer->processor)) {
$actions[] = l(t('Settings'), $path .'/settings/'. $config['processor']['plugin_key']);
}
- // @todo: We assume that every processor supports mapping - that's not
- // necessarily the case.
$actions[] = l(t('Mapping'), $path .'/mapping');
$info['title'] = t('Processor');
$info['body'] = array(
@@ -451,7 +449,6 @@ function feeds_ui_plugin_form_submit($form, &$form_state) {
$form['#importer']->setPlugin($form_state['values']['plugin_key']);
$form['#importer']->save();
drupal_set_message(t('Changed !type plugin.', array('!type' => $form['#plugin_type'])));
- // @todo: redirect to plugin's settings form if available.
}
/**
@@ -483,7 +480,7 @@ function theme_feeds_ui_plugin_form($form) {
/**
* Edit mapping.
*
- * @todo: completely merge this into config form handling. This is just a
+ * @todo Completely merge this into config form handling. This is just a
* shared form of configuration, most of the common functionality can live in
* FeedsProcessor, a flag can tell whether mapping is supported or not.
*/
@@ -711,7 +708,7 @@ function theme_feeds_ui_edit_page($config_info, $active_container) {
* Render a simple container. A container can have a title, a description and
* one or more actions. Recursive.
*
- * @todo: Replace with theme_fieldset or a wrapper to theme_fieldset?
+ * @todo Replace with theme_fieldset or a wrapper to theme_fieldset?
*
* @param $container
* An array that describes the container. All elements are optional:
diff --git a/feeds_ui/tests/feeds_ui.test b/feeds_ui/tests/feeds_ui.test
index 13f7ea34a7d9c1068c91c9510b950ffbd8da6d15..38ae677c2206e357e93ce7171fe8fe71906a1d48 100644
--- a/feeds_ui/tests/feeds_ui.test
+++ b/feeds_ui/tests/feeds_ui.test
@@ -134,6 +134,6 @@ class FeedsUIUserInterfaceTestCase extends FeedsWebTestCase {
$this->drupalPost('node/add/page', $edit, 'Save');
$this->assertText('Page Development Seed has been created.');
- // @todo: refreshing/deleting feed items. Needs to live in feeds.test
+ // @todo Refreshing/deleting feed items. Needs to live in feeds.test
}
}
\ No newline at end of file
diff --git a/includes/FeedsConfigurable.inc b/includes/FeedsConfigurable.inc
index e8ed186f837270f6905ee715cedcc1ca01f6ef78..ee9e28398fcf2108cc7ee62a7bada43053411bde 100644
--- a/includes/FeedsConfigurable.inc
+++ b/includes/FeedsConfigurable.inc
@@ -20,7 +20,7 @@ abstract class FeedsConfigurable {
/*
CTools export type of this object.
- @todo: should live in FeedsImporter. Not all child classes
+ @todo Should live in FeedsImporter. Not all child classes
of FeedsConfigurable are exportable. Same goes for $disabled.
Export type can be one of
@@ -128,7 +128,7 @@ abstract class FeedsConfigurable {
/**
* Return default configuration.
*
- * @todo: rename to getConfigDefaults().
+ * @todo rename to getConfigDefaults().
*
* @return
* Array where keys are the variable names of the configuration elements and
diff --git a/includes/FeedsDataHandler.inc b/includes/FeedsDataHandler.inc
index ecde52d775439de7897f578da432d247af09c574..e95f5f0f8d6bc3e1738df9f1befffa32098512f0 100644
--- a/includes/FeedsDataHandler.inc
+++ b/includes/FeedsDataHandler.inc
@@ -5,7 +5,7 @@
* @file
* Data handler used in FeedsDataProcessor.
*
- * @todo: Move to data module?
+ * @todo Move to data module?
*/
/**
@@ -69,7 +69,7 @@ class FeedsDataHandler extends DataHandler {
static $handlers;
if (!isset($handlers[$table][$key])) {
$class = 'FeedsDataHandler';
- // @todo: this is an undocumented stop gap until data modules supports
+ // @todo This is an undocumented stop gap until Data module supports
// handler plugins.
if ($info = variable_get($table .'_handler', NULL)) {
$class = $info['class'];
@@ -173,7 +173,7 @@ class FeedsDataHandler extends DataHandler {
* ),
* );
*
- * @todo: push this functionality into DataHandler.
+ * @todo Push this functionality into DataHandler.
*/
public function delete($clause) {
@@ -237,7 +237,7 @@ class FeedsDataHandler extends DataHandler {
}
/**
- * @todo: support save().
+ * @todo Support save().
*/
public function save(&$record, $update) {
throw new Exception(t('Not implemented.'));
diff --git a/includes/FeedsImporter.inc b/includes/FeedsImporter.inc
index a59f951c9eefe54d3bf5497404b8be29623eafe0..e784e8124bf927dadffe094dc2c78b8c99f568f2 100644
--- a/includes/FeedsImporter.inc
+++ b/includes/FeedsImporter.inc
@@ -134,7 +134,7 @@ class FeedsImporter extends FeedsConfigurable {
* @param $plugin_key
* A fetcher, parser or processor plugin.
*
- * @todo: error handling, handle setting to the same plugin.
+ * @todo Error handling, handle setting to the same plugin.
*/
public function setPlugin($plugin_key) {
// $plugin_type can be either 'fetcher', 'parser' or 'processor'
@@ -193,7 +193,7 @@ class FeedsImporter extends FeedsConfigurable {
'processor' => array(
'plugin_key' => 'FeedsNodeProcessor',
),
- 'content_type' => 'page', // @todo: provide default content type feed.
+ 'content_type' => 'page',
'update' => 0,
'import_period' => 1800, // Refresh every 30 minutes by default.
'expire_period' => 3600, // Expire every hour by default, this is a hidden setting.
diff --git a/includes/FeedsScheduler.inc b/includes/FeedsScheduler.inc
index 6ce7fdfc527491aba86e0c9fbfe650c22b523ae0..1872d9ec40b7e16be745cdbef01845bb5719fe67 100644
--- a/includes/FeedsScheduler.inc
+++ b/includes/FeedsScheduler.inc
@@ -88,11 +88,6 @@ class FeedsScheduler implements FeedsSchedulerInterface {
*
* If drupal_queue is present, only pushes refresh tasks to queue and
* returns. If drupal_queue is not available, works off tasks.
- *
- * @todo: Run cleanup task that
- * 1) Picks up items that are scheduled and not worked off for more than
- * e. g. 6 hours.
- * 2) Logs these items with watchdog.
*/
public function cron() {
@@ -162,9 +157,9 @@ class FeedsScheduler implements FeedsSchedulerInterface {
*
* Add a feed to the scheduler.
*
- * @todo: Create optional parameter $last_scheduled_time to pass in.
- * Set this value if a feed is refreshed on creation.
- * @todo: Create an abstract interface for items that can be added?
+ * @todo Create optional parameter $last_scheduled_time to pass in. Set this
+ * value if a feed is refreshed on creation.
+ * @todo Create an abstract interface for items that can be added?
*/
public function add($importer_id, $callback, $feed_nid = 0) {
$save = array(
diff --git a/includes/FeedsSource.inc b/includes/FeedsSource.inc
index e43b9c3f49d143b2250bdd7f1147def991b131bf..ed4fded79114f26f1c91545bc051da3db3ad9452 100644
--- a/includes/FeedsSource.inc
+++ b/includes/FeedsSource.inc
@@ -62,8 +62,9 @@ interface FeedsSourceInterface {
* instance of a FeedsSource class exists once per feed_nid to be imported.
*
* As with FeedsImporter, the idea with FeedsSource is that it can be used
- * without actually saving the object to the database (@todo: needs to be
- * tested).
+ * without actually saving the object to the database (
+ *
+ * @todo Test whether FeedsSource can be used without saving it.
*/
class FeedsSource extends FeedsConfigurable {
@@ -101,9 +102,9 @@ class FeedsSource extends FeedsConfigurable {
/**
* Import a feed: execute, fetching, parsing and processing stage.
*
- * @todo: Iron out and document potential Exceptions.
- * @todo: Support batching.
- * @todo: catch exceptions outside of import(), clear() and expire().
+ * @todo Iron out and document potential Exceptions.
+ * @todo Support batching.
+ * @todo catch exceptions outside of import(), clear() and expire().
*/
public function import() {
try {
@@ -159,12 +160,13 @@ class FeedsSource extends FeedsConfigurable {
/**
* Load configuration and unpack.
+ *
+ * @todo Patch CTools to move constants from export.inc to ctools.module.
*/
public function load() {
if ($config = db_result(db_query('SELECT config FROM {feeds_source} WHERE id = "%s" AND feed_nid = %d', $this->id, $this->feed_nid))) {
// While FeedsSource cannot be exported, we still use CTool's export.inc
// export definitions.
- // @todo: patch CTools to move constants from export.inc to ctools.module.
ctools_include('export');
$this->export_type = EXPORT_IN_DATABASE;
$this->config = unserialize($config);
diff --git a/libraries/common_syndication_parser.inc b/libraries/common_syndication_parser.inc
index f7b7760ff19f0fffcffa445e5c7a904f153b5823..9efcb27430fc5896536cd7dca2c07f592814e300 100644
--- a/libraries/common_syndication_parser.inc
+++ b/libraries/common_syndication_parser.inc
@@ -292,7 +292,7 @@ function _parser_common_syndication_RDF10_parse($feed_XML) {
$item['rdf'] = (object)array();
foreach ($rdf_data as $rdf_property => $rdf_value) {
// looks nicer in the mapper UI
- // @todo: revisit, not used with feedapi mapper anymore.
+ // @todo Revisit, not used with feedapi mapper anymore.
$rdf_property = str_replace(':', '_', $rdf_property);
$item['rdf'][$rdf_property] = $rdf_value;
}
diff --git a/libraries/http_request.inc b/libraries/http_request.inc
index c6f037ee80bed0e1e43dfee7504cd694db4699d7..08d8500d528316053f549a305a1095c8dca9ea6c 100644
--- a/libraries/http_request.inc
+++ b/libraries/http_request.inc
@@ -14,9 +14,9 @@
* HTML document, function attempts to discover RSS or Atom feeds and downloads
* them.
*
- * @todo: debug
- * @todo: cache detected rss feeds in url.
- * @todo: use exceptions, not string or false return values.
+ * @todo Debug
+ * @todo Cache detected rss feeds in url.
+ * @todo Use exceptions, not string or false return values.
*
* @return
* string - the downloaded data, FALSE - if the URL is not reachable
diff --git a/libraries/opml_parser.inc b/libraries/opml_parser.inc
index 0d1489a5ddc80aa4c18c41c6fdfd0d9071500b93..de0f9df2c7545bef1aa71ccf838372c82ec41ed0 100644
--- a/libraries/opml_parser.inc
+++ b/libraries/opml_parser.inc
@@ -20,7 +20,7 @@ function opml_parser_parse($raw) {
$feeds['title'] = (string)current($xml->xpath('//head/title'));
- // @todo: Make xpath case insensitive.
+ // @todo Make xpath case insensitive.
$outlines = $xml->xpath('//outline[@xmlUrl]');
foreach ($outlines as $outline) {
$item = array();
diff --git a/plugins/FeedsCSVParser.inc b/plugins/FeedsCSVParser.inc
index 40e299c6d1af1850d38167f59a178fcad4894304..5e34da0539a3e429f54d31a3108d0d41763d7dde 100644
--- a/plugins/FeedsCSVParser.inc
+++ b/plugins/FeedsCSVParser.inc
@@ -22,7 +22,7 @@ class FeedsCSVParser extends FeedsParser {
unset($parser);
// Apply titles in lower case.
- // @todo: push this functionality into ParserCSV.
+ // @todo Push this functionality into ParserCSV.
$header = array_shift($rows);
foreach ($header as $i => $title) {
$header[$i] = strtolower($title); // Use lower case only.
diff --git a/plugins/FeedsDataProcessor.inc b/plugins/FeedsDataProcessor.inc
index 7292be8207050d062bfec548bfd284572ee26952..af42e805b38dc8eb8389d388093213a70253155b 100644
--- a/plugins/FeedsDataProcessor.inc
+++ b/plugins/FeedsDataProcessor.inc
@@ -141,7 +141,7 @@ class FeedsDataProcessor extends FeedsProcessor {
foreach ($schema['fields'] as $field_name => $field) {
if (!in_array($field_name, array('id', 'feed_nid'))) {
// Any existing field can be optionally unique.
- // @todo: push this reverse mapping of spec to short name into data
+ // @todo Push this reverse mapping of spec to short name into data
// module.
$type = $field['type'];
if ($type == 'int' && $field['unsigned']) {
@@ -278,7 +278,7 @@ class FeedsDataProcessor extends FeedsProcessor {
* @throws Exception $e
* Throws this exception if a table cannot be found and cannot be created.
*
- * @todo: Make *Data module* throw exception when table can't be found or
+ * @todo Make *Data module* throw exception when table can't be found or
* can't be created.
*/
protected function table() {
diff --git a/plugins/FeedsFeedNodeProcessor.inc b/plugins/FeedsFeedNodeProcessor.inc
index 11d5d38548b41d5a48f9fffc678603cf851b55af..57f2dbeed1ef187a4056c307a755f48505669da5 100644
--- a/plugins/FeedsFeedNodeProcessor.inc
+++ b/plugins/FeedsFeedNodeProcessor.inc
@@ -89,7 +89,7 @@ class FeedsFeedNodeProcessor extends FeedsProcessor {
/*
Assign an aggregated node always to current user.
- @todo: this won't work in all cases as the assumption here is that
+ @todo This won't work in all cases as the assumption here is that
import is happening one off when user is logged in. Assumption breaks if
feed node processor is being used for aggregation on cron time and a
specific user should still be the owner of the imported feed nodes.
@@ -125,8 +125,6 @@ class FeedsFeedNodeProcessor extends FeedsProcessor {
}
if (empty($types)) {
$types[''] = t('No feed node content type available');
- // @todo: configForm() is executed 4 times - why?
- // drupal_set_message(t('There is no feed content type available. In order to import feed nodes, you must first create at least configuration that is attached to a content type.'), 'error');
}
else {
$types = array(
diff --git a/plugins/FeedsFetcher.inc b/plugins/FeedsFetcher.inc
index 2bcfe67e10aa949a533bfa1933643abdb0b4f282..a70d52ea9e98580b8d8376555de952a499f57249 100644
--- a/plugins/FeedsFetcher.inc
+++ b/plugins/FeedsFetcher.inc
@@ -15,9 +15,6 @@ abstract class FeedsFetcher extends FeedsPlugin {
*
* @param $source
* Source value as entered by user through sourceForm().
- *
- * @todo: Define format of return value?
- * @todo: Should it be execute()?
*/
public abstract function fetch(FeedsSource $source);
diff --git a/plugins/FeedsHTTPFetcher.inc b/plugins/FeedsHTTPFetcher.inc
index b357d3aa751c2162eb6bfe746b1c284556db9699..7feb16a495da4f3d2196801fb3e64bfaa5ac2608 100644
--- a/plugins/FeedsHTTPFetcher.inc
+++ b/plugins/FeedsHTTPFetcher.inc
@@ -57,21 +57,5 @@ class FeedsHTTPFetcher extends FeedsFetcher {
public function configDefaults() {
return array('auto_detect_feeds' => FALSE);
}
-
- /**
- * Configuration form.
- */
- public function configForm(&$form_state) {
- $form = array();
- return $form;
- // @todo:
- $form['auto_detect_feeds'] = array(
- '#type' => 'checkbox',
- '#title' => t('Auto detect feeds (not tested)'),
- '#description' => t('Auto detect RSS or Atom feeds in the downloaded document and use them instead of the given URL.'),
- '#default_value' => $this->config['auto_detect_feeds'],
- );
- return $form;
- }
}
diff --git a/plugins/FeedsNodeProcessor.inc b/plugins/FeedsNodeProcessor.inc
index efe2cc6098a1bd8016a00933a7b63f998e4f6304..4465d9df70f4132bfa9ac5f86a67ed753a3cde7f 100644
--- a/plugins/FeedsNodeProcessor.inc
+++ b/plugins/FeedsNodeProcessor.inc
@@ -84,7 +84,6 @@ class FeedsNodeProcessor extends FeedsProcessor {
/**
* Implementation of FeedsProcessor::clear().
- * @todo: use batch API.
*/
public function clear(FeedsSource $source) {
// Count number of deleted nodes.
@@ -115,7 +114,7 @@ class FeedsNodeProcessor extends FeedsProcessor {
if ($time == FEEDS_EXPIRE_NEVER) {
return;
}
- // @todo: expires 50 at a time at the moment.
+ // @todo Expires 50 at a time at the moment.
// Create a way of letting the caller know whether all nodes could be
// deleted. Has to be thought through in a larger context of batch
// processing support for import and expiry.
@@ -147,7 +146,7 @@ class FeedsNodeProcessor extends FeedsProcessor {
$types = node_get_types('names');
$type = isset($types['story']) ? 'story' : key($types);
return array(
- 'content_type' => $type, // @todo: provide default content type feed_item.
+ 'content_type' => $type,
'update_existing' => 0,
'expire' => FEEDS_EXPIRE_NEVER,
'mappings' => array(),
diff --git a/plugins/FeedsParser.inc b/plugins/FeedsParser.inc
index 2a8e1000b8d4d4bc5790b1d461bdf1045f650489..fda63183de87b5ccf9cc8131e28ead81906318a6 100644
--- a/plugins/FeedsParser.inc
+++ b/plugins/FeedsParser.inc
@@ -3,8 +3,6 @@
/**
* Abstract class, defines interface for parsers.
- *
- * @todo: make implement FeedsSourceInterface
*/
abstract class FeedsParser extends FeedsPlugin {
@@ -17,11 +15,6 @@ abstract class FeedsParser extends FeedsPlugin {
* FeedsImportBatch returned by fetcher.
* @param FeedsSource $source
* Source information.
- * @return
- * A parsed array.
- * @todo: define this array (object?).
- *
- * @todo: Should it be execute() ?
*/
public abstract function parse(FeedsImportBatch $batch, FeedsSource $source);
diff --git a/plugins/FeedsProcessor.inc b/plugins/FeedsProcessor.inc
index 8b14d0ab698b1f0c4fe7c5fea46e70d42d893fbd..62aad767574b4a18bc63b0e5b2002cd8ffc598da 100644
--- a/plugins/FeedsProcessor.inc
+++ b/plugins/FeedsProcessor.inc
@@ -3,8 +3,6 @@
/**
* Abstract class, defines interface for processors.
- *
- * @todo: declare an interface for mapping related functions.
*/
abstract class FeedsProcessor extends FeedsPlugin {
@@ -16,8 +14,6 @@ abstract class FeedsProcessor extends FeedsPlugin {
* The current feed import data passed in from the parsing stage.
* @param FeedsSource $source
* Source information about this import.
- *
- * @todo: Should it be execute()?
*/
public abstract function process(FeedsImportBatch $batch, FeedsSource $source);
@@ -31,7 +27,6 @@ abstract class FeedsProcessor extends FeedsPlugin {
* item pertains to a certain souce is by using $source->feed_nid. It is the
* processor's responsibility to store the feed_nid of an imported item in
* the processing stage.
- * @todo: pass in feed_nid instead of source?
*/
public abstract function clear(FeedsSource $source);
diff --git a/plugins/FeedsSimplePieParser.inc b/plugins/FeedsSimplePieParser.inc
index ac03f77bfb3a428dc55da87ec2f60acac6d5a5f1..601aaa6a6dcfef94aa744882392e25258cd23294 100644
--- a/plugins/FeedsSimplePieParser.inc
+++ b/plugins/FeedsSimplePieParser.inc
@@ -19,7 +19,7 @@ class FeedsSimplePieParser extends FeedsParser {
$parser->set_raw_data($batch->getRaw());
$parser->set_stupidly_fast(TRUE);
$parser->encode_instead_of_strip(FALSE);
- // @todo: is caching effective when we pass in raw data?
+ // @todo Is caching effective when we pass in raw data?
$parser->enable_cache(TRUE);
$parser->set_cache_location($this->cacheDirectory());
$parser->init();
diff --git a/plugins/FeedsUserProcessor.inc b/plugins/FeedsUserProcessor.inc
index cd598c2e5c76ce11ef8b46a65ed36669dc226bfa..22b16883f6398ab861936f76b3ad7dfe726e4d02 100644
--- a/plugins/FeedsUserProcessor.inc
+++ b/plugins/FeedsUserProcessor.inc
@@ -38,7 +38,7 @@ class FeedsUserProcessor extends FeedsProcessor {
}
// Save the user.
- // @todo: is this really the best way to use this function?
+ // @todo Is this really the best way to use this function?
user_save($account, (array) $account);
if ($uid) {
diff --git a/tests/feeds.test b/tests/feeds.test
index 2936142becaf342bb12f08e49d998eaf094ccf13..ab9a43a1a6826c2d8794f9fcb7b7dc95ff76b1cc 100644
--- a/tests/feeds.test
+++ b/tests/feeds.test
@@ -29,10 +29,7 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
* Set up test.
*/
public function setUp() {
- // @todo: once we have default configurations shipping with feeds, we do not
- // need feeds_ui.
parent::setUp('feeds', 'feeds_ui', 'ctools');
-
$this->drupalLogin(
$this->drupalCreateUser(
array(
@@ -347,10 +344,7 @@ class FeedsRSStoDataTest extends FeedsWebTestCase {
* Set up test.
*/
public function setUp() {
- // @todo: once we have default configurations shipping with feeds, we do not
- // need feeds_ui.
parent::setUp('feeds', 'feeds_ui', 'ctools', 'data', 'data_ui', 'views');
-
$this->drupalLogin(
$this->drupalCreateUser(
array(
@@ -473,7 +467,6 @@ class FeedsRSStoDataTest extends FeedsWebTestCase {
$this->assertText('Deleted 10 items.');
// Assert DB status, now there should be no items.
- // @todo: fails, is there something cached?
$count = db_result(db_query('SELECT COUNT(*) FROM {feeds_data_rss}'));
$this->assertEqual($count, 0, 'Accurate number of items in database.');
@@ -485,8 +478,8 @@ class FeedsRSStoDataTest extends FeedsWebTestCase {
$count = db_result(db_query('SELECT COUNT(*) FROM {feeds_data_rss}'));
$this->assertEqual($count, 10, 'Accurate number of items in database.');
- // @todo: Standalone import form testing.
- // @todo: Create a second feed and test.
+ // @todo Standalone import form testing.
+ // @todo Create a second feed and test.
}
}
@@ -574,7 +567,7 @@ class FeedsCSVtoUsersTest extends FeedsWebTestCase {
$this->assertText('Gomez');
$this->assertText('Pugsley');
- // @todo: test status setting, update existing and role settings.
+ // @todo Test status setting, update existing and role settings.
}
}
@@ -739,8 +732,8 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
$count = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE type = "story" AND status = 1'));
$this->assertEqual($count, 200, 'The total of 200 story nodes has not changed.');
- // @todo: use debug time feature in FeedsScheduler and test behavior in future.
- // @todo: how do I call an API function on the test system from the test script?
+ // @todo Use debug time feature in FeedsScheduler and test behavior in future.
+ // @todo How do I call an API function on the test system from the test script?
}
}
diff --git a/tests/feeds.test.inc b/tests/feeds.test.inc
index 80bee177ff9dc969929c0317e3d20c9443417dfe..ec88f28cd18a5cefffd1b3835b1a0cd72538f955 100644
--- a/tests/feeds.test.inc
+++ b/tests/feeds.test.inc
@@ -75,7 +75,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
/**
* Create an importer configuration.
*
- * @todo: rename to createImporterConfig()
+ * @todo Rename to createImporterConfig()
*
* @param $name
* The natural name of the feed.
@@ -271,8 +271,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
* @deprecated:
* Use setPlugin() instead.
*
- * @todo:
- * Refactor users of assertPlugin() and make them use setPugin() instead.
+ * @todo Refactor users of assertPlugin() and make them use setPugin() instead.
*/
public function assertPlugins($id, $fetcher, $parser, $processor) {
// Assert actual configuration.
diff --git a/views/feeds_views_handler_field_source.inc b/views/feeds_views_handler_field_source.inc
index 3526e41d545d0186f0a619263c1c0f32c76e9868..689554519584baf3d5a9a7338532475be1d21979 100644
--- a/views/feeds_views_handler_field_source.inc
+++ b/views/feeds_views_handler_field_source.inc
@@ -17,7 +17,7 @@ class feeds_views_handler_field_source extends views_handler_field {
return check_url($value['FeedsHTTPFetcher']['source']);
}
elseif (isset($value['FeedsFileFetcher']['feeds_source'])) {
- // @todo: this is untested.
+ // @todo This is untested.
return $GLOBALS['base_url'] .'/'. check_plain($value['FeedsFileFetcher']['feeds_source']);
}
return '';