From 79554857722e7302f8a6074792079cd97fe1214d Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Fri, 12 Feb 2010 12:56:04 +0100 Subject: [PATCH] Inizio migrazione a libgdaex e senza la dipendenza di libconfi. --- .gitignore | 25 ++ autogen.sh | 101 +----- config.h.in | 10 + configure.ac | 15 +- data/libautedb/glade/autedb.glade | 543 ++++++++++++------------------ src/Makefile.am | 4 +- src/aute_db.c | 306 +++++++++++------ 7 files changed, 477 insertions(+), 527 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..08f49ef --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +COPYING +INSTALL +Makefile +Makefile.in +aclocal.m4 +autom4te.cache/ +config.guess +config.log +config.status +config.sub +configure +depcomp +version.xml +gtk-doc.make +install-sh +libaute.pc +libtool +ltmain.sh +missing +.deps +.libs +*.lo +*.o +*.la +*~ diff --git a/autogen.sh b/autogen.sh index c8462f7..2b9d0ee 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,98 +1,23 @@ -#!/bin/sh +#!/bin/bash # Run this to generate all the initial makefiles, etc. srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -ORIGDIR=`pwd` -cd $srcdir -PROJECT=libautedb -TEST_TYPE=-f -FILE=configure.ac +PKG_NAME="libaute-db" -DIE=0 - -have_libtool=false -if libtoolize --version < /dev/null > /dev/null 2>&1 ; then - libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` - case $libtool_version in - 1.4*|1.5*) - have_libtool=true - ;; - esac -fi -if $have_libtool ; then : ; else - echo - echo "You must have libtool 1.4 installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" - DIE=1 -fi - -(gtkdocize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have gtk-doc installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" - DIE=1 +(test -f $srcdir/configure.ac \ + && test -d $srcdir/src \ + && test -f $srcdir/src/aute_db.c) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level libaute directory" + exit 1 } -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" - DIE=1 +which gnome-autogen.sh || { + echo "You need to install gnome-common from GNOME and make" + echo "sure the gnome-autogen.sh script is in your \$PATH." + exit 1 } -if automake --version < /dev/null > /dev/null 2>&1 ; then - AUTOMAKE=automake - ACLOCAL=aclocal -else - echo - echo "You must have automake 1.7.x installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" - DIE=1 -fi - -if test "$DIE" -eq 1; then - exit 1 -fi - -test $TEST_TYPE $FILE || { - echo "You must run this script in the top-level $PROJECT directory" - exit 1 -} - -if test -z "$AUTOGEN_SUBDIR_MODE"; then - if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." - fi -fi - -rm -rf autom4te.cache - -# README and INSTALL are required by automake, but may be deleted by clean -# up rules. to get automake to work, simply touch these here, they will be -# regenerated from their corresponding *.in files by ./configure anyway. -touch README INSTALL - -$ACLOCAL || exit $? - -libtoolize --force || exit $? -gtkdocize || exit $? - -autoheader || exit $? - -$AUTOMAKE --add-missing || exit $? -autoconf || exit $? -cd $ORIGDIR || exit $? - -if test -z "$AUTOGEN_SUBDIR_MODE"; then - $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? - - echo - echo "Now type 'make' to compile $PROJECT." -fi +USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/config.h.in b/config.h.in index 0e1824b..95d491c 100644 --- a/config.h.in +++ b/config.h.in @@ -6,6 +6,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* libconfi is present */ +#undef HAVE_LIBCONFI + /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -30,6 +33,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE @@ -45,6 +52,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff --git a/configure.ac b/configure.ac index dddfc04..ef11dcc 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([libaute-db], [0.0.1], [azagli@libero.it]) +AC_INIT([libaute-db], [0.0.2], [azagli@libero.it]) AC_CONFIG_SRCDIR([src/aute_db.c]) AC_CONFIG_HEADER([config.h]) @@ -18,14 +18,19 @@ AC_PROG_CC AC_PROG_LIBTOOL # Checks for libraries. -PKG_CHECK_MODULES(LIBAUTEDB, [gtk+-2.0 >= 2.8.0 - libglade-2.0 >= 2.6.0 - libgdaobj >= 0.0.2 - libaute >= 0.0.1]) +PKG_CHECK_MODULES(LIBAUTEDB, [gtk+-2.0 >= 2.16.0 + libgdaex >= 0.1.0 + libaute >= 0.0.2]) AC_SUBST(LIBAUTEDB_CFLAGS) AC_SUBST(LIBAUTEDB_LIBS) +PKG_CHECK_MODULES(LIBCONFI, [libconfi >= 0.0.2], AC_DEFINE(HAVE_LIBCONFI, [1], [libconfi is present]), have_libconfi=yes) + +AM_CONDITIONAL(HAVE_LIBCONFI, test x"$have_libconfi" = "xyes") +AC_SUBST(LIBCONFI_CFLAGS) +AC_SUBST(LIBCONFI_LIBS) + AM_PATH_LIBGCRYPT(1.2.1, :, [AC_MSG_ERROR([libgcrypt >= 1.2.1 not found.])]) AC_SUBST(LIBGCRYPT_CFLAGS) diff --git a/data/libautedb/glade/autedb.glade b/data/libautedb/glade/autedb.glade index 1eb9497..382a861 100644 --- a/data/libautedb/glade/autedb.glade +++ b/data/libautedb/glade/autedb.glade @@ -1,336 +1,207 @@ - - - - - - - True - Autenticazione - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - True - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 5 - True - 3 - 2 - False - 3 - 3 - - - - True - Utente - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Password - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - * - True - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - False - 0 - - True - * - True - - - 1 - 2 - 1 - 2 - - - - - - - True - True - False - 0 - - - - 5 - True - 2 - 2 - False - 3 - 3 - - - - True - Nuova - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Conferma - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - False - 0 - - True - * - True - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - False - 0 - - True - * - True - - - 1 - 2 - 1 - 2 - - - - - - - - - True - _Cambia password - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - 2 - 2 - 3 - fill - - - - - 0 - True - True - - - - - - - + + + + + + True + Autenticazione + True + dialog + + + True + + + True + 5 + 3 + 2 + 3 + 3 + + + True + 0 + Utente + + + GTK_FILL + + + + + + True + 0 + Password + + + 1 + 2 + GTK_FILL + + + + + + True + True + True + + + 1 + 2 + + + + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + + + True + 5 + 2 + 2 + 3 + 3 + + + True + 0 + Nuova + + + GTK_FILL + + + + + + True + 0 + Conferma + + + 1 + 2 + GTK_FILL + + + + + + True + True + False + True + + + 1 + 2 + + + + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + + + True + _Cambia password + True + + + + + 2 + 2 + 3 + GTK_FILL + + + + + 2 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton1 + okbutton1 + + + diff --git a/src/Makefile.am b/src/Makefile.am index ea52079..e887b68 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,10 +2,12 @@ gladedir = $(datadir)/libaute-db/glade AM_CPPFLAGS = $(LIBAUTEDB_CFLAGS) \ $(LIBGCRYPT_CFLAGS) \ + $(LIBCONFI_CFLAGS) \ -DGLADEDIR=\""$(gladedir)"\" LIBS = $(LIBAUTEDB_LIBS) \ - $(LIBGCRYPT_LIBS) + $(LIBGCRYPT_LIBS) \ + $(LIBCONFI_LIBS) libaute_pluginsdir = $(libdir)/libaute/plugins libaute_plugins_LTLIBRARIES = libaute-db.la diff --git a/src/aute_db.c b/src/aute_db.c index 811b9f6..31e0f68 100644 --- a/src/aute_db.c +++ b/src/aute_db.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2010 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 @@ -17,28 +17,29 @@ */ #include -#include #include -#include -#include +#include -static GtkWidget *txt_utente, - *txt_password, - *exp_cambio, - *txt_password_nuova, - *txt_password_conferma; +#ifdef HAVE_LIBCONFI + #include +#endif + +static GtkWidget *txt_utente; +static GtkWidget *txt_password; +static GtkWidget *exp_cambio; +static GtkWidget *txt_password_nuova; +static GtkWidget *txt_password_conferma; /* PRIVATE */ +#ifdef HAVE_LIBCONFI static gboolean -get_connection_parameters (Confi *confi, gchar **provider_id, gchar **cnc_string) +get_connection_parameters_from_confi (Confi *confi, gchar **cnc_string) { gboolean ret = TRUE; - *provider_id = confi_path_get_value (confi, "aute/aute-db/db/provider_id"); *cnc_string = confi_path_get_value (confi, "aute/aute-db/db/cnc_string"); - if (*provider_id == NULL || *cnc_string == NULL - || strcmp (g_strstrip (*provider_id), "") == 0 + if (*cnc_string == NULL || strcmp (g_strstrip (*cnc_string), "") == 0) { ret = FALSE; @@ -46,6 +47,7 @@ get_connection_parameters (Confi *confi, gchar **provider_id, gchar **cnc_string return ret; } +#endif /** * cifra_password: @@ -74,41 +76,72 @@ static gchar } static gchar -*controllo (Confi *confi) +*controllo (GSList *parameters) { gchar *sql; gchar *utente = ""; gchar *password; gchar *password_nuova; - gchar *provider_id; gchar *cnc_string; - GdaO *gdao; + GdaEx *gdaex; GdaDataModel *dm; utente = g_strstrip (g_strdup (gtk_entry_get_text (GTK_ENTRY (txt_utente)))); password = g_strstrip (g_strdup (gtk_entry_get_text (GTK_ENTRY (txt_password)))); + cnc_string = NULL; + +#ifdef HAVE_LIBCONFI + /* the first and only parameters must be a Confi object */ /* leggo i parametri di connessione dalla configurazione */ - if (!get_connection_parameters (confi, &provider_id, &cnc_string)) return NULL; + if (IS_CONFI (parameters->data)) + { + if (!get_connection_parameters_from_confi (CONFI (parameters->data), &cnc_string)) + { + cnc_string = NULL; + } + } +#endif - /* creo un oggetto GdaO */ - gdao = gdao_new_from_string (NULL, provider_id, cnc_string); - if (gdao == NULL) return NULL; + if (cnc_string == NULL) + { + GSList *param; + + param = g_slist_next (parameters); + if (param != NULL && param->data != NULL) + { + cnc_string = g_strdup ((gchar *)param->data); + cnc_string = g_strstrip (cnc_string); + if (g_strcmp0 (cnc_string, "") == 0) + { + cnc_string = NULL; + } + } + } + + if (cnc_string == NULL) + { + return NULL; + } + + /* creo un oggetto GdaEx */ + gdaex = gdaex_new_from_string (cnc_string); + if (gdaex == NULL) return NULL; sql = g_strdup_printf ("SELECT codice FROM utenti " "WHERE codice = '%s' AND " "password = '%s' AND " "status <> 'E'", - gdao_strescape (utente, NULL), - gdao_strescape (cifra_password (password), NULL)); - dm = gdao_query (gdao, sql); + gdaex_strescape (utente, NULL), + gdaex_strescape (cifra_password (password), NULL)); + dm = gdaex_query (gdaex, sql); if (dm == NULL || gda_data_model_get_n_rows (dm) <= 0) { g_warning ("Utente o password non validi."); return NULL; } - utente = g_strstrip (g_strdup (gdao_data_model_get_field_value_stringify_at (dm, 0, "codice"))); + utente = g_strstrip (g_strdup (gdaex_data_model_get_field_value_stringify_at (dm, 0, "codice"))); if (strcmp (utente, "") != 0 && gtk_expander_get_expanded (GTK_EXPANDER (exp_cambio))) @@ -130,9 +163,9 @@ static gchar sql = g_strdup_printf ("UPDATE utenti " "SET password = '%s' " "WHERE codice = '%s'", - gdao_strescape (cifra_password (password_nuova), NULL), - gdao_strescape (utente, NULL)); - if (gdao_execute (gdao, sql) == -1) + gdaex_strescape (cifra_password (password_nuova), NULL), + gdaex_strescape (utente, NULL)); + if (gdaex_execute (gdao, sql) == -1) { /* TO DO */ g_warning ("Errore durante la modifica della password."); @@ -146,18 +179,26 @@ static gchar /* PUBLIC */ gchar -*autentica (Confi *confi) +*autentica (GSList *parameters) { + GError *error; gchar *ret = NULL; - GladeXML *gla_main = glade_xml_new (GLADEDIR "/autedb.glade", NULL, NULL); - GtkWidget *diag = glade_xml_get_widget (gla_main, "diag_main"); + error = NULL; + + GtkBuilder *gtkbuilder = gtk_builder_new (); + if (!gtk_builder_add_from_file (gtkbuilder, GLADEDIR "/autedb.glade", &error)) + { + return NULL; + } + + GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "diag_main")); - txt_utente = glade_xml_get_widget (gla_main, "txt_utente"); - txt_password = glade_xml_get_widget (gla_main, "txt_password"); - exp_cambio = glade_xml_get_widget (gla_main, "exp_cambio"); - txt_password_nuova = glade_xml_get_widget (gla_main, "txt_password_nuova"); - txt_password_conferma = glade_xml_get_widget (gla_main, "txt_password_conferma"); + txt_utente = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "txt_utente")); + txt_password = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "txt_password")); + exp_cambio = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "exp_cambio")); + txt_password_nuova = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "txt_password_nuova")); + txt_password_conferma = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "txt_password_conferma")); /* imposto di default l'utente corrente della sessione */ gtk_entry_set_text (GTK_ENTRY (txt_utente), g_get_user_name ()); @@ -167,7 +208,7 @@ gchar { case GTK_RESPONSE_OK: /* controllo dell'utente e della password */ - ret = controllo (confi); + ret = controllo (parameters); break; case GTK_RESPONSE_CANCEL: @@ -179,34 +220,27 @@ gchar } gtk_widget_destroy (diag); - g_object_unref (gla_main); + g_object_unref (gtkbuilder); return ret; } /** * crea_utente: - * @confi: + * @parameters: * @codice: * @password: */ gboolean -crea_utente (Confi *confi, const gchar *codice, const gchar *password) +crea_utente (GSList *parameters, const gchar *codice, const gchar *password) { gchar *codice_; gchar *password_; - gchar *provider_id; gchar *cnc_string; gchar *sql; - GdaO *gdao; + GdaEx *gdaex; GdaDataModel *dm; - if (!IS_CONFI (confi)) - { - g_warning ("confi non è un oggetto Confi valido."); - return FALSE; - } - if (codice == FALSE || password == NULL) { g_warning ("codice o password nulli."); @@ -222,58 +256,83 @@ crea_utente (Confi *confi, const gchar *codice, const gchar *password) return FALSE; } + cnc_string = NULL; + +#ifdef HAVE_LIBCONFI + /* the first and only parameters must be a Confi object */ /* leggo i parametri di connessione dalla configurazione */ - if (!get_connection_parameters (confi, &provider_id, &cnc_string)) return FALSE; + if (IS_CONFI (parameters->data)) + { + if (!get_connection_parameters_from_confi (CONFI (parameters->data), &cnc_string)) + { + cnc_string = NULL; + } + } +#endif + + if (cnc_string == NULL) + { + GSList *param; + + param = g_slist_next (parameters); + if (param != NULL && param->data != NULL) + { + cnc_string = g_strdup ((gchar *)param->data); + cnc_string = g_strstrip (cnc_string); + if (g_strcmp0 (cnc_string, "") == 0) + { + cnc_string = NULL; + } + } + } + + if (cnc_string == NULL) + { + return FALSE; + } /* creo un oggetto GdaO */ - gdao = gdao_new_from_string (NULL, provider_id, cnc_string); - if (gdao == NULL) return FALSE; + gdaex = gdaex_new_from_string (cnc_string); + if (gdaex == NULL) return FALSE; /* controllo se esiste gia' */ - sql = g_strdup_printf ("SELECT codice FROM utenti WHERE codice = '%s'", - gdao_strescape (codice_, NULL)); - dm = gdao_query (gdao, sql); + sql = g_strdup_printf ("SELECT codice FROM utenti WHERE codice = '%s'", + gdaex_strescape (codice_, NULL)); + dm = gdaex_query (gdaex, sql); if (dm != NULL && gda_data_model_get_n_rows (dm) > 0) { /* aggiorno l'utente */ sql = g_strdup_printf ("UPDATE utenti SET password = '%s' WHERE codice = '%s'", - gdao_strescape (cifra_password (password_), NULL), - gdao_strescape (codice_, NULL)); + gdaex_strescape (cifra_password (password_), NULL), + gdaex_strescape (codice_, NULL)); } else { /* creo l'utente */ sql = g_strdup_printf ("INSERT INTO utenti VALUES ('%s', '%s', '')", - gdao_strescape (codice_, NULL), - gdao_strescape (cifra_password (password_), NULL)); + gdaex_strescape (codice_, NULL), + gdaex_strescape (cifra_password (password_), NULL)); } - return (gdao_execute (gdao, sql) >= 0); + return (gdaex_execute (gdaex, sql) >= 0); } /** * modifice_utente: - * @confi: + * @parameters: * @codice: * @password: */ gboolean -modifica_utente (Confi *confi, const gchar *codice, const gchar *password) +modifica_utente (GSList *parameters, const gchar *codice, const gchar *password) { gchar *codice_; gchar *password_; - gchar *provider_id; gchar *cnc_string; gchar *sql; - GdaO *gdao; + GdaEx *gdaex; GdaDataModel *dm; - if (!IS_CONFI (confi)) - { - g_warning ("confi non è un oggetto Confi valido."); - return FALSE; - } - if (codice == FALSE || password == NULL) { g_warning ("codice o password nulli."); @@ -289,54 +348,77 @@ modifica_utente (Confi *confi, const gchar *codice, const gchar *password) return FALSE; } +#ifdef HAVE_LIBCONFI + /* the first and only parameters must be a Confi object */ /* leggo i parametri di connessione dalla configurazione */ - if (!get_connection_parameters (confi, &provider_id, &cnc_string)) return FALSE; + if (IS_CONFI (parameters->data)) + { + if (!get_connection_parameters_from_confi (CONFI (parameters->data), &cnc_string)) + { + cnc_string = NULL; + } + } +#endif - /* creo un oggetto GdaO */ - gdao = gdao_new_from_string (NULL, provider_id, cnc_string); - if (gdao == NULL) return FALSE; + if (cnc_string == NULL) + { + GSList *param; + + param = g_slist_next (parameters); + if (param != NULL && param->data != NULL) + { + cnc_string = g_strdup ((gchar *)param->data); + cnc_string = g_strstrip (cnc_string); + if (g_strcmp0 (cnc_string, "") == 0) + { + cnc_string = NULL; + } + } + } + + if (cnc_string == NULL) + { + return FALSE; + } + + /* creo un oggetto GdaEx */ + gdaex = gdaex_new_from_string (cnc_string); + if (gdaex == NULL) return FALSE; /* controllo se non esiste */ - sql = g_strdup_printf ("SELECT codice FROM utenti WHERE codice = '%s'", - gdao_strescape (codice_, NULL)); - dm = gdao_query (gdao, sql); + sql = g_strdup_printf ("SELECT codice FROM utenti WHERE codice = '%s'", + gdaex_strescape (codice_, NULL)); + dm = gdaex_query (gdaex, sql); if (dm == NULL || gda_data_model_get_n_rows (dm) <= 0) { /* creo l'utente */ sql = g_strdup_printf ("INSERT INTO utenti VALUES ('%s', '%s', '')", - gdao_strescape (codice_, NULL), - gdao_strescape (cifra_password (password_), NULL)); + gdaex_strescape (codice_, NULL), + gdaex_strescape (cifra_password (password_), NULL)); } else { /* aggiorno l'utente */ sql = g_strdup_printf ("UPDATE utenti SET password = '%s' WHERE codice = '%s'", - gdao_strescape (cifra_password (password_), NULL), - gdao_strescape (codice_, NULL)); + gdaex_strescape (cifra_password (password_), NULL), + gdaex_strescape (codice_, NULL)); } - return (gdao_execute (gdao, sql) >= 0); + return (gdaex_execute (gdaex, sql) >= 0); } /** * elimina_utente: - * @confi: + * @parameters: * @codice: */ gboolean -elimina_utente (Confi *confi, const gchar *codice) +elimina_utente (GSList *parameters, const gchar *codice) { gchar *codice_; - gchar *provider_id; gchar *cnc_string; gchar *sql; - GdaO *gdao; - - if (!IS_CONFI (confi)) - { - g_warning ("confi non è un oggetto Confi valido."); - return FALSE; - } + GdaEx *gdaex; if (codice == FALSE) { @@ -352,16 +434,46 @@ elimina_utente (Confi *confi, const gchar *codice) return FALSE; } +#ifdef HAVE_LIBCONFI + /* the first and only parameters must be a Confi object */ /* leggo i parametri di connessione dalla configurazione */ - if (!get_connection_parameters (confi, &provider_id, &cnc_string)) return FALSE; + if (IS_CONFI (parameters->data)) + { + if (!get_connection_parameters_from_confi (CONFI (parameters->data), &cnc_string)) + { + cnc_string = NULL; + } + } +#endif - /* creo un oggetto GdaO */ - gdao = gdao_new_from_string (NULL, provider_id, cnc_string); - if (gdao == NULL) return FALSE; + if (cnc_string == NULL) + { + GSList *param; + + param = g_slist_next (parameters); + if (param != NULL && param->data != NULL) + { + cnc_string = g_strdup ((gchar *)param->data); + cnc_string = g_strstrip (cnc_string); + if (g_strcmp0 (cnc_string, "") == 0) + { + cnc_string = NULL; + } + } + } + + if (cnc_string == NULL) + { + return FALSE; + } + + /* creo un oggetto GdaEx */ + gdaex = gdaex_new_from_string (cnc_string); + if (gdaex == NULL) return FALSE; /* elimino _logicamente_ l'utente */ - sql = g_strdup_printf ("UPDATE utenti SET status = 'E' WHERE codice = '%s'", - gdao_strescape (codice_, NULL)); + sql = g_strdup_printf ("UPDATE utenti SET status = 'E' WHERE codice = '%s'", + gdaex_strescape (codice_, NULL)); - return (gdao_execute (gdao, sql) >= 0); + return (gdaex_execute (gdaex, sql) >= 0); } -- 2.49.0