/[drupal]/contributions/modules/og_aggregator/og_aggregator.module
ViewVC logotype

Diff of /contributions/modules/og_aggregator/og_aggregator.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.6.2.3, Mon May 11 00:41:42 2009 UTC revision 1.6.2.4, Wed Jul 1 04:16:52 2009 UTC
# Line 293  function og_aggregator_form_feed_validat Line 293  function og_aggregator_form_feed_validat
293      }      }
294      while ($feed = db_fetch_object($result)) {      while ($feed = db_fetch_object($result)) {
295        if (strcasecmp($feed->title, $form_state['values']['title']) == 0) {        if (strcasecmp($feed->title, $form_state['values']['title']) == 0) {
296          form_set_error('title', t('A feed named %feed already exists. Please enter a unique url.', array('%feed' => theme('placeholder', $form_state['values']['url']))));          form_set_error('title', t('A feed named %feed already exists. Please enter a unique url.', array('%feed' => $form_state['values']['url'])));
297        }        }
298      }      }
299    }    }
# Line 312  function og_aggregator_form_feed_submit( Line 312  function og_aggregator_form_feed_submit(
312    menu_rebuild();    menu_rebuild();
313    if (isset($form_state['values']['fid'])) {    if (isset($form_state['values']['fid'])) {
314      if (isset($form_state['values']['title'])) {      if (isset($form_state['values']['title'])) {
315        drupal_set_message(t('The feed %feed has been updated.', array('%feed' => theme('placeholder', $form_state['values']['title']))));        drupal_set_message(t('The feed %feed has been updated.', array('%feed' => $form_state['values']['title'])));
316        if (arg(0) == 'admin') {        if (arg(0) == 'admin') {
317          $form_state['redirect'] = 'admin/og/aggregator/';          $form_state['redirect'] = 'admin/og/aggregator/';
318        }        }
# Line 321  function og_aggregator_form_feed_submit( Line 321  function og_aggregator_form_feed_submit(
321        }        }
322      }      }
323      else {      else {
324        watchdog('og_aggregator', 'Feed %feed deleted.', array('%feed' => theme('placeholder', $title)));        watchdog('og_aggregator', 'Feed %feed deleted.', array('%feed' => $title));
325        drupal_set_message(t('The feed %feed has been deleted.', array('%feed' => theme('placeholder', $title))));        drupal_set_message(t('The feed %feed has been deleted.', array('%feed' => $title)));
326        if (arg(0) == 'admin') {        if (arg(0) == 'admin') {
327          $form_state['redirect'] = 'admin/og/aggregator/';          $form_state['redirect'] = 'admin/og/aggregator/';
328        }        }
# Line 332  function og_aggregator_form_feed_submit( Line 332  function og_aggregator_form_feed_submit(
332      }      }
333    }    }
334    else {    else {
335      watchdog('og_aggregator', 'Feed %feed added.', array('%feed' => theme('placeholder', $form_state['values']['title'])), WATCHDOG_NOTICE, l(t('view'), 'admin/aggregator'));      watchdog('og_aggregator', 'Feed %feed added.', array('%feed' => $form_state['values']['title']), WATCHDOG_NOTICE, l(t('view'), 'admin/aggregator'));
336      drupal_set_message(t('The feed %feed has been added.', array('%feed' => theme('placeholder', $form_state['values']['title']))));      drupal_set_message(t('The feed %feed has been added.', array('%feed' => $form_state['values']['title'])));
337    }    }
338  }  }
339    
# Line 419  function og_aggregator_remove_feed($feed Line 419  function og_aggregator_remove_feed($feed
419  function og_aggregator_remove($feed) {  function og_aggregator_remove($feed) {
420    db_query('DELETE FROM {og_aggregator_item} WHERE fid = %d', $feed['fid']);    db_query('DELETE FROM {og_aggregator_item} WHERE fid = %d', $feed['fid']);
421    db_query("UPDATE {og_aggregator_feed} SET checked = 0, etag = '', modified = 0 WHERE fid = %d", $feed['fid']);    db_query("UPDATE {og_aggregator_feed} SET checked = 0, etag = '', modified = 0 WHERE fid = %d", $feed['fid']);
422    drupal_set_message(t('The news items from %site have been removed.', array('%site' => theme('placeholder', $feed['title']))));    drupal_set_message(t('The news items from %site have been removed.', array('%site' => $feed['title'])));
423  }  }
424    
425  /**  /**
# Line 458  function og_aggregator_refresh($feed) { Line 458  function og_aggregator_refresh($feed) {
458    switch ($result->code) {    switch ($result->code) {
459      case 304:      case 304:
460        db_query('UPDATE {og_aggregator_feed} SET checked = %d WHERE fid = %d', time(), $feed['fid']);        db_query('UPDATE {og_aggregator_feed} SET checked = %d WHERE fid = %d', time(), $feed['fid']);
461        drupal_set_message(t('There is no new syndicated content from %site.', array('%site' => theme('placeholder', $feed['title']))));        drupal_set_message(t('There is no new syndicated content from %site.', array('%site' => $feed['title'])));
462        break;        break;
463      case 301:      case 301:
464        $feed['url'] = $result->redirect_url;        $feed['url'] = $result->redirect_url;
465        watchdog('og_aggregator', 'Updated URL for feed %title to %url.', array('%title' => theme('placeholder', $feed['title']), '%url' => theme('placeholder', $feed['url'])));        watchdog('og_aggregator', 'Updated URL for feed %title to %url.', array('%title' => $feed['title'], '%url' => $feed['url']));
466    
467      case 200:      case 200:
468      case 302:      case 302:
# Line 510  function og_aggregator_refresh($feed) { Line 510  function og_aggregator_refresh($feed) {
510    
511          cache_clear_all();          cache_clear_all();
512    
513          watchdog('og_aggregator', 'There is new syndicated content from %site.', array('%site' => theme('placeholder', $feed['title'])));          watchdog('og_aggregator', 'There is new syndicated content from %site.', array('%site' => $feed['title']));
514          drupal_set_message(t('There is new syndicated content from %site.', array('%site' => theme('placeholder', $feed['title']))));          drupal_set_message(t('There is new syndicated content from %site.', array('%site' => $feed['title'])));
515        }        }
516        break;        break;
517      default:      default:
518        watchdog('og_aggregator', 'The RSS-feed from %site seems to be broken, due to "%error".', array('%site' => theme('placeholder', $feed['title']), '%error' => theme('placeholder', $result->code .' '. $result->error)), WATCHDOG_WARNING);        watchdog('og_aggregator', 'The RSS-feed from %site seems to be broken, due to "%error".', array('%site' => $feed['title'], '%error' => $result->code .' '. $result->error), WATCHDOG_WARNING);
519        drupal_set_message(t('The RSS-feed from %site seems to be broken, because of error "%error".', array('%site' => theme('placeholder', $feed['title']), '%error' => theme('placeholder', $result->code .' '. $result->error))));        drupal_set_message(t('The RSS-feed from %site seems to be broken, because of error "%error".', array('%site' => $feed['title'], '%error' => $result->code .' '. $result->error)));
520    }    }
521  }  }
522    
# Line 547  function og_aggregator_parse_feed(&$data Line 547  function og_aggregator_parse_feed(&$data
547    xml_set_character_data_handler($xml_parser, 'aggregator_element_data');    xml_set_character_data_handler($xml_parser, 'aggregator_element_data');
548    
549    if (!xml_parse($xml_parser, $data, 1)) {    if (!xml_parse($xml_parser, $data, 1)) {
550      watchdog('og_aggregator', 'The RSS-feed from %site seems to be broken, due to an error "%error" on line %line.', array('%site' => theme('placeholder', $feed['title']), '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser)), WATCHDOG_WARNING);      watchdog('og_aggregator', 'The RSS-feed from %site seems to be broken, due to an error "%error" on line %line.', array('%site' => $feed['title'], '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser)), WATCHDOG_WARNING);
551      drupal_set_message(t('The RSS-feed from %site seems to be broken, because of error "%error" on line %line.', array('%site' => theme('placeholder', $feed['title']), '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser))), 'error');      drupal_set_message(t('The RSS-feed from %site seems to be broken, because of error "%error" on line %line.', array('%site' => $feed['title'], '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser))), 'error');
552      return 0;      return 0;
553    }    }
554    xml_parser_free($xml_parser);    xml_parser_free($xml_parser);
# Line 711  function _og_aggregator_newsstream($og) Line 711  function _og_aggregator_newsstream($og)
711      $out .= theme('pager', NULL, $nodes_per_page);      $out .= theme('pager', NULL, $nodes_per_page);
712    }    }
713    else {    else {
714      $out = t('There are no external feeds for this group.');      $out = t('There are no feeds from external sites for this group.');
715    }    }
716    return $out;    return $out;
717  }  }
Legend:
Removed from v.1.6.2.3  
changed lines
  Added in v.1.6.2.4
  ViewVC Help
Powered by ViewVC 1.1.2