diff -ruN e-smith-base-5.6.0.old/root/sbin/e-smith/console e-smith-base-5.6.0/root/sbin/e-smith/console --- e-smith-base-5.6.0.old/root/sbin/e-smith/console 2008-10-07 10:34:53.000000000 -0700 +++ e-smith-base-5.6.0/root/sbin/e-smith/console 2014-04-05 10:48:42.000000000 -0700 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl -wT #---------------------------------------------------------------------- # copyright (C) 1999-2006 Mitel Corporation @@ -36,28 +36,28 @@ $ENV{TERM} = $termType if($termType); -system("/bin/sh", "/etc/profile.d/lang.sh"); +system '/bin/sh', '/etc/profile.d/lang.sh'; my %menu2object = (); my @args = (); my @items = (); -my $menu_dir = "/sbin/e-smith/console-menu-items"; +my $menu_dir = '/sbin/e-smith/console-menu-items'; -opendir(ITEMS, $menu_dir); +opendir ITEMS, $menu_dir; -while (defined(my $item = readdir(ITEMS))) +while (defined (my $item = readdir ITEMS )) { next unless -f "$menu_dir/$item"; if ($item =~ /([\w\.]+)/) { - $item = $1; + $item = $1; } else { - warn "Don't know what to do with $menu_dir/$item\n"; - next; + warn "Don't know what to do with $menu_dir/$item\n"; + next; } my $obj = require "$menu_dir/$item"; @@ -73,9 +73,9 @@ { next if ($item->order < 0); push @args, $number . '.', gettext($item->name); - $menu2object{$number++ . "."} = $item; + $menu2object{$number++ . '.'} = $item; } - + my $quit = esmith::console::quitConsole->new; while (1) { @@ -85,21 +85,21 @@ $db->reload; - my $title = gettext("Server console"); - $title .= " (${SystemName}.${DomainName})"; + my $title = gettext('Server console'); + $title .= " (${SystemName}.${DomainName}) "; - $title .= " " . gettext("** unsaved changes **") + $title .= gettext('** unsaved changes **') if ( $db->get_value('UnsavedChanges') eq 'yes' ); my ($rc, $choice) = $console->menu_page ( title => $title, text => - gettext("Welcome to the server console!") . + gettext('Welcome to the server console!') . "\n\n" . - gettext("Use the Arrow and Tab keys to make your selection, then press Enter."), + gettext('Use the Arrow and Tab keys to make your selection, then press Enter.'), argsref => \@args, - left => gettext("Exit"), + left => gettext('Exit'), ); $choice = ($rc == 0) ? $menu2object{$choice} : $quit;