// Which is the latest version on server?
$ONLINE = array(
- 'version' => str_replace("\n", '', $response[0]),
- 'changed' => str_replace("\n", '', $response[1]),
- 'revision' => str_replace("\n", '', $response[2]),
+ 'version' => trim(str_replace("\n", '', $response[0])),
+ 'changed' => trim(str_replace("\n", '', $response[1])),
+ 'revision' => trim(str_replace("\n", '', $response[2])),
'code' => '200 OK'
);
} else {
// Is a newer version available?
if (empty($ONLINE['version'])) {
// Disconnected?
- loadTemplate('admin_settings_saved', false, '<div class="admin_failed">{--ADMIN_CANNOT_CHECK_VERSION--} (' . $ONLINE['code'] . ')</div>');
-} elseif (($ONLINE['version'] != getConfig('FULL_VERSION')) || ($ONLINE['revision'] != getConfig('CURR_SVN_REVISION'))) {
+ loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CANNOT_CHECK_VERSION--} (' . $ONLINE['code'] . ')');
+} elseif (($ONLINE['version'] != getFullVersion()) || ($ONLINE['revision'] > getCurrSvnRevision())) {
// New full-version available (all previous released patches are included in this version!)
$ONLINE['changed'] = generateDateTime($ONLINE['changed'], 2);
// Load template
loadTemplate('admin_update_download', false, $ONLINE);
+} elseif ($ONLINE['revision'] < getCurrSvnRevision()) {
+ // Installed revision is newer than on server
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_LOCAL_REVISION_IS_NEWER_THAN_UPDATE--}');
} else {
// You have the latest version!
- loadTemplate('admin_settings_saved', false, '{--NO_UPDATES_AVAILABLE--}');
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_UPDATES_AVAILABLE--}');
}
// [EOF]