Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-27 06:07:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Uncommented / fixed the methods that take WebServerRequest in HTMLBuilder and it's bind class.

Browse Source
This commit is contained in:
Relintai 2022-07-22 11:45:12 +02:00
parent 0eba7b461f
commit caa93f89b0
4 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/web/html/html_builder.cpp
View File

@ -1,5 +1,7 @@
#include "html_builder.h" #include "html_builder.h"
#include "../http/web_server_request.h"
HTMLTag *HTMLTag::str(const String &str) { HTMLTag *HTMLTag::str(const String &str) {
result += " " + str; result += " " + str;
@ -2573,14 +2575,12 @@ HTMLBuilder *HTMLBuilder::form_post(const String &action, const String &cls, con
return this; return this;
} }
/* HTMLBuilder *HTMLBuilder::form_postr(const String &action, Ref<WebServerRequest> request, const String &cls, const String &id) {
HTMLBuilder *HTMLBuilder::form_post(const String &action, Request *request, const String &cls, const String &id) {
form_post(action, cls, id); form_post(action, cls, id);
csrf_token(request); csrf_tokenr(request);
return this; return this;
} }
*/
HTMLTag *HTMLBuilder::input_button() { HTMLTag *HTMLBuilder::input_button() {
write_tag(); write_tag();
@ -3326,11 +3326,10 @@ HTMLBuilder *HTMLBuilder::csrf_token(const String &token) {
return this; return this;
} }
/*
HTMLBuilder *HTMLBuilder::csrf_token(Request *request) { HTMLBuilder *HTMLBuilder::csrf_tokenr(Ref<WebServerRequest> request) {
return csrf_token(request->get_csrf_token()); return csrf_token(request->get_csrf_token());
} }
*/
void HTMLBuilder::f() { void HTMLBuilder::f() {
write_tag(); write_tag();

7
modules/web/html/html_builder.h
View File

@ -3,8 +3,11 @@
#include "core/ustring.h" #include "core/ustring.h"
#include "core/reference.h"
class Request; class Request;
class HTMLBuilder; class HTMLBuilder;
class WebServerRequest;
class HTMLTag { class HTMLTag {
public: public:
@ -470,7 +473,7 @@ public:
HTMLBuilder *form_get(const String &action, const String &cls = "", const String &id = ""); HTMLBuilder *form_get(const String &action, const String &cls = "", const String &id = "");
HTMLBuilder *form_post(const String &action, const String &cls = "", const String &id = ""); HTMLBuilder *form_post(const String &action, const String &cls = "", const String &id = "");
// will add a csrf token from request // will add a csrf token from request
//HTMLBuilder *form_post(const String &action, Request *request, const String &cls = "", const String &id = ""); HTMLBuilder *form_postr(const String &action, Ref<WebServerRequest> request, const String &cls = "", const String &id = "");
HTMLTag *input_button(); HTMLTag *input_button();
HTMLTag *input_checkbox(); HTMLTag *input_checkbox();
@ -521,7 +524,7 @@ public:
HTMLBuilder *input_hidden(const String &name, const String &value); HTMLBuilder *input_hidden(const String &name, const String &value);
HTMLBuilder *csrf_token(const String &token); HTMLBuilder *csrf_token(const String &token);
//HTMLBuilder *csrf_token(Request *request); HTMLBuilder *csrf_tokenr(Ref<WebServerRequest> request);
void f(); void f();

20
modules/web/html/html_builder_bind.cpp
View File

@ -4,7 +4,7 @@
#include "core/method_bind_ext.gen.inc" #include "core/method_bind_ext.gen.inc"
//#include "web/http/request.h" #include "../http/web_server_request.h"
bool _HTMLTag::get_simple() const { bool _HTMLTag::get_simple() const {
return simple; return simple;
@ -2778,14 +2778,12 @@ Ref<_HTMLTag> _HTMLBuilder::form_post(const String &action, const String &cls, c
return tag; return tag;
} }
/* Ref<_HTMLBuilder> _HTMLBuilder::form_postr(const String &action, Ref<WebServerRequest> request, const String &cls, const String &id) {
Ref<_HTMLBuilder> _HTMLBuilder::form_post(const String &action, Request *request, const String &cls, const String &id) {
form_post(action, cls, id); form_post(action, cls, id);
csrf_token(request); csrf_tokenr(request);
return Ref<_HTMLBuilder>(this); return Ref<_HTMLBuilder>(this);
} }
*/
Ref<_HTMLBuilder> _HTMLBuilder::flabel(const String &pfor, const String &plabel, const String &cls, const String &id) { Ref<_HTMLBuilder> _HTMLBuilder::flabel(const String &pfor, const String &plabel, const String &cls, const String &id) {
Ref<_HTMLTag> t = label(); Ref<_HTMLTag> t = label();
@ -3486,11 +3484,10 @@ Ref<_HTMLBuilder> _HTMLBuilder::csrf_token(const String &token) {
return Ref<_HTMLBuilder>(this); return Ref<_HTMLBuilder>(this);
} }
/*
Ref<_HTMLBuilder> _HTMLBuilder::csrf_token(Request *request) { Ref<_HTMLBuilder> _HTMLBuilder::csrf_tokenr(Ref<WebServerRequest> request) {
return csrf_token(request->get_csrf_token()); return csrf_token(request->get_csrf_token());
} }
*/
void _HTMLBuilder::f() { void _HTMLBuilder::f() {
write_tag(); write_tag();
@ -3893,10 +3890,7 @@ void _HTMLBuilder::_bind_methods() {
ClassDB::bind_method(D_METHOD("form_get", "action", "cls", "id"), &_HTMLBuilder::form_get, "", "", ""); ClassDB::bind_method(D_METHOD("form_get", "action", "cls", "id"), &_HTMLBuilder::form_get, "", "", "");
ClassDB::bind_method(D_METHOD("form_post", "action", "cls", "id"), &_HTMLBuilder::form_post, "", "", ""); ClassDB::bind_method(D_METHOD("form_post", "action", "cls", "id"), &_HTMLBuilder::form_post, "", "", "");
ClassDB::bind_method(D_METHOD("form_postr", "action", "request", "cls", "id"), &_HTMLBuilder::form_postr, "", "");
//ClassDB::bind_method(D_METHOD("", "name", "cls", "id"), &_HTMLBuilder::, "", "", "");
// will add a csrf token from request
//Ref<_HTMLBuilder> form_post(const String &action, Request *request, const String &cls = "", const String &id = "");
ClassDB::bind_method(D_METHOD("input_button", "name", "value", "cls", "id"), &_HTMLBuilder::input_button, "", "", "", ""); ClassDB::bind_method(D_METHOD("input_button", "name", "value", "cls", "id"), &_HTMLBuilder::input_button, "", "", "", "");
ClassDB::bind_method(D_METHOD("input_checkbox", "name", "value", "checked", "cls", "id"), &_HTMLBuilder::input_checkbox, "", "", false, "", ""); ClassDB::bind_method(D_METHOD("input_checkbox", "name", "value", "checked", "cls", "id"), &_HTMLBuilder::input_checkbox, "", "", false, "", "");
@ -3924,7 +3918,7 @@ void _HTMLBuilder::_bind_methods() {
ClassDB::bind_method(D_METHOD("flabel", "pfor", "plabel", "cls", "id"), &_HTMLBuilder::flabel, "", ""); ClassDB::bind_method(D_METHOD("flabel", "pfor", "plabel", "cls", "id"), &_HTMLBuilder::flabel, "", "");
ClassDB::bind_method(D_METHOD("csrf_token", "token"), &_HTMLBuilder::csrf_token); ClassDB::bind_method(D_METHOD("csrf_token", "token"), &_HTMLBuilder::csrf_token);
//ClassDB::bind_method(D_METHOD("csrf_token", "request"), &_HTMLBuilder::csrf_token); ClassDB::bind_method(D_METHOD("csrf_tokenr", "request"), &_HTMLBuilder::csrf_tokenr);
ClassDB::bind_method(D_METHOD("f"), &_HTMLBuilder::f); ClassDB::bind_method(D_METHOD("f"), &_HTMLBuilder::f);

5
modules/web/html/html_builder_bind.h
View File

@ -7,6 +7,7 @@
#include "core/reference.h" #include "core/reference.h"
class _HTMLBuilder; class _HTMLBuilder;
class WebServerRequest;
class _HTMLTag : public Reference { class _HTMLTag : public Reference {
GDCLASS(_HTMLTag, Reference) GDCLASS(_HTMLTag, Reference)
@ -472,7 +473,7 @@ public:
Ref<_HTMLTag> form_get(const String &action = "", const String &cls = "", const String &id = ""); Ref<_HTMLTag> form_get(const String &action = "", const String &cls = "", const String &id = "");
Ref<_HTMLTag> form_post(const String &action = "", const String &cls = "", const String &id = ""); Ref<_HTMLTag> form_post(const String &action = "", const String &cls = "", const String &id = "");
// will add a csrf token from request // will add a csrf token from request
//Ref<_HTMLBuilder> form_post(const String &action, Request *request, const String &cls = "", const String &id = ""); Ref<_HTMLBuilder> form_postr(const String &action, Ref<WebServerRequest> request, const String &cls = "", const String &id = "");
Ref<_HTMLTag> input_button(const String &name = "", const String &value = "", const String &cls = "", const String &id = ""); Ref<_HTMLTag> input_button(const String &name = "", const String &value = "", const String &cls = "", const String &id = "");
Ref<_HTMLTag> input_checkbox(const String &name = "", const String &value = "", const bool checked = false, const String &cls = "", const String &id = ""); Ref<_HTMLTag> input_checkbox(const String &name = "", const String &value = "", const bool checked = false, const String &cls = "", const String &id = "");
@ -500,7 +501,7 @@ public:
Ref<_HTMLBuilder> flabel(const String &pfor, const String &plabel, const String &cls = "", const String &id = ""); Ref<_HTMLBuilder> flabel(const String &pfor, const String &plabel, const String &cls = "", const String &id = "");
Ref<_HTMLBuilder> csrf_token(const String &token); Ref<_HTMLBuilder> csrf_token(const String &token);
//Ref<_HTMLBuilder> csrf_token(Request *request); Ref<_HTMLBuilder> csrf_tokenr(Ref<WebServerRequest> request);
void f(); void f();