Changeset 3285

Timestamp:

May 15, 2009, 6:23:03 PM (15 years ago)

Author:

ronosman

Message:

Bug 972 fixed : pLoader cannot connect to gallery authenticated by Apache.

Location:

extras/pLoader/trunk/src/Uploader

Files:

• GUI/wxApp.pm (modified) (5 diffs)
• PWG.pm (modified) (1 diff)
• PWG/WebServices.pm (modified) (3 diffs)

extras/pLoader/trunk/src/Uploader/GUI/wxApp.pm

@@ -290 +290 @@
           site_username
           site_password
+          http_username
+          http_password
           rejects
           imagelist
@@ -366 +368 @@
         $self->{site_password}
     );
+
+    $self->http_username(
+        $self->{http_username}
+    );
+    $self->http_password(
+        $self->{http_password}
+    );
+
+
     $self->current_language(
         $self->{current_language}||wxLANGUAGE_ENGLISH
@@ -448 +459 @@
                     site_username
                     site_password
+                    http_username
+                    http_password
                     current_language
                 /
@@ -584 +597 @@
                 site_username  => $self->site_username,
                 site_password  => $self->site_password,
+                http_username  => $self->http_username,
+                http_password  => $self->http_password,
                 branding       => $self->branding,
             }
@@ -934 +949 @@
 }
 
-sub _readParams2 {
-        my( $self, $file ) = @_ ;
-
-
-        my $expr_params ;
-        eval { $expr_params = read_file( $file ); } ;
-        
-        my $paramValues = [] ;
-        if($expr_params){
-                my $expr = '$paramValues = ' ;
-                $expr .=  "$expr_params ; " ;
-                eval $expr ;
-        }
-        
-        return unless 'HASH' eq ref $paramValues ;
-        
-        $self->SetKeyValues($paramValues);
-}
 
 

extras/pLoader/trunk/src/Uploader/PWG.pm

@@ -35 +35 @@
            site_username
            site_password
+           http_username
+           http_password
+           branding
       / 
 );

extras/pLoader/trunk/src/Uploader/PWG/WebServices.pm

@@ -71 +71 @@
     );
     
+    
     $self->uagent->cookie_jar({});      
 
@@ -83 +84 @@
     $self->password(
         $self->{site_password}
+    );
+
+    
+    $self->uagent->default_headers->authorization_basic(
+        $self->{http_username}||$self->username, 
+        $self->{http_password}||$self->password
     );
     
@@ -125 +132 @@
         };
     }
-        
+
     $self->login_result(
         $hresult