From 845409cba4a524df11ff516537fd5a8ea0923923 Mon Sep 17 00:00:00 2001 From: octo Date: Fri, 22 Apr 2005 17:40:14 +0000 Subject: [PATCH] Many bugs fixed, more features inplemented. Rapid debelopment at work.. --- book.cgi | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- lib/Person.pm | 68 ++++++++++++++++++++------------ 2 files changed, 163 insertions(+), 28 deletions(-) diff --git a/book.cgi b/book.cgi index c6de51e..8a616b1 100755 --- a/book.cgi +++ b/book.cgi @@ -16,6 +16,18 @@ our %Config = (); our @MultiFields = (qw(address homephone cellphone officephone fax mail uri group)); +our %FieldNames = +( + address => 'Address', + homephone => 'Home Phone', + cellphone => 'Cellphone', + officephone => 'Office Phone', + fax => 'FAX', + mail => 'E-Mail', + uri => 'URI (Homepage)', + group => 'Group' +); + our $MySelf = $ENV{'SCRIPT_NAME'}; our $Action = param ('action'); @@ -24,6 +36,7 @@ $Action ||= 'default'; our %Actions = ( default => \&action_default, + detail => \&action_detail, edit => \&action_edit, save => \&action_save, search => \&action_search @@ -69,7 +82,7 @@ if (!defined ($Actions{$Action})) $Actions{$Action}->(); -print qq#
Authenticated as ($UserCN, $UserID, #, $Config{'base_dn'}, qq#)
\n#; +#print qq#
Authenticated as ($UserCN, $UserID, #, $Config{'base_dn'}, qq#)
\n#; print_html_end (); @@ -84,9 +97,103 @@ sub action_default print "action_default\n"; } +sub action_detail +{ + my $cn = param ('cn'); + die unless ($cn); + + my $person = Person->load ($cn); + if (!$person) + { + print qq(\t
Entry "$cn" could not be loaded from DB.
\n); + return; + } + + my $cn_esc = uri_escape ($cn); + + print < + + Name + $cn + +EOF + for (@MultiFields) + { + my $field = $_; + my $values = $person->get ($field); + my $num = scalar (@$values); + my $print = defined ($FieldNames{$field}) ? $FieldNames{$field} : $field; + + next unless ($num); + + print "\t\t\n"; + if ($num > 1) + { + print qq(\t\t\t$print\n); + } + else + { + print qq(\t\t\t$print\n); + } + + for (my $i = 0; $i < $num; $i++) + { + my $val = $values->[$i]; + print "\t\t\n" if ($i); + print "\t\t\t$val\n", + "\t\t\n"; + } + } + print < +
+ [edit] +
+EOF +} + sub action_search { - print "action_search\n"; + my $search = param ('search'); + + $search ||= ''; + $search =~ s/[^\s\w]//g; + + if (!$search) + { + print qq(\t
Sorry, the empty search is not allowed.
\n); + action_default (); + return; + } + + my @patterns = split (m/\s+/, $search); + my @filter = (); + + for (@patterns) + { + my $pattern = "$_*"; + push (@filter, [[lastname => $pattern], [firstname => $pattern]]); + } + + my @matches = Person->search (@filter); + + if (!@matches) + { + print qq(\t
No entries matched your search.
\n); + return; + } + + print qq(\t
    \n); + for (@matches) + { + my $person = $_; + my $cn = $person->name (); + my $cn_esc = uri_escape ($cn); + + print qq(\t\t
  • $cn
    • \n); + } + print qq(\t
\n); } sub action_edit @@ -354,6 +461,12 @@ div.foot { color: gray; background-color: white; + + position: absolute; + top: auto; + right: 0px; + bottom: 0px; + left: 0px; font-size: x-small; text-align: right; @@ -382,7 +495,9 @@ th { color: black; background-color: #999999; + padding: 0.3ex; text-align: left; + vertical-align: top; } //--> @@ -409,13 +524,13 @@ EOF
EOF } - print "\t

octo's lightweight address book

\n"; + print "\t

octo's Lightweight Address Book

\n"; } sub print_html_end { print <octo's Address Book <octo at verplant.org> +
octo's Lightweight Address Book <octo at verplant.org>
EOF diff --git a/lib/Person.pm b/lib/Person.pm index 79ed9f7..96a5977 100644 --- a/lib/Person.pm +++ b/lib/Person.pm @@ -134,7 +134,7 @@ sub load my $pkg = shift; my $cn = shift; - my ($retval) = search ($pkg, cn => $cn); + my ($retval) = search ($pkg, [[cn => $cn]]); if (!$retval) { @@ -245,47 +245,67 @@ sub create Search for the given patterns. Returns a list of I-objects. + @filter = + ( + [ + [field => value], # OR + [field => value] + ], # AND + ... + ); + =cut sub search { my $pkg = shift; - my %patterns = @_; - my %filter = (); - my $filter = '(objectclass=inetOrgPerson)'; + + my @patterns = @_; + my @konjunct = (); + my $filter; + my $mesg; my @retval = (); - for (keys %patterns) + for (@patterns) { - my $key = $_; - my $val = $patterns{$key}; + my $dj = $_; + my @disjunc = (); - $key = $ExternalNames{$key} if (defined ($ExternalNames{$key})); - if (!defined ($ValidFields{$key})) + for (@$dj) { - warn ("Not a valid field: $key"); - next; - } + my $field = $_->[0]; + my $value = $_->[1]; - $filter{$key} = $val; - } + $field = $ExternalNames{$field} if (defined ($ExternalNames{$field})); + if (!defined ($ValidFields{$field})) + { + warn ("Not a valid field: $field"); + next; + } - if (%filter) - { - if (scalar (keys %filter) == 1) - { - my ($key) = keys (%filter); - my $val = $filter{$key}; - $filter = "(& $filter ($key=$val))"; + $value =~ s/([\(\)\\])/\\$1/g; + + push (@disjunc, "($field=$value)"); } - else + + if (@disjunc) { - my $tmp = join (' ', map { '(' . $_ . '=' . $filter->{$_} . ')' } (keys (%$filter))); - $filter = "(& $filter (| $tmp))"; + push (@konjunct, join ('', '(|', @disjunc, ')')); } } + if (@konjunct) + { + $filter = join ('', '(&(objectclass=inetOrgPerson)', @konjunct, ')'); + } + else + { + $filter = '(objectclass=inetOrgPerson)'; + } + + print STDERR "Debug: using filter: $filter"; + $mesg = $Ldap->search ( base => $Config{'base_dn'}, -- 2.11.0