The unified diff between revisions [de4db4df..] and [ecd4e292..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'orangelogin.pl'

#
# old_revision [de4db4dfdb5b06db3036c818377dc60413897099]
# new_revision [ecd4e29264735a669eb7c177cde4a4afeb3f21dd]
#
# patch "orangelogin.pl"
#  from [5c2b702d6898933698a423b082a2864756f9737e]
#    to [a1669077494ebc019fea4aa7508d11ee917d3d0b]
#
============================================================
--- orangelogin.pl	5c2b702d6898933698a423b082a2864756f9737e
+++ orangelogin.pl	a1669077494ebc019fea4aa7508d11ee917d3d0b
@@ -28,13 +28,13 @@ $username = $options{'username'};
 close CONFIG;
 
 $username = $options{'username'};
-die "username not set" unless defined($username);
+error("username not set") unless defined($username);
 
 $password = $options{'password'};
-die "password not set" unless defined($password);
+error("password not set") unless defined($password);
 
 $downloaddir = $options{'downloaddir'};
-die "downloaddir not set" unless defined($downloaddir);
+error("downloaddir not set") unless defined($downloaddir);
 
 print "Fetching homepage\n";
 $mech->get("https://www.orange.co.uk/");
@@ -46,8 +46,8 @@ $mech->submit_form(
 $mech->submit_form(
 	form_number => 1,
 	fields      => {
-		txtMSISDN  => $username,
-		txtPassword  => $password,
+		LOGIN     => $username,
+		PASSWORD  => $password,
 	}
 );
 
@@ -62,6 +62,8 @@ $mech->submit_form(
 	}
 );
 
+follow_processing();
+
 print "Following view your bills link\n";
 
 $mech->follow_link( text_regex => qr/view your bills/ );
@@ -74,7 +76,6 @@ for $link (@links) {
     my ($invoice) = $url =~ /leg_invoice=(\d+)/;
     my $filename = $downloaddir . '/' . $invoice . ".pdf";
     unless (-e $filename) {
-#	print "Downloading invoice $invoice to $filename from $url\n";
 	print "Downloading invoice $invoice to $filename\n";
         downloadbill($url, $filename);
         #$mech->mirror($url, $filename);
@@ -83,13 +84,6 @@ for $link (@links) {
     }
 }
 
-#$mech->follow_link( text_regex => qr/log out/ );
-
-#print $mech->content();
-
-#$mech->dump_forms( undef, $absolute );
-#$mech->dump_links( undef, $absolute );
-
 sub follow_processing {
     my $url, $attempts;
 
@@ -105,7 +99,6 @@ sub follow_processing {
 
         $url =~ s/&/&/g;
 
-#        print "Attempt $attempts. Found URL: $url\n";
 	print "Waiting for processing. Attempt $attempts.\n";
 
         my $newurl = $mech->uri();
@@ -113,8 +106,6 @@ sub follow_processing {
         $newurl =~ s/\/[^\/]*$//;
         $newurl = $newurl . "/" . $url;
 
-#        print "I think I'm going to $newurl\n";
-
         $mech->get($newurl);
         print "Processing finished.\n";
     }