summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaouda Lo <daouda@mandriva.com>2006-02-21 12:34:25 +0000
committerDaouda Lo <daouda@mandriva.com>2006-02-21 12:34:25 +0000
commit275ba3532e92f394f332591e91c9cea9d8a52a85 (patch)
treec7c84482a127c31bb4e81391af3b97cda77e968d
parent7a9b6226b59654617cf2cdb3ec324c539d646f2d (diff)
downloadmgaonline-275ba3532e92f394f332591e91c9cea9d8a52a85.tar
mgaonline-275ba3532e92f394f332591e91c9cea9d8a52a85.tar.gz
mgaonline-275ba3532e92f394f332591e91c9cea9d8a52a85.tar.bz2
mgaonline-275ba3532e92f394f332591e91c9cea9d8a52a85.tar.xz
mgaonline-275ba3532e92f394f332591e91c9cea9d8a52a85.zip
- no needed key anymore
-rwxr-xr-xmdkonline18
1 files changed, 10 insertions, 8 deletions
diff --git a/mdkonline b/mdkonline
index ab54f4f1..c1e4c7be 100755
--- a/mdkonline
+++ b/mdkonline
@@ -84,9 +84,11 @@ sub get_conf() {
}
sub send_conf_via_soap {
+ my ($login, $password, $boxname, $descboxname, $country) = @_;
my $w = $in->wait_message(N("Please wait"), N("Reading configuration\n")) if $ia;
my $reg_host = mdkonline::register_upload_host($login, $password, $boxname, $descboxname, $country);
undef $w if $w;
+ $reg_host
}
sub send_conf {
@@ -154,7 +156,7 @@ my $wiz = wizards->new(
no_back => $is_success eq 'OK' ? 1 : 0,
post => sub {
if ($is_success eq 'OK') {
- ($sendconfres, $key) = send_conf($login, $password, $boxname);
+ $sendconfres = send_conf_via_soap($login, $password, $boxname, $descboxname, $country);
"upload";
} else { "choices" }
}
@@ -203,7 +205,7 @@ my $wiz = wizards->new(
}
},
post => sub {
- if ($sendconfres eq 'TRUE' && $key) {
+ if ($sendconfres eq 'TRUE') {
#mdkonline::automated_upgrades($conffile, $login, md5_hex($password), $boxname, $key, $country, 'TRUE');
#mdkonline::write_conf($registered);
#mdkonline::clean_confdir();
@@ -227,12 +229,12 @@ my $wiz = wizards->new(
if (!$ia && $login && $password && $boxname) {
$is_success = mdkonline::create_authenticate_account('authenticate', $login, $password);
if ($is_success eq 'OK') {
- ($sendconfres, $key) = send_conf($login, $password, $boxname);
- print "RESULT = $sendconfres - $key";
- if ($sendconfres eq 'TRUE' && $key) {
- mdkonline::automated_upgrades($conffile, $login, md5_hex($password), $boxname, $key, $country, 'TRUE');
- mdkonline::write_wide_conf($login, $boxname, $country);
- output_p($logfile, N("Configuration uploaded successfully"));
+ $sendconfres = send_conf_via_soap($login, $password, $boxname, $descboxname, $country);
+ print "RESULT = $sendconfres";
+ if ($sendconfres eq 'TRUE') {
+ #mdkonline::automated_upgrades($conffile, $login, md5_hex($password), $boxname, $key, $country, 'TRUE');
+ #mdkonline::write_wide_conf($login, $boxname, $country);
+ #output_p($logfile, N("Configuration uploaded successfully"));
} else { output_p($logfile, N("Problem uploading configuration")) }
} else {
output_p($logfile, N("Cannot connect to Mandriva Online website: wrong login/password or router/firewall bad settings"));