Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
3536fa8a
Unverified
Commit
3536fa8a
authored
Aug 23, 2020
by
Zach H
Committed by
GitHub
Aug 23, 2020
Browse files
Fix #4072 by changing outdated HTTP to HTTPS calls within the codebase (#4073)
parent
b0c7b907
Changes
5
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/chatview/chatview.cpp
View file @
3536fa8a
...
...
@@ -128,7 +128,7 @@ void ChatView::appendCardTag(QTextCursor &cursor, const QString &cardName)
void
ChatView
::
appendUrlTag
(
QTextCursor
&
cursor
,
QString
url
)
{
if
(
!
url
.
contains
(
"://"
))
url
.
prepend
(
"http://"
);
url
.
prepend
(
"http
s
://"
);
QTextCharFormat
oldFormat
=
cursor
.
charFormat
();
QTextCharFormat
anchorFormat
=
oldFormat
;
...
...
cockatrice/src/dlg_settings.cpp
View file @
3536fa8a
...
...
@@ -1328,7 +1328,7 @@ void DlgSettings::closeEvent(QCloseEvent *event)
break
;
case
NotLoaded
:
loadErrorMessage
=
tr
(
"Your card database did not finish loading
\n\n
"
"Please file a ticket at http://github.com/Cockatrice/Cockatrice/issues with your "
"Please file a ticket at http
s
://github.com/Cockatrice/Cockatrice/issues with your "
"cards.xml attached
\n\n
"
"Would you like to change your database location setting?"
);
break
;
...
...
@@ -1342,7 +1342,7 @@ void DlgSettings::closeEvent(QCloseEvent *event)
break
;
default:
loadErrorMessage
=
tr
(
"Unknown card database load status
\n\n
"
"Please file a ticket at http://github.com/Cockatrice/Cockatrice/issues
\n\n
"
"Please file a ticket at http
s
://github.com/Cockatrice/Cockatrice/issues
\n\n
"
"Would you like to change your database location setting?"
);
break
;
...
...
cockatrice/src/settings/downloadsettings.cpp
View file @
3536fa8a
...
...
@@ -32,8 +32,8 @@ void DownloadSettings::populateDefaultURLs()
downloadURLs
.
clear
();
downloadURLs
.
append
(
"https://api.scryfall.com/cards/!set:uuid!?format=image&face=!prop:side!"
);
downloadURLs
.
append
(
"https://api.scryfall.com/cards/multiverse/!set:muid!?format=image"
);
downloadURLs
.
append
(
"http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!set:muid!&type=card"
);
downloadURLs
.
append
(
"http://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card"
);
downloadURLs
.
append
(
"http
s
://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!set:muid!&type=card"
);
downloadURLs
.
append
(
"http
s
://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card"
);
setValue
(
QVariant
::
fromValue
(
downloadURLs
),
"urls"
,
"downloads"
);
}
...
...
cockatrice/src/tappedout_interface.cpp
View file @
3536fa8a
...
...
@@ -34,7 +34,7 @@ void TappedOutInterface::queryFinished(QNetworkReply *reply)
*/
QString
deckUrl
=
reply
->
rawHeader
(
"Location"
);
qDebug
()
<<
"Tappedout: good reply, http status"
<<
httpStatus
<<
"location"
<<
deckUrl
;
QDesktopServices
::
openUrl
(
"http://tappedout.net"
+
deckUrl
);
QDesktopServices
::
openUrl
(
"http
s
://tappedout.net"
+
deckUrl
);
}
else
{
/*
* Otherwise, the deck has not been parsed correctly. Error messages can be extracted
...
...
@@ -86,7 +86,7 @@ void TappedOutInterface::analyzeDeck(DeckList *deck)
QByteArray
data
;
getAnalyzeRequestData
(
deck
,
&
data
);
QNetworkRequest
request
(
QUrl
(
"http://tappedout.net/mtg-decks/paste/"
));
QNetworkRequest
request
(
QUrl
(
"http
s
://tappedout.net/mtg-decks/paste/"
));
request
.
setHeader
(
QNetworkRequest
::
ContentTypeHeader
,
"application/x-www-form-urlencoded"
);
manager
->
post
(
request
,
data
);
...
...
common/decklist.cpp
View file @
3536fa8a
...
...
@@ -336,7 +336,7 @@ DeckList::DeckList()
root
=
new
InnerDecklistNode
;
}
// TODO: http://qt-project.org/doc/qt-4.8/qobject.html#no-copy-constructor-or-assignment-operator
// TODO: http
s
://qt-project.org/doc/qt-4.8/qobject.html#no-copy-constructor-or-assignment-operator
DeckList
::
DeckList
(
const
DeckList
&
other
)
:
QObject
(),
name
(
other
.
name
),
comments
(
other
.
comments
),
deckHash
(
other
.
deckHash
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment