Index: modules/update_status/update_status.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/update_status/update_status.module,v
retrieving revision 1.63
diff -u -p -r1.63 update_status.module
--- modules/update_status/update_status.module	23 Jun 2007 00:21:49 -0000	1.63
+++ modules/update_status/update_status.module	23 Jun 2007 00:39:55 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: update_status.module,v 1.63 2007/06/23 00:21:49 dww Exp $
+// $Id: update_status.module,v 1.61 2007/06/22 04:59:10 dww Exp $
 
 // Version of core that this module is currently at (and therefore,
 // that sites running it must be at and will want to query for).
@@ -561,6 +561,13 @@ function update_status_calculate_project
           $avail[$project]['latest_version'] = $version;
         }
 
+        // Look for the development snapshot release for this branch.
+        if (!isset($avail[$project]['dev_version'])
+            && isset($release['version_extra'])
+            && $release['version_extra'] == 'dev') {
+          $avail[$project]['dev_version'] = $version;
+        }
+
         // Look for the 'recommended' version if we haven't found it yet (see
         // phpdoc at the top of this function for the definition).
         if (!isset($avail[$project]['recommended'])
@@ -580,7 +587,16 @@ function update_status_calculate_project
           break;
         }
 
-        // See if this release is a security update
+        // If we're running a dev snapshot and have a timestamp, stop
+        // searching for security updates once we hit an official release
+        // older than what we've got.
+        if ($projects[$project]['type'] == 'dev' && isset($release['date'])
+            && isset($projects[$project]['datestamp'])
+            && ($release['date'] + 100 < $projects[$project]['datestamp'])) {
+          continue;
+        }
+
+        // See if this release is a security update.
         if (isset($release['terms'])
             && isset($release['terms']['Release type'])
             && in_array('Security update', $release['terms']['Release type'])) {
@@ -593,6 +609,21 @@ function update_status_calculate_project
       if (!isset($avail[$project]['recommended']) && isset($avail[$project]['latest_version'])) {
         $avail[$project]['recommended'] = $avail[$project]['latest_version'];
       }
+
+      // If we're running a dev snapshot, compare the date of the dev snapshot
+      // with the latest official version, and record the absolute latest in
+      // 'latest_dev' so we can correctly decide if there's a newer release
+      // than our current snapshot.
+      if ($projects[$project]['type'] == 'dev') {
+        if (isset($avail[$project]['dev_version']) && $avail[$project]['releases'][$avail[$project]['dev_version']]['date'] > $avail[$project]['releases'][$avail[$project]['latest_version']]['date']) {
+          $projects[$project]['latest_dev'] = $avail[$project]['dev_version'];
+        }
+        else {
+          $projects[$project]['latest_dev'] = $avail[$project]['latest_version'];
+        }
+      }
+
+      // Stash the info about available releases into our $projects array.
       $projects[$project] += $avail[$project];
 
       //
@@ -635,29 +666,28 @@ function update_status_calculate_project
           }
           break;
         case 'dev':
-          $latest_version = $avail[$project]['releases'][$projects[$project]['latest_version']];
-
-          if (isset($latest_version['version_extra']) && $latest_version['version_extra'] == 'dev') {
-            if (empty($projects[$project]['datestamp'])) {
-              $projects[$project]['status'] = UPDATE_STATUS_NOT_CHECKED;
-              $projects[$project]['reason'] = t('No filedate available');
-            }
-            else if (abs($latest_version['date'] - $projects[$project]['datestamp']) < 100) {
-              $projects[$project]['status'] = UPDATE_STATUS_CURRENT;
-            }
-            elseif ($warning_level == UPDATE_STATUS_WARNING_SECURITY && empty($projects[$project]['security updates'])) {
-              $projects[$project]['status'] = UPDATE_STATUS_NOT_CHECKED;
-              $projects[$project]['reason'] = t('Not a security update');
-            }
-            else {
-              $projects[$project]['status'] = UPDATE_STATUS_NOT_CURRENT;
-            }
+          if (!empty($projects[$project]['security updates'])) {
+            $projects[$project]['status'] = UPDATE_STATUS_NOT_CURRENT;
             break;
           }
 
-          $projects[$project]['status'] = UPDATE_STATUS_NOT_CHECKED;
-          $projects[$project]['reason'] = t('Dev version');
+          $latest = $avail[$project]['releases'][$projects[$project]['latest_dev']];
+          if (empty($projects[$project]['datestamp'])) {
+            $projects[$project]['status'] = UPDATE_STATUS_NOT_CHECKED;
+            $projects[$project]['reason'] = t('No filedate available');
+          }
+          elseif (($projects[$project]['datestamp'] + 100 > $latest['date'])) {
+            $projects[$project]['status'] = UPDATE_STATUS_CURRENT;
+          }
+          elseif ($warning_level == UPDATE_STATUS_WARNING_SECURITY) {
+            $projects[$project]['status'] = UPDATE_STATUS_NOT_CHECKED;
+            $projects[$project]['reason'] = t('Not a security update');
+          }
+          else {
+            $projects[$project]['status'] = UPDATE_STATUS_NOT_CURRENT;
+          }
           break;
+
         default:
           $projects[$project]['status'] = UPDATE_STATUS_UNKNOWN;
           $projects[$project]['reason'] = t('Invalid info');
@@ -740,7 +770,7 @@ function theme_update_status_report($dat
       $row .= check_plain($project['name']);
     }
     $row .= ' '. check_plain($project['existing_version']);
-    if (strpos($project['existing_version'], '-dev') && !empty($project['datestamp'])) {
+    if ($project['type'] == 'dev' && !empty($project['datestamp'])) {
       $row .= ' ('. format_date($project['datestamp'], 'custom', 'Y-M-d') .') ';
     }
     $row .= "</div>\n";
@@ -781,6 +811,11 @@ function theme_update_status_report($dat
       if ($project['recommended'] != $project['latest_version']) {
         $row .= theme('update_status_version', $project['releases'][$project['latest_version']], t('Latest version:'), 'version-latest');
       }
+      if ($project['type'] == 'dev'
+          && $project['status'] != UPDATE_STATUS_CURRENT
+          && $project['latest_version'] != $project['dev_version']) {
+        $row .= theme('update_status_version', $project['releases'][$project['dev_version']], t('Development version:'), 'version-latest');
+      }
     }
 
     if (isset($project['also'])) {