Changeset 317 for trunk

Timestamp:

05/24/10 05:11:50 (14 years ago)

Author:

nanardon

Message:

• use extern_uid existance to figure if the voters need an external authentication

Location:

trunk/lib/Epoll/DB

Files:

• Poll.pm (modified) (3 diffs)
• Voting.pm (modified) (1 diff)

trunk/lib/Epoll/DB/Poll.pm

@@ -846 +846 @@
     my $ext_auth = $options{ext_auth} && $handle->can_authenticate;
     my $authid;
-    if ($ext_auth) { # register authentication
+    if ($ext_auth || $options{save_param}) {
         my $find_next_id = $self->db->prepare_cached(
             q{select nextval('extern_auth_id_seq'::regclass)}
@@ -855 +855 @@
 
         my $add_auth = $self->db->prepare_cached(
-            q{insert into extern_auth (id, params, owner, auth_type, desc) values
+            q{insert into extern_auth (id, params, owner, auth_type, "desc") values
             (?,?,?,?,?)}
         );
@@ -867 +867 @@
     };
     foreach (@list) {
-        $self->addupd_voting($_->[0], $_->[1] || '', $authid, $_->[2]) or do {
+        $self->addupd_voting(
+            $_->[0], $_->[1] || '', $authid, ($ext_auth ? $_->[2]: undef)
+        ) or do {
             $self->db->rollback;
             return;

trunk/lib/Epoll/DB/Voting.pm

@@ -58 +58 @@
 
         warn "ee";
-    if ($userinfo->{extern_auth}) {
+    if ($userinfo->{extern_uid}) {
         warn "rr";
         my $handle = $self->stored_import_handle($userinfo->{extern_auth})