Changeset 871 for Link-Accounts-Remote

Timestamp:

12/23/11 17:03:52 (12 years ago)

Author:

nanardon

Message:

• fix error detection

Location:

Link-Accounts-Remote

Files:

• bin/la-chpasswd (modified) (2 diffs)
• lib/Link/Accounts/Remote.pm (modified) (4 diffs)

Link-Accounts-Remote/bin/la-chpasswd

@@ -65 +65 @@
 my $lar = Link::Accounts::Remote->new($url);
 
-if ($lar->simple_request(
+if ($lar->query(
         'user.change_password',
         $user,
@@ -74 +74 @@
     exit 0;
 } else {
-    die "Error when trying to change password: " . $RPC::XML::ERROR . "\n";
+    die "Error when trying to change password: " . $Link::Accounts::Remote::ERROR . "\n";
 }
 

Link-Accounts-Remote/lib/Link/Accounts/Remote.pm

@@ -12 +12 @@
 our $VERSION = '0.01';
 
+our $ERROR;
+
 sub new {
     my ($class, $url) = @_;
@@ -23 +25 @@
 
     # Don't check certificate:
-    $self->useragent->ssl_opts(verify_hostname => 0);
+    #$self->useragent->ssl_opts(verify_hostname => 0);
 
     bless $self, $class;
@@ -31 +33 @@
     my $domain = Net::Domain::hostdomain() or return;
 
-    my $res     = Net::DNS::Resolver->new;
+    my $res = Net::DNS::Resolver->new;
     if (my $query = $res->query("_link_accounts.$domain", 'TXT')) {
         foreach my $rr ($query->answer) {
@@ -39 +41 @@
     }
     return;
+}
+
+sub query {
+    my ($self, @args) = @_;
+
+    my $res = $self->send_request(@args);
+    if (!$res) {
+        $ERROR = $RPC::XML::ERROR;
+        return undef;
+    } elsif (ref $res && !$res->is_fault) {
+        return @{$res->value};
+    } else {
+        $ERROR = $res->string;
+        return;
+   }
 }