* This file is part of DisOrder
* Copyright (C) 2008 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 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.
- *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file disobedience/users.c
* @brief User management for Disobedience
*
* When you select 'add' a new empty set of details are displayed to be edited.
* Again Apply will commit them.
+ *
+ * TODO:
+ * - enter new username in the GtkTreeView
+ * - should have a cancel or close button, consistent with properties and login
*/
#include "disobedience.h"
#include "bits.h"
+#include "sendmail.h"
+
+static void users_details_sensitize_all(void);
+static void users_set_report(const char *msg);
static GtkWidget *users_window;
static GtkListStore *users_list;
static GtkWidget *users_details_password;
static GtkWidget *users_details_password2;
static GtkWidget *users_details_rights[32];
+static GtkWidget *users_reporter;
static int users_details_row;
static const char *users_selected;
static const char *users_deferred_select;
*
* If users_deferred_select is set then that user is selected.
*/
-static void users_got_list(void attribute((unused)) *v, int nvec, char **vec) {
+static void users_got_list(void attribute((unused)) *v,
+ const char *err,
+ int nvec, char **vec) {
int n;
GtkTreeIter iter;
+ if(err) {
+ popup_protocol_error(0, err);
+ return;
+ }
/* Present users in alphabetical order */
qsort(vec, nvec, sizeof (char *), usercmp);
/* Set the list contents */
1, 1); /* x/ypadding */
}
+static void users_entry_changed(GtkEditable attribute((unused)) *editable,
+ gpointer attribute((unused)) user_data) {
+ users_details_sensitize_all();
+}
+
/** @brief Add a row to the user details table
* @param entryp Where to put GtkEntry
* @param title Label for this row
if(!(entry = *entryp)) {
*entryp = entry = gtk_entry_new();
+ g_signal_connect(entry, "changed",
+ G_CALLBACK(users_entry_changed), 0);
users_detail_generic(title, entry);
}
gtk_entry_set_visibility(GTK_ENTRY(entry),
GtkWidget **checkp = &users_details_rights[leftmost_bit(right)];
if(!(check = *checkp)) {
- *checkp = check = gtk_check_button_new();
+ *checkp = check = gtk_check_button_new_with_label("");
users_detail_generic(title, check);
}
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), !!(value & right));
/** @brief Set sensitivity of everything in sight */
static void users_details_sensitize_all(void) {
int n;
+ const char *report = 0;
for(n = 0; n < 32; ++n)
if(users_details_rights[n])
users_details_sensitize(RIGHT_MOVE_ANY);
users_details_sensitize(RIGHT_REMOVE_ANY);
users_details_sensitize(RIGHT_SCRATCH_ANY);
- gtk_widget_set_sensitive(users_apply_button, users_mode != MODE_NONE);
+ int apply_sensitive = 1;
+ if(users_mode == MODE_NONE)
+ apply_sensitive = 0;
+ else {
+ const char *name = gtk_entry_get_text(GTK_ENTRY(users_details_name));
+ const char *email = gtk_entry_get_text(GTK_ENTRY(users_details_email));
+ const char *pw = gtk_entry_get_text(GTK_ENTRY(users_details_password));
+ const char *pw2 = gtk_entry_get_text(GTK_ENTRY(users_details_password2));
+ /* Username must be filled in */
+ if(!*name) {
+ apply_sensitive = 0;
+ if(!report)
+ report = "Must fill in username";
+ }
+ /* Passwords must be nontrivial and match */
+ if(!*pw) {
+ apply_sensitive = 0;
+ if(!report)
+ report = "Must fill in password";
+ }
+ if(strcmp(pw, pw2)) {
+ apply_sensitive = 0;
+ if(!report)
+ report = "Passwords must match";
+ }
+ /* Email address must be somewhat valid */
+ if(*email) {
+ if(!email_valid(email)) {
+ apply_sensitive = 0;
+ report = "Invalid email address";
+ }
+ }
+ }
+ gtk_widget_set_sensitive(users_apply_button, apply_sensitive);
gtk_widget_set_sensitive(users_delete_button, !!users_selected);
+ users_set_report(report);
}
/** @brief Called when an _ALL widget is toggled
rights_type mask) {
const uint32_t first = mask / 7;
const int bit = leftmost_bit(first);
- GtkWidget **widgets = &users_details_rights[bit], *any, *mine, *random;
+ GtkWidget **widgets = &users_details_rights[bit], *any, *mine, *rnd;
if(!*widgets) {
GtkWidget *hbox = gtk_hbox_new(FALSE, 2);
any = widgets[0] = gtk_check_button_new_with_label("Any");
mine = widgets[1] = gtk_check_button_new_with_label("Own");
- random = widgets[2] = gtk_check_button_new_with_label("Random");
+ rnd = widgets[2] = gtk_check_button_new_with_label("Random");
gtk_box_pack_start(GTK_BOX(hbox), any, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), mine, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), random, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), rnd, FALSE, FALSE, 0);
users_detail_generic(title, hbox);
g_signal_connect(any, "toggled", G_CALLBACK(users_any_toggled), NULL);
users_details_rights[bit] = any;
users_details_rights[bit + 1] = mine;
- users_details_rights[bit + 2] = random;
+ users_details_rights[bit + 2] = rnd;
} else {
any = widgets[0];
mine = widgets[1];
- random = widgets[2];
+ rnd = widgets[2];
}
/* Discard irrelevant bits */
bits &= mask;
bits >>= bit;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(any), !!(bits & 1));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mine), !!(bits & 2));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(random), !!(bits & 4));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rnd), !!(bits & 4));
+}
+
+/** @brief Called when the details table is destroyed */
+static void users_details_destroyed(GtkWidget attribute((unused)) *widget,
+ GtkWidget attribute((unused)) **wp) {
+ users_details_table = 0;
+ g_object_unref(users_list);
+ users_list = 0;
+ users_details_name = 0;
+ users_details_email = 0;
+ users_details_password = 0;
+ users_details_password2 = 0;
+ memset(users_details_rights, 0, sizeof users_details_rights);
+ /* also users_selection? Not AFAICT; _get_selection does upref */
}
/** @brief Create or modify the user details table
* @param email Email address
* @param rights User rights string
* @param password Password
+ * @param nameflags Visibility/editability for username
+ * @param flags Visibility/editability for other fields
*/
static void users_makedetails(const char *name,
const char *email,
rights_type r = 0;
/* Create the table if it doesn't already exist */
- if(!users_details_table)
+ if(!users_details_table) {
users_details_table = gtk_table_new(4, 2, FALSE/*!homogeneous*/);
+ g_signal_connect(users_details_table, "destroy",
+ G_CALLBACK(users_details_destroyed), 0);
+ }
/* Create or update the widgets */
users_add_detail(&users_details_name, "Username", name,
return r;
}
-/** @brief Called when various things fail */
-static void users_op_failed(struct callbackdata attribute((unused)) *cbd,
- int attribute((unused)) code,
- const char *msg) {
- popup_submsg(users_window, GTK_MESSAGE_ERROR, msg);
+/** @brief Called when a user setting has been edited */
+static void users_edituser_completed(void attribute((unused)) *v,
+ const char *err) {
+ if(err)
+ popup_submsg(users_window, GTK_MESSAGE_ERROR, err);
}
/** @brief Called when a new user has been created */
-static void users_adduser_completed(void *v) {
- struct callbackdata *cbd = v;
-
- /* Now the user is created we can go ahead and set the email address */
- if(*cbd->u.edituser.email) {
- struct callbackdata *ncbd = xmalloc(sizeof *cbd);
- ncbd->onerror = users_op_failed;
- disorder_eclient_edituser(client, NULL, cbd->u.edituser.user,
- "email", cbd->u.edituser.email, ncbd);
+static void users_adduser_completed(void *v,
+ const char *err) {
+ if(err) {
+ popup_submsg(users_window, GTK_MESSAGE_ERROR, err);
+ mode(ADD); /* Let the user try again */
+ } else {
+ const struct kvp *const kvp = v;
+ const char *user = kvp_get(kvp, "user");
+ const char *email = kvp_get(kvp, "email"); /* maybe NULL */
+
+ /* Now the user is created we can go ahead and set the email address */
+ if(email)
+ disorder_eclient_edituser(client, users_edituser_completed, user,
+ "email", email, NULL);
+ /* Refresh the list of users */
+ disorder_eclient_users(client, users_got_list, 0);
+ /* We'll select the newly created user */
+ users_deferred_select = user;
}
- /* Refresh the list of users */
- disorder_eclient_users(client, users_got_list, 0);
- /* We'll select the newly created user */
- users_deferred_select = cbd->u.edituser.user;
-}
-
-/** @brief Called if creating a new user fails */
-static void users_adduser_failed(struct callbackdata attribute((unused)) *cbd,
- int attribute((unused)) code,
- const char *msg) {
- popup_submsg(users_window, GTK_MESSAGE_ERROR, msg);
- mode(ADD); /* Let the user try again */
}
/** @brief Called when the 'Apply' button is pressed */
static void users_apply(GtkButton attribute((unused)) *button,
gpointer attribute((unused)) userdata) {
- struct callbackdata *cbd;
const char *password;
const char *password2;
const char *name;
popup_submsg(users_window, GTK_MESSAGE_ERROR, "Invalid email address");
return;
}
- cbd = xmalloc(sizeof *cbd);
- cbd->onerror = users_adduser_failed;
- cbd->u.edituser.user = name;
- cbd->u.edituser.email = email;
- disorder_eclient_adduser(client, users_adduser_completed,
+ disorder_eclient_adduser(client,
+ users_adduser_completed,
name,
password,
rights_string(users_get_rights()),
- cbd);
+ kvp_make("user", name,
+ "email", email,
+ (char *)0));
/* We switch to no-op mode while creating the user */
mode(NONE);
break;
popup_submsg(users_window, GTK_MESSAGE_ERROR, "Invalid email address");
return;
}
- cbd = xmalloc(sizeof *cbd);
- cbd->onerror = users_op_failed;
- disorder_eclient_edituser(client, NULL, users_selected,
- "email", email, cbd);
- disorder_eclient_edituser(client, NULL, users_selected,
- "password", password, cbd);
- disorder_eclient_edituser(client, NULL, users_selected,
- "rights", rights_string(users_get_rights()), cbd);
+ disorder_eclient_edituser(client, users_edituser_completed, users_selected,
+ "email", email, NULL);
+ disorder_eclient_edituser(client, users_edituser_completed, users_selected,
+ "password", password, NULL);
+ disorder_eclient_edituser(client, users_edituser_completed, users_selected,
+ "rights", rights_string(users_get_rights()), NULL);
/* We remain in edit mode */
break;
}
}
/** @brief Called when a user has been deleted */
-static void users_deleted(void *v) {
- const struct callbackdata *const cbd = v;
- GtkTreeIter iter[1];
-
- if(!users_find_user(cbd->u.user, iter)) /* Find the user... */
- gtk_list_store_remove(users_list, iter); /* ...and remove them */
+static void users_delete_completed(void *v,
+ const char *err) {
+ if(err)
+ popup_submsg(users_window, GTK_MESSAGE_ERROR, err);
+ else {
+ const struct kvp *const kvp = v;
+ const char *const user = kvp_get(kvp, "user");
+ GtkTreeIter iter[1];
+
+ if(!users_find_user(user, iter)) /* Find the user... */
+ gtk_list_store_remove(users_list, iter); /* ...and remove them */
+ }
}
/** @brief Called when the 'Delete' button is pressed */
gpointer attribute((unused)) userdata) {
GtkWidget *yesno;
int res;
- struct callbackdata *cbd;
if(!users_selected)
return;
res = gtk_dialog_run(GTK_DIALOG(yesno));
gtk_widget_destroy(yesno);
if(res == GTK_RESPONSE_YES) {
- cbd = xmalloc(sizeof *cbd);
- cbd->onerror = users_op_failed;
- cbd->u.user = users_selected;
- disorder_eclient_deluser(client, users_deleted, cbd->u.user, cbd);
+ disorder_eclient_deluser(client, users_delete_completed, users_selected,
+ kvp_make("user", users_selected,
+ (char *)0));
}
}
-static void users_got_email(void attribute((unused)) *v, const char *value) {
+static void users_got_email(void attribute((unused)) *v,
+ const char *err,
+ const char *value) {
+ if(err)
+ popup_protocol_error(0, err);
users_email = value;
}
-static void users_got_rights(void attribute((unused)) *v, const char *value) {
+static void users_got_rights(void attribute((unused)) *v,
+ const char *err,
+ const char *value) {
+ if(err)
+ popup_protocol_error(0, err);
users_rights = value;
}
-static void users_got_password(void attribute((unused)) *v, const char *value) {
+static void users_got_password(void attribute((unused)) *v,
+ const char *err,
+ const char *value) {
+ if(err)
+ popup_protocol_error(0, err);
+ /* TODO if an error occurred gathering user info, we should react in some
+ * different way */
users_password = value;
users_makedetails(users_selected,
users_email,
mode(NONE); /* not editing *yet* */
}
+static GtkWidget *users_make_reporter() {
+ if(!users_reporter) {
+ users_reporter = gtk_label_new("");
+ gtk_label_set_ellipsize(GTK_LABEL(users_reporter), PANGO_ELLIPSIZE_END);
+ gtk_misc_set_alignment(GTK_MISC(users_reporter), 0.99, 0);
+ g_signal_connect(users_reporter, "destroy",
+ G_CALLBACK(gtk_widget_destroyed), &users_reporter);
+ }
+ return users_reporter;
+}
+
+static void users_set_report(const char *msg) {
+ gtk_label_set_text(GTK_LABEL(users_make_reporter()), msg ? msg : "");
+}
+
/** @brief Table of buttons below the user list */
static struct button users_buttons[] = {
{
};
#define NUSERS_BUTTONS (sizeof users_buttons / sizeof *users_buttons)
+/** @brief Keypress handler */
+static gboolean users_keypress(GtkWidget attribute((unused)) *widget,
+ GdkEventKey *event,
+ gpointer attribute((unused)) user_data) {
+ if(event->state)
+ return FALSE;
+ switch(event->keyval) {
+ case GDK_Escape:
+ gtk_widget_destroy(users_window);
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
+
/** @brief Pop up the user management window */
void manage_users(void) {
GtkWidget *tree, *buttons, *hbox, *hbox2, *vbox, *vbox2;
gtk_window_present(GTK_WINDOW(users_window));
return;
}
+ /* Destroy old widgets */
+ if(users_reporter)
+ gtk_widget_destroy(users_reporter);
/* Create the window */
users_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_style(users_window, tool_style);
g_signal_connect(users_window, "destroy",
G_CALLBACK(gtk_widget_destroyed), &users_window);
gtk_window_set_title(GTK_WINDOW(users_window), "User Management");
+ /* Keyboard shortcuts */
+ g_signal_connect(users_window, "key-press-event",
+ G_CALLBACK(users_keypress), 0);
/* default size is too small */
gtk_window_set_default_size(GTK_WINDOW(users_window), 240, 240);
users_delete_button = users_buttons[1].widget;
/* Buttons live below the list */
- vbox = gtk_vbox_new(FALSE, 2);
- gtk_box_pack_start(GTK_BOX(vbox), tree, TRUE/*expand*/, TRUE/*fill*/, 0);
+ vbox = gtk_vbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), scroll_widget(tree), TRUE/*expand*/, TRUE/*fill*/, 0);
gtk_box_pack_start(GTK_BOX(vbox), buttons, FALSE/*expand*/, FALSE, 0);
/* Create an empty user details table, and put an apply button below it */
vbox2 = gtk_vbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), users_details_table,
TRUE/*expand*/, TRUE/*fill*/, 0);
+ gtk_box_pack_start(GTK_BOX(vbox2), gtk_hseparator_new(),
+ FALSE/*expand*/, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox2), users_make_reporter(),
+ FALSE/*expand*/, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox2,
FALSE/*expand*/, FALSE, 0);
- /* User details are to the right of the list */
- hbox = gtk_hbox_new(FALSE, 2);
- gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE/*expand*/, FALSE, 2);
- gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE/*expand*/, TRUE/*fill*/, 2);
- gtk_container_add(GTK_CONTAINER(users_window), hbox);
+ /* User details are to the right of the list. We put in a pointless event
+ * box as as spacer, so that the longest label in the user details isn't
+ * cuddled up to the user list. */
+ hbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE/*expand*/, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), gtk_event_box_new(), FALSE/*expand*/, FALSE, 2);
+ gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE/*expand*/, TRUE/*fill*/, 0);
+ gtk_container_add(GTK_CONTAINER(users_window), frame_widget(hbox, NULL));
}
/*
~mdw / disorder / blobdiff