Started login form.

diff --git a/data/bcity_fe/ctpl/Makefile.am b/data/bcity_fe/ctpl/Makefile.am
index 36db9a1e6c691e36def0e68d965360e8bcf2b887..36e45980c32cb27e41ffea07c330d1f1ce99e9f6 100644 (file)
--- 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 (file)
index 0000000..e44f297
--- /dev/null
+++ b/data/bcity_fe/ctpl/login_index.ctpl
@@ -0,0 +1,8 @@
+<form class="form-signin">
+         <h2 class="form-signin-heading">B-City</h2>
+         <label for="inputEmail" class="sr-only">Email</label>
+         <input type="email" id="inputEmail" class="form-control" placeholder="Email" required autofocus>
+         <label for="inputPassword" class="sr-only">Password</label>
+         <input type="password" id="inputPassword" class="form-control" placeholder="Password" required>
+         <button class="btn btn-lg btn-primary btn-block" type="submit">Accedi</button>
+</form>

diff --git a/data/bcity_fe/ctpl/template.ctpl b/data/bcity_fe/ctpl/template.ctpl
index dd977e5df55c4181445d82094b09c1ce18525170..01fb7d10dcd6ca6073d9efe035358434f40dd558 100644 (file)
--- a/data/bcity_fe/ctpl/template.ctpl
+++ b/data/bcity_fe/ctpl/template.ctpl
@@ -8,14 +8,16 @@
     <title>B-City</title>
 
     <!-- Bootstrap -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
+       <!-- Latest compiled and minified CSS -->
+       <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
+
        <!-- Optional theme -->
-       <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
+       <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css" integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r" crossorigin="anonymous">
 
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
+       <!-- Latest compiled and minified JavaScript -->
+       <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
 
        {head}
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 851a65c4737119a19f5dca032c5678a9c9986e96..c92a86a9e47d5e201484e8c72b5e3cac8fb0bc87 100644 (file)
--- 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 a5493f9fca5c752c1f0888220903f9a7ab656d0b..034033b4dec1a400233309246b584cc015dd8cab 100644 (file)
--- 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 0c5bd7230ed5d58ba7e9dc49f139ef5f21ce7c5b..e302ff10173da18924e2e02953760c08268ab29e 100644 (file)
--- 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 fbc95b311370dc3494b9b65b79e4b94f8653e964..5f714565e6a28d3c2163d628833f916de3843826 100644 (file)
--- a/src/index.c
+++ b/src/index.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Andrea Zagli <a.zagli@comune.scandicci.fi.it>
+ * Copyright (C) 2016 Andrea Zagli <azagli@libero.it>
  *
  *  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 (file)
index 0000000..3e25211
--- /dev/null
+++ b/src/login.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2016 Andrea Zagli <azagli@libero.it>
+ *
+ *  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 <config.h>
+#endif
+
+#include <syslog.h>
+
+#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 (file)
index 0000000..ae987b7
--- /dev/null
+++ b/src/login.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2016 Andrea Zagli <azagli@libero.it>
+ *
+ *  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 <config.h>
+#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 268cad4221b38d33d4b45f665b3b6813acd527a0..acc2f2910239c21045d261c4cccb1c83531afcf8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -26,6 +26,7 @@
 #include <libgdaex/libgdaex.h>
 
 #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);