mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 922338: update link to phishing protection info in Firefox, r=dao,wesj,mbrubeck,fabrice

This commit is contained in:
Gavin Sharp 2013-10-08 14:00:48 -07:00
Родитель a101895f6b
Коммит 992c46c5f1
9 изменённых файлов: 16 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
b2g/app/b2g.js
Просмотреть файл

@ -324,7 +324,6 @@ pref("browser.safebrowsing.provider.0.reportMalwareURL", "http://{moz:locale}.ma
pref("browser.safebrowsing.provider.0.reportMalwareErrorURL", "http://{moz:locale}.malware-error.mozilla.com/?hl={moz:locale}");
// FAQ URLs
pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/%APP%/phishing-protection/");
pref("browser.geolocation.warning.infoURL", "http://www.mozilla.com/%LOCALE%/%APP%/geolocation/");
// Name of the about: page contributed by safebrowsing to handle display of error

1
browser/app/profile/firefox.js
Просмотреть файл

@ -795,7 +795,6 @@ pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozill
pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
pref("browser.safebrowsing.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/phishing-protection/");
pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
// Since the application reputation query isn't hooked in anywhere yet, this
// preference does not matter. To be extra safe, don't turn this preference on

6
browser/base/content/browser.js
Просмотреть файл

@ -2404,11 +2404,7 @@ let BrowserOnClick = {
}
}
else { // It's a phishing site, not malware
try {
content.location = formatURL("browser.safebrowsing.warning.infoURL", true);
} catch (e) {
Components.utils.reportError("Couldn't get phishing info URL: " + e);
}
openHelpLink("phishing-malware", false, "current");
}
break;

7
browser/base/content/utilityOverlay.js
Просмотреть файл

@ -656,13 +656,16 @@ function isValidFeed(aLink, aPrincipal, aIsFeed)
}
// aCalledFromModal is optional
function openHelpLink(aHelpTopic, aCalledFromModal) {
function openHelpLink(aHelpTopic, aCalledFromModal, aWhere) {
var url = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
.getService(Components.interfaces.nsIURLFormatter)
.formatURLPref("app.support.baseURL");
url += aHelpTopic;
var where = aCalledFromModal ? "window" : "tab";
var where = aWhere;
if (!aWhere)
where = aCalledFromModal ? "window" : "tab";
openUILinkIn(url, where);
}

10
browser/metro/base/content/browser.js
Просмотреть файл

@ -677,13 +677,9 @@ var Browser = {
break;
}
case "report-phishing": {
// It's a phishing site, not malware
try {
let reportURL = formatter.formatURLPref("browser.safebrowsing.warning.infoURL");
this.loadURI(reportURL);
} catch (e) {
Cu.reportError("Couldn't get phishing info URL: " + e);
}
// It's a phishing site, just link to the generic information page
let url = Services.urlFormatter.formatURLPref("app.support.baseURL");
this.loadURI(url + "phishing-malware");
break;
}
}

1
browser/metro/profile/metro.js
Просмотреть файл

@ -613,7 +613,6 @@ pref("browser.safebrowsing.provider.0.reportMalwareURL", "http://{moz:locale}.ma
pref("browser.safebrowsing.provider.0.reportMalwareErrorURL", "http://{moz:locale}.malware-error.mozilla.com/?hl={moz:locale}");
// FAQ URLs
pref("browser.safebrowsing.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/phishing-protection/");
pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/geolocation/");
// Name of the about: page contributed by safebrowsing to handle display of error

1
mobile/android/app/mobile.js
Просмотреть файл

@ -587,7 +587,6 @@ pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozill
pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/");
pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
pref("browser.safebrowsing.id", @MOZ_APP_UA_NAME@);

10
mobile/android/chrome/content/browser.js
Просмотреть файл

@ -4962,13 +4962,9 @@ var ErrorPageEventHandler = {
Cu.reportError("Couldn't get malware report URL: " + e);
}
} else {
// It's a phishing site, not malware. (There's no report URL)
try {
let reportURL = formatter.formatURLPref("browser.safebrowsing.warning.infoURL");
BrowserApp.selectedBrowser.loadURI(reportURL);
} catch (e) {
Cu.reportError("Couldn't get phishing info URL: " + e);
}
// It's a phishing site, just link to the generic information page
let url = Services.urlFormatter.formatURLPref("app.support.baseURL");
BrowserApp.selectedBrowser.loadURI(url + "phishing-malware");
}
} else if (target == errorDoc.getElementById("ignoreWarningButton")) {
Telemetry.addData("SECURITY_UI", nsISecTel[bucketName + "IGNORE_WARNING"]);

11
toolkit/components/viewsource/content/viewSource.js
Просмотреть файл

@ -263,13 +263,10 @@ function onClickContent(event) {
} catch (e) {
Components.utils.reportError("Couldn't get malware report URL: " + e);
}
} else { // It's a phishing site, not malware
try {
var infoURL = Services.urlFormatter.formatURLPref("browser.safebrowsing.warning.infoURL", true);
openURL(infoURL);
} catch (e) {
Components.utils.reportError("Couldn't get phishing info URL: " + e);
}
} else {
// It's a phishing site, just link to the generic information page
let url = Services.urlFormatter.formatURLPref("app.support.baseURL");
openURL(url + "phishing-malware");
}
} else if (target == errorDoc.getElementById('ignoreWarningButton')) {
// Allow users to override and continue through to the site