X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fdictionary-update-receiver;h=352b9bbbfd09d77fb1f405be2a53b199d7627615;hp=d088236b7429f2cb080b22624aa4949212ae7628;hb=3ca67ce14212ba4421029d7b8db90f03f106c67c;hpb=c68fb80a6bbf7acbcac4b2cb2143f5fea745cd2b

diff --git a/yarrg/dictionary-update-receiver b/yarrg/dictionary-update-receiver
index d088236..352b9bb 100755
--- a/yarrg/dictionary-update-receiver
+++ b/yarrg/dictionary-update-receiver
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# This script is invoked when the YPP SC PCTB client talks to the
+# This script is invoked when the yarrg wants to send an update to the
 # dictionary server.  See README.privacy.
 
 # This is part of ypp-sc-tools, a set of third-party tools for assisting
@@ -28,7 +28,7 @@
 
 # upload testing runes:
 #
-# YPPSC_PCTB_DICT_UPDATE=./ YPPSC_PCTB_DICT_SUBMIT=./ ./ypp-commodities --ocean midnight --pirate aristarchus --find-island --same --raw-tsv >raw.tsv  
+# YPPSC_YARRG_DICT_UPDATE=./ YPPSC_YARRG_DICT_SUBMIT=./ ./yarrg --ocean midnight --pirate aristarchus --find-island --same --raw-tsv >raw.tsv  
 # ./dictionary-manager --debug --approve-updates '' . .
 
 use strict (qw(vars));
@@ -41,6 +41,8 @@ use CGI qw/:standard -private_tempfiles/;
 use IO::Pipe;
 use IO::Handle;
 
+use Commods;
+
 my $aadepth=2;
 
 #---------- pixmaps ----------
@@ -187,7 +189,7 @@ my $version= param('version');
 my $spec_aadepth= param('depth');
 if ($version ne '3'  ||  $spec_aadepth ne $aadepth) {
     print header('text/plain',
-		 "403 YPP SC PCTB client is out of date".
+		 "403 yarrg client is out of date".
 		 " ($version, $spec_aadepth)");
     print "\nYour YPP SC client is out of date.\n";
     exit 0;
@@ -205,15 +207,7 @@ if (defined $ocean && defined $pirate) {
     $pirate= '';
 }
 
-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,$pirate";
-}
+my $caller= cgi_get_caller();
 
 my $kind;
 my @xa;