Skip to content

Commit

Permalink
Switch to HTTPs
Browse files Browse the repository at this point in the history
  • Loading branch information
@gerundt
gerundt committed Aug 5, 2019
1 parent f04063c commit 405b9b5
Show file tree
Hide file tree
Showing 11 changed files with 68 additions and 66 deletions.
14 changes: 8 additions & 6 deletions htdocs/.htaccess
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@ ErrorDocument 404 /404.php
</FilesMatch>

#Redirect PAD download URL to current WinMerge version...
Redirect permanent /downloads/WinMerge-Setup.exe http://downloads.sourceforge.net/winmerge/WinMerge-2.14.0-Setup.exe
Redirect permanent /downloads/WinMerge-Setup.exe https://downloads.sourceforge.net/winmerge/WinMerge-2.16.4-Setup.exe

#Redirect www.winmerge.org to winmerge.org...
#Redirect HTTP to HTTPS and www.winmerge.org to winmerge.org...
RewriteEngine On
RewriteCond %{HTTPS} off
RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=permanent,L]
RewriteCond %{HTTP_HOST} ^www\.winmerge\.org$ [NC]
RewriteRule ^(.*)$ http://winmerge.org/$1 [R=permanent,L]
RewriteRule ^(.*)$ https://winmerge.org/$1 [R=permanent,L]

#CSS versioning...
RewriteEngine On
Expand Down Expand Up @@ -74,13 +76,13 @@ Redirect permanent /translations/status_trunk_rss.php /translations/status-feed/
Redirect permanent /about/ /

#Move manual to a own sub domain...
Redirect permanent /docs/manual/ http://manual.winmerge.org/
Redirect permanent /docs/manual/ https://manual.winmerge.org/

#Move quick tour to a own sub domain...
Redirect permanent /docs/tour/ http://tour.winmerge.org/
Redirect permanent /docs/tour/ https://tour.winmerge.org/

#Move forums to a own sub domain...
Redirect permanent /forums http://forums.winmerge.org/
Redirect permanent /forums https://forums.winmerge.org/

#Tracker shortcuts...
RewriteEngine On
Expand Down
2 changes: 1 addition & 1 deletion htdocs/404.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<ul>
<li><?php __e('<a href="%s">Documentation</a>?', '/docs/');?>
<ul>
<li><?php __e('<a href="%s">Manual</a>?', 'http://manual.winmerge.org/');?></li>
<li><?php __e('<a href="%s">Manual</a>?', 'https://manual.winmerge.org/');?></li>
<li><?php __e('<a href="%s">Release Notes</a>?', '/docs/releasenotes.php');?></li>
<li><?php __e('<a href="%s">Change Log</a>?', '/docs/changelog.php');?></li>
</ul>
Expand Down
8 changes: 4 additions & 4 deletions htdocs/docs/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
$page->printHead(__('Documentation'), TAB_DOCS);

$page->printHeading(__('Documentation'));
$page->printLinkedSubHeading(__('Manual'), 'http://manual.winmerge.org/');
$page->printPara(__('The <a href="%s">manual</a> explains how to use WinMerge, and documents its capabilities and limitations.', 'http://manual.winmerge.org/'));
$page->printLinkedSubHeading(__('Quick Tour'), 'http://tour.winmerge.org/');
$page->printPara(__('The <a href="%s">quick tour</a> describes the main WinMerge features in one page.', 'http://tour.winmerge.org/'));
$page->printLinkedSubHeading(__('Manual'), 'https://manual.winmerge.org/');
$page->printPara(__('The <a href="%s">manual</a> explains how to use WinMerge, and documents its capabilities and limitations.', 'https://manual.winmerge.org/'));
$page->printLinkedSubHeading(__('Quick Tour'), 'https://tour.winmerge.org/');
$page->printPara(__('The <a href="%s">quick tour</a> describes the main WinMerge features in one page.', 'https://tour.winmerge.org/'));
$page->printLinkedSubHeading(__('Release Notes'), 'releasenotes.php');
$page->printPara(__('The <a href="%1$s">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href="%2$s">known issues</a> in the current WinMerge release.', 'releasenotes.php', 'releasenotes.php#issues'));
$page->printLinkedSubHeading(__('Change Log'), 'changelog.php');
Expand Down
4 changes: 2 additions & 2 deletions htdocs/downloads/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
$page->printHead(__('Download WinMerge'), TAB_DOWNLOADS, 'toggle(\'checksumslist\');');

$page->printHeading(__('Download WinMerge'));
$page->printPara(__('The easiest way to install WinMerge is to download and run the Installer. Read the <a href="%s">online manual</a> for help using it.', 'http://manual.winmerge.org/Install.html'));
$page->printPara(__('The easiest way to install WinMerge is to download and run the Installer. Read the <a href="%s">online manual</a> for help using it.', 'https://manual.winmerge.org/Install.html'));
$page->printSubHeading(__('WinMerge %s', $stablerelease->getVersionNumber()));
$page->printPara(__('The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>.', $stablerelease->getVersionNumber(), $stablerelease->getDate()),
__('For detailed info on what is new, read the <a href="%1$s">change log</a> and the <a href="%2$s">release notes</a>.', '/docs/changelog.php', '/docs/releasenotes.php'));
Expand Down Expand Up @@ -139,7 +139,7 @@
},
"softwareVersion": "<?php echo $stablerelease->getVersionNumber();?>",
"downloadUrl": "<?php echo $stablerelease->getDownload('setup.exe');?>",
"screenshot": "http://winmerge.org/about/screenshots/screenshot.png",
"screenshot": "https://winmerge.org/screenshots/filecmp.png",
"license": "https://www.gnu.org/licenses/gpl-2.0.html"
}
</script>
Expand Down
6 changes: 3 additions & 3 deletions htdocs/engine/page.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,11 @@
foreach ($this->_rssfeeds as $rssurl => $rsstitle) { //for all RSS feeds...
$temp .= " <link rel=\"alternate\" type=\"application/rss+xml\" title=\"" . $rsstitle . "\" href=\"" . $rssurl . "\">\n";
}
$temp .= " <link rel=\"canonical\" href=\"http://winmerge.org" . $translations->getLink($translations->getActiveLanguage(), true) . "\">\n";
$temp .= " <link rel=\"canonical\" href=\"https://winmerge.org" . $translations->getLink($translations->getActiveLanguage(), true) . "\">\n";
if ($translations->getLanguagesCount() > 1) { //if at least 2 languages exists...
foreach ($translations->getLanguages() as $language) {
$languageId = str_replace('_', '-', $language->getId());
$languageLink = 'http://winmerge.org' . $translations->getLink($language, true);
$languageLink = 'https://winmerge.org' . $translations->getLink($language, true);
$temp .= " <link rel=\"alternate\" href=\"" . $languageLink . "\" hreflang=\"" . $languageId . "\">\n";
}
}
Expand Down Expand Up @@ -444,7 +444,7 @@
$line = preg_replace('#(WinMerge [0-9]\.[0-9].*-.*\))#si', '<h3>\\1</h3>', $line);
$line = preg_replace('#r(\d+)#si', '<a href="https://sourceforge.net/p/winmerge/code/\\1" target="_blank">r\\1</a>', $line);
$line = preg_replace('#\#(\d{6,})#si', '<a href="https://sourceforge.net/support/tracker.php?aid=\\1" target="_blank">#\\1</a>', $line);
$line = preg_replace('#patches:\#(\d+)#si', '<a href="http://winmerge.org/patch/\\1" target="_blank">#\\1</a>', $line);
$line = preg_replace('#patches:\#(\d+)#si', '<a href="https://winmerge.org/patch/\\1" target="_blank">#\\1</a>', $line);

$html .= $line;
}
Expand Down
2 changes: 1 addition & 1 deletion htdocs/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<li><?php __e('Archive file support using 7-Zip');?></li>
<li><?php __e('Plugin support');?></li>
<li><?php __e('Localizable interface');?></li>
<li><?php __e('<a href="%s">Online manual</a> and installed HTML Help manual', 'http://manual.winmerge.org/');?></li>
<li><?php __e('<a href="%s">Online manual</a> and installed HTML Help manual', 'https://manual.winmerge.org/');?></li>
</ul>
<?php
$page->printSubHeading(__('WinMerge %s - latest stable version', $stablerelease->getVersionNumber()));
Expand Down
2 changes: 1 addition & 1 deletion htdocs/robots.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
User-agent: *
Allow: /

Sitemap: http://winmerge.org/sitemap.xml
Sitemap: https://winmerge.org/sitemap.xml
22 changes: 11 additions & 11 deletions htdocs/sitemap.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
http://winmerge.org/
http://winmerge.org/docs/
http://winmerge.org/docs/changelog.php
http://winmerge.org/docs/releasenotes.php
http://winmerge.org/downloads/
http://winmerge.org/screenshots/
http://winmerge.org/source-code/
http://winmerge.org/support/
http://winmerge.org/translations/
http://winmerge.org/translations/instructions.php
http://winmerge.org/translations/status_website.php
https://winmerge.org/
https://winmerge.org/docs/
https://winmerge.org/docs/changelog.php
https://winmerge.org/docs/releasenotes.php
https://winmerge.org/downloads/
https://winmerge.org/screenshots/
https://winmerge.org/source-code/
https://winmerge.org/support/
https://winmerge.org/translations/
https://winmerge.org/translations/instructions.php
https://winmerge.org/translations/status_website.php
22 changes: 11 additions & 11 deletions htdocs/sitemap.xml.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
include('engine/engine.inc');

$baseUrls = [
'http://winmerge.org/',
'http://winmerge.org/docs/',
'http://winmerge.org/docs/changelog.php',
'http://winmerge.org/docs/releasenotes.php',
'http://winmerge.org/downloads/',
'http://winmerge.org/screenshots/',
'http://winmerge.org/source-code/',
'http://winmerge.org/support/',
'http://winmerge.org/translations/',
'http://winmerge.org/translations/instructions.php',
'http://winmerge.org/translations/status_website.php'
'https://winmerge.org/',
'https://winmerge.org/docs/',
'https://winmerge.org/docs/changelog.php',
'https://winmerge.org/docs/releasenotes.php',
'https://winmerge.org/downloads/',
'https://winmerge.org/screenshots/',
'https://winmerge.org/source-code/',
'https://winmerge.org/support/',
'https://winmerge.org/translations/',
'https://winmerge.org/translations/instructions.php',
'https://winmerge.org/translations/status_website.php'
];

$languages = $translations->getLanguages();
Expand Down
40 changes: 20 additions & 20 deletions htdocs/support/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
$page->printHead(__('Support'), TAB_SUPPORT);

$page->printHeading(__('Support'));
$page->printPara(__('The <a href="%s">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer.', 'http://forums.winmerge.org/viewforum.php?f=4'),
$page->printPara(__('The <a href="%s">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer.', 'https://forums.winmerge.org/viewforum.php?f=4'),
__('A other way is a subscription to the <a href="%s">support mailing list</a>.', '#support'));
$page->printPara(__('If you find a bug, please submit it as a <a href="%s">bug report</a>.', 'http://bugs.winmerge.org/'),
$page->printPara(__('If you find a bug, please submit it as a <a href="%s">bug report</a>.', 'https://bugs.winmerge.org/'),
__('Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking <span class="guimenu">Help</span> &#8594; <span class="guimenuitem">Configuration</span> in the WinMerge window.'),
__('Good information in a bug report makes it more likely that your bug will be fixed quickly.'));
$page->printPara(__('You must <a href="%s">register with SourceForge.net</a> before posting a bug report (registration is free).', 'https://sourceforge.net/account/registration/'),
__('We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information.'),
__('We rarely sent direct emails but you will get notifications when we ask questions in the bug item.'));
$page->printPara(__('Wish list items on the <a href="%s">feature request list</a> will also be considered, but we make absolutely no promises.', 'http://feature-requests.winmerge.org/'));
$page->printPara(__('Wish list items on the <a href="%s">feature request list</a> will also be considered, but we make absolutely no promises.', 'https://feature-requests.winmerge.org/'));

$page->printSubHeading(__('Active Forum Topics'));
$activetopics = new Forum_ActiveTopics('http://forums.winmerge.org/');
$activetopics = new Forum_ActiveTopics('https://forums.winmerge.org/');
print("<ul class=\"rssfeeditems\">\n");
foreach ($activetopics->getTopics(0, 5) as $topic) { //for all active topics...
$lastPostLine = '';
Expand All @@ -30,7 +30,7 @@
}
print(" <li><a href=\"".$topic->getLink()."\">".$topic->getTitle()."</a> <em>".$lastPostLine."</em></li>\n");
}
print(" <li><a href=\"http://forums.winmerge.org/search.php?st=0&amp;search_id=active_topics\">".__('View all active topics&hellip;')."</a></li>\n");
print(" <li><a href=\"https://forums.winmerge.org/search.php?st=0&amp;search_id=active_topics\">".__('View all active topics&hellip;')."</a></li>\n");
print("</ul>\n");

$page->printSubHeading(__('Mailing Lists'));
Expand All @@ -39,49 +39,49 @@
<div class="indented">
<p><?php __e('This list is only for announcing new releases of WinMerge.');?></p>
<ul class="buttons">
<li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-announce" class="button is-small is-success"><?php __e('Subscribe');?></a></li>
<li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-announce" class="button is-small is-danger"><?php __e('Unsubscribe');?></a></li>
<li><a href="https://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-announce" class="button is-small"><?php __e('Archive');?></a></li>
<li><a href="https://sourceforge.net/projects/winmerge/lists/winmerge-announce" class="button is-small is-success"><?php __e('Subscribe');?></a></li>
<li><a href="https://sourceforge.net/projects/winmerge/lists/winmerge-announce/unsubscribe" class="button is-small is-danger"><?php __e('Unsubscribe');?></a></li>
<li><a href="https://sourceforge.net/p/winmerge/mailman/winmerge-announce/" class="button is-small"><?php __e('Archive');?></a></li>
<li><strong><?php __e('Low Traffic');?></strong></li>
</ul>
</div> <!-- .indented -->
<h4><?php __e('Support List');?></em></h4>
<div class="indented">
<p><?php __e('You should ask all your support questions on this list.');?></p>
<ul class="buttons">
<li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-support" class="button is-small is-success"><?php __e('Subscribe');?></a></li>
<li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-support" class="button is-small is-danger"><?php __e('Unsubscribe');?></a></li>
<li><a href="https://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-support" class="button is-small"><?php __e('Archive');?></a></li>
<li><a href="https://sourceforge.net/projects/winmerge/lists/winmerge-support" class="button is-small is-success"><?php __e('Subscribe');?></a></li>
<li><a href="https://sourceforge.net/projects/winmerge/lists/winmerge-support/unsubscribe" class="button is-small is-danger"><?php __e('Unsubscribe');?></a></li>
<li><a href="https://sourceforge.net/p/winmerge/mailman/winmerge-support/" class="button is-small"><?php __e('Archive');?></a></li>
<li><strong><?php __e('Normal Traffic');?></strong></li>
</ul>
</div> <!-- .indented -->
<h4><?php __e('User List');?></h4>
<div class="indented">
<p><?php __e('This list is for user related questions. Having questions posted to this list may allow others having the same problem to solve it on their own.');?></p>
<ul class="buttons">
<li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-user" class="button is-small is-success"><?php __e('Subscribe');?></a></li>
<li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-user" class="button is-small is-danger"><?php __e('Unsubscribe');?></a></li>
<li><a href="https://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-user" class="button is-small"><?php __e('Archive');?></a></li>
<li><a href="https://sourceforge.net/projects/winmerge/lists/winmerge-user" class="button is-small is-success"><?php __e('Subscribe');?></a></li>
<li><a href="https://sourceforge.net/projects/winmerge/lists/winmerge-user/unsubscribe" class="button is-small is-danger"><?php __e('Unsubscribe');?></a></li>
<li><a href="https://sourceforge.net/p/winmerge/mailman/winmerge-user" class="button is-small"><?php __e('Archive');?></a></li>
<li><strong><?php __e('Normal Traffic');?></strong></li>
</ul>
</div> <!-- .indented -->
<h4><?php __e('Translate List');?></h4>
<div class="indented">
<p><?php __e('This list is used for coordinating the translations.');?></p>
<ul class="buttons">
<li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-translate" class="button is-small is-success"><?php __e('Subscribe');?></a></li>
<li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-translate" class="button is-small is-danger"><?php __e('Unsubscribe');?></a></li>
<li><a href="https://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-translate" class="button is-small"><?php __e('Archive');?></a></li>
<li><a href="https://sourceforge.net/projects/winmerge/lists/winmerge-translate" class="button is-small is-success"><?php __e('Subscribe');?></a></li>
<li><a href="https://sourceforge.net/projects/winmerge/lists/winmerge-translate/unsubscribe" class="button is-small is-danger"><?php __e('Unsubscribe');?></a></li>
<li><a href="https://sourceforge.net/p/winmerge/mailman/winmerge-translate" class="button is-small"><?php __e('Archive');?></a></li>
<li><strong><?php __e('Low Traffic');?></strong></li>
</ul>
</div> <!-- .indented -->
<h4><?php __e('Development List');?></h4>
<div class="indented">
<p><?php __e('This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc.');?></p>
<ul class="buttons">
<li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-development" class="button is-small is-success"><?php __e('Subscribe');?></a></li>
<li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-development" class="button is-small is-danger"><?php __e('Unsubscribe');?></a></li>
<li><a href="https://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-development" class="button is-small"><?php __e('Archive');?></a></li>
<li><a href="https://sourceforge.net/projects/winmerge/lists/winmerge-development" class="button is-small is-success"><?php __e('Subscribe');?></a></li>
<li><a href="https://sourceforge.net/projects/winmerge/lists/winmerge-development/unsubscribe" class="button is-small is-danger"><?php __e('Unsubscribe');?></a></li>
<li><a href="https://sourceforge.net/p/winmerge/mailman/winmerge-development" class="button is-small"><?php __e('Archive');?></a></li>
<li><strong><?php __e('Normal Traffic');?></strong></li>
</ul>
</div> <!-- .indented -->
Expand Down
Loading

0 comments on commit 405b9b5

Please sign in to comment.