diff -urp leech-orig/leech.module leech/leech.module
--- leech-orig/leech.module	2007-07-30 19:02:38.000000000 +0200
+++ leech/leech.module	2007-08-26 14:54:36.000000000 +0200
@@ -714,7 +714,7 @@ function leech_form_alter($form_id, &$fo
     if (user_access('administer nodes')) {
       // don't allow regular user's to "steal fame" :)
       $feeds = array();
-      $result = db_query(db_rewrite_sql('SELECT n.nid, n.title FROM {node} n, {leech_news_feed} f WHERE f.nid = n.nid'));
+      $result = db_query(db_rewrite_sql('SELECT n.nid, n.title FROM {node} n INNER JOIN {leech_news_feed} f ON f.nid = n.nid'));
       while ($temp = db_fetch_array($result)) {
         $feeds[$temp['nid']] = $temp['title'];
       }
@@ -1071,11 +1071,10 @@ function leech_cron() {
   }
   
   // Delete too old items
-  $result = db_query("SELECT f.items_delete, n.created, i.nid
-                      FROM {node} AS n, {leech_news_item} AS i, {leech_news_feed} AS f
-                      WHERE ( n.nid = i.nid AND
-                              f.nid = i.fid)"
-  );
+  $sql  = 'SELECT f.items_delete, n.created, i.nid FROM {node} n ';
+  $sql .= 'INNER JOIN {leech_news_item} i ON n.nid = i.nid ';
+  $sql .= 'INNER JOIN {leech_news_feed} f ON f.nid = i.fid ';
+  $result = db_query($sql);
   $now = time();
   while ($node = db_fetch_object($result))  {
     if (abs($now - $node->created) > $node->items_delete) {
@@ -1240,7 +1239,7 @@ function leech_validate(&$node, $form = 
     if (trim($form['leech']['url']['#value']) == '') {
       return;
     }
-    $result = db_query("SELECT l.nid, n.title FROM {node} n, {leech} l WHERE l.url = '%s' AND l.nid = n.nid", $form['leech']['url']['#value']);
+    $result = db_query("SELECT l.nid, n.title FROM {node} n INNER JOIN {leech} l ON l.nid = n.nid WHERE l.url = '%s' ", $form['leech']['url']['#value']);
     while ($leech = db_fetch_object($result)) {
       if ($leech->nid != $node->nid) {
         $link = l($leech->title, "node/{$leech->nid}");
@@ -1523,7 +1522,7 @@ function leech_page_feed_list() {
  * Menu callback; Generates an OPML representation of all feeds.
  */
 function leech_page_opml() {
-  $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, l.url FROM {node} n, {leech} l WHERE l.nid = n.nid ORDER BY n.title ASC'));
+  $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, l.url FROM {node} n INNER JOIN {leech} l ON l.nid = n.nid ORDER BY n.title ASC'));
   // should we do this?: $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, l.url FROM {node} n, {leech} l, {leech_news_feed} f WHERE f.nid = n.nid AND l.nid = f.nid ORDER BY n.title ASC'));
   $output = '';
   while ($leech = db_fetch_object($result)) {
@@ -2202,7 +2201,7 @@ function _leech_news_save_items(&$node) 
   $promoted = array();
   $promoted_changed = FALSE;
   if ($node->leech_news->items_promote != 1000000000 && $node->leech_news->items_promote != 0) {
-    $result = db_query('SELECT i.nid AS nid, n.created AS created FROM {node} n, {leech_news_item} i WHERE i.fid = %d AND i.nid = n.nid AND n.status = 1 AND n.promote = 1 ORDER BY n.created ASC', $node->nid);
+    $result = db_query('SELECT i.nid AS nid, n.created AS created FROM {node} n INNER JOIN {leech_news_item} i ON i.nid = n.nid WHERE i.fid = %d AND n.status = 1 AND n.promote = 1 ORDER BY n.created ASC', $node->nid);
     while ($temp = db_fetch_array($result)) {
       $promoted[$temp['nid']] = $temp['created'];
     }
@@ -2259,7 +2258,7 @@ function _leech_news_save_items(&$node) 
       $entry = db_fetch_object(db_query("SELECT nid FROM {leech_news_item} WHERE link = '%s' AND fid = %d", $item->link, $node->nid));
     }
     else {
-      $entry = db_fetch_object(db_query("SELECT n.nid AS nid FROM {node} n, {leech_news_item} i WHERE i.fid = %d AND i.nid = n.nid AND n.title = '%s'", $node->nid, $item->title));
+      $entry = db_fetch_object(db_query("SELECT n.nid AS nid FROM {node} n INNER JOIN {leech_news_item} i ON i.nid = n.nid WHERE i.fid = %d AND n.title = '%s'", $node->nid, $item->title));
     }
     if (isset($entry) && isset($entry->nid)) {
       if (!$node->leech_news->items_update) {
@@ -2401,7 +2400,7 @@ function _leech_news_save_items(&$node) 
     $range = count($promoted) - $node->leech_news->items_promote;
     // If there is less promoted items than needed we have to create new list of promoted
     if ($range < 0) {
-      $result = db_query_range('SELECT n.nid, n.created FROM {node} n, {leech_news_item} i WHERE n.status = 1 AND n.nid = i.nid AND i.fid = %d ORDER BY n.created DESC', $node->nid, 0, $node->leech_news->items_promote);
+      $result = db_query_range('SELECT n.nid, n.created FROM {node} n INNER JOIN {leech_news_item} i ON n.nid = i.nid WHERE n.status = 1 AND i.fid = %d ORDER BY n.created DESC', $node->nid, 0, $node->leech_news->items_promote);
       while ($temp = db_fetch_object($result)) {
         $promoted[$temp->nid] = $temp->created;
       }