From 1b73b2c0736583274c4b3bd7a1ae0faf6990fdc4 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 7 Feb 2016 13:57:40 +0100 Subject: [PATCH] Started new user registration. --- configure.ac | 1 + data/bcity_fe/Makefile.am | 2 +- data/bcity_fe/ctpl/Makefile.am | 3 +- data/bcity_fe/ctpl/login_index.ctpl | 4 + data/bcity_fe/ctpl/user_register.ctpl | 4 + data/bcity_fe/form/Makefile.am | 6 ++ data/bcity_fe/form/user_register.form | 37 +++++++++ src/Makefile.am | 6 +- src/commons.h | 1 + src/main.c | 8 +- src/user.c | 114 ++++++++++++++++++++++++++ src/user.h | 33 ++++++++ 12 files changed, 215 insertions(+), 4 deletions(-) create mode 100644 data/bcity_fe/ctpl/user_register.ctpl create mode 100644 data/bcity_fe/form/Makefile.am create mode 100644 data/bcity_fe/form/user_register.form create mode 100644 src/user.c create mode 100644 src/user.h diff --git a/configure.ac b/configure.ac index 1d1248b..fc359a2 100644 --- a/configure.ac +++ b/configure.ac @@ -83,6 +83,7 @@ AC_CONFIG_FILES([ data/Makefile data/bcity_fe/Makefile data/bcity_fe/ctpl/Makefile + data/bcity_fe/form/Makefile doc/Makefile doc/bcity_fe/Makefile doc/bcity_fe/db/Makefile diff --git a/data/bcity_fe/Makefile.am b/data/bcity_fe/Makefile.am index c909be9..3353336 100644 --- a/data/bcity_fe/Makefile.am +++ b/data/bcity_fe/Makefile.am @@ -1 +1 @@ -SUBDIRS = ctpl +SUBDIRS = ctpl form diff --git a/data/bcity_fe/ctpl/Makefile.am b/data/bcity_fe/ctpl/Makefile.am index 7b71168..1f4969a 100644 --- a/data/bcity_fe/ctpl/Makefile.am +++ b/data/bcity_fe/ctpl/Makefile.am @@ -5,6 +5,7 @@ ctpl_DATA = \ index_index.ctpl \ index_category.ctpl \ index_save.ctpl \ - login_index.ctpl + login_index.ctpl \ + user_register.ctpl EXTRA_DIST = diff --git a/data/bcity_fe/ctpl/login_index.ctpl b/data/bcity_fe/ctpl/login_index.ctpl index 35c9e09..439d92a 100644 --- a/data/bcity_fe/ctpl/login_index.ctpl +++ b/data/bcity_fe/ctpl/login_index.ctpl @@ -7,3 +7,7 @@ +
+o
+registrati +
diff --git a/data/bcity_fe/ctpl/user_register.ctpl b/data/bcity_fe/ctpl/user_register.ctpl new file mode 100644 index 0000000..81be586 --- /dev/null +++ b/data/bcity_fe/ctpl/user_register.ctpl @@ -0,0 +1,4 @@ +

B-City

+ +{form_msg} +{form} diff --git a/data/bcity_fe/form/Makefile.am b/data/bcity_fe/form/Makefile.am new file mode 100644 index 0000000..7c15d87 --- /dev/null +++ b/data/bcity_fe/form/Makefile.am @@ -0,0 +1,6 @@ +formdir = $(datadir)/$(PACKAGE)/form + +form_DATA = \ + user_register.form + +EXTRA_DIST = diff --git a/data/bcity_fe/form/user_register.form b/data/bcity_fe/form/user_register.form new file mode 100644 index 0000000..3404934 --- /dev/null +++ b/data/bcity_fe/form/user_register.form @@ -0,0 +1,37 @@ + + + + + email + + + + + + email_conferma + + + + + + name + + + + + + + surname + + + + + + + submit + Conferma + + + + + diff --git a/src/Makefile.am b/src/Makefile.am index c92a86a..b71a430 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,10 +1,12 @@ configdir = $(datadir)/$(PACKAGE)/conf ctpldir = $(datadir)/$(PACKAGE)/ctpl +formdir = $(datadir)/$(PACKAGE)/form imagesdir = $(datadir)/$(PACKAGE)/images AM_CPPFLAGS = $(BCITYFE_CFLAGS) \ -DCONFIGDIR=\""$(configdir)"\" \ -DCTPLDIR=\""$(ctpldir)"\" \ + -DFORMDIR=\""$(formdir)"\" \ -DIMAGESDIR=\""$(imagesdir)"\" LIBS = $(BCITYFE_LIBS) \ @@ -19,4 +21,6 @@ bcity_fe_SOURCES = \ index.h \ login.c \ login.h \ - main.c + main.c \ + user.c \ + user.h diff --git a/src/commons.h b/src/commons.h index f328484..a239d5a 100644 --- a/src/commons.h +++ b/src/commons.h @@ -34,6 +34,7 @@ typedef struct { gchar *configdir; gchar *ctpldir; + gchar *formdir; gchar *imagesdir; GKeyFile *config; diff --git a/src/main.c b/src/main.c index cbf9888..65e196f 100644 --- a/src/main.c +++ b/src/main.c @@ -26,8 +26,9 @@ #include #include "commons.h" -#include "login.h" #include "index.h" +#include "login.h" +#include "user.h" int main (int argc, char *argv[]) @@ -53,6 +54,7 @@ main (int argc, char *argv[]) commons->configdir = g_strdup (CONFIGDIR); commons->ctpldir = g_strdup (CTPLDIR); + commons->formdir = g_strdup (FORMDIR); commons->imagesdir = g_strdup (IMAGESDIR); /* leggo la configurazione dal file */ @@ -140,6 +142,10 @@ main (int argc, char *argv[]) zak_cgi_url_connect (zcgi_url, "/login/index", (ZakCgiUrlConnectedFunction)login_index, commons); zak_cgi_url_connect (zcgi_url, "/login/logout", (ZakCgiUrlConnectedFunction)login_logout, commons); + + zak_cgi_url_connect (zcgi_url, "/user[/]?", (ZakCgiUrlConnectedFunction)user_register, commons); + zak_cgi_url_connect (zcgi_url, "/user/register", (ZakCgiUrlConnectedFunction)user_register, commons); + zak_cgi_url_dispatch (zcgi_url); header = g_string_new (ZAK_CGI_STANDARD_HEADER_HTML); diff --git a/src/user.c b/src/user.c new file mode 100644 index 0000000..f984d0c --- /dev/null +++ b/src/user.c @@ -0,0 +1,114 @@ +/* + * 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 "user.h" + +void +user_register (GMatchInfo *minfo, gpointer user_data) +{ + CtplEnviron *env; + + ZakCgiForm *form; + + gchar *filename; + gchar *content; + + guint i; + GPtrArray *ar_messages; + GString *msg; + + Commons *commons = (Commons *)user_data; + + if (get_is_logged (commons)) + { + zak_cgi_main_redirect (commons->zcgi_main, "/bcity/bcity_fe/index/index"); + return; + } + + env = ctpl_environ_new (); + ctpl_environ_push_string (env, "form_msg", ""); + ctpl_environ_push_string (env, "form", ""); + + form = zak_cgi_form_new (commons->zcgi_main, + "method", "post", + "action", "/bcity/bcity_fe/user/register", + NULL); + + if (zak_form_form_load_from_file (ZAK_FORM_FORM (form), FORMDIR "/user_register.form")) + { + if (zak_cgi_main_is_post (commons->zcgi_main)) + { + /* validating the form */ + zak_cgi_form_bind (form); + if (zak_form_form_is_valid (ZAK_FORM_FORM (form))) + { + ctpl_environ_push_string (env, "form", "Form is valid!!!"); + } + else + { + ctpl_environ_push_string (env, "form", zak_cgi_form_render (form)); + + ar_messages = zak_form_form_get_messages (ZAK_FORM_FORM (form)); + if (ar_messages != NULL) + { + msg = g_string_new (""); + for (i = 0; i < ar_messages->len; i++) + { + g_string_append_printf (msg, "\n
  • %s
    • ", (gchar *)g_ptr_array_index (ar_messages, i)); + } + if (g_strcmp0 (msg->str, "") != 0) + { + g_string_prepend (msg, "

      \n"); + g_string_append (msg, "

    \n"); + + ctpl_environ_push_string (env, "form_msg", msg->str); + } + g_string_free (msg, TRUE); + } + } + } + else + { + ctpl_environ_push_string (env, "form", zak_cgi_form_render (form)); + } + } + + filename = g_build_filename (commons->ctpldir, "user_register.ctpl", NULL); + content = get_ctpl_filled (filename, env); + g_free (filename); + ctpl_environ_unref (env); + + env = ctpl_environ_new (); + ctpl_environ_push_string (env, "head", ""); + ctpl_environ_push_string (env, "body_tag", ""); + 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); + ctpl_environ_unref (env); + + g_free (content); +} diff --git a/src/user.h b/src/user.h new file mode 100644 index 0000000..863d8f2 --- /dev/null +++ b/src/user.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 __USER_H__ +#define __USER_H__ + + +#ifdef HAVE_CONFIG_H + #include +#endif + +#include "commons.h" + + +void user_register (GMatchInfo *minfo, gpointer user_data); + + +#endif /* __INDEX_H__ */ -- 2.49.0