X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=licom.cgi;h=59eddd66fb65a04bcd2e978a6bb5adf4601cadaa;hb=297ce7fe28302141e53fb85c12ccc1db65ff59d7;hp=80239b50a0de8339e607f8e962520452abca39bc;hpb=efe4485ed983d6573813abf54fe6ddd9e855434b;p=licom.git

diff --git a/licom.cgi b/licom.cgi
index 80239b5..59eddd6 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
 			[<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
@@ -479,7 +482,7 @@ EOF
 		my $print = defined ($FieldNames{$field}) ? $FieldNames{$field} : $field;
 		my @values = @{$contacts->{$field}};
 
-		next if (!$UserID and $field eq 'group');
+		next if ($field eq 'group');
 
 		push (@values, '');
 		
@@ -496,6 +499,31 @@ EOF
 		}
 	}
 
+	if ($UserID)
+	{
+		my %c_groups = map { $_ => 1 } (@{$contacts->{'group'}});
+		my %a_groups = ();
+		my @a_persons = LiCoM::Person->search ();
+
+		for (@a_persons)
+		{
+			$a_groups{$_} = 1 for ($_->get ('group'));
+		}
+
+		print "\t\t\t<tr>\n",
+		"\t\t\t\t<th>", $FieldNames{'group'}, "</th>\n",
+		qq(\t\t\t\t<td><select name="group" multiple="multiple">\n);
+		for (sort (keys %a_groups))
+		{
+			my $group = $_;
+			my $selec = defined ($c_groups{$group}) ? ' selected="selected"' : '';
+
+			print qq(\t\t\t\t\t<option value="$group"$selec>$group</option>\n);
+		}
+		print "\t\t\t\t</select></td>\n",
+		"\t\t\t</tr>\n";
+	}
+
 	print <<EOF;
 			<tr>
 				<th colspan="2" class="menu">
@@ -671,6 +699,8 @@ EOF
 		my $vc_fld = $vcard_types{$field};
 		my $values = $person->get ($field);
 
+		next unless ($vc_fld);
+
 		for (@$values)
 		{
 			my $value = $_;
@@ -693,12 +723,12 @@ sub action_verify
 	$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 &quot;$cn&quot; is &quot;$password&quot;.);
@@ -744,10 +774,10 @@ sub action_verify_send_mail
 	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;
@@ -773,18 +803,66 @@ 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;
@@ -1001,6 +1079,7 @@ Content-Type: text/html; charset=UTF-8
 
 	<body>
 EOF
+
 	if ($UserID)
 	{
 		my $search = param ('search') || '';
@@ -1099,9 +1178,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. &quot;+49 911 123456&quot;');
+			push (@errors, 'Telephone numbers have to begin with the country code and only numbers, spaces and dashes are allowed, e.g. &quot;+49 911-123456&quot;');
 			last;
 		}
 	}
@@ -1134,8 +1213,8 @@ sub get_contacts
 		{
 			for (@values)
 			{
-				$_ =~ s/\D//g;
-				$_ = '+' . $_;
+				$_ =~ s/[^0-9 \-]//g;
+				$_ = '+' . $_ if ($_);
 			}
 		}