From 5777df3386de82584e764a0d605d4fe37bd1f967 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 30 Jan 2016 11:28:27 +0100 Subject: [PATCH] Started login form. --- data/bcity_fe/ctpl/Makefile.am | 3 +- data/bcity_fe/ctpl/login_index.ctpl | 8 +++++ data/bcity_fe/ctpl/template.ctpl | 12 ++++--- src/Makefile.am | 2 ++ src/commons.c | 6 ++++ src/commons.h | 1 + src/index.c | 8 ++++- src/login.c | 51 +++++++++++++++++++++++++++++ src/login.h | 33 +++++++++++++++++++ src/main.c | 5 +++ 10 files changed, 122 insertions(+), 7 deletions(-) create mode 100644 data/bcity_fe/ctpl/login_index.ctpl create mode 100644 src/login.c create mode 100644 src/login.h diff --git a/data/bcity_fe/ctpl/Makefile.am b/data/bcity_fe/ctpl/Makefile.am index 36db9a1..36e4598 100644 --- a/data/bcity_fe/ctpl/Makefile.am +++ b/data/bcity_fe/ctpl/Makefile.am @@ -2,6 +2,7 @@ ctpldir = $(datadir)/$(PACKAGE)/ctpl ctpl_DATA = \ template.ctpl \ - index_index.ctpl + index_index.ctpl \ + login_index.ctpl EXTRA_DIST = diff --git a/data/bcity_fe/ctpl/login_index.ctpl b/data/bcity_fe/ctpl/login_index.ctpl new file mode 100644 index 0000000..e44f297 --- /dev/null +++ b/data/bcity_fe/ctpl/login_index.ctpl @@ -0,0 +1,8 @@ +
+ + + + + + +
diff --git a/data/bcity_fe/ctpl/template.ctpl b/data/bcity_fe/ctpl/template.ctpl index dd977e5..01fb7d1 100644 --- a/data/bcity_fe/ctpl/template.ctpl +++ b/data/bcity_fe/ctpl/template.ctpl @@ -8,14 +8,16 @@ B-City - + + + - + - - - + + + {head} diff --git a/src/Makefile.am b/src/Makefile.am index 851a65c..c92a86a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,4 +17,6 @@ bcity_fe_SOURCES = \ commons.h \ index.c \ index.h \ + login.c \ + login.h \ main.c diff --git a/src/commons.c b/src/commons.c index a5493f9..034033b 100644 --- a/src/commons.c +++ b/src/commons.c @@ -84,3 +84,9 @@ gchar return ret; } + +gboolean +get_is_logged (Commons *commons) +{ + return (zak_cgi_session_get_value (commons->zcgi_session, "user_name") != NULL); +} diff --git a/src/commons.h b/src/commons.h index 0c5bd72..e302ff1 100644 --- a/src/commons.h +++ b/src/commons.h @@ -50,6 +50,7 @@ typedef struct gchar *get_ctpl_filled (const gchar *ctpl_file, CtplEnviron *env); +gboolean get_is_logged (Commons *commons); #endif /* __COMMONS_H__ */ diff --git a/src/index.c b/src/index.c index fbc95b3..5f71456 100644 --- a/src/index.c +++ b/src/index.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Andrea Zagli + * Copyright (C) 2016 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,6 +34,12 @@ index_index (GMatchInfo *minfo, gpointer user_data) Commons *commons = (Commons *)user_data; + if (!get_is_logged (commons)) + { + zak_cgi_main_redirect (commons->zcgi_main, "/bcity/bcity_fe/login/index"); + return; + } + filename = g_build_filename (commons->ctpldir, "index_index.ctpl", NULL); content = get_ctpl_filled (filename, NULL); g_free (filename); diff --git a/src/login.c b/src/login.c new file mode 100644 index 0000000..3e25211 --- /dev/null +++ b/src/login.c @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2016 Andrea Zagli + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H + #include +#endif + +#include + +#include "login.h" + +void +login_index (GMatchInfo *minfo, gpointer user_data) +{ + CtplEnviron *env; + + gchar *filename; + gchar *content; + + Commons *commons = (Commons *)user_data; + + filename = g_build_filename (commons->ctpldir, "login_index.ctpl", NULL); + content = get_ctpl_filled (filename, NULL); + g_free (filename); + + env = ctpl_environ_new (); + ctpl_environ_push_string (env, "head", ""); + ctpl_environ_push_string (env, "body", content); + + filename = g_build_filename (commons->ctpldir, "template.ctpl", NULL); + g_string_printf (commons->out, "%s", + get_ctpl_filled (filename, env)); + g_free (filename); + + g_free (content); +} diff --git a/src/login.h b/src/login.h new file mode 100644 index 0000000..ae987b7 --- /dev/null +++ b/src/login.h @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2016 Andrea Zagli + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __LOGIN_H__ +#define __LOGIN_H__ + + +#ifdef HAVE_CONFIG_H + #include +#endif + +#include "commons.h" + + +void login_index (GMatchInfo *minfo, gpointer user_data); + + +#endif /* __INDEX_H__ */ diff --git a/src/main.c b/src/main.c index 268cad4..acc2f29 100644 --- a/src/main.c +++ b/src/main.c @@ -26,6 +26,7 @@ #include #include "commons.h" +#include "login.h" #include "index.h" int @@ -91,10 +92,14 @@ main (int argc, char *argv[]) /* Routing */ zcgi_url = zak_cgi_url_new (commons->zcgi_main); + zak_cgi_url_connect (zcgi_url, "", (ZakCgiUrlConnectedFunction)index_index, commons); zak_cgi_url_connect (zcgi_url, "/", (ZakCgiUrlConnectedFunction)index_index, commons); zak_cgi_url_connect (zcgi_url, "/index[/]?", (ZakCgiUrlConnectedFunction)index_index, commons); zak_cgi_url_connect (zcgi_url, "/index/index", (ZakCgiUrlConnectedFunction)index_index, commons); + zak_cgi_url_connect (zcgi_url, "/login[/]?", (ZakCgiUrlConnectedFunction)login_index, commons); + zak_cgi_url_connect (zcgi_url, "/login/index", (ZakCgiUrlConnectedFunction)login_index, commons); + zak_cgi_url_dispatch (zcgi_url); header = g_string_new (ZAK_CGI_STANDARD_HEADER_HTML); -- 2.49.0