From: octo Date: Sat, 30 Apr 2005 15:01:26 +0000 (+0000) Subject: The ability to delete entries has been added. X-Git-Tag: Release-0.3~15 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=4758eb69e1fcffb4ab236f60bb0fbbac5f980247;p=licom.git The ability to delete entries has been added. Phone numbers now may contain spaces and dashes. Internal changes in LiCoM::Person. --- diff --git a/lib/LiCoM/Person.pm b/lib/LiCoM/Person.pm index cbc2eab..564d208 100644 --- a/lib/LiCoM/Person.pm +++ b/lib/LiCoM/Person.pm @@ -29,7 +29,8 @@ our %ValidFields = labeledURI => 1, mail => 1, mobile => 1, - o => 1 + o => 1, + userPassword => 0 ); our %ExternalNames = @@ -44,7 +45,8 @@ our %ExternalNames = uri => 'labeledURI', mail => 'mail', cellphone => 'mobile', - group => 'o' + group => 'o', + password => 'userPassword' ); our $Ldap; @@ -291,7 +293,16 @@ sub search if (@disjunc) { - push (@konjunct, join ('', '(|', @disjunc, ')')); + my $tmp; + if (scalar (@disjunc) == 1) + { + $tmp = $disjunc[0]; + } + else + { + $tmp = join ('', '(|', @disjunc, ')'); + } + push (@konjunct, $tmp); } } @@ -433,7 +444,8 @@ sub name =item I<$obj>-EB ([I<@groups>]) -Get or set the attribute. +Get or set the attribute. This is the same as calling S-EB +(I<$field>, I<\@values>)> or S-EB (I<$field>)>. =cut @@ -450,14 +462,34 @@ sub AUTOLOAD return (set ($obj, $field, @values ? [@values] : undef)) } +=item I<$obj>-EB (I<$field>) + +Returs the value(s) of field I<$field>. + +=cut + sub get { my $obj = shift; my $field = shift; - return (set ($obj, $field, undef)); + if (wantarray ()) + { + return (set ($obj, $field, undef)); + } + else + { + return (scalar (set ($obj, $field, undef))); + } } +=item I<$obj>-EB (I<$field>, I<\@values>) + +Sets the field I<$field> to the value(s) I<\@valued>. Pass an empty array-ref +to delete the field. + +=cut + sub set { my $obj = shift; @@ -544,23 +576,6 @@ sub get_user return ($cn, $id); } -sub password -{ - my $obj = shift; - my $entry = $obj->{'ldap'}; - my $pwd; - - if (@_) - { - $pwd = shift; - $entry->changetype ('modify'); - $entry->replace (userPassword => $pwd); - $entry->update ($Ldap); - } - - $pwd = $entry->get_value ('userPassword'); -} - =back =head1 AUTHOR diff --git a/licom.cgi b/licom.cgi index 40bb8a3..8a52ef4 100755 --- a/licom.cgi +++ b/licom.cgi @@ -44,6 +44,8 @@ our %Actions = save => [\&html_start, \&action_save, \&html_end], search => [\&html_start, \&action_search, \&html_end], verify => [\&html_start, \&action_verify, \&html_end], + delete => [\&html_start, \&action_ask_del, \&html_end], + expunge => [\&html_start, \&action_do_del, \&html_end], vcard => \&action_vcard ); @@ -322,6 +324,7 @@ EOF [Verify] [vCard] [Edit] + [Delete] EOF @@ -787,6 +790,49 @@ EOM return (1); } +sub action_ask_del +{ + my $cn = param ('cn'); + $cn or die; + + my $person = LiCoM::Person->load ($cn); + $person or die; + + my $cn_esc = uri_escape ($cn); + + print <Really delete $cn? + +
+ You are about to delete $cn. Are you + totally, absolutely sure you want to do this? +
+ + + +EOF +} + +sub action_do_del +{ + my $cn = param ('cn'); + $cn or die; + + my $person = LiCoM::Person->load ($cn); + $person or die; + + $person->delete (); + + print <$cn has been deleted. + +EOF + action_browse (); +} + sub html_start { my $title = shift; @@ -1101,9 +1147,9 @@ sub verify_fields my $number = $_; next unless ($number); - if ($number !~ m/^\+/) + if ($number !~ m/^\+[0-9 \-]+$/) { - push (@errors, 'Telephone numbers have to begin with the country code, e.g. "+49 911 123456"'); + push (@errors, 'Telephone numbers have to begin with the country code and only numbers, spaces and dashes are allowed, e.g. "+49 911-123456"'); last; } } @@ -1136,8 +1182,8 @@ sub get_contacts { for (@values) { - $_ =~ s/\D//g; - $_ = '+' . $_; + $_ =~ s/[^0-9 \-]//g; + $_ = '+' . $_ if ($_); } }