add closing dialogs, redirecting and removing content functionality to the winix framework
add such new methods to FunctionBase: - bool can_push_url_to_browser_history(); - void add_standard_models(); - void close_modal_dialogs(); - void prepare_doc_url(const wchar_t * local_url, pt::WTextStream & url); - void prepare_doc_url(const wchar_t * local_url, std::wstring & url); - std::wstring prepare_doc_url(const wchar_t * local_url = nullptr); - std::wstring prepare_doc_url(const std::wstring & local_url); - void redirect_to(const wchar_t * url, bool append_domain = true); - void redirect_to(const std::wstring & url, bool append_domain = true); - void redirect_to(const pt::WTextStream & url, bool append_domain = true); - void redirect_to(const wchar_t * url, const wchar_t * frame_url, const wchar_t * dom_target); - void redirect_to(const std::wstring & url, const std::wstring & frame_url, const std::wstring & dom_target); - void redirect_to(pt::WTextStream & url, pt::WTextStream & frame_url, pt::WTextStream & dom_target); - void redirect_to(pt::WTextStream & url, pt::WTextStream & frame_url, const wchar_t * dom_target); - void redirect_to(const wchar_t * url, const wchar_t * frame_url, pt::WTextStream & dom_target); - void retarged(const wchar_t * frame, const wchar_t * dom_target, const wchar_t * push_url = nullptr, const wchar_t * swap_algorithm = nullptr); - void retarged(const std::wstring & frame, const std::wstring & dom_target, const std::wstring & push_url, const wchar_t * swap_algorithm = nullptr); - void retarged(const wchar_t * frame, pt::WTextStream & dom_target, const wchar_t * push_url = nullptr, const wchar_t * swap_algorithm = nullptr); - void remove_content(pt::WTextStream & dom_target, bool close_dialogs = false); - void remove_content(const wchar_t * dom_target, bool has_postfix, long dom_target_postfix, bool close_dialogs = false); - void remove_content(const wchar_t * dom_target, long dom_target_postfix, bool close_dialogs = false); - void remove_content(const wchar_t * dom_target, bool close_dialogs = false); - void update_content(const wchar_t * frame, pt::WTextStream & dom_target, bool close_dialogs = false); - void update_content(const wchar_t * frame, const wchar_t * dom_target, bool has_postfix, long dom_target_postfix, bool close_dialogs = false); - void update_content(const wchar_t * frame, const wchar_t * dom_target, long dom_target_postfix, bool close_dialogs = false); - void update_content(const wchar_t * frame, const wchar_t * dom_target, bool close_dialogs = false); while here: - refactor PascalCase to snake_case in FunctionBase - add start_request() and finish_request() methods to FunctionBase - add has_*_access() methods to FunctionBase - fix: FunctionBase::clear() method was not called if a request was assigned to a job - add a WinixEzcHelper model - allow to serialize a header if the header value is neither a string nor an integer - refactor PascalCase to snake_case in functions: Emacs, Mkdir, Upload
This commit is contained in:
@@ -620,7 +620,7 @@ void App::MakeRenameMeToABetterName()
|
||||
|
||||
if( cur.request->function )
|
||||
{
|
||||
cur.request->function->CheckOriginHeader();
|
||||
cur.request->function->check_origin_header();
|
||||
}
|
||||
|
||||
// cur.request->status can be changed by function_parser
|
||||
@@ -754,6 +754,9 @@ void App::ProcessRequest()
|
||||
|
||||
try
|
||||
{
|
||||
if( cur.request->function )
|
||||
cur.request->function->clear();
|
||||
|
||||
if( cur.request->run_state == Request::RunState::finished )
|
||||
{
|
||||
ClearAfterRequest();
|
||||
@@ -1342,7 +1345,7 @@ void App::ReadPostVars()
|
||||
if( cur.request->method == Request::post || cur.request->method == Request::put ||
|
||||
cur.request->method == Request::patch || cur.request->method == Request::delete_ )
|
||||
{
|
||||
bool copy_raw_post = (cur.request->function && cur.request->function->NeedToCopyRawPost());
|
||||
bool copy_raw_post = (cur.request->function && cur.request->function->need_to_copy_raw_post());
|
||||
|
||||
if( pt::is_substr_nc(Header::multipart_form_data, cur.request->env_content_type.c_str()) )
|
||||
{
|
||||
|
||||
@@ -381,10 +381,19 @@ void Job::DoRequestContinuationJob(JobTask & job_task, size_t priority)
|
||||
{
|
||||
cur->request->FinishRequest(); // if cur->request->function were null then templates functions would not work
|
||||
load_avg->StopRequest(cur->request);
|
||||
|
||||
if( cur->request->function )
|
||||
cur->request->function->clear();
|
||||
|
||||
cur->request->Clear();
|
||||
cur->request->run_state = Request::RunState::finished;
|
||||
RemoveOldRequest(cur->request);
|
||||
}
|
||||
else
|
||||
{
|
||||
if( cur->request->function )
|
||||
cur->request->function->clear();
|
||||
}
|
||||
|
||||
main_log << logendrequest;
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2008-2023, Tomasz Sowa
|
||||
* Copyright (c) 2008-2024, Tomasz Sowa
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -156,9 +156,6 @@ void Request::Clear()
|
||||
RemovePostFileTmp(post_file_tab);
|
||||
ClearOutputStreams();
|
||||
|
||||
if( function )
|
||||
function->Clear();
|
||||
|
||||
post_file_tab.clear();
|
||||
cookie_tab.clear();
|
||||
post_in.clear();
|
||||
@@ -1941,39 +1938,30 @@ void Request::SendHeaders()
|
||||
|
||||
for(i=headers.value.value_object.begin() ; i != headers.value.value_object.end() ; ++i)
|
||||
{
|
||||
bool header_prepared = false;
|
||||
pt::wide_to_utf8(i->first, aheader_name);
|
||||
|
||||
if( i->second->is_wstr() )
|
||||
{
|
||||
pt::wide_to_utf8(i->first, aheader_name);
|
||||
pt::wide_to_utf8(*i->second->get_wstr(), aheader_value);
|
||||
header_prepared = true;
|
||||
}
|
||||
else
|
||||
if( i->second->is_long_long() )
|
||||
{
|
||||
pt::wide_to_utf8(i->first, aheader_name);
|
||||
pt::Toa(*i->second->get_long_long(), aheader_value);
|
||||
header_prepared = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if( plog )
|
||||
{
|
||||
(*plog) << log2 << "Skipping HTTP Header: " << i->first << " - it's neither a wstr nor a long long" << logend;
|
||||
}
|
||||
i->second->serialize_to_json_to(aheader_value, false);
|
||||
}
|
||||
|
||||
if( header_prepared )
|
||||
{
|
||||
FCGX_PutS(aheader_name.c_str(), fcgi_request.out);
|
||||
FCGX_PutS(": ", fcgi_request.out);
|
||||
FCGX_PutS(aheader_value.c_str(), fcgi_request.out);
|
||||
FCGX_PutS("\r\n", fcgi_request.out);
|
||||
FCGX_PutS(aheader_name.c_str(), fcgi_request.out);
|
||||
FCGX_PutS(": ", fcgi_request.out);
|
||||
FCGX_PutS(aheader_value.c_str(), fcgi_request.out);
|
||||
FCGX_PutS("\r\n", fcgi_request.out);
|
||||
|
||||
if( config->log_http_answer_headers && plog )
|
||||
(*plog) << log1 << "HTTP Header: " << aheader_name << ": " << aheader_value << logend;
|
||||
}
|
||||
if( config->log_http_answer_headers && plog )
|
||||
(*plog) << log1 << "HTTP Header: " << aheader_name << ": " << aheader_value << logend;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user