Ignore:
Timestamp:
2014-03-05T18:37:26+01:00 (10 years ago)
Author:
stoecker
Message:

see #9778 - use TLS for JOSM website access

Location:
trunk/src/org/openstreetmap/josm/tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

    r6797 r6897  
    162162                    tr("You have encountered an error in JOSM. Before you file a bug report " +
    163163                            "make sure you have updated to the latest version of JOSM here:")), GBC.eol());
    164             p.add(new UrlLabel(Main.JOSM_WEBSITE,2), GBC.eop().insets(8,0,0,0));
     164            p.add(new UrlLabel(Main.getJOSMWebsite(),2), GBC.eop().insets(8,0,0,0));
    165165            p.add(new JMultilineLabel(
    166166                    tr("You should also update your plugins. If neither of those help please " +
     
    174174                    tr("Alternatively, if that does not work you can manually fill in the information " +
    175175                            "below at this URL:")), GBC.eol());
    176             p.add(new UrlLabel(Main.JOSM_WEBSITE+"/newticket",2), GBC.eop().insets(8,0,0,0));
     176            p.add(new UrlLabel(Main.getJOSMWebsite()+"/newticket",2), GBC.eop().insets(8,0,0,0));
    177177            if (Utils.copyToClipboard(text)) {
    178178                p.add(new JLabel(tr("(The text has already been copied to your clipboard.)")), GBC.eop());
     
    217217            Utils.close(gzip);
    218218
    219             return new URL(Main.JOSM_WEBSITE+"/josmticket?" +
     219            return new URL(Main.getJOSMWebsite()+"/josmticket?" +
    220220                    "gdata="+Base64.encode(ByteBuffer.wrap(out.toByteArray()), true));
    221221        } catch (IOException e) {
     
    234234        URL url = getBugReportUrl(debugText);
    235235        if (url != null) {
    236             return new UrlLabel(url.toString(), Main.JOSM_WEBSITE+"/josmticket?...", 2);
     236            return new UrlLabel(url.toString(), Main.getJOSMWebsite()+"/josmticket?...", 2);
    237237        }
    238238        return null;
  • trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

    r6889 r6897  
    304304        double lon = (Math.round(dlon * decimals));
    305305        lon /= decimals;
    306         return Main.OSM_WEBSITE + "/#map="+zoom+"/"+lat+"/"+lon;
     306        return Main.getOSMWebsite() + "/#map="+zoom+"/"+lat+"/"+lon;
    307307    }
    308308}
  • trunk/src/org/openstreetmap/josm/tools/WikiReader.java

    r6642 r6897  
    3030     */
    3131    public WikiReader() {
    32         this.baseurl = Main.pref.get("help.baseurl", Main.JOSM_WEBSITE);
     32        this.baseurl = Main.pref.get("help.baseurl", Main.getJOSMWebsite());
    3333    }
    3434
     
    114114        String b = "";
    115115        String full = "";
     116        String baseurlus = baseurl.replace("https:","http:");
     117        String baseurlse = baseurlus.replace("http:","https:");
    116118        for (String line = in.readLine(); line != null; line = in.readLine()) {
    117119            full += line;
     
    136138                b += line.replaceAll("<img ", "<img border=\"0\" ")
    137139                         .replaceAll("<span class=\"icon\">.</span>", "")
    138                          .replaceAll("href=\"/", "href=\"" + baseurl + "/")
     140                         .replaceAll("href=\"/", "href=\"" + baseurlus + "/")
     141                         .replaceAll("href=\"/", "href=\"" + baseurlse + "/")
    139142                         .replaceAll(" />", ">")
    140143                         + "\n";
Note: See TracChangeset for help on using the changeset viewer.