summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-08-09 22:34:59 +0200
committermadmaxoft <github@xoft.cz>2014-08-09 22:56:06 +0200
commitdcef688ccc0ae60b001ce40fd591a2dfafbac294 (patch)
tree3494115d8618d19516350b809ec6264e0b4818fe /src
parentMerge pull request #1295 from mc-server/crystal (diff)
downloadcuberite-dcef688ccc0ae60b001ce40fd591a2dfafbac294.tar
cuberite-dcef688ccc0ae60b001ce40fd591a2dfafbac294.tar.gz
cuberite-dcef688ccc0ae60b001ce40fd591a2dfafbac294.tar.bz2
cuberite-dcef688ccc0ae60b001ce40fd591a2dfafbac294.tar.lz
cuberite-dcef688ccc0ae60b001ce40fd591a2dfafbac294.tar.xz
cuberite-dcef688ccc0ae60b001ce40fd591a2dfafbac294.tar.zst
cuberite-dcef688ccc0ae60b001ce40fd591a2dfafbac294.zip
Diffstat (limited to '')
-rw-r--r--src/WebAdmin.cpp32
-rw-r--r--src/WebAdmin.h5
2 files changed, 36 insertions, 1 deletions
diff --git a/src/WebAdmin.cpp b/src/WebAdmin.cpp
index f5dc6fde7..ab6925e55 100644
--- a/src/WebAdmin.cpp
+++ b/src/WebAdmin.cpp
@@ -444,6 +444,38 @@ AString cWebAdmin::GetHTMLEscapedString(const AString & a_Input)
+AString cWebAdmin::GetURLEncodedString(const AString & a_Input)
+{
+ // Translation table from nibble to hex:
+ static const char Hex[] = "0123456789abcdef";
+
+ // Preallocate the output to match input:
+ AString dst;
+ size_t len = a_Input.length();
+ dst.reserve(len);
+
+ // Loop over input and substitute whatever is needed:
+ for (size_t i = 0; i < len; i++)
+ {
+ char ch = a_Input[i];
+ if (isalnum(ch) || (ch == '-') || (ch == '_') || (ch == '.') || (ch == '~'))
+ {
+ dst.push_back(ch);
+ }
+ else
+ {
+ dst.push_back('%');
+ dst.push_back(Hex[(ch >> 4) & 0x0f]);
+ dst.push_back(Hex[ch & 0x0f]);
+ }
+ } // for i - a_Input[]
+ return dst;
+}
+
+
+
+
+
AString cWebAdmin::GetBaseURL(const AStringVector & a_URLSplit)
{
AString BaseURL = "./";
diff --git a/src/WebAdmin.h b/src/WebAdmin.h
index d679a097c..018a27b69 100644
--- a/src/WebAdmin.h
+++ b/src/WebAdmin.h
@@ -134,6 +134,9 @@ public:
/** Escapes text passed into it, so it can be embedded into html. */
static AString GetHTMLEscapedString(const AString & a_Input);
+
+ /** Escapes the string for use in an URL */
+ static AString GetURLEncodedString(const AString & a_Input);
AString GetIPv4Ports(void) const { return m_PortsIPv4; }
AString GetIPv6Ports(void) const { return m_PortsIPv6; }
@@ -141,7 +144,7 @@ public:
// tolua_end
/** Returns the prefix needed for making a link point to the webadmin root from the given URL ("../../../webadmin"-style) */
- AString GetBaseURL(const AStringVector& a_URLSplit);
+ static AString GetBaseURL(const AStringVector & a_URLSplit);
protected:
/** Common base class for request body data handlers */