1
0
Fork 0
mirror of https://github.com/KingDuckZ/kamokan.git synced 2025-02-09 09:23:56 +00:00

Extract pastie's token manually from the request uri.

This commit is contained in:
King_DuckZ 2017-06-07 00:49:44 +01:00
parent 108a8c8e06
commit 8795977da9

View file

@ -24,6 +24,7 @@
#include <srchilite/sourcehighlight.h> #include <srchilite/sourcehighlight.h>
#include <srchilite/langmap.h> #include <srchilite/langmap.h>
#include <sstream> #include <sstream>
#include <algorithm>
namespace tawashi { namespace tawashi {
namespace { namespace {
@ -34,6 +35,15 @@ namespace tawashi {
return parSettings.as<std::string>("highlight_css"); return parSettings.as<std::string>("highlight_css");
} }
boost::string_view get_pastie_name (boost::string_view parRequest) {
using boost::string_view;
auto it_found = std::find(parRequest.begin(), parRequest.end(), '?');
if (parRequest.end() == it_found)
return parRequest.substr(0, it_found - parRequest.begin());
else
return parRequest;
}
} //unnamed namespace } //unnamed namespace
PastieResponse::PastieResponse ( PastieResponse::PastieResponse (
@ -76,7 +86,7 @@ namespace tawashi {
} }
void PastieResponse::on_mustache_prepare (mstch::map& parContext) { void PastieResponse::on_mustache_prepare (mstch::map& parContext) {
boost::string_view token = cgi_env().path_info_relative(); boost::string_view token = get_pastie_name(cgi_env().request_uri_relative());
boost::optional<std::string> pastie = this->storage().retrieve_pastie(token); boost::optional<std::string> pastie = this->storage().retrieve_pastie(token);
if (not pastie) { if (not pastie) {