1ced64e0b4
Since curl 7.21.2 - (October 13 2010), curl_escape (a deprecated function that will be removed in the future) changed it's behavior and no longer escapes the characters '-', '.', '_' and '~'. The only reasonable solution for us is to stop using it and use our own version that mimics the old behavior. The only other alternative would be to rename every .xml file with escaped characters in their name upon installation, depending on the behavior of the installed libcurl (on standalone anyway). However, if you add to that in the future curl_escape has to be replaced with curl_easy_escape, which is far from easy to call as it requires a CURL to be passed for which LL invented a wrapper in libllmessage, but did hide that (Curl::Easy is only defined in a .cpp file), then we're better of just using our own function, which I named LLWeb::curlEscape.
119 lines
2.9 KiB
C++
119 lines
2.9 KiB
C++
/**
|
|
* @file llweb.cpp
|
|
* @brief Functions dealing with web browsers
|
|
* @author James Cook
|
|
*
|
|
* $LicenseInfo:firstyear=2006&license=viewergpl$
|
|
*
|
|
* Copyright (c) 2006-2009, Linden Research, Inc.
|
|
*
|
|
* Second Life Viewer Source Code
|
|
* The source code in this file ("Source Code") is provided by Linden Lab
|
|
* to you under the terms of the GNU General Public License, version 2.0
|
|
* ("GPL"), unless you have obtained a separate licensing agreement
|
|
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
|
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
|
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
|
|
*
|
|
* There are special exceptions to the terms and conditions of the GPL as
|
|
* it is applied to this Source Code. View the full text of the exception
|
|
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
|
* online at
|
|
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
|
|
*
|
|
* By copying, modifying or distributing this software, you acknowledge
|
|
* that you have read and understood your obligations described above,
|
|
* and agree to abide by those obligations.
|
|
*
|
|
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
|
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
|
* COMPLETENESS OR PERFORMANCE.
|
|
* $/LicenseInfo$
|
|
*/
|
|
|
|
#include "llviewerprecompiledheaders.h"
|
|
|
|
#include "llweb.h"
|
|
|
|
#include "llviewerwindow.h"
|
|
|
|
#include "llviewercontrol.h"
|
|
#include "llfloatermediabrowser.h"
|
|
|
|
// static
|
|
void LLWeb::initClass()
|
|
{
|
|
LLAlertDialog::setURLLoader(&sAlertURLLoader);
|
|
}
|
|
|
|
// static
|
|
void LLWeb::loadURL(const std::string& url)
|
|
{
|
|
if (gSavedSettings.getBOOL("UseExternalBrowser"))
|
|
{
|
|
loadURLExternal(url);
|
|
}
|
|
else
|
|
{
|
|
LLFloaterMediaBrowser::showInstance(url);
|
|
}
|
|
}
|
|
|
|
|
|
// static
|
|
void LLWeb::loadURLExternal(const std::string& url)
|
|
{
|
|
std::string escaped_url = escapeURL(url);
|
|
gViewerWindow->getWindow()->spawnWebBrowser(escaped_url);
|
|
}
|
|
|
|
|
|
// static
|
|
std::string LLWeb::curlEscape(const std::string& url)
|
|
{
|
|
std::stringstream escaped_url;
|
|
for (std::string::const_iterator iter = url.begin(); iter != url.end(); ++iter)
|
|
{
|
|
if (std::isalnum(*iter))
|
|
escaped_url << *iter;
|
|
else
|
|
escaped_url << '%' << std::hex << std::setfill('0') << std::setw(2) << std::uppercase << (int)*iter;
|
|
}
|
|
return escaped_url.str();
|
|
}
|
|
|
|
// static
|
|
std::string LLWeb::escapeURL(const std::string& url)
|
|
{
|
|
// The CURL curl_escape() function escapes colons, slashes,
|
|
// and all characters but A-Z and 0-9. Do a cheesy mini-escape.
|
|
std::string escaped_url;
|
|
S32 len = url.length();
|
|
for (S32 i = 0; i < len; i++)
|
|
{
|
|
char c = url[i];
|
|
if (c == ' ')
|
|
{
|
|
escaped_url += "%20";
|
|
}
|
|
else if (c == '\\')
|
|
{
|
|
escaped_url += "%5C";
|
|
}
|
|
else
|
|
{
|
|
escaped_url += c;
|
|
}
|
|
}
|
|
return escaped_url;
|
|
}
|
|
|
|
// virtual
|
|
void LLWeb::URLLoader::load(const std::string& url)
|
|
{
|
|
loadURL(url);
|
|
}
|
|
|
|
// static
|
|
LLWeb::URLLoader LLWeb::sAlertURLLoader;
|