resync branches

1 files changed, 36 insertions, 30 deletions

diff --git a/mdkonline b/mdkonline
index cbcec800..639a31ce 100755
--- a/mdkonline
+++ b/mdkonline
@@ -31,13 +31,11 @@ use lang;
 
 use Getopt::Long;
 
-BEGIN { unshift @::textdomains, 'mdkonline', 'drakfirstboot' };
+BEGIN { unshift @::textdomains, 'mdkonline', 'drakfirstboot' }
 
 use mdkonline;
 use Digest::MD5  qw(md5 md5_hex md5_base64);
 
-my $in = interactive->vnew('su');
-
 my $expert_link = 'http://www.mandrakeexpert.com';
 my $online_link = 'https://www.mandrakeonline.net';
 
@@ -45,10 +43,18 @@ my $confdir = '/root/.MdkOnline';
 my $conffile = "$confdir/mdkupdate";
 my $logfile = '/var/tmp/mdkonline.log';
 
+my ($wiz, $login, $nlogin, $password, $npassword, $boxname, $cfmpassword, $email, $is_success, $key, $r, $createaccount, $sendconfres, $country, $ia);
+
+$ia = 1;
+
+GetOptions('interactive!' => \$ia, 'login=s' => \$login, 'pass=s' => \$password, 'box=s' => \$boxname, 'country:s' => \$country);
+
 #for compatibilities
 mkdir_p($confdir) if !-d $confdir;
 -e '/root/.mdkupdate' and system("mv", "/root/.mdkupdate", $conffile);
 
+my $in = interactive->vnew('su') if $ia;
+
 $::Wizard_title = N("Mandrakeonline");
 
 my %choices = (
@@ -58,9 +64,7 @@ my %choices = (
   
 my $choice = $choices{account};
 
-my ($wiz, $login, $nlogin, $password, $npassword, $boxname, $cfmpassword, $email, $is_success, $key, $r, $createaccount, $sendconfres, $country);
 
-GetOptions('login=s' => \$login, 'pass=s' => \$password, 'box=s' => \$boxname, 'country:s' => \$country);
 
 my %countries = map { lang::c2name($_) => $_ } lang::list_countries();
 $country = lang::c2name(lang::read('', $>)->{country});
@@ -70,7 +74,7 @@ sub read_conf() {
     my %t = getVarsFromSh($wideconf);
     my $host = chomp_(`hostname`);
     $t{MACHINE} ||= $1 if $host =~ /(\w+)(.*)/;
-    $login = $t{LOGIN}; $boxname = $t{MACHINE}
+    $login = $t{LOGIN}; $boxname = $t{MACHINE};
 }
 sub check_login {
     my ($log, $pass, $box) = @_;
@@ -80,27 +84,27 @@ sub check_login {
     my $clink = $expert_link . '/firsttimewizard/validusercheck.php' . '?u=' . $log . '&p=' . $pp;
     $resp = mdkonline::get_from_URL($clink, "MdkOnline_tuiAgent/");
     $resp->is_success and $res = $resp->content =~ /TRUE/ ? 1 : 0;
-    $res
+    $res;
 }
 sub send_conf {
     my ($log, $pass, $box) = @_;
     my $uplink = $online_link . '/wizard.php';
     my $pp = md5_hex($pass);
-    my $w = $in->wait_message(N("Please wait"), N("Reading configuration\n"));
+    my $w = $in->wait_message(N("Please wait"), N("Reading configuration\n")) if $ia;
     mdkonline::report_config("$confdir/$log.$pp.$box.online.log");
     my $tag = { submit => "upload_wizard", wizard => ["$confdir/$log.$pp.$box.online.log.bz2.uue"] };
-    undef $w;
-    my $ww = $in->wait_message(N("Please wait"), N("Sending configuration..."));
+    undef $w if $w;
+    my $ww = $in->wait_message(N("Please wait"), N("Sending configuration...")) if $ia;
     ($sendconfres, $key) = mdkonline::send_config($uplink, $tag);
     mdkonline::hw_upload($log, $pass, $box);
-    undef $ww;
-    ($sendconfres, $key)
+    undef $ww if $ww;
+    ($sendconfres, $key);
 }
 sub create_new_account {
     my ($log, $pass, $mail) = @_;
     my $url = $expert_link . '/online3_CreateAccount.php' . '?desuserid=' . $log . '&despwd=' . $pass . '&user_email=' . $mail;
     my $ca = mdkonline::subscribe_online($url);
-    $ca
+    $ca;
 }
 $wiz = {
 	name => N("Mandrakeonline"),
@@ -125,27 +129,27 @@ $wiz = {
 				   { label => N("Login:"),   val => \$login },
 				   { label => N("Password:"), val => \$password, hidden => 1 },
 				   { label => N("Machine name:"), val => \$boxname },
-				  ],
+				  ];
 			      },
 			      post => sub {
-				  my $_wait = $in->wait_message(N("Please wait"), N("Connecting to Mandrakeonline website..."));
+				  my $_wait = $in->wait_message(N("Please wait"), N("Connecting to Mandrakeonline website...")) if $ia;
 				  $is_success = check_login($login, $password, $boxname); undef($_wait);
-				  "authenticate"
+				  "authenticate";
 			      },
 			     },
 		  authenticate => {
 				   name => sub {
 				       if ($is_success) {
-					   N("In order to benefit from Mandrakeonline services,\nwe are about to upload your configuration.\n\nThe Wizard will now send the following information to Mandrakesoft:\n1) the list of packages you have installed on your system,\n2) your hardware configuration.\n\nIf you feel uncomfortable by that idea, or do not want to benefit from this service,\nplease press 'Cancel'. By pressing 'Next', you allow us to keep you informed\nabout security updates and useful upgrades via personalized email alerts.\nFurthermore, you benefit from discounted paid support services on\nwww.mandrakeexpert.com.")
+					   N("In order to benefit from Mandrakeonline services,\nwe are about to upload your configuration.\n\nThe Wizard will now send the following information to Mandrakesoft:\n1) the list of packages you have installed on your system,\n2) your hardware configuration.\n\nIf you feel uncomfortable by that idea, or do not want to benefit from this service,\nplease press 'Cancel'. By pressing 'Next', you allow us to keep you informed\nabout security updates and useful upgrades via personalized email alerts.\nFurthermore, you benefit from discounted paid support services on\nwww.mandrakeexpert.com.");
 				       } else {
-					   N("Connection problem") . "  " . N("or") . "  " . N("wrong password:") . "\n" . N("Your login or password was wrong.\n Either you'll have to type it again, or you'll need to create an account on Mandrakeonline.\n In the latter case, go back to the first step to connect to Mandrakeonline.\n Be aware that you must also provide a Machine name \n (only alphabetical characters are admitted)")
+					   N("Connection problem") . "  " . N("or") . "  " . N("wrong password:") . "\n" . N("Your login or password was wrong.\n Either you'll have to type it again, or you'll need to create an account on Mandrakeonline.\n In the latter case, go back to the first step to connect to Mandrakeonline.\n Be aware that you must also provide a Machine name \n (only alphabetical characters are admitted)");
 				       }
 				   },
 				   no_back => $is_success ? 1 : 0,
 				   post => sub { 
 				       if ($is_success) {
 					   ($sendconfres, $key) = send_conf($login, $password, $boxname);
-					   "upload"
+					   "upload";
 				       } else { "choices" }
 				   }
 				  },
@@ -157,11 +161,11 @@ $wiz = {
 				     { label => N("Password:"), val => \$npassword, hidden => 1 },
 				     { label => N("Confirm Password:"), val => \$cfmpassword, hidden => 1 },
 				     { label => N("Mail contact:"),   val => \$email },
-				    ]
+				    ];
 				},
 				post => sub {
 				    $createaccount = $npassword ne $cfmpassword ? N("The passwords do not match\n Please try again\n") : $nlogin eq '' ? N("Please provide a login") : mdkonline::check_valid_email($email) == 0 ?  N("Not a valid mail address!\n") : create_new_account($nlogin, $npassword, $email);
-				    "createaccount"
+				    "createaccount";
 				}
 			       },
 		  createaccount => {
@@ -169,7 +173,7 @@ $wiz = {
 					$createaccount eq 'OK' ? "\n\n" . N("Mandrakeonline Account successfully created.\nPlease click \"Next\" to authenticate and upload your configuration\n") : $createaccount;
 				    },
 				    post => sub {
-					$createaccount eq 'OK' ? "account" : "noaccount"
+					$createaccount eq 'OK' ? "account" : "noaccount";
 				    }
 				   },
 		  upload => {
@@ -177,14 +181,14 @@ $wiz = {
 				 if ($sendconfres eq 'TRUE' && $key) {
 				     "\n\n" . N("Your upload was successful!") . "\n\n" . N("From now you will receive on security and updates \nannouncements thanks to Mandrakeonline.") . "\n\n" . N("Mandrakeonline offers you the ability to automate the updates.\nA program will run regulary in your system waiting for new updates\n");
 				 } else {
-				     N("Connection problem") . N("Problem occurs when uploading files, please try again")
+				     N("Connection problem") . N("Problem occurs when uploading files, please try again");
 				 }
 			     },
 			     data => sub {
 				 if ($sendconfres eq 'TRUE' && $key) {
 				     [ 
 				      { label => N("Country"), val => \$country, type => "combo", list => [ sort keys %countries ], not_edit => 0 }
-				     ]
+				     ];
 				 }
 			     },
 			     post => sub {
@@ -192,15 +196,15 @@ $wiz = {
 				     mdkonline::automated_upgrades($conffile, $login, md5_hex($password), $boxname, $key, $country, 'TRUE');
 				     mdkonline::write_wide_conf($login, $boxname, $country);
 				     mdkonline::clean_confdir();
-				     "end" 
+				     "end";
 				 } else {
-				     "authenticate"
+				     "authenticate";
 				 }
 			     },
 			    },
 		  end => {
 			  name => sub {
-			      N("Congratulations") . "\n\n" . N("Your Mandrakeonline account has been successfully configured\n")
+			      N("Congratulations") . "\n\n" . N("Your Mandrakeonline account has been successfully configured\n");
 			  },
 			  end => 1,
 			  no_back => 1,
@@ -209,16 +213,18 @@ $wiz = {
 		 }
        };
 
-if ($login && $password && $boxname) { 
+if (!$ia && $login && $password && $boxname) { 
     $is_success = check_login($login, $password, $boxname);
     if ($is_success) {
 	($sendconfres, $key) = send_conf($login, $password, $boxname);
 	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"))
+	    output_p($logfile, N("Configuration uploaded successfully"));
 	} else { output_p($logfile, N("Problem uploading configuration")) }
-    } else { output_p($logfile, N("Cannot connect to mandrakeonline website: wrong login/password or router/firewall bad settings")) }
+    } else { 
+	output_p($logfile, N("Cannot connect to mandrakeonline website: wrong login/password or router/firewall bad settings"));
+    }
 } else {
     wizards->new->safe_process($wiz, $in);
 }