diff -r --exclude=fr --exclude=diff.txt ./console/console-menu-items/testInternet.pl ../v7r2/console/console-menu-items/testInternet.pl 28a29,35 > use LWP; > use HTTP::Request::Common; > use Digest::SHA1 qw(sha1_hex); > > use esmith::ConfigDB; > my $db = esmith::ConfigDB->open_ro or die "Couldn't open ConfigDB\n"; > 45a53,70 > use constant SERVERTEST => 'http://www.contribs.org/servertest/'; > > my $release = esmith::util::determineRelease(); > my $sysid_hash = sha1_hex($db->get_prop('sysconfig','SystemID')); > > my $url = SERVERTEST . "?" . "ReleaseVersion=$release" . > "&SystemIDHash=$sysid_hash"; > > my $ua = LWP::UserAgent->new; > > # add proxy arguments if appropriate > if ($db->get_value('SquidParent')) > { > my $parent = $db->get_value('SquidParent'); > my $port = $db->get_value('SquidParentPort') || "3128"; > $ua->proxy(['http', 'ftp'], "http://$parent:$port/"); > } > 51c76,84 < if (system("/sbin/e-smith/statusreport") == 0) --- > my $response; > > eval { > local $SIG{INT} = sub {die 1}; > > $response = $ua->get($url); > }; > > if ($response->is_success) 61a95,98 > warn gettext("Response to Internet test was"), ": ", > $response->message, > "\n"; > diff -r --exclude=fr --exclude=diff.txt ./po/adminQuotaSummary.po ../v7r2/po/adminQuotaSummary.po 11c11 < "POT-Creation-Date: 2006-05-02 11:47+1000\n" --- > "POT-Creation-Date: 2006-03-16 18:37+1100\n" diff -r --exclude=fr --exclude=diff.txt ./po/foot.tmpl.po ../v7r2/po/foot.tmpl.po 11c11 < "POT-Creation-Date: 2006-06-05 18:38+1000\n" --- > "POT-Creation-Date: 2006-04-25 09:48+1000\n" diff -r --exclude=fr --exclude=diff.txt ./po/server-console.po ../v7r2/po/server-console.po 11c11 < "POT-Creation-Date: 2006-06-05 18:38+1000\n" --- > "POT-Creation-Date: 2006-04-25 09:48+1000\n" diff -r --exclude=fr --exclude=diff.txt ./po/userOverQuota.po ../v7r2/po/userOverQuota.po 11c11 < "POT-Creation-Date: 2006-05-02 11:47+1000\n" --- > "POT-Creation-Date: 2006-03-16 18:37+1100\n"