Fix dictionary-update-receiver to cope with new cgi_get_caller

[ypp-sc-tools.web-live.git] / yarrg / Commods.pm

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 9b190c4b3a88d5236cc1e9ff9f41058a12118be2..b670f58a0c5245c12a9f0d14082ae8c437a583d5 100644 (file)
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -32,7 +32,7 @@ BEGIN {
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
-    @EXPORT      = qw(&parse_info1 &rsync_master
+    @EXPORT      = qw(&parse_info_clientside
                      &parse_info_serverside &parse_info_serverside_ocean
                      %oceans %commods %clients %routes %route_mysteries
                      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
@@ -40,7 +40,7 @@ BEGIN {
                      &pipethrough_prep &pipethrough_run
                      &pipethrough_run_along &pipethrough_run_finish
                      &pipethrough_run_gzip
-                     &cgipostform);
+                     &cgipostform &yarrgpostform &cgi_get_caller);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
@@ -252,6 +252,13 @@ sub pipethrough_run_gzip ($) {
     pipethrough_run($_[0],undef,'gzip','gzip');
 }
 
+sub yarrgpostform ($$) {
+    my ($ua, $form) = @_;
+    my $dest= $ENV{'YPPSC_YARRG_YARRG'};
+    get_our_version($form, 'client');
+    return cgipostform($ua, "$dest/commod-update-receiver", $form);
+}    
+
 sub cgipostform ($$$) {
     my ($ua, $url, $form) = @_;
     my $req= HTTP::Request::Common::POST($url,
@@ -325,4 +332,17 @@ sub check_tsv_line ($$) {
     return @v;
 }
 
+sub cgi_get_caller () {
+    my $caller= $ENV{'REMOTE_ADDR'};
+    $caller= 'LOCAL' unless defined $caller;
+
+    my $fwdf= $ENV{'HTTP_X_FORWARDED_FOR'};
+    if (defined $fwdf) {
+       $fwdf =~ s/\s//g;
+       $fwdf =~ s/[^0-9.,]/?/g;
+       $caller= "$fwdf";
+    }
+    return $caller;
+}
+
 1;