perl_checker cleanups

1 files changed, 27 insertions, 27 deletions

diff --git a/userdrake b/userdrake
index 20edc47..61e5547 100755
--- a/userdrake
+++ b/userdrake
@@ -73,7 +73,7 @@ my %prefs = getVarsFromSh($conffile);
 my %sec = getVarsFromSh($secfile);
 my $sysfilter = text2bool($prefs{FILTER});
 
-sub HelpSystem { exec("drakhelp --id userdrake") unless fork() }
+sub HelpSystem() { exec("drakhelp --id userdrake") unless fork() }
 
 $us->{wnd} = ugtk2->new(N("Mandriva Linux Users Management Tool") . " " . $us->{VERSION});
 gtkset_size_request($us->{wnd}{rwindow}, 660, 460);
@@ -169,7 +169,7 @@ foreach ([ N("Add User"), N("Add a user to the system"), 'user_add', \&AddUser ]
     #    $toolb->append_space;
 }
 
-my ($tbuser, $tbgroup, $tbedit, $tbdel, $tbref) = @toolbwg;
+my ($_tbuser, $_tbgroup, $tbedit, $tbdel, $_tbref) = @toolbwg;
 GrayDelEdit();
 my $ctx = USER::ADMIN->new; 
 $fbut->signal_connect('clicked', sub { $stringsearch = $filter->get_text; Refresh($sysfilter, $stringsearch) });
@@ -183,7 +183,7 @@ undef $window_splash;
 $us->{wnd}->main;
 ugtk2->exit(0);
 
-sub GrayDelEdit {
+sub GrayDelEdit() {
     foreach ($tbedit, $tbdel, $buttorcheck{edit}, $buttorcheck{delete}) { defined $_ and $_->set_sensitive(0) }
 }
 sub TreeUnselect {
@@ -191,8 +191,8 @@ sub TreeUnselect {
     $treev->get_selection->unselect_all;
     GrayDelEdit();
 }
-sub NotebookSwitch { 
-    my $page = $nb->get_current_page;
+sub NotebookSwitch() { 
+    #my $page = $nb->get_current_page;
     TreeUnselect($usertree); TreeUnselect($grouptree);
 }
 sub ComputeLockExpire {
@@ -205,13 +205,13 @@ sub ComputeLockExpire {
 }
 sub RefreshUsersFull {
     my ($filterusers, $strfilt) = @_;
-    my ($users, $gid, $group, $groupnm, $expr); 
+    my ($users, $group, $groupnm, $expr); 
     defined $ctx and $users = $ctx->UsersEnumerateFull;
     $utree_model->clear;
     my @UserReal;
   LOOP: foreach my $l (@$users) { next LOOP if $filterusers &&  $l->Uid($GetValue) <= 499 ||  $l->Uid($GetValue) == 65534; push(@UserReal, $l) if $l->UserName($GetValue) =~ /^\Q$strfilt/ }
     foreach my $l (@UserReal) {
-	$a = $l->Gid($GetValue); $group = $ctx->LookupGroupById($a); $groupnm = ''; $expr = ComputeLockExpire($l);
+	my $a = $l->Gid($GetValue); $group = $ctx->LookupGroupById($a); $groupnm = ''; $expr = ComputeLockExpire($l);
 	$group and $groupnm = $group->GroupName($GetValue); 
 	my $s = $l->Gecos($GetValue);
 	c::set_tagged_utf8($s);
@@ -226,7 +226,8 @@ sub RefreshGroupsFull {
     my @GroupReal;
   LOOP: foreach my $g (@$groups) { next LOOP if $filtergroups && $g->Gid($GetValue) <= 499 || $g->Gid($GetValue) == 65534; push(@GroupReal, $g)  if $g->GroupName($GetValue) =~ /^\Q$strfilt/ }
     foreach my $g (@GroupReal) {
-	my $group = $ctx->LookupGroupById($a); my $a = $g->GroupName($GetValue);
+     my $a = $g->GroupName($GetValue);
+	#my $group = $ctx->LookupGroupById($a);
 	my $u_b_g = $a && $ctx->EnumerateUsersByGroup($a);
 	my $listUbyG = join(',', @$u_b_g);
 	my $group_id = $g->Gid($GetValue);
@@ -287,7 +288,7 @@ sub GetFaceIcon {
 		       });
     $hb;
 }
-sub AddUser {
+sub AddUser() {
     my $w = NewWindow(N("Create New User"));
     my $dontcreatehomedir = 0; my $is_system = 0;
     my %u; 
@@ -421,7 +422,7 @@ sub GimmeChoice {
     gtkset_mousecursor_normal();
     $choice;
 }
-sub AddGroup {
+sub AddGroup() {
     my $w = NewWindow(N("Create New Group"));
     my $mode = 0; my %g; my $is_system = 0;
     gtkadd($w,
@@ -494,7 +495,7 @@ sub FillUserInfo {
     $us->{o}{shells}->entry->set_text($ent->LoginShell($GetValue));
     $us->{o}{homedir}->set_text($ent->HomeDir($GetValue));
 }
-sub Delete {
+sub Delete() {
     my $page = $nb->get_current_page;
     $us->{wnd}{rwindow}->set_sensitive(0);
     gtkset_mousecursor_wait(); $error = 0;
@@ -636,7 +637,7 @@ sub GtkEntrySized {
     $e->set_size_request($spac, 20);
     $e;
 }
-sub BuildUui {
+sub BuildUui() {
     gtkpack_(my $vbox = Gtk2::VBox->new(0, 2),
 	     1, create_packtable({ homogeneous => 1, col_spacings => 5, row_spacings => 5 },
 				 [ N("Full Name:"), $us->{o}{fullname} = Gtk2::Entry->new ],
@@ -651,7 +652,7 @@ sub BuildUui {
     $vbox;
 }
 sub BuildGui {
-    my $groupentry = @_;
+    #my $groupentry = @_;
     gtkpack_(my $vbox = Gtk2::VBox->new(0, 2),
 	     1, create_packtable({ homogeneous => 1, col_spacings => 5, row_spacings =>5 },
 				 [ N("Group Name:"), $us->{o}{groupname} = Gtk2::Entry->new ]
@@ -668,23 +669,22 @@ sub NewWindow {
     $w->set_modal(1);
     $w;
 }
-sub Edit {
+sub Edit() {
     my $w = NewWindow(N("Edit Groups / Users"));
     my $model = Gtk2::ListStore->new("Gtk2::Gdk::Pixbuf", "Glib::String", "Glib::Int");
     my $tree = Gtk2::TreeView->new_with_model($model); my %g; my %u; 
-    my ($groupname, $username, $groupEnt, $userEnt, $members, $times, $min, $max, $warn, $inact, $primgid, $temp, $Gent);
+    my ($groupname, $username, $groupEnt, $userEnt, $members, $times, $min, $max, $warn, $inact, $primgid, $Gent);
     my @primgroup;
     my @pix = ($pixdir . 'selected.png', $pixdir . 'unselected.png');
     $tree->get_selection->set_mode('browse');
     $tree->append_column(my $check = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererPixbuf->new, 'pixbuf' => 0));
     $check->{is_pixbuf_column} = 1;
-    $tree->append_column(my $col = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 1));
+    $tree->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 1));
     $tree->set_headers_visible(0);
     my $p = $nb->get_current_page;
     my $nbU = Gtk2::Notebook->new; my $nbG = Gtk2::Notebook->new;
     if ($p <= 0) {
-	my $m = 0; my $s = 0; 
-	my ($vald, $mo, $ye) = (localtime)[3, 4, 5]; my $valy = $ye+1900; my $valm = $mo+1;
+	my ($vald, $mo, $ye) = (localtime())[3, 4, 5]; my $valy = $ye+1900; my $valm = $mo+1;
 	gtkappend_page($nbU,
 		       gtkpack_(Gtk2::VBox->new(0, 2),
 				1, BuildUui(),
@@ -697,7 +697,7 @@ sub Edit {
 				0, $us->{o}{acheckexpire} = Gtk2::CheckButton->new(N("Enable account expiration")),
 				0, gtkpack__(my $h = Gtk2::HBox->new(0, 10),
 					     Gtk2::Label->new(N("Account expires (YYYY-MM-DD):")), 
-					     map { my $s = $_->[0]; my $value = $_->[1]; my $minv = $_->[2]; my $maxv = $_->[3]; my $spc = $_->[4];
+					     map { my $s = $_->[0]; my $value = $_->[1]; my $minv = $_->[2]; my $maxv = $_->[3]; #my $spc = $_->[4];
 						   $us->{o}{$s} = Gtk2::SpinButton->new(Gtk2::Adjustment->new($value, $minv , $maxv, 1, 10, 10), 1, 0);
 					       } (['expy', $valy, 1970, 10000], ['expm', $valm, 1, 12], ['expd', $vald, 1, 31]),
 					    ),
@@ -817,7 +817,7 @@ sub Edit {
 								     $userEnt->HomeDir($u{homedir}); $userEnt->LoginShell($u{shell});
 								     $username = $userEnt->UserName($GetValue);
 								     $model->foreach(sub {
-											 my ($mod, $path, $iter) = @_;
+											 my ($mod, $_path, $iter) = @_;
 											 $ch = $mod->get($iter, 2); 
 											 $name = $mod->get($iter, 1);
 											 $gEnt = $ctx->LookupGroupByName($name);
@@ -878,7 +878,7 @@ sub Edit {
 								 $members = $ctx->EnumerateUsersByGroup($groupname);
 								 my $gid = $groupEnt->Gid($GetValue);
 								 !$error and $model->foreach(sub {
-												 my ($mod, $path, $iter) = @_;
+												 my ($mod, $_path, $iter) = @_;
 												 $ch = $mod->get($iter, 2); 
 												 $name = $mod->get($iter, 1);
 												 if ($ch == 1) {
@@ -974,9 +974,9 @@ sub ConvTime {
     return $days;
 }
 sub TimeOfArray {
-    my ($reltime, $cm) = @_;
-    my $h; my $t; my %mth = (Jan => 1, Feb => 2, Mar => 3, Apr => 4, May => 5, Jun => 6, Jul => 7, Aug => 8, Sep => 9, Oct => 10, Nov => 11, Dec => 12);
-    $t = localtime($reltime * 24 * 60 * 60) =~ /(\S+)\s+(\S+)\s+(\d+)\s+(\S+)\s+(\d+)/;
+    my ($_reltime, $cm) = @_;
+    my $h; my %mth = (Jan => 1, Feb => 2, Mar => 3, Apr => 4, May => 5, Jun => 6, Jul => 7, Aug => 8, Sep => 9, Oct => 10, Nov => 11, Dec => 12);
+    #my $t = localtime($reltime * 24 * 60 * 60) =~ /(\S+)\s+(\S+)\s+(\d+)\s+(\S+)\s+(\d+)/;
     $h->{daystr} = $1; $h->{month} = $2; $h->{dayint} = $3; $h->{year} = $5;
     $cm and $h->{month} = $mth{$2}; 
     $h;
@@ -987,7 +987,7 @@ sub InArray {
 }
 sub RemoveFromArray {
     my ($item, $arr) = @_;
-    my ($t, $s) = partition { $item ne $_ } @$arr;
+    my ($t, $_s) = partition { $item ne $_ } @$arr;
     return @$t;
 }
 sub GrayBox {
@@ -1008,7 +1008,7 @@ sub NewDialog {
     gtkset_modal($dialog, 1);
     $dialog;
 }
-sub About {
+sub About() {
     my $window_about = NewDialog(N("Userdrake"));
     my $tree_model = Gtk2::TreeStore->new("Glib::String", "Glib::String", "Glib::String");
     my $list = Gtk2::TreeView->new_with_model($tree_model);
@@ -1050,7 +1050,7 @@ sub RaiseError {
 	  );
     $w->show_all;
 }
-sub QuitGlobal {
+sub QuitGlobal() {
     setVarsInSh($conffile, {
        FILTER => bool2text($sysfilter),
     });