diff options
author | Daouda Lo <daouda@mandriva.com> | 2002-08-05 10:51:38 +0000 |
---|---|---|
committer | Daouda Lo <daouda@mandriva.com> | 2002-08-05 10:51:38 +0000 |
commit | a24eca5d7683f4ea5489230c683687b73c193961 (patch) | |
tree | f3673752195363b54d0820d4f02ac714b4510b66 /perl-install | |
parent | df8d11813c57fa2b0f593465917ea184973f6066 (diff) | |
download | drakx-backup-do-not-use-a24eca5d7683f4ea5489230c683687b73c193961.tar drakx-backup-do-not-use-a24eca5d7683f4ea5489230c683687b73c193961.tar.gz drakx-backup-do-not-use-a24eca5d7683f4ea5489230c683687b73c193961.tar.bz2 drakx-backup-do-not-use-a24eca5d7683f4ea5489230c683687b73c193961.tar.xz drakx-backup-do-not-use-a24eca5d7683f4ea5489230c683687b73c193961.zip |
- cleanup (remove all sms stuffs: code and labels)
- do not expand mail address
Diffstat (limited to 'perl-install')
-rwxr-xr-x | perl-install/standalone/logdrake | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index 094c9f904..3dbd34372 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -212,7 +212,7 @@ gtkadd($window, createScrolledWindow($log_text) )) : (1, $log_text), if_(!$::isExplain, 0, gtkadd (gtkset_border_width(gtkset_layout(new Gtk::HButtonBox,-end), 5), - if_ (!$::isFile, gtksignal_connect(new Gtk::Button (_("Mail/SMS alert")), clicked => sub { eval { alert_config() }; + if_ (!$::isFile, gtksignal_connect(new Gtk::Button (_("Mail alert")), clicked => sub { eval { alert_config() }; if ($@ =~ /wizcancel/) { $::Wizard_no_previous = 1; $::Wizard_no_cancel = 1; @@ -389,7 +389,7 @@ sub alert_config { $::isWizard = 1; $::Wizard_pix_up = "wiz_drakgw.png"; # FIXME - $::Wizard_title = _("Mail/SMS alert"); + $::Wizard_title = _("Mail alert"); my $cron = q(#!/usr/bin/perl # generated by logdrake @@ -400,14 +400,14 @@ my $r = "*** ". chomp_(`date`) . " ***\n"; my $initdir = "/etc/init.d"; - my ($load,$mail,$email,$smtp,$sms,$smssend); + my ($load,$mail,$email,$smtp,); $load = 3; begin: $::Wizard_finished = 0; $::Wizard_no_previous = 1; - $in->ask_okcancel(_("Mail/SMS alert configuration"), - _("Welcome to the mail/SMS configuration utility.\n\nHere, you'll be able to set up the alert system.\n"), + $in->ask_okcancel(_("Mail alert configuration"), + _("Welcome to the mail configuration utility.\n\nHere, you'll be able to set up the alert system.\n"), 1) or quit(); step_service: @@ -456,20 +456,15 @@ $r .= "Load is huge: $load\n" if ($load >@ . "$load);\n\n"; # $::Wizard_no_previous = 1; $::Wizard_finished = 1; $in->ask_from(_("alert configuration"), - _("Configure the way the system will alert you"), + _("Please enter your email address below "), [ - { label => "mail", val => \$mail, type => "bool", text => "mail output" }, - { label => "email", val => \$email, disabled => sub { !$mail } }, - #{ label => "smtp", val => \$smtp, disabled => sub { !$mail } }, { label => "" }, -# { label => "sms output", val => \$sms, type => "bool", text => "You need to have smsend set up (works only for some countries)" }, - # { label => "smssend output", val => \$smssend , disabled => sub { !$sms } }, + { label => "Email", val => \$email}, ]) or goto step_load; $cron .= q@#- report it@; - if ($mail) { - $cron .= q@ -$email = @."$email;\n\n"; + $cron .= q@ +$email = @. "'" . "$email" . "'" . ";\n\n"; $cron .= q! open F, '|/usr/sbin/sendmail -oi -t'; @@ -483,15 +478,9 @@ print F $r; # EOF!; output "$cron_hourly", $cron; chmod 0755, $cron_hourly; - } - + print ("whole cron is ****** $cron *******\n"); -#elsif ($sms) { - #$in->do_pkgs->install('smssend'); - # $cron .= q!system(smssend !, $smssend, q!chomp_(`date`)); -#} - undef $::isWizard; $::WizardWindow->destroy if defined $::WizardWindow; undef $::WizardWindow; |