[phpmix-cvs] drupal/modules/akismet akismet.module,1.16,1.17

[<php...@li...>]

Update of /cvsroot/phpmix/drupal/modules/akismet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv743

Modified Files:
	akismet.module 
Log Message:
Changed how problems are displayed when checking for version updates.

Index: akismet.module
===================================================================
RCS file: /cvsroot/phpmix/drupal/modules/akismet/akismet.module,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** akismet.module	10 Jun 2006 13:14:44 -0000	1.16
--- akismet.module	10 Jun 2006 13:36:35 -0000	1.17
***************
*** 17,21 ****
  define('AKISMET_MODULE_VERSION', '1.0.0 beta');
  define('AKISMET_MODULE_HOMEURL', 'http://www.phpmix.org/projects/drupal/4_7/akismet');
! define('AKISMET_MODULE_USERAGENT', 'phpMiX Version Checker | projects/drupal/4_7/akismet | '. AKISMET_MODULE_VERSION);
  
  
--- 17,21 ----
  define('AKISMET_MODULE_VERSION', '1.0.0 beta');
  define('AKISMET_MODULE_HOMEURL', 'http://www.phpmix.org/projects/drupal/4_7/akismet');
! define('AKISMET_MODULE_USERAGENT', 'phpMiX.org | projects/drupal/4_7/akismet | '. AKISMET_MODULE_VERSION);
  
  
***************
*** 1466,1472 ****
    }
    $new_version = _akismet_check_version(isset($_GET['vchk']) ? TRUE : FALSE);
!   $output = '<p>';
    if (empty($new_version)) {
!     $output .= t('Sorry, could not connect to remote server to check for version information. Please, consult the <a href="%admin-logs">log</a> for details.', array('%admin-logs' => url('admin/logs')));
    }
    else {
--- 1466,1472 ----
    }
    $new_version = _akismet_check_version(isset($_GET['vchk']) ? TRUE : FALSE);
!   $output = '';
    if (empty($new_version)) {
!     drupal_set_message(t('Sorry, could not connect to remote server to check for new version information. Please, consult the <a href="%admin-logs">log</a> for details.', array('%admin-logs' => url('admin/logs'))), 'error');
    }
    else {
***************
*** 1475,1487 ****
      }
      if ($new_version != AKISMET_MODULE_VERSION) {
!       $output .= t('Your installation does <strong>not</strong> seem to be up to date. Updates are available, please visit the <a href="%module-url" target="_blank">Akismet module home</a> to obtain the latest version. The latest available version is <strong>%new-version</strong>. ', array('%module-url' => AKISMET_MODULE_HOMEURL, '%new-version' => $new_version));
      }
    }
    $output .= t('You are running version <strong>%your-version</strong>.', array('%your-version' => AKISMET_MODULE_VERSION));
    $timestamp_last = variable_get('akismet_version_check_timestamp', 0);
    if ($timestamp_last) {
!     $output .= ' '. t('Last time checked: <strong>%last</strong>. The time is now %time.', array('%last' => format_date($timestamp_last), '%time' => format_date(time())));
    }
!   $output .= ' '. t('<a href="%check">Check for newest version</a>.', array('%check' => url($url, 'vchk=1')));
    $output .= '</p>';
    return $output;
--- 1475,1488 ----
      }
      if ($new_version != AKISMET_MODULE_VERSION) {
!       drupal_set_message(t('Your installation does <strong>not</strong> seem to be up to date. Updates are available, please visit the <a href="%module-url" target="_blank">Akismet module home</a> to obtain the latest version. The latest available version is <strong>%new-version</strong>. ', array('%module-url' => AKISMET_MODULE_HOMEURL, '%new-version' => $new_version)), 'error');
      }
    }
+   $output = '<p>';
    $output .= t('You are running version <strong>%your-version</strong>.', array('%your-version' => AKISMET_MODULE_VERSION));
    $timestamp_last = variable_get('akismet_version_check_timestamp', 0);
    if ($timestamp_last) {
!     $output .= '<br />'. t('Last time checked: %last. The time is now %time.', array('%last' => format_date($timestamp_last), '%time' => format_date(time())));
    }
!   $output .= '<br />'. t('<a href="%check">Check for newest version</a>.', array('%check' => url($url, 'vchk=1')));
    $output .= '</p>';
    return $output;