[Httpmail-devel] HTTPMailClient minor clean up patch

[Rob N. <na...@bi...>]

This patch allows HTTPMailClient to "use strict".  It fixes a minor
bug in a regex, and I removed some stuff which isn't likely to be
used (handled by get_httpmail.pl).

Cheers,
Rob
----------------------------------------------------------------
Index: HTTPMailClient.pm
===================================================================
*** HTTPMailClient.pm	2002/10/01 23:05:25	1.1
--- HTTPMailClient.pm	2002/10/02 18:14:25	1.4
***************
*** 14,26 ****
  use HTTP::Cookies;
  use XML::XPath;
  use XML::XPath::XMLParser;
! #use strict;
  
  {
! 	package RequestAgent;
! 	@ISA = qw(LWP::UserAgent);
  
! 	my $user, $passwd;
  
  	sub new
  	{ 
--- 14,26 ----
  use HTTP::Cookies;
  use XML::XPath;
  use XML::XPath::XMLParser;
! use strict;
  
  {
! 	package Mail::HTTPMailClient::RequestAgent;
! 	@Mail::HTTPMailClient::RequestAgent::ISA = qw(LWP::UserAgent);
  
! 	my($user, $passwd);
  
  	sub new
  	{ 
***************
*** 105,126 ****
  
  sub new
  {
! 	my $classname = shift;
  	my $self = {
! 		user     => "",
! 		passwd   => "",
! 		server   => "http://services.msn.com/svcs/hotmail/httpmail.asp",
! 		markread => "no",
! 		onlynew  => "no",
! 		leave    => "no",
! 		forward  => "",
! 		savefile => "",
! 		sendmail => "sendmail",
  	};
- 
- 	if (-x "/usr/sbin/sendmail") { $cfg{sendmail} = "/usr/sbin/sendmail" }
- 	elsif (-x "/usr/lib/sendmail") { $cfg{sendmail} = "/usr/lib/sendmail" }
- 
  	bless($self, $classname);
  	return $self;
  }
--- 105,115 ----
  
  sub new
  {
! 	my($classname, $server) = @_;
  	my $self = {
! 	    server => $server
! 	        || "http://services.msn.com/svcs/hotmail/httpmail.asp",
  	};
  	bless($self, $classname);
  	return $self;
  }
***************
*** 130,136 ****
  	my $self = shift;
  	($self->{user}, $self->{passwd}) = @_;
  
! 	$self->{ua} = new RequestAgent;
  	$self->{ua}->cookie_jar(new HTTP::Cookies);
  	$self->{ua}->set_user($self->{user}, $self->{passwd});
  
--- 119,125 ----
  	my $self = shift;
  	($self->{user}, $self->{passwd}) = @_;
  
! 	$self->{ua} = new Mail::HTTPMailClient::RequestAgent;
  	$self->{ua}->cookie_jar(new HTTP::Cookies);
  	$self->{ua}->set_user($self->{user}, $self->{passwd});
  
***************
*** 158,168 ****
  sub getFolders
  {
  	my ($self) = @_;
! 	$req = new HTTP::Request(PROPFIND => $self->{msgfolderroot});
  	$req->content_type("text/xml");
  	$req->content($findsubs);
  
! 	$res = $self->{ua}->request($req);
  
  	my $xp = new XML::XPath(xml => $res->content);
  	my @folders;
--- 147,157 ----
  sub getFolders
  {
  	my ($self) = @_;
! 	my $req = new HTTP::Request(PROPFIND => $self->{msgfolderroot});
  	$req->content_type("text/xml");
  	$req->content($findsubs);
  
! 	my $res = $self->{ua}->request($req);
  
  	my $xp = new XML::XPath(xml => $res->content);
  	my @folders;
***************
*** 184,191 ****
  
  sub getMessageHeaders
  {
! 	my $self = shift;
! 	my $curfolder = $self->{inbox};
  	my @messages;
  
  	my $req = new HTTP::Request(PROPFIND => $curfolder);
--- 173,180 ----
  
  sub getMessageHeaders
  {
! 	my($self, $curfolder) = @_;
! 	$curfolder ||= $self->{inbox};
  	my @messages;
  
  	my $req = new HTTP::Request(PROPFIND => $curfolder);
***************
*** 208,214 ****
  		$msg->{subject}    = $xp->findvalue(".//m:subject", $node);
  		$msg->{size}       = $xp->findvalue(".//D:getcontentlength", $node);
  		$msg->{folder}     = $curfolder;
! 		$msg->{href} =~ /$curfolder(.*)$/;
  		$msg->{id}         = $1;
  		push @messages, $msg;
  	}
--- 197,203 ----
  		$msg->{subject}    = $xp->findvalue(".//m:subject", $node);
  		$msg->{size}       = $xp->findvalue(".//D:getcontentlength", $node);
  		$msg->{folder}     = $curfolder;
! 		$msg->{href} =~ /\Q$curfolder\E(.*)$/;
  		$msg->{id}         = $1;
  		push @messages, $msg;
  	}