Skip to content

Fix invalid update URL in EP-Launch #11789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JasonGlazer wants to merge 1 commit into
base: develop
Choose a base branch
from
+25 −17
Open

Fix invalid update URL in EP-Launch #11789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bin/EP-Launch/EP-Launch.exe
View file
Open in desktop
Binary file not shown.
21 changes: 14 additions & 7 deletions src/EP-Launch/epl-ui.frm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION 5.00
Object = "{48E59290-9880-11CF-9754-00AA00C00908}#1.0#0"; "MSINET.OCX"
Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0"; "MSCOMCTL.OCX"
Object = "{F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0"; "ComDlg32.OCX"
Object = "{48E59290-9880-11CF-9754-00AA00C00908}#1.0#0"; "MSINET.OCX"
Begin VB.Form eplUI
BorderStyle = 1 'Fixed Single
Caption = "EP-Launch"
Expand Down Expand Up @@ -1524,7 +1524,7 @@ Private Declare Function GetShortPathName Lib "kernel32.dll" Alias "GetShortPath
' The following code is from VBnet and is used for file associations
'
''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
' Copyright �1996-2007 VBnet, Randy Birch, All Rights Reserved.
' Copyright �1996-2007 VBnet, Randy Birch, All Rights Reserved.
' Some pages may also contain other copyrights by the author.
''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
' Distribution: You can freely use this code in your own
Expand Down Expand Up @@ -1700,7 +1700,7 @@ Private Declare Function RegSetValueEx Lib "advapi32" Alias "RegSetValueExA" (By
End Function

''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
' Copyright �1996-2007 VBnet, Randy Birch, All Rights Reserved.
' Copyright �1996-2007 VBnet, Randy Birch, All Rights Reserved.
' Some pages may also contain other copyrights by the author.
''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
' Distribution: You can freely use this code in your own
Expand Down Expand Up @@ -2132,6 +2132,7 @@ Private Sub queueTimer_Timer()
Call manageSimulationQueue
End Sub


Private Sub viewSelectedHistory_Click()
Call runViewSelectedFileFromHistory
End Sub
Expand Down Expand Up @@ -4290,6 +4291,7 @@ Dim firstUse As String, t As String, X As Double
Dim setString As String
Dim parts() As String
Dim wthrCount As Integer
Dim newURL As String
firstUse = GetSetting("EP-Launch", "Pointers", "FirstUse", "True")
Debug.Print "FirstUse?", firstUse
If firstUse = "True" Then
Expand Down Expand Up @@ -4357,7 +4359,7 @@ If firstUse = "True" Then
'update checking
updateLastAnchor = ""
updateLastDate = "1/1/2008"
updatePageURL = "http://energyplus.net/epupdate.htm"
updatePageURL = "http://natlabrockies.github.io/EnergyPlus/epupdate.htm"
updateAutoCheck = True
Call SaveAllSettings
Else
Expand Down Expand Up @@ -4526,8 +4528,12 @@ Else
updateLastDate = GetSetting("EP-Launch", "UpdateCheck", "LastDate")
If updateLastDate = "" Then updateLastDate = "1/1/2008"
updatePageURL = GetSetting("EP-Launch", "UpdateCheck", "CheckURL")
'If updatePageURL = "" Then updatePageURL = "http://gard.com/ep/epupdate.htm"
If updatePageURL = "" Then updatePageURL = "http://energyplus.net/epupdate.htm"
newURL = "http://natlabrockies.github.io/EnergyPlus/epupdate.htm"
If updatePageURL = "" Then updatePageURL = newURL
If updatePageURL = "http://gard.com/ep/epupdate.htm" Then updatePageURL = newURL
If updatePageURL = "http://nrel.github.io/EnergyPlus/epupdate.htm" Then updatePageURL = newURL
If updatePageURL = "http://energyplus.net/epupdate.htm" Then updatePageURL = newURL
If updatePageURL = "http://eeredevapps1.nrel.gov/buildings/energyplus/update/epupdate.htm" Then updatePageURL = newURL
If Left(GetSetting("EP-Launch", "UpdateCheck", "AutoCheck"), 1) = "F" Then
updateAutoCheck = False
Else
Expand Down Expand Up @@ -6892,6 +6898,7 @@ lblCheckingUpdates.Visible = True
'updatePageURL = "http://gard.com/ep/junk.htm"
'updatePageURL = "http://eeredevapps1.nrel.gov/buildings/energyplus/update/epupdate.htm"
'updatePageURL = "http://energyplus.net/epupdate.htm"
'updatePageURL = "http://natlabrockies.github.io/EnergyPlus/epupdate.htm"
'updateLastDate = "9/2/2009 12:47:47 AM"
'-----------------------------------------

Expand Down Expand Up @@ -7169,7 +7176,7 @@ End Sub
' WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
' the specific language governing rights and limitations under the License.
'
' Copyright � 1996-2014 GARD Analytics. All rights reserved.
' Copyright � 1996-2014 GARD Analytics. All rights reserved.
'
' NOTICE: The U.S. Government is granted for itself and others acting on its
' behalf a paid-up, nonexclusive, irrevocable, worldwide license in this data to
Expand Down
9 changes: 5 additions & 4 deletions src/EP-Launch/epl.vbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ Type=Exe
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\Windows\SysWOW64\stdole2.tlb#OLE Automation
Reference=*\G{C0A63B80-4B21-11D3-BD95-D426EF2C7949}#1.0#0#..\..\..\..\..\..\..\WINDOWS\SysWow64\Vsflex7L.ocx#ComponentOne VSFlexGrid 7.1 (Light)
Object={C0A63B80-4B21-11D3-BD95-D426EF2C7949}#1.0#0; Vsflex7L.ocx
Object={48E59290-9880-11CF-9754-00AA00C00908}#1.0#0; MSINET.OCX
Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0; MSCOMCTL.OCX
Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX
Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; ComDlg32.OCX
Expand All @@ -14,6 +13,8 @@ Form=frmRunStatus.frm
Form=frmOptions.frm
Form=frmDefineViewResults.frm
Module=MainModule; MainModule.bas
Object={38911DA0-E448-11D0-84A3-00DD01104159}#1.1#0; COMCT332.OCX
Object={48E59290-9880-11CF-9754-00AA00C00908}#1.0#0; MSINET.OCX
IconForm="eplUI"
Startup="eplUI"
HelpFile=""
Expand All @@ -25,12 +26,12 @@ HelpContextID="0"
CompatibleMode="0"
MajorVer=2
MinorVer=1
RevisionVer=7
RevisionVer=8
AutoIncrementVer=0
ServerSupportFiles=0
VersionComments="2.17a"
VersionComments="2.18"
VersionCompanyName="GARD Analytics, Inc."
VersionLegalCopyright="Copyright 2000-2025 by GARD Analytics Inc. subject to approval."
VersionLegalCopyright="Copyright 2000-2026 by GARD Analytics Inc. subject to approval."
VersionProductName="EPLaunch"
CompilationType=0
OptimizationType=0
Expand Down
10 changes: 5 additions & 5 deletions src/EP-Launch/epl.vbw
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
eplUI = 366, 25, 1710, 945, , 130, 130, 1680, 1033, C
frmAbout = 327, 84, 1877, 987, C, 208, 208, 1758, 1111, C
eplUI = 693, 103, 2037, 1023, , 130, 130, 1680, 1033, C
frmAbout = 327, 84, 1877, 987, , 208, 208, 1758, 1111, C
crashMessage = 809, 145, 1940, 1065, , 26, 26, 927, 946, C
frmNewQueue = 124, 453, 1674, 1356, , 416, 416, 1966, 1319, C
frmRunStatus = 0, 0, 0, 0, C, 442, 442, 1992, 1345, C
frmOptions = 0, 0, 0, 0, C, 0, 0, 1550, 903, C
frmDefineViewResults = 0, 0, 0, 0, C, 26, 26, 1576, 929, C
frmRunStatus = 156, 156, 1829, 910, , 442, 442, 1992, 1345, C
frmOptions = 182, 182, 1855, 936, , 0, 0, 1550, 903, C
frmDefineViewResults = 208, 208, 1881, 962, , 26, 26, 1576, 929, C
MainModule = 78, 78, 1628, 981,
2 changes: 1 addition & 1 deletion src/EP-Launch/frmAbout.frm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Begin VB.Form frmAbout
Width = 3855
End
Begin VB.Label lblTitle
Caption = "EP-Launch - Version 2.17"
Caption = "EP-Launch - Version 2.18"
BeginProperty Font
Name = "MS Sans Serif"
Size = 12
Expand Down