X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Feditldap.c;h=67e01ecd416875656c276de39cd6ad642055cda0;hp=6fe9c107689968ad5db9f03fd76410ab1eb7141e;hb=e161b441652f527c1fde8dc94d2676f36cf9d901;hpb=28b049672badcd9ee47061e208a5fb470845e99b
diff --git a/src/editldap.c b/src/editldap.c
index 6fe9c1076..67e01ecd4 100644
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001 Match Grun
+ * Copyright (C) 2001-2003 Match Grun
*
* 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
@@ -18,7 +18,7 @@
*/
/*
- * Edit VCard address book data.
+ * Edit LDAP address book data.
*/
#ifdef HAVE_CONFIG_H
@@ -43,11 +43,17 @@
#include "prefs_common.h"
#include "addressitem.h"
#include "mgutils.h"
-#include "syldap.h"
+#include "ldapserver.h"
+#include "ldapctrl.h"
+#include "ldaputil.h"
#include "editldap_basedn.h"
#include "manage_window.h"
#include "gtkutils.h"
+#define PAGE_BASIC 0
+#define PAGE_SEARCH 1
+#define PAGE_EXTENDED 2
+
#define ADDRESSBOOK_GUESS_LDAP_NAME "MyServer"
#define ADDRESSBOOK_GUESS_LDAP_SERVER "localhost"
@@ -68,10 +74,53 @@ static struct _LDAPEdit {
GtkWidget *spinbtn_timeout;
GtkWidget *entry_bindDN;
GtkWidget *entry_bindPW;
- GtkWidget *entry_criteria;
GtkWidget *spinbtn_maxentry;
+ GtkWidget *entry_criteria;
+ GtkWidget *spinbtn_queryage;
+ GtkWidget *check_dynsearch;
+ GtkWidget *check_matchoption;
} ldapedit;
+/**
+ * Parse out individual attribute names from criteria string.
+ * \param criteria Criteria string.
+ * \ctl Control object.
+ */
+static gboolean editldap_validate_criteria( gchar *criteria ) {
+ gchar *ptr;
+ gchar **splitStr;
+ gint i;
+ gboolean errorFlag;
+
+ errorFlag = TRUE;
+
+ /* Replace delimiters with spaces */
+ ptr = criteria;
+ while( *ptr ) {
+ if( *ptr == ',' || *ptr == ';' || *ptr == '|' )
+ *ptr = ' ';
+ ptr++;
+ }
+
+ /* Parse string */
+ splitStr = g_strsplit( criteria, " ", 0 );
+ i = 0;
+ while( TRUE ) {
+ if( splitStr[i] ) {
+ if( *splitStr[i] ) {
+ errorFlag = FALSE;
+ break;
+ }
+ }
+ else {
+ break;
+ }
+ i++;
+ }
+ g_strfreev( splitStr );
+ return errorFlag;
+}
+
/*
* Edit functions.
*/
@@ -79,14 +128,67 @@ static void edit_ldap_status_show( gchar *msg ) {
if( ldapedit.statusbar != NULL ) {
gtk_statusbar_pop( GTK_STATUSBAR(ldapedit.statusbar), ldapedit.status_cid );
if( msg ) {
- gtk_statusbar_push( GTK_STATUSBAR(ldapedit.statusbar), ldapedit.status_cid, msg );
+ gtk_statusbar_push( GTK_STATUSBAR(ldapedit.statusbar),
+ ldapedit.status_cid, msg );
}
}
}
+static gboolean edit_ldap_validate( void ) {
+ gchar *str;
+ gboolean errorFlag;
+ gint page;
+
+ errorFlag = FALSE;
+ str = gtk_editable_get_chars(
+ GTK_EDITABLE(ldapedit.entry_name), 0, -1 );
+ if( *str == '\0' ) {
+ page = PAGE_BASIC;
+ gtk_widget_grab_focus( ldapedit.entry_name );
+ edit_ldap_status_show( _( "A Name must be supplied." ) );
+ errorFlag = TRUE;
+ }
+ g_free( str );
+
+ if( ! errorFlag ) {
+ str = gtk_editable_get_chars(
+ GTK_EDITABLE(ldapedit.entry_server), 0, -1 );
+ if( *str == '\0' ) {
+ page = PAGE_BASIC;
+ gtk_widget_grab_focus( ldapedit.entry_server );
+ edit_ldap_status_show(
+ _( "A Hostname must be supplied for the server." ) );
+ errorFlag = TRUE;
+ }
+ g_free( str );
+ }
+
+ if( ! errorFlag ) {
+ str = gtk_editable_get_chars(
+ GTK_EDITABLE(ldapedit.entry_criteria), 0, -1 );
+ if( editldap_validate_criteria( str ) ) {
+ page = PAGE_SEARCH;
+ gtk_widget_grab_focus( ldapedit.entry_criteria );
+ edit_ldap_status_show(
+ _( "At least one LDAP search attribute should be supplied." ) );
+ errorFlag = TRUE;
+ }
+ g_free( str );
+ }
+
+ /* Switch to page with error */
+ if( errorFlag ) {
+ gtk_notebook_set_page( GTK_NOTEBOOK(ldapedit.notebook), page );
+ }
+
+ return errorFlag;
+}
+
static void edit_ldap_ok( GtkWidget *widget, gboolean *cancelled ) {
- *cancelled = FALSE;
- gtk_main_quit();
+ if( ! edit_ldap_validate() ) {
+ *cancelled = FALSE;
+ gtk_main_quit();
+ }
}
static void edit_ldap_cancel( GtkWidget *widget, gboolean *cancelled ) {
@@ -107,10 +209,6 @@ static void edit_ldap_key_pressed( GtkWidget *widget, GdkEventKey *event, gboole
}
}
-static void edit_ldap_switch_page( GtkWidget *widget ) {
- edit_ldap_status_show( "" );
-}
-
static void edit_ldap_server_check( void ) {
gchar *sHost, *sBind, *sPass;
gint iPort, iTime;
@@ -118,6 +216,7 @@ static void edit_ldap_server_check( void ) {
gchar *sBaseDN = NULL;
gint iBaseDN = 0;
gboolean flg;
+ GList *baseDN = NULL;
edit_ldap_status_show( "" );
flg = FALSE;
@@ -130,10 +229,10 @@ static void edit_ldap_server_check( void ) {
g_strchomp( sBind ); g_strchug( sBind );
g_strchomp( sPass ); g_strchug( sPass );
if( *sHost != '\0' ) {
- // Test connection to server
- if( syldap_test_connect_s( sHost, iPort ) ) {
- // Attempt to read base DN
- GList *baseDN = syldap_read_basedn_s( sHost, iPort, sBind, sPass, iTime );
+ /* Test connection to server */
+ if( ldaputil_test_connect( sHost, iPort ) ) {
+ /* Attempt to read base DN */
+ baseDN = ldaputil_read_basedn( sHost, iPort, sBind, sPass, iTime );
if( baseDN ) {
GList *node = baseDN;
while( node ) {
@@ -154,12 +253,12 @@ static void edit_ldap_server_check( void ) {
g_free( sPass );
if( sBaseDN ) {
- // Load search DN
+ /* Load search DN */
gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_baseDN), sBaseDN);
g_free( sBaseDN );
}
- // Display appropriate message
+ /* Display appropriate message */
if( flg ) {
sMsg = _( "Connected successfully to server" );
}
@@ -196,7 +295,7 @@ static void edit_ldap_basedn_select( void ) {
}
static void edit_ldap_search_reset( void ) {
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_criteria), SYLDAP_DFL_CRITERIA );
+ gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_criteria), LDAPCTL_DFL_ATTR_LIST );
}
static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
@@ -223,23 +322,22 @@ static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
cancelled);
vbox = gtk_vbox_new( FALSE, 6 );
- //gtk_container_set_border_width(GTK_CONTAINER(vbox), BORDER_WIDTH);
gtk_widget_show( vbox );
gtk_container_add( GTK_CONTAINER( window ), vbox );
- // Notebook
+ /* Notebook */
notebook = gtk_notebook_new();
gtk_widget_show( notebook );
gtk_box_pack_start( GTK_BOX( vbox ), notebook, TRUE, TRUE, 0 );
gtk_container_set_border_width( GTK_CONTAINER( notebook ), 6 );
- // Status line
+ /* Status line */
hsbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
- // Button panel
+ /* Button panel */
gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
&cancel_btn, _("Cancel"), NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
@@ -249,8 +347,6 @@ static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
GTK_SIGNAL_FUNC(edit_ldap_ok), cancelled);
gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
GTK_SIGNAL_FUNC(edit_ldap_cancel), cancelled);
- gtk_signal_connect(GTK_OBJECT(notebook), "switch_page",
- GTK_SIGNAL_FUNC(edit_ldap_switch_page), NULL );
gtk_widget_show_all(vbox);
@@ -259,10 +355,12 @@ static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
ldapedit.ok_btn = ok_btn;
ldapedit.cancel_btn = cancel_btn;
ldapedit.statusbar = statusbar;
- ldapedit.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Edit LDAP Server Dialog" );
+ ldapedit.status_cid =
+ gtk_statusbar_get_context_id(
+ GTK_STATUSBAR(statusbar), "Edit LDAP Server Dialog" );
}
-void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
+static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *label;
@@ -274,12 +372,12 @@ void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
GtkWidget *entry_baseDN;
GtkWidget *check_btn;
GtkWidget *lookdn_btn;
+ GtkTooltips *toolTip;
gint top;
vbox = gtk_vbox_new( FALSE, 8 );
gtk_widget_show( vbox );
gtk_container_add( GTK_CONTAINER( ldapedit.notebook ), vbox );
- //gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
label = gtk_label_new( pageLbl );
gtk_widget_show( label );
@@ -293,25 +391,41 @@ void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
gtk_table_set_row_spacings(GTK_TABLE(table), 8);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- // First row
+ /* First row */
top = 0;
label = gtk_label_new(_("Name"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
entry_name = gtk_entry_new();
- gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, top, (top + 1),
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, entry_name, _(
+ "A name that you wish to call the server." ),
+ NULL );
- // Next row
+ /* Next row */
++top;
label = gtk_label_new(_("Hostname"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
entry_server = gtk_entry_new();
- gtk_table_attach(GTK_TABLE(table), entry_server, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
-
- // Next row
+ gtk_table_attach(GTK_TABLE(table), entry_server, 1, 2, top, (top + 1),
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, entry_server, _(
+ "This is the hostname of the server. For example, " \
+ "\"ldap.mydomain.com\" may be appropriate for the " \
+ "\"mydomain.com\" organization. An IP address may also be " \
+ "used. You may specify \"localhost\" if running an LDAP " \
+ "server on the same computer as Sylpheed." ),
+ NULL );
+
+ /* Next row */
++top;
label = gtk_label_new(_("Port"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
@@ -323,28 +437,59 @@ void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_port, FALSE, FALSE, 0);
gtk_widget_set_usize (spinbtn_port, 64, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_port), TRUE);
- gtk_table_attach(GTK_TABLE(table), hbox_spin, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(table), hbox_spin, 1, 2, top, (top + 1),
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, spinbtn_port, _(
+ "The port number that the server listens on. Port 389 is " \
+ "the default." ),
+ NULL );
check_btn = gtk_button_new_with_label( _(" Check Server "));
gtk_table_attach(GTK_TABLE(table), check_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
- // Next row
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, check_btn, _(
+ "Press this button to test the connection to the server." ),
+ NULL );
+
+ /* Next row */
++top;
label = gtk_label_new(_("Search Base"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
entry_baseDN = gtk_entry_new();
- gtk_table_attach(GTK_TABLE(table), entry_baseDN, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(table), entry_baseDN, 1, 2, top, (top + 1),
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, entry_baseDN, _(
+ "This specifies the name of the directory to be searched " \
+ "on the server. Examples include:\n" \
+ " dc=sylpheed,dc=org\n" \
+ " ou=people,dc=domainname,dc=com\n" \
+ " o=Organization Name,c=Country\n"
+ ),
+ NULL );
lookdn_btn = gtk_button_new_with_label( _(" ... "));
gtk_table_attach(GTK_TABLE(table), lookdn_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, lookdn_btn, _(
+ "Press this button to lookup the name of available " \
+ "directory names on the server." ),
+ NULL );
+
+ /* Signal handlers */
gtk_signal_connect(GTK_OBJECT(check_btn), "clicked",
GTK_SIGNAL_FUNC(edit_ldap_server_check), NULL);
gtk_signal_connect(GTK_OBJECT(lookdn_btn), "clicked",
GTK_SIGNAL_FUNC(edit_ldap_basedn_select), NULL);
+ /* Done */
gtk_widget_show_all(vbox);
ldapedit.entry_name = entry_name;
@@ -353,25 +498,23 @@ void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
ldapedit.entry_baseDN = entry_baseDN;
}
-void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl ) {
+static void addressbook_edit_ldap_page_search( gint pageNum, gchar *pageLbl ) {
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *label;
- GtkWidget *entry_bindDN;
- GtkWidget *entry_bindPW;
GtkWidget *entry_criteria;
GtkWidget *hbox_spin;
- GtkObject *spinbtn_timeout_adj;
- GtkWidget *spinbtn_timeout;
- GtkObject *spinbtn_maxentry_adj;
- GtkWidget *spinbtn_maxentry;
+ GtkObject *spinbtn_queryage_adj;
+ GtkWidget *spinbtn_queryage;
+ GtkWidget *check_dynsearch;
+ GtkWidget *check_matchoption;
GtkWidget *reset_btn;
+ GtkTooltips *toolTip;
gint top;
vbox = gtk_vbox_new( FALSE, 8 );
gtk_widget_show( vbox );
gtk_container_add( GTK_CONTAINER( ldapedit.notebook ), vbox );
- //gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
label = gtk_label_new( pageLbl );
gtk_widget_show( label );
@@ -385,37 +528,175 @@ void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl ) {
gtk_table_set_row_spacings(GTK_TABLE(table), 8);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- // First row
+ /* First row */
top = 0;
- label = gtk_label_new(_("Search Criteria"));
+ label = gtk_label_new(_("Search Attributes"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
entry_criteria = gtk_entry_new();
- gtk_table_attach(GTK_TABLE(table), entry_criteria, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(table), entry_criteria, 1, 2, top, (top + 1),
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, entry_criteria, _(
+ "A list of LDAP attribute names that should be searched " \
+ "when attempting to find a name or address." ),
+ NULL );
- reset_btn = gtk_button_new_with_label( _(" Reset "));
+ reset_btn = gtk_button_new_with_label( _(" Defaults "));
gtk_table_attach(GTK_TABLE(table), reset_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
- // Next row
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, reset_btn, _(
+ "This resets the attribute names to a default value " \
+ "that should find most names and addresses during a " \
+ "name or address search process." ),
+ NULL );
+
+ /* Next row */
+ ++top;
+ label = gtk_label_new(_("Max Query Age (secs)"));
+ gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+
+ hbox_spin = gtk_hbox_new (FALSE, 8);
+ spinbtn_queryage_adj = gtk_adjustment_new(
+ LDAPCTL_DFL_QUERY_AGE, 1, LDAPCTL_MAX_QUERY_AGE, 10, 1000, 1000 );
+ spinbtn_queryage = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_queryage_adj), 1, 0);
+ gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_queryage, FALSE, FALSE, 0);
+ gtk_widget_set_usize (spinbtn_queryage, 64, -1);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_queryage), TRUE);
+ gtk_table_attach(GTK_TABLE(table), hbox_spin, 1, 2, top, (top + 1),
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, spinbtn_queryage, _(
+ "This defines the maximum period of time (in seconds) that " \
+ "an address search result is valid for address completion " \
+ "purposes. Search results are stored in a cache until this " \
+ "period of time has passed and then retired. This will " \
+ "improve the response time when attempting to search for " \
+ "the same name or address on subsequent address completion " \
+ "requests. The cache will be searched in preference to " \
+ "performing a new server search request. The default value " \
+ "of 600 seconds (10 minutes), should be sufficient for most " \
+ "servers. A larger value will reduce the search time for " \
+ "subsequent searches. This is useful for servers that have " \
+ "slow response times at the expense of more memory to cache " \
+ "results." ),
+ NULL );
+
+ /* Next row */
++top;
+ check_dynsearch = gtk_check_button_new_with_label(
+ _("Include server in dynamic search") );
+ gtk_table_attach(GTK_TABLE(table), check_dynsearch, 1, 3, top, (top + 1),
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, check_dynsearch, _(
+ "Check this option to include this server for dynamic " \
+ "searches when using address completion." ),
+ NULL );
+
+ /* Next row */
+ ++top;
+ check_matchoption = gtk_check_button_new_with_label(
+ _("Match names 'containing' search term") );
+ gtk_table_attach(GTK_TABLE(table), check_matchoption, 1, 3, top, (top + 1),
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, check_matchoption, _(
+ "Searches for names and addresses can be performed either " \
+ "using \"begins-with\" or \"contains\" search term. Check " \
+ "this option to perform a \"contains\" search; this type of " \
+ "search usually takes longer to complete. Note that for " \
+ "performance reasons, address completion uses " \
+ "\"begins-with\" for all searches against other address " \
+ "interfaces." \
+ ),
+ NULL );
+
+ /* Signal handlers */
+ gtk_signal_connect(GTK_OBJECT(reset_btn), "clicked",
+ GTK_SIGNAL_FUNC(edit_ldap_search_reset), NULL);
+
+ /* Done */
+ gtk_widget_show_all(vbox);
+
+ ldapedit.entry_criteria = entry_criteria;
+ ldapedit.spinbtn_queryage = spinbtn_queryage;
+ ldapedit.check_dynsearch = check_dynsearch;
+ ldapedit.check_matchoption = check_matchoption;
+}
+
+static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl ) {
+ GtkWidget *vbox;
+ GtkWidget *table;
+ GtkWidget *label;
+ GtkWidget *entry_bindDN;
+ GtkWidget *entry_bindPW;
+ GtkWidget *hbox_spin;
+ GtkObject *spinbtn_timeout_adj;
+ GtkWidget *spinbtn_timeout;
+ GtkObject *spinbtn_maxentry_adj;
+ GtkWidget *spinbtn_maxentry;
+ GtkTooltips *toolTip;
+ gint top;
+
+ vbox = gtk_vbox_new( FALSE, 8 );
+ gtk_widget_show( vbox );
+ gtk_container_add( GTK_CONTAINER( ldapedit.notebook ), vbox );
+
+ label = gtk_label_new( pageLbl );
+ gtk_widget_show( label );
+ gtk_notebook_set_tab_label(
+ GTK_NOTEBOOK( ldapedit.notebook ),
+ gtk_notebook_get_nth_page( GTK_NOTEBOOK( ldapedit.notebook ), pageNum ), label );
+
+ table = gtk_table_new( LDAPEDIT_TABLE_ROWS, LDAPEDIT_TABLE_COLS, FALSE);
+ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
+ gtk_container_set_border_width( GTK_CONTAINER(table), 8 );
+ gtk_table_set_row_spacings(GTK_TABLE(table), 8);
+ gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+
+ /* Next row */
+ top = 0;
label = gtk_label_new(_("Bind DN"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
entry_bindDN = gtk_entry_new();
- gtk_table_attach(GTK_TABLE(table), entry_bindDN, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
-
- // Next row
+ gtk_table_attach(GTK_TABLE(table), entry_bindDN, 1, 2, top, (top + 1),
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, entry_bindDN, _(
+ "The LDAP user account name to be used to connect to the server. " \
+ "This is usually only used for protected servers. This name " \
+ "is typically formatted as: \"cn=user,dc=sylpheed,dc=com\". " \
+ "This is usually left empty when performing a search." ),
+ NULL );
+
+ /* Next row */
++top;
label = gtk_label_new(_("Bind Password"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
entry_bindPW = gtk_entry_new();
- gtk_table_attach(GTK_TABLE(table), entry_bindPW, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(table), entry_bindPW, 1, 2, top, (top + 1),
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, entry_bindPW, _(
+ "The password to be used when connecting as the \"Bind DN\" " \
+ "user." ),
+ NULL );
- // Next row
+ /* Next row */
++top;
label = gtk_label_new(_("Timeout (secs)"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
@@ -427,9 +708,14 @@ void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl ) {
gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_timeout, FALSE, FALSE, 0);
gtk_widget_set_usize (spinbtn_timeout, 64, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_timeout), TRUE);
- gtk_table_attach(GTK_TABLE(table), hbox_spin, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(table), hbox_spin, 1, 2, top, (top + 1),
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- // Next row
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, spinbtn_timeout, _(
+ "The timeout period in seconds." ), NULL );
+
+ /* Next row */
++top;
label = gtk_label_new(_("Maximum Entries"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
@@ -441,14 +727,18 @@ void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl ) {
gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_maxentry, FALSE, FALSE, 0);
gtk_widget_set_usize (spinbtn_maxentry, 64, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_maxentry), TRUE);
- gtk_table_attach(GTK_TABLE(table), hbox_spin, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(table), hbox_spin, 1, 2, top, (top + 1),
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- gtk_signal_connect(GTK_OBJECT(reset_btn), "clicked",
- GTK_SIGNAL_FUNC(edit_ldap_search_reset), NULL);
+ toolTip = gtk_tooltips_new();
+ gtk_tooltips_set_tip( toolTip, spinbtn_maxentry, _(
+ "The maximum number of entries that should be returned " \
+ "in the search result." ),
+ NULL );
+ /* Done */
gtk_widget_show_all(vbox);
- ldapedit.entry_criteria = entry_criteria;
ldapedit.entry_bindDN = entry_bindDN;
ldapedit.entry_bindPW = entry_bindPW;
ldapedit.spinbtn_timeout = spinbtn_timeout;
@@ -459,6 +749,7 @@ static void addressbook_edit_ldap_create( gboolean *cancelled ) {
gint page = 0;
addressbook_edit_ldap_dialog_create( cancelled );
addressbook_edit_ldap_page_basic( page++, _( "Basic" ) );
+ addressbook_edit_ldap_page_search( page++, _( "Search" ) );
addressbook_edit_ldap_page_extended( page++, _( "Extended" ) );
gtk_widget_show_all( ldapedit.window );
}
@@ -496,17 +787,169 @@ gint edit_ldap_get_optmenu( GtkOptionMenu *optmenu ) {
return GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem)));
}
-AdapterDSource *addressbook_edit_ldap( AddressIndex *addrIndex, AdapterDSource *ads ) {
+/**
+ * Format criteria list for display.
+ * \param ctl Control object.
+ * \return Formatted string, or NULL if no attributes found.
+ */
+static gchar *editldap_build_criteria_list( const LdapControl *ctl ) {
+ gchar *str = NULL;
+ gchar *tmp = NULL;
+ GList *node;
+
+ node = ldapctl_get_criteria_list( ctl );
+ while( node ) {
+ gchar *attr = node->data;
+ if( str ) {
+ tmp = g_strdup_printf( "%s, %s", str, attr );
+ g_free( str );
+ str = tmp;
+ tmp = NULL;
+ }
+ else {
+ str = g_strdup( attr );
+ }
+ node = g_list_next( node );
+ }
+
+ return str;
+}
+
+/**
+ * Parse out individual attribute names from criteria string.
+ * \param criteria Criteria string.
+ * \ctl Control object.
+ */
+static void editldap_parse_criteria( gchar *criteria, LdapControl *ctl ) {
+ gchar *ptr;
+ gchar **splitStr;
+ gint i;
+
+ /* Replace delimiters with spaces */
+ ptr = criteria;
+ while( *ptr ) {
+ if( *ptr == ',' || *ptr == ';' || *ptr == '|' )
+ *ptr = ' ';
+ ptr++;
+ }
+
+ /* Parse string */
+ ldapctl_criteria_list_clear( ctl );
+ splitStr = g_strsplit( criteria, " ", 0 );
+ i = 0;
+ while( TRUE ) {
+ if( splitStr[i] ) {
+ if( *splitStr[i] ) {
+ ldapctl_criteria_list_add( ctl, splitStr[i] );
+ }
+ }
+ else {
+ break;
+ }
+ i++;
+ }
+ g_strfreev( splitStr );
+}
+
+/**
+ * Clear entry fields to reasonable defaults (for a new server entry).
+ */
+static void edit_ldap_clear_fields( void ) {
+ gtk_entry_set_text(
+ GTK_ENTRY(ldapedit.entry_name), ADDRESSBOOK_GUESS_LDAP_NAME );
+ gtk_entry_set_text(
+ GTK_ENTRY(ldapedit.entry_server), ADDRESSBOOK_GUESS_LDAP_SERVER );
+ gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_baseDN), "");
+ gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_bindDN), "");
+ gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_bindPW), "");
+ gtk_spin_button_set_value(
+ GTK_SPIN_BUTTON( ldapedit.spinbtn_port ), LDAPCTL_DFL_PORT );
+ gtk_spin_button_set_value(
+ GTK_SPIN_BUTTON( ldapedit.spinbtn_timeout ), LDAPCTL_DFL_TIMEOUT );
+ gtk_spin_button_set_value(
+ GTK_SPIN_BUTTON( ldapedit.spinbtn_maxentry ), LDAPCTL_DFL_TIMEOUT );
+ gtk_entry_set_text(
+ GTK_ENTRY(ldapedit.entry_criteria), LDAPCTL_DFL_ATTR_LIST );
+ gtk_spin_button_set_value(
+ GTK_SPIN_BUTTON(ldapedit.spinbtn_queryage), LDAPCTL_DFL_QUERY_AGE );
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch), TRUE );
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON( ldapedit.check_matchoption), FALSE );
+}
+
+/**
+ * Load entry fields from server control data.
+ * \param server Server object.
+ */
+static void edit_ldap_set_fields( LdapServer *server ) {
+ LdapControl *ctl;
+ gchar *crit;
+
+ if( ldapsvr_get_name( server ) )
+ gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_name),
+ ldapsvr_get_name( server ) );
+
+ ctl = server->control;
+ if( ctl->hostName )
+ gtk_entry_set_text(
+ GTK_ENTRY(ldapedit.entry_server), ctl->hostName);
+ if( ctl->baseDN )
+ gtk_entry_set_text(
+ GTK_ENTRY(ldapedit.entry_baseDN), ctl->baseDN );
+ if( ctl->bindDN )
+ gtk_entry_set_text(
+ GTK_ENTRY(ldapedit.entry_bindDN), ctl->bindDN );
+ if( ctl->bindPass )
+ gtk_entry_set_text(
+ GTK_ENTRY(ldapedit.entry_bindPW), ctl->bindPass );
+ gtk_spin_button_set_value(
+ GTK_SPIN_BUTTON(ldapedit.spinbtn_port), ctl->port );
+ gtk_spin_button_set_value(
+ GTK_SPIN_BUTTON(ldapedit.spinbtn_timeout), ctl->timeOut );
+ gtk_spin_button_set_value(
+ GTK_SPIN_BUTTON(ldapedit.spinbtn_maxentry), ctl->maxEntries );
+
+ /* Format criteria */
+ crit = editldap_build_criteria_list( ctl );
+ if( crit ) {
+ gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_criteria), crit );
+ g_free( crit );
+ }
+ else {
+ gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_criteria), "" );
+ }
+ gtk_spin_button_set_value(
+ GTK_SPIN_BUTTON(ldapedit.spinbtn_queryage), ctl->maxQueryAge );
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch), server->searchFlag );
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON( ldapedit.check_matchoption),
+ ( ctl->matchingOption == LDAPCTL_MATCH_CONTAINS ) );
+}
+
+/**
+ * Edit LDAP server datasource that appears addressbook.
+ * \param addrIndex Address index object.
+ * \param ads Data source adapter.
+ * \return Update data source adapter, or NULL if user cancelled
+ * edit with dialog.
+ */
+AdapterDSource *addressbook_edit_ldap(
+ AddressIndex *addrIndex, AdapterDSource *ads )
+{
static gboolean cancelled;
gchar *sName, *sHost, *sBase, *sBind, *sPass, *sCrit;
- gint iPort, iMaxE, iTime;
+ gint iPort, iMaxE, iTime, iAge;
+ gboolean bSrch, bMatch;
AddressDataSource *ds = NULL;
- SyldapServer *server = NULL;
+ LdapServer *server = NULL;
+ LdapControl *ctl = NULL;
gboolean fin;
if (!ldapedit.window)
addressbook_edit_ldap_create(&cancelled);
- gtk_notebook_set_page( GTK_NOTEBOOK(ldapedit.notebook), 0 );
+ gtk_notebook_set_page( GTK_NOTEBOOK(ldapedit.notebook), PAGE_BASIC );
gtk_widget_grab_focus(ldapedit.ok_btn);
gtk_widget_grab_focus(ldapedit.entry_name);
gtk_widget_show(ldapedit.window);
@@ -516,71 +959,78 @@ AdapterDSource *addressbook_edit_ldap( AddressIndex *addrIndex, AdapterDSource *
if( ads ) {
ds = ads->dataSource;
server = ds->rawDataSource;
- if (server->name)
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_name), server->name);
- if (server->hostName)
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_server), server->hostName);
- gtk_spin_button_set_value( GTK_SPIN_BUTTON( ldapedit.spinbtn_port ), server->port );
- gtk_spin_button_set_value( GTK_SPIN_BUTTON( ldapedit.spinbtn_timeout ), server->timeOut );
- if (server->baseDN)
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_baseDN), server->baseDN);
- if (server->searchCriteria)
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_criteria), server->searchCriteria);
- if (server->bindDN)
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_bindDN), server->bindDN);
- if (server->bindPass)
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_bindPW), server->bindPass);
- gtk_spin_button_set_value( GTK_SPIN_BUTTON( ldapedit.spinbtn_maxentry ), server->maxEntries );
- gtk_window_set_title( GTK_WINDOW(ldapedit.window), _("Edit LDAP Server"));
+ edit_ldap_set_fields( server );
+ gtk_window_set_title(
+ GTK_WINDOW(ldapedit.window), _("Edit LDAP Server"));
}
else {
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_name), ADDRESSBOOK_GUESS_LDAP_NAME );
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_server), ADDRESSBOOK_GUESS_LDAP_SERVER );
- gtk_spin_button_set_value( GTK_SPIN_BUTTON( ldapedit.spinbtn_port ), SYLDAP_DFL_PORT );
- gtk_spin_button_set_value( GTK_SPIN_BUTTON( ldapedit.spinbtn_timeout ), SYLDAP_DFL_TIMEOUT );
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_baseDN), "");
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_criteria), SYLDAP_DFL_CRITERIA );
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_bindDN), "");
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_bindPW), "");
- gtk_spin_button_set_value( GTK_SPIN_BUTTON( ldapedit.spinbtn_maxentry ), SYLDAP_MAX_ENTRIES );
- gtk_window_set_title( GTK_WINDOW(ldapedit.window), _("Add New LDAP Server"));
+ edit_ldap_clear_fields();
+ gtk_window_set_title(
+ GTK_WINDOW(ldapedit.window), _("Add New LDAP Server"));
}
gtk_main();
gtk_widget_hide(ldapedit.window);
if (cancelled == TRUE) return NULL;
- fin = FALSE;
- sName = gtk_editable_get_chars( GTK_EDITABLE(ldapedit.entry_name), 0, -1 );
- sHost = gtk_editable_get_chars( GTK_EDITABLE(ldapedit.entry_server), 0, -1 );
- iPort = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( ldapedit.spinbtn_port ) );
- iTime = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( ldapedit.spinbtn_timeout ) );
- sBase = gtk_editable_get_chars( GTK_EDITABLE(ldapedit.entry_baseDN), 0, -1 );
- sCrit = gtk_editable_get_chars( GTK_EDITABLE(ldapedit.entry_criteria), 0, -1 );
- sBind = gtk_editable_get_chars( GTK_EDITABLE(ldapedit.entry_bindDN), 0, -1 );
- sPass = gtk_editable_get_chars( GTK_EDITABLE(ldapedit.entry_bindPW), 0, -1 );
- iMaxE = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( ldapedit.spinbtn_maxentry ) );
+ sName = gtk_editable_get_chars(
+ GTK_EDITABLE(ldapedit.entry_name), 0, -1 );
+ sHost = gtk_editable_get_chars(
+ GTK_EDITABLE(ldapedit.entry_server), 0, -1 );
+ sBase = gtk_editable_get_chars(
+ GTK_EDITABLE(ldapedit.entry_baseDN), 0, -1 );
+ sCrit = gtk_editable_get_chars(
+ GTK_EDITABLE(ldapedit.entry_criteria), 0, -1 );
+ sBind = gtk_editable_get_chars(
+ GTK_EDITABLE(ldapedit.entry_bindDN), 0, -1 );
+ sPass = gtk_editable_get_chars(
+ GTK_EDITABLE(ldapedit.entry_bindPW), 0, -1 );
+ iPort = gtk_spin_button_get_value_as_int(
+ GTK_SPIN_BUTTON( ldapedit.spinbtn_port ) );
+ iTime = gtk_spin_button_get_value_as_int(
+ GTK_SPIN_BUTTON( ldapedit.spinbtn_timeout ) );
+ iMaxE = gtk_spin_button_get_value_as_int(
+ GTK_SPIN_BUTTON( ldapedit.spinbtn_maxentry ) );
+ iAge = gtk_spin_button_get_value_as_int(
+ GTK_SPIN_BUTTON( ldapedit.spinbtn_queryage ) );
+ bSrch = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch ) );
+ bMatch = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON( ldapedit.check_matchoption ) );
+ fin = FALSE;
if( *sName == '\0' ) fin = TRUE;
if( *sHost == '\0' ) fin = TRUE;
- if( *sBase == '\0' ) fin = TRUE;
if( ! fin ) {
+ /* Save changes */
if( ! ads ) {
- server = syldap_create();
- ds = addrindex_index_add_datasource( addrIndex, ADDR_IF_LDAP, server );
- ads = addressbook_create_ds_adapter( ds, ADDR_LDAP, NULL );
+ /* New server */
+ server = ldapsvr_create();
+ ds = addrindex_index_add_datasource(
+ addrIndex, ADDR_IF_LDAP, server );
+ ads = addressbook_create_ds_adapter(
+ ds, ADDR_LDAP, NULL );
}
+ ctl = server->control;
addressbook_ads_set_name( ads, sName );
- syldap_set_name( server, sName );
- syldap_set_host( server, sHost );
- syldap_set_port( server, iPort );
- syldap_set_base_dn( server, sBase );
- syldap_set_bind_dn( server, sBind );
- syldap_set_bind_password( server, sPass );
- syldap_set_search_criteria( server, sCrit );
- syldap_set_max_entries( server, iMaxE );
- syldap_set_timeout( server, iTime );
+ ldapsvr_set_name( server, sName );
+ ldapsvr_set_search_flag( server, bSrch );
+ ldapctl_set_host( ctl, sHost );
+ ldapctl_set_base_dn( ctl, sBase );
+ ldapctl_set_bind_dn( ctl, sBind );
+ ldapctl_set_bind_password( ctl, sPass );
+ ldapctl_set_port( ctl, iPort );
+ ldapctl_set_max_entries( ctl, iMaxE );
+ ldapctl_set_timeout( ctl, iTime );
+ ldapctl_set_max_query_age( ctl, iAge );
+ ldapctl_set_matching_option(
+ ctl, bMatch ?
+ LDAPCTL_MATCH_CONTAINS : LDAPCTL_MATCH_BEGINWITH );
+
+ /* Save attributes */
+ editldap_parse_criteria( sCrit, ctl );
+
}
g_free( sName );
g_free( sHost );