Commit 71831ee6 authored by funkydude's avatar funkydude
Browse files

Expand usage of HTTPS and fix a few URLs

parent b7ac7dfa
......@@ -4,16 +4,16 @@
# BOINC
Project Website: http://boinc.berkeley.edu
Project Website: https://boinc.berkeley.edu
## Want to create a project
See: http://boinc.berkeley.edu/trac/wiki
See: https://boinc.berkeley.edu/trac/wiki
## Want to help translate
See: http://boinc.berkeley.edu/trac/wiki/TranslateIntro
See: https://boinc.berkeley.edu/trac/wiki/TranslateIntro
## Want to contribute
See: http://boinc.berkeley.edu/trac/wiki/SoftwareDevelopment
See: https://boinc.berkeley.edu/trac/wiki/SoftwareDevelopment
### Note
......
......@@ -204,7 +204,7 @@ void CDlgAbout::CreateControls() {
itemBoxSizer3->Add(itemStaticText15, 0, wxALIGN_CENTER|wxALL, 5);
m_AboutBOINCURLCtrl = new wxHyperlinkCtrl;
m_AboutBOINCURLCtrl->Create( itemDialog1, ID_ABOUTBOINCLINK, wxT("http://boinc.berkeley.edu/"), wxT("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxHL_ALIGN_CENTRE | wxHL_CONTEXTMENU );
m_AboutBOINCURLCtrl->Create( itemDialog1, ID_ABOUTBOINCLINK, wxT("https://boinc.berkeley.edu/"), wxT("https://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxHL_ALIGN_CENTRE | wxHL_CONTEXTMENU );
itemBoxSizer3->Add(m_AboutBOINCURLCtrl, 0, wxALIGN_CENTER|wxALL, 0);
wxStaticLine* itemStaticLine15 = new wxStaticLine;
......
......@@ -304,7 +304,7 @@ void CProjectInfoPage::CreateControls()
m_pProjectDetailsURLStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, _("Web site:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer20->Add(m_pProjectDetailsURLStaticCtrl, 0, wxALIGN_LEFT|wxRIGHT|wxBOTTOM, 2);
m_pProjectDetailsURLCtrl = new wxHyperlinkCtrl( itemWizardPage23, wxID_STATIC, wxT("BOINC"), wxT("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxHL_CONTEXTMENU|wxHL_ALIGN_LEFT);
m_pProjectDetailsURLCtrl = new wxHyperlinkCtrl( itemWizardPage23, wxID_STATIC, wxT("BOINC"), wxT("https://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxHL_CONTEXTMENU|wxHL_ALIGN_LEFT);
itemFlexGridSizer20->Add(m_pProjectDetailsURLCtrl, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxBOTTOM, 5);
wxFlexGridSizer* itemFlexGridSizer24 = new wxFlexGridSizer(2, 1, 0, 0);
......
......@@ -667,14 +667,14 @@ bool CSkinAdvanced::InitializeDelayedValidation() {
if (show_error_msgs) {
fprintf(stderr, "Skin Manager: Organization web site was not defined. Using default.\n");
}
m_strOrganizationWebsite = wxT("http://boinc.berkeley.edu");
m_strOrganizationWebsite = wxT("https://boinc.berkeley.edu");
wxASSERT(!m_strOrganizationWebsite.IsEmpty());
}
if (m_strOrganizationHelpUrl.IsEmpty()) {
if (show_error_msgs) {
fprintf(stderr, "Skin Manager: Organization help url was not defined. Using default.\n");
}
m_strOrganizationHelpUrl = wxT("http://boinc.berkeley.edu/manager_links.php");
m_strOrganizationHelpUrl = wxT("https://boinc.berkeley.edu/manager_links.php");
wxASSERT(!m_strOrganizationHelpUrl.IsEmpty());
}
if (!m_bDefaultTabSpecified) {
......
Boinc Logo:
http://boinc.berkeley.edu/logo.php
https://boinc.berkeley.edu/logo.php
Background (used with permission by Funerium):
http://funerium.deviantart.com/art/Moment-in-space-XCVI-103416759?q=gallery%3Afunerium%2F230361&qo=100
https://funerium.deviantart.com/art/Moment-in-space-XCVI-103416759?q=gallery%3Afunerium%2F230361&qo=100
Background changes and Icons:
Jacob Klein
\ No newline at end of file
......@@ -83,8 +83,8 @@
<is_branded>1</is_branded>
<organization_name>Charity Engine</organization_name>
<organization_website>http://www.charityengine.com</organization_website>
<organization_help_url>http://www.charityengine.com/manager_menu.php</organization_help_url>
<organization_website>https://www.charityengine.com</organization_website>
<organization_help_url>https://www.charityengine.com/manager_menu.php</organization_help_url>
</advanced>
......
......@@ -83,8 +83,8 @@
<is_branded>1</is_branded>
<organization_name>GridRepublic</organization_name>
<organization_website>http://www.gridrepublic.org</organization_website>
<organization_help_url>http://www.gridrepublic.org/manager_menu.php</organization_help_url>
<organization_website>https://www.gridrepublic.org</organization_website>
<organization_help_url>https://www.gridrepublic.org/manager_menu.php</organization_help_url>
</advanced>
......
......@@ -239,8 +239,8 @@
</image>
</application_snooze_icon>
<organization_name>World Community Grid</organization_name>
<organization_website>http://www.worldcommunitygrid.org</organization_website>
<organization_help_url>http://www.worldcommunitygrid.org/boinc.do</organization_help_url>
<organization_website>https://www.worldcommunitygrid.org</organization_website>
<organization_help_url>https://www.worldcommunitygrid.org/boinc.do</organization_help_url>
<application_short_name>World Community Grid</application_short_name>
<!-- this setting makes the BOINC manager automatically open to a particular tab on the -->
<!-- advanced view, overriding a users last displayed view. 0 means use users last open tab -->
......
......@@ -30,8 +30,8 @@
<application_name>World Community Grid - BOINC Manager</application_name>
<application_short_name>World Community Grid</application_short_name>
<organization_name>World Community Grid</organization_name>
<organization_website>http://www.worldcommunitygrid.org</organization_website>
<organization_help_url>http://www.worldcommunitygrid.org/boinc.do</organization_help_url>
<organization_website>https://www.worldcommunitygrid.org</organization_website>
<organization_help_url>https://www.worldcommunitygrid.org/boinc.do</organization_help_url>
</advanced>
</en>
</skin>
......@@ -12,7 +12,7 @@ function show_item($y) {
if (strstr($file, 'http://')) {
$url = $file;
} else {
$url = "http://boinc.berkeley.edu/addons/$file";
$url = "https://boinc.berkeley.edu/addons/$file";
}
page_head($y[1]);
......
......@@ -3,6 +3,6 @@
require_once("../html/inc/page_translate.inc");
find_translation("dg.html");
Header("Location: http://boinc.berkeley.edu/trac/wiki/DesktopGrid");
Header("Location: https://boinc.berkeley.edu/trac/wiki/DesktopGrid");
?>
......@@ -13,9 +13,9 @@ if (0) {
function search_form() {
echo "
<form method=get action=\"http://google.com/search\">
<input type=hidden name=domains value=\"http://boinc.berkeley.edu\">
<input type=hidden name=sitesearch value=\"http://boinc.berkeley.edu\">
<form method=get action=\"https://google.com/search\">
<input type=hidden name=domains value=\"https://boinc.berkeley.edu\">
<input type=hidden name=sitesearch value=\"https://boinc.berkeley.edu\">
<span class=\"nobar\">
<input class=small name=q size=20>
<input class=small type=submit value=".tra("Search").">
......
......@@ -38,7 +38,7 @@ function version_url($file) {
global $url_base;
return $url_base.$file;
// if (is_dev($v)) {
// return "http://boinc.berkeley.edu/dl/$file";
// return "https://boinc.berkeley.edu/dl/$file";
// } else {
// return $url_base.$file;
// }
......
......@@ -20,7 +20,7 @@ Note:
These email lists do not provide tech support
for SETI@home or other BOINC projects.
Help for SETI@home is available on the
<a href=http://setiathome.berkeley.edu/forum_help_desk.php>SETI@home message boards</a>
<a href=https://setiathome.berkeley.edu/forum_help_desk.php>SETI@home message boards</a>
and help for BOINC is available <a href=help.php>here</a>.
</font></b>
......@@ -60,7 +60,7 @@ list_item("<a href=http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_helpers>
"For BOINC <a href=help.php>Help Volunteers</a>,
to discuss policies and user problems."
);
list_item("<a href=http://groups.google.com/group/boinc-team-founders>BOINC team founders</a> (Google group)",
list_item("<a href=https://groups.google.com/forum/#!forum/boinc-team-founders>BOINC team founders</a> (Google group)",
"Discussion of team-related issues."
);
list_end();
......
......@@ -17,9 +17,9 @@ echo "
<li>
".tra("
by voice, using %1Skype%2, a free Internet-based telephone system. If you don't already have Skype, you can %3download and install it now%4. When you're finished, return to this page.",
"<a href=\"http://www.skype.com\">",
"<a href=\"https://www.skype.com\">",
"</a>",
"<a href=\"http://www.skype.com\">",
"<a href=\"https://www.skype.com\">",
"</a>"
)."
<li> ".tra("using Skype chat")."
......
......@@ -106,7 +106,7 @@ function show_vols($vols) {
<p>
If you're setting up a BOINC project, this is not the place to get help.
Instead, try the
<a href=http://boinc.berkeley.edu/email_lists.php>boinc_projects</a>
<a href=https://boinc.berkeley.edu/email_lists.php>boinc_projects</a>
email list.
";
list_start("border=0");
......
......@@ -3,12 +3,12 @@
define("MYSQLI", false);
$host = $_SERVER["SERVER_NAME"];
if ($host == "bossa.berkeley.edu") {
Header("Location: http://boinc.berkeley.edu/trac/wiki/BossaIntro");
Header("Location: https://boinc.berkeley.edu/trac/wiki/BossaIntro");
exit();
}
if ($host == "bolt.berkeley.edu") {
Header("Location: http://boinc.berkeley.edu/trac/wiki/BoltIntro");
Header("Location: https://boinc.berkeley.edu/trac/wiki/BoltIntro");
exit();
}
......@@ -39,7 +39,7 @@ function show_totals() {
$fn = "boinc_state.xml";
if (!file_exists($fn) || filemtime($fn) < time()-86400) {
$uid = time();
$x = file_get_contents("http://boincstats.com/en/xml/boincState?uid=$uid");
$x = file_get_contents("https://boincstats.com/en/xml/boincState?uid=$uid");
if ($x) {
$f = fopen($fn, "w");
fwrite($f, $x);
......@@ -82,8 +82,8 @@ function show_news_items() {
function show_participate() {
echo "
<tr><td class=heading_left>
<a href=http://www.facebook.com/pages/BOINC/32672338584><img width=36 src=images/facebook_logo.jpg align=left title='BOINC on Facebook'></a>
<a href=https://plus.google.com/117150698502685192946/posts><img width=36 src=images/google_plus_logo.jpg align=left title='BOINC on Google+'></a>
<a href=https://www.facebook.com/BOINC-32672338584/><img width=36 src=images/facebook_logo.jpg align=left title='BOINC on Facebook'></a>
<a href=https://plus.google.com/+boinc><img width=36 src=images/google_plus_logo.jpg align=left title='BOINC on Google+'></a>
<center>
<span class=section_title>"
// "Volunteer" is used as a verb
......@@ -110,7 +110,7 @@ function show_participate() {
tra("Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "),
"<a href=\"wiki/Account_managers\">",
"</a>",
"<a href=\"http://www.gridrepublic.org\">",
"<a href=\"https://www.gridrepublic.org\">",
"</a>",
"<a href=\"https://bam.boincstats.com/\">",
"</a>"
......
......@@ -44,7 +44,7 @@ $info_sites = array(
"(survey of volunteer computing, including non-BOINC projects)"
),
array(
"http://www.rechenkraft.net/wiki/",
"https://www.rechenkraft.net/wiki/",
"Rechenkraft.net wiki",
"(German, English, Portuguese)"
),
......@@ -98,8 +98,8 @@ function show_social_media() {
//array("http://www.myboinc.com/", "BOINC Users of the Day"),
//array("http://groups.myspace.com/BOINConMYSPACE", "BOINC on MySpace"),
//array("http://www.boincuk.com/repository.php", "bunc", "(excellent newsletter produced by BOINC UK)"),
array("http://www.linkedin.com/groups?gid=678497", "BOINC group on LinkedIn"),
array("http://www.facebook.com/#!/pages/BOINC/109465765746025?ref=ts", "BOINC on Facebook"),
array("https://www.linkedin.com/groups/678497/profile", "BOINC group on LinkedIn"),
array("https://www.facebook.com/pages/Berkeley-Open-Infrastructure-for-Network-Computing/111781192172429", "BOINC on Facebook"),
);
echo "<ul>";
foreach ($misc_sites as $m) {
......@@ -148,7 +148,7 @@ echo "
The following web sites show statistics for one or more BOINC projects.
These sites use XML-format data exported by BOINC projects,
as described
<a href=http://boinc.berkeley.edu/trac/wiki/CreditStats>here</a>.
<a href=trac/wiki/CreditStats>here</a>.
If you're interested in running your own site or
participating in the development efforts,
please contact the people listed below.
......@@ -191,7 +191,7 @@ echo "
<ul>
<li> <a href=http://www.crunching-family.at/download-center/>Crunching Family Skin Download</a>
<li> <a href=http://www.czechnationalteam.cz/view.php?cisloclanku=2007040003>Czech National Team skin</a> (in Czech)
<li> <a href=http://www.grid-france.fr/tutos/boinc-personnaliser-aux-couleurs-equipe >Skin for Equipe France (WCG)</a>
<li> <a href=http://www.grid-france.fr/tutos/boinc-personnaliser-aux-couleurs-equipe>Skin for Equipe France (WCG)</a>
";
//<li> <a href=http://wcg.userfriendly.org/resources.jspx>Skin for team UserFriendly.org</a>
echo "
......@@ -376,8 +376,8 @@ If you'd like to add a web site to this list, please
<h2>BOINC-related videos</h2>
<ul>
<li> <a href=http://www.youtube.com/watch?v=8iSRLIK-x6A>David Anderson talks about BOINC</a> (2006)
<li> <a href=http://www.youtube.com/watch?v=GzATbET3g54>David Baker talks about Rosetta@home</a>
<li> <a href=https://www.youtube.com/watch?v=8iSRLIK-x6A>David Anderson talks about BOINC</a> (2006)
<li> <a href=https://www.youtube.com/watch?v=GzATbET3g54>David Baker talks about Rosetta@home</a>
</ul>
";
page_tail();
......
......@@ -62,9 +62,9 @@ Installer splash screen:
</ul>
'Powered by BOINC' image:
<p>
<a href=http://boinc.berkeley.edu><img src=logo/pb_boinc.gif></a>
<a href=https://boinc.berkeley.edu><img src=logo/pb_boinc.gif></a>
<p>
(always link this to http://boinc.berkeley.edu)
(always link this to https://boinc.berkeley.edu)
<p>
Monochrome/black:
<p>
......
......@@ -25,112 +25,112 @@ if (isset($_GET['controlid'])) $controlid = $_GET['controlid'];
if ($target == "notice") {
if ($controlid == 'download') {
header('Location: http://boinc.berkeley.edu/wiki/Release_Notes');
header('Location: https://boinc.berkeley.edu/wiki/Release_Notes');
} else if ($controlid == 'statefile') {
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
} else if ($controlid == 'proxy_env') {
header('Location: http://boinc.berkeley.edu/wiki/Client_configuration#Environment_variables');
header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Environment_variables');
} else if ($controlid == 'app_info') {
header('Location: http://boinc.berkeley.edu/wiki/Anonymous_platform');
header('Location: https://boinc.berkeley.edu/wiki/Anonymous_platform');
} else if ($controlid == 'remote_hosts') {
header('Location: http://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely');
header('Location: https://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely');
} else if ($controlid == 'log_flags') {
header('Location: http://boinc.berkeley.edu/wiki/Client_configuration#Logging_flags');
header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Logging_flags');
} else if ($controlid == 'config') {
header('Location: http://boinc.berkeley.edu/wiki/Client_configuration#Configuration_file');
header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Configuration_file');
} else {
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
}
} else if ($target == "advanced_preferences") {
header('Location: http://boinc.berkeley.edu/wiki/Local_preferences#Advanced_view');
header('Location: https://boinc.berkeley.edu/wiki/Local_preferences#Advanced_view');
} else if ($target == "simple_preferences") {
header('Location: http://boinc.berkeley.edu/wiki/Local_preferences#Simple_view');
header('Location: https://boinc.berkeley.edu/wiki/Local_preferences#Simple_view');
} else if (($target == "advanced") && version_compare($version, "5.10.0", ">=") && version_compare($version, "6.12.0", "<")) {
if ($controlid == "6024") {
header('Location: http://boinc.berkeley.edu');
header('Location: https://boinc.berkeley.edu');
} else if ($controlid == "6025") {
header('Location: http://boinc.berkeley.edu/wiki/Advanced_view_6_10');
header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_10');
} else if ($controlid == "6035") {
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
} else {
header('Location: http://boinc.berkeley.edu/wiki/Advanced_view_6_10');
header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_10');
}
} else if (($target == "simple") && version_compare($version, "5.10.0", ">=") && version_compare($version, "6.12.0", "<")) {
if ($controlid == "6024") {
header('Location: http://boinc.berkeley.edu');
header('Location: https://boinc.berkeley.edu');
} else if ($controlid == "6025") {
header('Location: http://boinc.berkeley.edu/wiki/Simple_view');
header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
} else if ($controlid == "6035") {
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
} else {
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
}
} else if (($target == "advanced") && version_compare($version, "6.12.0", ">=") && version_compare($version, "7.0.0", "<")) {
if ($controlid == "6024") {
header('Location: http://boinc.berkeley.edu');
header('Location: https://boinc.berkeley.edu');
} else if ($controlid == "6025") {
header('Location: http://boinc.berkeley.edu/wiki/Advanced_view_6_12');
header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_12');
} else if ($controlid == "6035") {
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
} else {
header('Location: http://boinc.berkeley.edu/wiki/Advanced_view_6_12');
header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_12');
}
} else if (($target == "simple") && version_compare($version, "6.12.0", ">=") && version_compare($version, "7.0.0", "<")) {
if ($controlid == "6024") {
header('Location: http://boinc.berkeley.edu');
header('Location: https://boinc.berkeley.edu');
} else if ($controlid == "6025") {
header('Location: http://boinc.berkeley.edu/wiki/Simple_view_6_12');
header('Location: https://boinc.berkeley.edu/wiki/Simple_view_6_12');
} else if ($controlid == "6035") {
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
} else {
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
}
} else if (($target == "simple") && version_compare($version, "7.2.0", ">=") && version_compare($version, "7.4.0", "<")) {
if ($controlid == "6024") {
header('Location: http://boinc.berkeley.edu');
header('Location: https://boinc.berkeley.edu');
} else if ($controlid == "6025") {
header('Location: http://boinc.berkeley.edu/wiki/Simple_view');
header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
} else if ($controlid == "6035") {
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
} else {
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
}
} else {
if ($target == "advanced") {
if ($controlid == "6024") {
header('Location: http://boinc.berkeley.edu');
header('Location: https://boinc.berkeley.edu');
} else if ($controlid == "6025") {
header('Location: http://boinc.berkeley.edu/wiki/Advanced_view');
header('Location: https://boinc.berkeley.edu/wiki/Advanced_view');
} else if ($controlid == "6035") {
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
} else {
header('Location: http://boinc.berkeley.edu/wiki/Advanced_view');
header('Location: https://boinc.berkeley.edu/wiki/Advanced_view');
}
} else if ($target == "simple") {
if ($controlid == "6024") {
// "Show info about BOINC" item on Mac simple-view menu
//
header('Location: http://boinc.berkeley.edu');
header('Location: https://boinc.berkeley.edu');
} else if ($controlid == "6025") {
// "Show info about BOINC manager" item on Mac simple-view menu
//
header('Location: http://boinc.berkeley.edu/wiki/Simple_view');
header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
} else if ($controlid == "6035") {
// "Show info about BOINC and BOINC Manager"
// item on Mac simple-view menu ?? do we need this item?
//
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
} else if ($controlid >= "6400" && $controlid <= "6499") {
// Any control that has focus in the simple view
//
header('Location: http://boinc.berkeley.edu/wiki/Simple_view');
header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
} else {
// the question-mark button
//
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
}
} else {
header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment