diff --git a/HEADS b/HEADS index 1533138..778d0dd 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"master": "0c6c20bd64ebe3a9fe798af793f3181aeb3fd0e5"}} \ No newline at end of file +{"engine": {"master": "f498628ee1d76781a62d72e7fd9bfdbd211ad95d"}} \ No newline at end of file diff --git a/app/ccms_root.cpp b/app/ccms_root.cpp index 805578f..4e101db 100644 --- a/app/ccms_root.cpp +++ b/app/ccms_root.cpp @@ -37,7 +37,7 @@ void CCMSRoot::handle_request_main(Request *request) { // this is a hack, until I have a simple index node, or port contentcontroller. if (request->get_path_segment_count() == 0) { - index(request); + _handle_request_main(request); return; } @@ -52,6 +52,15 @@ void CCMSRoot::handle_request_main(Request *request) { handler->handle_request_main(request); } +void CCMSRoot::_handle_request_main(Request *request) { + // ENSURE_LOGIN(request); + + add_menu(request); + + request->body += "test"; + request->compile_and_send_body(); +} + bool CCMSRoot::is_logged_in(Request *request) { if (!request->session.is_valid()) { return false; @@ -62,15 +71,6 @@ bool CCMSRoot::is_logged_in(Request *request) { return u.is_valid(); } -void CCMSRoot::index(Request *request) { - // ENSURE_LOGIN(request); - - add_menu(request); - - request->body += "test"; - request->compile_and_send_body(); -} - void CCMSRoot::add_menu(Request *request) { request->head += menu_head; diff --git a/app/ccms_root.h b/app/ccms_root.h index fa6cefa..f416b23 100644 --- a/app/ccms_root.h +++ b/app/ccms_root.h @@ -30,11 +30,10 @@ class CCMSRoot : public WebRoot { public: void handle_request_main(Request *request); + void _handle_request_main(Request *request); bool is_logged_in(Request *request); - void index(Request *request); - void add_menu(Request *request); void setup_middleware();