update version fixes

UI and web links fixes
nzbgetcom · Sep 14, 2023 · 29097c8 · 29097c8
1 parent a885a08
commit 29097c8
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 27 deletions.
diff --git a/configure b/configure
@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for nzbget 22.0.
 #
-# Report bugs to <hugbug@users.sourceforge.net>.
+# Report bugs to <nzbget@nzbget.com>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -267,7 +267,7 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: hugbug@users.sourceforge.net about your system,
+$0: nzbget@nzbget.com about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -582,7 +582,7 @@ PACKAGE_NAME='nzbget'
 PACKAGE_TARNAME='nzbget'
 PACKAGE_VERSION='22.0'
 PACKAGE_STRING='nzbget 22.0'
-PACKAGE_BUGREPORT='hugbug@users.sourceforge.net'
+PACKAGE_BUGREPORT='nzbget@nzbget.com'
 PACKAGE_URL=''
 
 ac_unique_file="daemon/main/nzbget.cpp"
@@ -1521,7 +1521,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <hugbug@users.sourceforge.net>.
+Report bugs to <nzbget@nzbget.com>.
 _ACEOF
 ac_status=$?
 fi
@@ -1744,7 +1744,7 @@ $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 ( $as_echo "## ------------------------------------------- ##
-## Report this to hugbug@users.sourceforge.net ##
+## Report this to nzbget@nzbget.com ##
 ## ------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -9223,7 +9223,7 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <hugbug@users.sourceforge.net>."
+Report bugs to <nzbget@nzbget.com>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 #
-#  This file is part of nzbget. See <http://nzbget.net>.
+#  This file is part of nzbget. See <http://nzbget.com>.
 #
 # Copyright (C) 2008-2021 Andrey Prygunkov <hugbug@users.sourceforge.net>
 #
@@ -21,7 +21,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.65)
-AC_INIT(nzbget, 22.0, hugbug@users.sourceforge.net)
+AC_INIT(nzbget, 22.0, nzbget@nzbget.com)
 AC_CONFIG_AUX_DIR(posix)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([foreign subdir-objects])

diff --git a/linux/package-info.json b/linux/package-info.json
@@ -1,4 +1,4 @@
 {
-	"update-info-link": "http://nzbget.net/info/nzbget-version-linux.json",
+	"update-info-link": "http://nzbget.com/info/nzbget-version-linux.json",
 	"install-script": "install-update.sh"
 }
diff --git a/nzbget.conf b/nzbget.conf
@@ -430,11 +430,10 @@ AuthorizedIP=
 # NOTE: For more details visit http://nzbget.net/certificate-verification.
 CertCheck=no
 
-# Automatically check for new releases (none, stable, testing).
+# Automatically check for new releases (none, stable).
 #
 #  None    - do not show notifcations;
 #  Stable  - show notifications about new stable releases;
-#  Testing - show notifications about new stable and testing releases.
 UpdateCheck=stable
 
 # User name for daemon-mode, POSIX only.

diff --git a/webui/config.js b/webui/config.js
@@ -2676,7 +2676,7 @@ var RestoreSettingsDialog = (new function($)
 
 
 /*** UPDATE DIALOG *******************************************************/
-
+// Version 22.0 : no check for test and develop update. For activate - uncomment commented lines and delete apropriate added lines.
 var UpdateDialog = (new function($)
 {
 	'use strict'
@@ -2757,7 +2757,7 @@ var UpdateDialog = (new function($)
 			Refresher.pause();
 		}
 
-		RPC.call('readurl', ['http://nzbget.net/info/nzbget-version.json?nocache=' + new Date().getTime(), 'nzbget version info'], loadedUpstreamInfo, error);
+		RPC.call('readurl', ['http://nzbget.com/info/nzbget-version.json?nocache=' + new Date().getTime(), 'nzbget version info'], loadedUpstreamInfo, error);
 	}
 
 	function error(e)
@@ -2786,6 +2786,7 @@ var UpdateDialog = (new function($)
 		}
 	}
 
+	// Version 22.0 : no check for test and develop update. For activate - change links to actual ones
 	function loadGitVerData(callback)
 	{
 		// fetching devel version number from github web-site
@@ -2870,21 +2871,32 @@ var UpdateDialog = (new function($)
 		$('#UpdateDialog_InstalledInfo').show();
 
 		$('#UpdateDialog_CurStable').text(VersionInfo['stable-version'] ? VersionInfo['stable-version'] : 'no data');
-		$('#UpdateDialog_CurTesting').text(VersionInfo['testing-version'] ? formatTesting(VersionInfo['testing-version']) : 'no data');
-		$('#UpdateDialog_CurDevel').text(VersionInfo['devel-version'] ? formatTesting(VersionInfo['devel-version']) : 'no data');
+		//$('#UpdateDialog_CurTesting').text(VersionInfo['testing-version'] ? formatTesting(VersionInfo['testing-version']) : 'no data');
+		//$('#UpdateDialog_CurDevel').text(VersionInfo['devel-version'] ? formatTesting(VersionInfo['devel-version']) : 'no data');
+		$('#UpdateDialog_CurTesting').text('N/A');
+		$('#UpdateDialog_CurDevel').text('N/A');
 
 		$('#UpdateDialog_CurNotesStable').attr('href', VersionInfo['stable-release-notes']);
-		$('#UpdateDialog_CurNotesTesting').attr('href', VersionInfo['testing-release-notes']);
-		$('#UpdateDialog_CurNotesDevel').attr('href', VersionInfo['devel-release-notes']);
+		//$('#UpdateDialog_CurNotesTesting').attr('href', VersionInfo['testing-release-notes']);
+		//$('#UpdateDialog_CurNotesDevel').attr('href', VersionInfo['devel-release-notes']);
+		$('#UpdateDialog_CurNotesTesting').attr('href', '');
+		$('#UpdateDialog_CurNotesDevel').attr('href', '');
 		$('#UpdateDialog_DownloadStable').attr('href', VersionInfo['stable-download']);
-		$('#UpdateDialog_DownloadTesting').attr('href', VersionInfo['testing-download']);
+		//$('#UpdateDialog_DownloadTesting').attr('href', VersionInfo['testing-download']);
+		$('#UpdateDialog_DownloadTesting').attr('href', '');
 		Util.show('#UpdateDialog_CurNotesStable', VersionInfo['stable-release-notes']);
-		Util.show('#UpdateDialog_CurNotesTesting', VersionInfo['testing-release-notes']);
-		Util.show('#UpdateDialog_CurNotesDevel', VersionInfo['devel-release-notes']);
+		//Util.show('#UpdateDialog_CurNotesTesting', VersionInfo['testing-release-notes']);
+		//Util.show('#UpdateDialog_CurNotesDevel', VersionInfo['devel-release-notes']);
+		Util.show('#UpdateDialog_CurNotesTesting', '');
+		Util.show('#UpdateDialog_CurNotesDevel', '');
+
 
 		$('#UpdateDialog_AvailStable').text(UpdateInfo['stable-version'] ? UpdateInfo['stable-version'] : 'not available');
-		$('#UpdateDialog_AvailTesting').text(UpdateInfo['testing-version'] ? formatTesting(UpdateInfo['testing-version']) : 'not available');
-		$('#UpdateDialog_AvailDevel').text(UpdateInfo['devel-version'] ? formatTesting(UpdateInfo['devel-version']) : 'not available');
+		//$('#UpdateDialog_AvailTesting').text(UpdateInfo['testing-version'] ? formatTesting(UpdateInfo['testing-version']) : 'not available');
+		//$('#UpdateDialog_AvailDevel').text(UpdateInfo['devel-version'] ? formatTesting(UpdateInfo['devel-version']) : 'not available');
+		$('#UpdateDialog_AvailTesting').text('');
+		$('#UpdateDialog_AvailDevel').text('');
+
 
 		if (UpdateInfo['stable-version'] === VersionInfo['stable-version'] &&
 			UpdateInfo['testing-version'] === VersionInfo['testing-version'])
@@ -2897,11 +2909,16 @@ var UpdateDialog = (new function($)
 		$('#UpdateDialog_DownloadRow td').css('border-style', 'none');
 
 		$('#UpdateDialog_AvailNotesStable').attr('href', UpdateInfo['stable-package-info']);
-		$('#UpdateDialog_AvailNotesTesting').attr('href', UpdateInfo['testing-package-info']);
-		$('#UpdateDialog_AvailNotesDevel').attr('href', UpdateInfo['devel-package-info']);
+		//$('#UpdateDialog_AvailNotesTesting').attr('href', UpdateInfo['testing-package-info']);
+		//$('#UpdateDialog_AvailNotesDevel').attr('href', UpdateInfo['devel-package-info']);
+		$('#UpdateDialog_AvailNotesTesting').attr('href', '');
+		$('#UpdateDialog_AvailNotesDevel').attr('href', '');
 		Util.show('#UpdateDialog_AvailNotesStableBlock', UpdateInfo['stable-package-info']);
-		Util.show('#UpdateDialog_AvailNotesTestingBlock', UpdateInfo['testing-package-info']);
-		Util.show('#UpdateDialog_AvailNotesDevelBlock', UpdateInfo['devel-package-info']);
+		//Util.show('#UpdateDialog_AvailNotesTestingBlock', UpdateInfo['testing-package-info']);
+		//Util.show('#UpdateDialog_AvailNotesDevelBlock', UpdateInfo['devel-package-info']);
+		Util.show('#UpdateDialog_AvailNotesTestingBlock', '');
+		Util.show('#UpdateDialog_AvailNotesDevelBlock', '');
+
 
 		var installedVer = vernumber(installedVersion);
 		var installedRev = revision(installedVersion);
@@ -2918,6 +2935,10 @@ var UpdateDialog = (new function($)
 			((installedVer < vernumber(UpdateInfo['devel-version'])) ||
 			 (installedTesting && installedVer === vernumber(UpdateInfo['devel-version'])) &&
 			  installedRev < revision(UpdateInfo['devel-version']));
+
+		// Version 22.0 : no check for test and develop update. For activate - delete the following line
+		canInstallTesting = '';	  
+
 		Util.show('#UpdateDialog_InstallStable', canInstallStable);
 		Util.show('#UpdateDialog_InstallTesting', canInstallTesting);
 		Util.show('#UpdateDialog_InstallDevel', canInstallDevel);
@@ -2929,6 +2950,10 @@ var UpdateDialog = (new function($)
 			((installedVer < vernumber(VersionInfo['testing-version'])) ||
 			 (installedTesting && installedVer === vernumber(VersionInfo['testing-version']) &&
 			  installedRev < revision(VersionInfo['testing-version'])));
+
+		// Version 22.0 : no check for test and develop update. For activate - delete the following line
+		canDownloadTesting = '';
+
 		Util.show('#UpdateDialog_DownloadStable', canDownloadStable);
 		Util.show('#UpdateDialog_DownloadTesting', canDownloadTesting);
 

diff --git a/windows/package-info.json b/windows/package-info.json
@@ -1,4 +1,4 @@
 {
-	"update-info-link": "http://nzbget.net/info/nzbget-version-windows.json",
+	"update-info-link": "http://nzbget.com/info/nzbget-version-windows.json",
 	"install-script": "install-update.bat"
 }