use URI::Escape;
use Data::Dumper;
-use LiCoM::Config (qw(get_config));
-use LiCoM::Person;
+use LiCoM::Config (qw(get_config set_config read_config));
+use LiCoM::Connection ();
+use LiCoM::Group ();
+use LiCoM::Person ();
our $Debug = 0;
-our $Config = {};
-our @MultiFields = (qw(address homephone cellphone officephone fax mail uri group));
+our @MultiFields = (qw(address homephone cellphone officephone fax mail uri));
our %FieldNames =
(
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
);
-$Config = get_config ();
+read_config ();
# make sure AuthLDAPRemoteUserIsDN is enabled.
die unless ($ENV{'REMOTE_USER'});
-$Config->{'base_dn'} = $ENV{'REMOTE_USER'};
+set_config ('base_dn', $ENV{'REMOTE_USER'});
-die unless (defined ($Config->{'uri'}) and defined ($Config->{'base_dn'})
- and defined ($Config->{'bind_dn'}) and defined ($Config->{'password'}));
+die unless (defined (get_config ('uri'))
+ and defined (get_config ('base_dn'))
+ and defined (get_config ('bind_dn'))
+ and defined (get_config ('password')));
-LiCoM::Person->connect
+LiCoM::Connection->connect
(
- uri => $Config->{'uri'},
- base_dn => $Config->{'base_dn'},
- bind_dn => $Config->{'bind_dn'},
- password => $Config->{'password'}
+ uri => get_config ('uri'),
+ bind_dn => get_config ('bind_dn'),
+ password => get_config ('password')
) or die;
-our ($UserCN, $UserID) = LiCoM::Person->get_user ($Config->{'base_dn'});
+our ($UserCN, $UserID) = LiCoM::Person->get_user ($ENV{'REMOTE_USER'});
if (!$UserID and $Action ne 'save')
{
}
}
-LiCoM::Person->disconnect ();
+LiCoM::Connection->disconnect ();
exit (0);
$group = shift if (@_);
$group ||= '';
- my @all;
- if ($group)
- {
- @all = LiCoM::Person->search ([[group => $group]]);
- }
- else
- {
- @all = LiCoM::Person->search ();
- }
-
if (!$group)
{
- my @nogroup = ();
- my %groups = ();
- for (@all)
- {
- my $person = $_;
- my @g = $person->get ('group');
-
- $groups{$_} = (defined ($groups{$_}) ? $groups{$_} + 1 : 1) for (@g);
-
- push (@nogroup, $person) if (!@g);
- }
- @all = @nogroup;
+ my @groups = LiCoM::Group->all ();
print qq(\t\t<h2>Contact Groups</h2>\n\t\t<ul class="groups">\n);
- for (sort (keys (%groups)))
+ for (@groups)
{
my $group = $_;
- my $group_esc = uri_escape ($group);
- my $num = $groups{$group};
-
- print qq(\t\t\t<li><a href="$MySelf?action=browse&group=$group_esc">$group</a> ($num)</li>\n);
+ my @members = $group->get_members ();
+ my $members = scalar (@members);
+ my $group_name = $group->name ();
+ my $group_esc = uri_escape ($group_name);
+ my $desc = $group->description ();
+
+ print qq#\t\t\t<li><a href="$MySelf?action=browse&group=$group_esc">$group_name</a> ($members Members)#;
+ print qq(<br />\n\t\t\t\t<span class="description">$desc</span>) if ($desc);
+ print "</li>\n";
}
- if (!%groups)
+ if (!@groups)
{
print qq(\t\t\t<li class="empty">There are no groups yet.</li>\n);
}
- print qq(\t\t</ul>\n\n);
- }
-
- if ($group)
- {
- print qq(\t\t<h2>Contact Group "$group"</h2>\n);
+ print <<EOF;
+ </ul>
+ <div class="menu">
+ [<a href="$MySelf?action=list">List all</a>]
+ </div>
+EOF
}
else
{
- print qq(\t\t<h2>Contacts without a group</h2>\n);
- }
-
- print qq(\t\t<ul class="results">\n);
- for (sort { $a->name () cmp $b->name () } (@all))
- {
- my $person = $_;
- my $cn = $person->name ();
- my $cn_esc = uri_escape ($cn);
-
- print qq(\t\t\t<li><a href="$MySelf?action=detail&cn=$cn_esc">$cn</a></li>\n);
- }
- if (!@all)
- {
- print "\t\t\t<li>There are no matching entries.</li>\n";
- }
- print qq(\t\t</ul>\n\n);
+ my $group_obj = LiCoM::Group->load ($group);
+ my $group_esc = uri_escape ($group_obj->name ());
+ my @member_names = $group_obj->get_members ();
+
+ print qq(\t\t<h2>Contact Group "$group"</h2>\n),
+ qq(\t\t<ul class="results">\n);
+ for (sort (@member_names))
+ {
+ my $cn = $_;
+ my $cn_esc = uri_escape ($cn);
- print qq(\t\t<div class="menu">\n);
- if ($group)
- {
- my $group_esc = uri_escape ($group);
- print qq(\t\t\t[<a href="$MySelf?action=list&group=$group_esc">List</a>]\n),
- qq(\t\t\t[<a href="$MySelf?action=browse">Back</a>]\n);
- }
- else
- {
- print qq(\t\t\t[<a href="$MySelf?action=list">List</a>]\n);
+ print qq(\t\t\t<li><a href="$MySelf?action=detail&cn=$cn_esc">$cn</a></li>\n);
+ }
+
+ print <<EOF;
+ </ul>
+ <div class="menu">
+ [<a href="$MySelf?action=list&group=$group_esc">List</a>]
+ [<a href="$MySelf?action=browse">Back</a>]
+ [Edit]
+ </div>
+EOF
}
- print qq(\t\t</div>\n);
}
sub action_list
[<a href="$MySelf?action=verify&cn=$cn_esc">Verify</a>]
[<a href="$MySelf?action=vcard&cn=$cn_esc">vCard</a>]
[<a href="$MySelf?action=edit&cn=$cn_esc">Edit</a>]
+ [<a href="$MySelf?action=delete&cn=$cn_esc">Delete</a>]
</div>
EOF
my $print = defined ($FieldNames{$field}) ? $FieldNames{$field} : $field;
my @values = @{$contacts->{$field}};
+ next if ($field eq 'group');
+
push (@values, '');
for (@values)
}
}
+ if ($UserID)
+ {
+ my @all_groups = LiCoM::Group->all ();
+
+ if (@all_groups)
+ {
+ print "\t\t\t<tr>\n",
+ "\t\t\t\t<th>Group(s)</th>\n",
+ qq(\t\t\t\t<td><select name="group" multiple="multiple" size="5">\n);
+
+ for (@all_groups)
+ {
+ my $group = $_;
+ my $group_name = $group->name ();
+ my $selected = '';
+
+ if (grep { $cn eq $_ } ($group->get_members ()))
+ {
+ $selected = ' selected="selected"';
+ }
+
+ print qq(\t\t\t\t\t<option value="$group_name"$selected>$group_name</option>\n);
+ }
+ print "\t\t\t\t</select></td>\n",
+ "\t\t\t</tr>\n";
+ }
+
+ print "\t\t\t<tr>\n",
+ "\t\t\t\t<th>New Group</th>\n",
+ qq(\t\t\t\t<td><input type="text" name="newgroup" value="" /></td>\n),
+ "\t\t\t</tr>\n";
+ }
+
print <<EOF;
<tr>
<th colspan="2" class="menu">
$cn = $person->name ();
+ for (param ('group'))
+ {
+ my $group_name = $_;
+ my $group = LiCoM::Group->load ($group_name);
+
+ if ($group)
+ {
+ $group->add_members ($cn);
+ }
+ else
+ {
+ print qq(\t<div class="error">Group "$group_name" does not exist or could not be loaded.</div>\n);
+ }
+ }
+
+ if (param ('newgroup'))
+ {
+ # FIXME add error handling
+ my $group_name = param ('newgroup');
+ LiCoM::Group->create ($group_name, '', $cn);
+ }
+
if ($button eq 'apply')
{
action_edit (cn => $cn);
$person->firstname ($firstname) if ($firstname and $firstname ne $person->firstname ());
$cn = $person->name ();
+ # FIXME Fix groups
}
my $contacts = get_contacts ();
{
my $field = $_;
+ next if (!$UserID and $field eq 'group');
+
if (defined ($contacts->{$field}))
{
my $values = $contacts->{$field};
}
}
+ my %changed_groups = map { $_ => 1 } (param ('group'));
+ my @current_groups = LiCoM::Group->load_by_member ($cn);
+
+ for (@current_groups)
+ {
+ my $group_obj = $_;
+ my $group_name = $group_obj->name ();
+
+ if (!defined ($changed_groups{$group_name}))
+ {
+ $group_obj->del_members ($cn);
+ }
+ else
+ {
+ delete ($changed_groups{$group_name});
+ }
+ }
+ for (keys %changed_groups)
+ {
+ my $group_name = $_;
+ my $group_obj = LiCoM::Group->load ($group_name) or die;
+
+ $group_obj->add_members ($cn);
+ }
+
+ if (param ('newgroup'))
+ {
+ # FIXME add error handling
+ my $group_name = param ('newgroup');
+ LiCoM::Group->create ($group_name, '', $cn);
+ }
+
if ($button eq 'apply' or !$UserID)
{
action_edit (cn => $cn);
my $vc_fld = $vcard_types{$field};
my $values = $person->get ($field);
+ next unless ($vc_fld);
+
for (@$values)
{
my $value = $_;
$mail ||= '';
my $message;
- my $password = $person->password ();
+ my $password = $person->get ('password');
if (!$password)
{
$password = pwgen ();
- $person->password ($password);
+ $person->set ('password', $password);
}
$message = qq(The password for the record "$cn" is "$password".);
my $person_name = $person->name ();
my ($person_mail) = $person->get ('mail');
my $person_gn = $person->firstname ();
- my $password = $person->password ();
+ my $password = $person->get ('password');
my $host = $ENV{'HTTP_HOST'};
- my $url = 'http://' . $host . $MySelf;
+ my $url = (defined ($ENV{'HTTPS'}) ? 'https://' : 'http://') . $host . $MySelf;
open ($smh, "| /usr/sbin/sendmail -t -f $owner_mail") or die ("open pipe to sendmail: $!");
print $smh <<EOM;
print $smh <<EOM;
If this entry is outdated or incomplete, please take a minute and correct it.
- Address: $url
+ Address: $url
Username: $person_name
Password: $password
-Thank you very much :) Regards,
+Thank you very much :)
+
+Regards,
$UserCN
+--
+This message was automatically generated by LiCoM,
+http://verplant.org/licom/
EOM
close ($smh);
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 <<EOF;
+ <h2>Really delete $cn?</h2>
+
+ <div>
+ You are about to delete <strong>$cn</strong>. Are you
+ totally, absolutely sure you want to do this?
+ </div>
+
+ <div class="menu">
+ [<a href="$MySelf?action=expunge&cn=$cn_esc">Yes, delete</a>]
+ [<a href="$MySelf?action=detail&cn=$cn_esc">No, keep</a>]
+ </div>
+
+EOF
+}
+
+sub action_do_del
+{
+ my $cn = param ('cn');
+ $cn or die;
+
+ my $person = LiCoM::Person->load ($cn);
+ $person or die;
+
+ $person->delete ();
+
+ print <<EOF;
+ <div>$cn has been deleted.</div>
+
+EOF
+ action_browse ();
+}
+
sub html_start
{
my $title = shift;
<body>
EOF
+
if ($UserID)
{
my $search = param ('search') || '';
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;
}
}
{
for (@values)
{
- $_ =~ s/\D//g;
- $_ = '+' . $_;
+ $_ =~ s/[^0-9 \-]//g;
+ $_ = '+' . $_ if ($_);
}
}
projects / licom.git / blobdiff