Enabled HTTPS on jrsoftware.org.

yeager · Feb 26, 2020 · 1a08810 · 1a08810
1 parent 434224c
commit 1a08810
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 47 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1 +1 @@
-custom: ['http://www.jrsoftware.org/isdonate.php']
+custom: ['https://jrsoftware.org/isdonate.php']
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ For conditions of distribution and use, see LICENSE.TXT.
 Contributing issues
 -------------------
 
-To report bugs or request new features use the [newsgroups](http://www.jrsoftware.org/newsgroups.php) (web-based interface available).
+To report bugs or request new features use the [newsgroups](https://jrsoftware.org/forums.php) (web-based interface available).
 
 Contributing new code or documentation updates
 ----------------------------------------------
@@ -54,7 +54,7 @@ http://git-scm.com/
 Contributing translations
 -------------------------
 
-To contribute translations please see http://jrsoftware.org/files/istrans/send.php.
+To contribute translations please see https://jrsoftware.org/files/istrans/send.php.
 
 Please do NOT use GitHub's web editor to edit ANSI translations and create pull
 requests. This editor doesn't work since it automatically turns ANSI files into

diff --git a/Files/Default.isl b/Files/Default.isl
@@ -1,7 +1,7 @@
 ; *** Inno Setup version 6.0.3+ English messages ***
 ;
 ; To download user-contributed translations of this file, go to:
-;   http://www.jrsoftware.org/files/istrans/
+;   https://jrsoftware.org/files/istrans/
 ;
 ; Note: When translating this text, do not add periods (.) to the end of
 ; messages that didn't have them already, because on those messages Inno

diff --git a/ISHelp/Staging/contents.js b/ISHelp/Staging/contents.js
@@ -1,15 +1,13 @@
 /*
   Inno Setup
-  Copyright (C) 1997-2010 Jordan Russell
+  Copyright (C) 1997-2020 Jordan Russell
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
-  $jrsoftware: ishelp/Staging/contents.js,v 1.12 2010/04/26 19:37:55 jr Exp $
-
   JavaScript code used by contents.htm
 */
 
-var searchTabBaseUrl = "http://www.jrsoftware.org/ishelp/";
+var searchTabBaseUrl = "https://jrsoftware.org/ishelp/";
 
 function get_absolute_top(obj)
 {

diff --git a/ISHelp/Staging/topic.js b/ISHelp/Staging/topic.js
@@ -1,11 +1,9 @@
 /*
   Inno Setup
-  Copyright (C) 1997-2010 Jordan Russell
+  Copyright (C) 1997-2020 Jordan Russell
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
-  $jrsoftware: ishelp/Staging/topic.js,v 1.7 2010/04/25 02:48:24 jr Exp $
-
   JavaScript code used by topic_*.htm
 */
 
@@ -76,8 +74,8 @@ function topic_loaded()
 	var matches;
 
 	if (window == window.top &&
-	    window.location.protocol == "http:" &&
-	    window.location.hostname == "www.jrsoftware.org" &&
+	    (window.location.protocol == "http:" || window.location.protocol == "http:") &&
+	    (window.location.hostname == "jrsoftware.org" || window.location.hostname == "www.jrsoftware.org") &&
 	    (matches = window.location.pathname.match(/^(\/.+\/)topic_([a-z0-9_\-]+)\.htm$/)) &&
 	    window.location.hash != "#noredir") {
 

diff --git a/ISHelp/isetup.xml b/ISHelp/isetup.xml
@@ -89,7 +89,7 @@
 <b>Inno Setup version 6.0.4</b><br/>
 <b>Copyright &copy; 1997-2020 Jordan Russell. All rights reserved.</b><br/>
 <b>Portions Copyright &copy; 2000-2020 Martijn Laan. All rights reserved.</b><br/>
-<extlink href="http://www.jrsoftware.org/">Inno Setup home page</extlink>
+<extlink href="https://jrsoftware.org/">Inno Setup home page</extlink>
 </p>
 
 <p><br/>
@@ -2788,7 +2788,7 @@ Type: files; Name: "{win}\MYPROG.INI"
 
 <p>The Frequently Asked Questions is now located in a separate document. Please click the "Inno Setup FAQ" shortcut created in the Start Menu when you installed Inno Setup, or open the "isfaq.url" file in your Inno Setup directory.</p>
 
-<p>For the most recent Frequently Asked Questions, go to <extlink href="http://www.jrsoftware.org/isfaq.php">http://www.jrsoftware.org/isfaq.php</extlink></p>
+<p>For the most recent Frequently Asked Questions, go to <extlink href="https://jrsoftware.org/isfaq.php">https://jrsoftware.org/isfaq.php</extlink></p>
 
 </body>
 </topic>
@@ -3079,7 +3079,7 @@ Filename: "{win}\MYPROG.INI"; Section: "InstallSettings"; Key: "InstallPath"; St
 
 <li>Inno Setup's own installers accept an additional /PORTABLE=1 command line parameter to enable portable mode which causes the installers to not create an uninstaller nor an entry in the Add/Remove Programs Control Panel applet.</li>
 
-<li>The Inno Setup backup website can be found at <extlink href="http://www.innosetup.nl/">www.innosetup.nl</extlink>. Normally this link will simply redirect you to the main website at <extlink href="http://www.jrsoftware.org/">www.jrsoftware.org</extlink> but in case of emergencies this redirect will be disabled.</li>
+<li>The Inno Setup backup website can be found at <extlink href="http://www.innosetup.nl/">www.innosetup.nl</extlink>. Normally this link will simply redirect you to the main website at <extlink href="https://jrsoftware.org/">jrsoftware.org</extlink> but in case of emergencies this redirect will be disabled.</li>
 
 </ul>
 
@@ -3662,7 +3662,7 @@ Keep the default set of selected tasks, but deselect the "desktopicon" task:<br/
 <body>
 
 <p>To support Inno Setup, go to this page:<br/>
-<extlink href="http://www.jrsoftware.org/isdonate.php">http://www.jrsoftware.org/isdonate.php</extlink></p>
+<extlink href="https://jrsoftware.org/isdonate.php">https://jrsoftware.org/isdonate.php</extlink></p>
 
 </body>
 </topic>
@@ -5042,7 +5042,7 @@ DiskSliceSize=1457664
 <setupdefault><tt>no</tt></setupdefault>
 <body>
 <p>If set to <tt>yes</tt>, files that are compiled into the installation (via [Files] section entries) will be encrypted using ARCFOUR encryption, with a 160-bit key derived from the value of the <link topic="setup_password">Password</link> [Setup] section directive.</p>
-<p>Because of encryption import/export laws in some countries, encryption support is not included in the main Inno Setup installer and must be downloaded and installed separately if you wish to use it. See the <extlink href="http://www.jrsoftware.org/isdl.php">Inno Setup Downloads</extlink> page for more information.</p>
+<p>Because of encryption import/export laws in some countries, encryption support is not included in the main Inno Setup installer and must be downloaded and installed separately if you wish to use it. See the <extlink href="https://jrsoftware.org/isdl.php">Inno Setup Downloads</extlink> page for more information.</p>
 <p>If encryption is enabled and you call the <link topic="isxfunc_ExtractTemporaryFile">ExtractTemporaryFile</link> function from the [Code] section prior to the user entering the correct password, the function will fail unless the <tt>noencryption</tt> flag is used on the [Files] section entry for the file.</p>
 <p>The key used for encryption is a 160-bit SHA-1 hash of 64-bit random salt plus the value of <link topic="setup_password">Password</link>.</p>
 </body>

diff --git a/Projects/CompForm.pas b/Projects/CompForm.pas
@@ -2275,7 +2275,7 @@ procedure TCompileForm.HISPPDocClick(Sender: TObject);
 
 procedure TCompileForm.HDonateClick(Sender: TObject);
 begin
-  ShellExecute(Application.Handle, 'open', 'http://www.jrsoftware.org/isdonate.php', nil,
+  ShellExecute(Application.Handle, 'open', 'https://jrsoftware.org/isdonate.php', nil,
     nil, SW_SHOW);
 end;
 

diff --git a/Projects/ISPP/Help/Staging/contents-template.htm b/Projects/ISPP/Help/Staging/contents-template.htm
@@ -11,7 +11,7 @@
 function init_ispp_contents()
 {
  init_contents(2);
- searchTabBaseUrl = "http://www.jrsoftware.org/ispphelp/";
+ searchTabBaseUrl = "https://jrsoftware.org/ispphelp/";
 }
 --></script>
 </head>

diff --git a/Projects/ISPP/Help/Staging/contents.js b/Projects/ISPP/Help/Staging/contents.js
@@ -1,15 +1,13 @@
 /*
   Inno Setup
-  Copyright (C) 1997-2010 Jordan Russell
+  Copyright (C) 1997-2020 Jordan Russell
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
-  $jrsoftware: ishelp/Staging/contents.js,v 1.12 2010/04/26 19:37:55 jr Exp $
-
   JavaScript code used by contents.htm
 */
 
-var searchTabBaseUrl = "http://www.jrsoftware.org/ishelp/";
+var searchTabBaseUrl = "https://jrsoftware.org/ishelp/";
 
 function get_absolute_top(obj)
 {

diff --git a/Projects/ISPP/Help/Staging/topic.js b/Projects/ISPP/Help/Staging/topic.js
@@ -1,11 +1,9 @@
 /*
   Inno Setup
-  Copyright (C) 1997-2010 Jordan Russell
+  Copyright (C) 1997-2020 Jordan Russell
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
-  $jrsoftware: ishelp/Staging/topic.js,v 1.7 2010/04/25 02:48:24 jr Exp $
-
   JavaScript code used by topic_*.htm
 */
 
@@ -76,8 +74,8 @@ function topic_loaded()
 	var matches;
 
 	if (window == window.top &&
-	    window.location.protocol == "http:" &&
-	    window.location.hostname == "www.jrsoftware.org" &&
+	    (window.location.protocol == "http:" || window.location.protocol == "http:") &&
+	    (window.location.hostname == "jrsoftware.org" || window.location.hostname == "www.jrsoftware.org") &&
 	    (matches = window.location.pathname.match(/^(\/.+\/)topic_([a-z0-9_\-]+)\.htm$/)) &&
 	    window.location.hash != "#noredir") {
 

diff --git a/Projects/SetupLdr.dpr b/Projects/SetupLdr.dpr
@@ -359,7 +359,7 @@ begin
           PrNote +
           CustomNote +
           SNewLine +
-          'For more detailed information, please visit http://www.jrsoftware.org/ishelp/index.php?topic=setupcmdline';
+          'For more detailed information, please visit https://jrsoftware.org/ishelp/index.php?topic=setupcmdline';
 
   MessageBox(0, PChar(Help), 'Setup', MB_OK or MB_ICONSTOP);
 end;

diff --git a/donate.iss b/donate.iss
@@ -6,7 +6,7 @@ procedure DonateImageOnClick(Sender: TObject);
 var
   ErrorCode: Integer;
 begin
-  ShellExecAsOriginalUser('open', 'http://www.jrsoftware.org/isdonate.php', '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode);
+  ShellExecAsOriginalUser('open', 'https://jrsoftware.org/isdonate.php', '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode);
 end;
 
 <event('InitializeWizard')>

diff --git a/license.txt b/license.txt
@@ -29,4 +29,4 @@ applications, and to alter and redistribute it, provided that the following cond
 
 Jordan Russell
 jr-2010 AT jrsoftware.org
-http://www.jrsoftware.org/
+https://jrsoftware.org/
diff --git a/setup.iss b/setup.iss
@@ -173,7 +173,7 @@ Source: "files\{#isppdll}"; DestName: "ISPP.dll"; DestDir: "{app}"; Flags: ignor
 Source: "files\ISPPBuiltins.iss"; DestDir: "{app}"; Flags: ignoreversion touch
 
 [INI]
-Filename: "{app}\isfaq.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.jrsoftware.org/isfaq.php" 
+Filename: "{app}\isfaq.url"; Section: "InternetShortcut"; Key: "URL"; String: "https://jrsoftware.org/isfaq.php" 
 
 [UninstallDelete]
 Type: files; Name: "{app}\isfaq.url"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		custom: ['http://www.jrsoftware.org/isdonate.php']
		custom: ['https://jrsoftware.org/isdonate.php']