Merge branch 'master' of github.com:webmin/usermin

mailbox/add_address.cgi

@@ -3,6 +3,8 @@
 # Add an address from an email to the user's address book
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our %in;
 
 require './mailbox-lib.pl';

mailbox/address_chooser.cgi

@@ -3,6 +3,8 @@
 # Display a list of entries from the address book
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %uconfig);
 
 our $trust_unknown_referers = 1;

mailbox/auto.pl

@@ -2,6 +2,8 @@
 # Scan through all folders, and apply the scheduled deletion policy for each
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 
 our $no_acl_check++;
 $ENV{'REMOTE_USER'} = getpwuid($<);

mailbox/copy.cgi

@@ -2,6 +2,8 @@
 # Copy (or move) all messages from one folder to another
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';

mailbox/copy_form.cgi

@@ -2,6 +2,8 @@
 # Show a form for copying or moving all email to another folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';

mailbox/delete_folders.cgi

@@ -2,6 +2,8 @@
 # Delete a bunch of folders
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';

mailbox/delete_mail.cgi

@@ -3,6 +3,8 @@
 # Delete, mark, move or copy multiple messages
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %userconfig, %gconfig);
 
 require './mailbox-lib.pl';

mailbox/detach.cgi

@@ -3,6 +3,8 @@
 # View one attachment from a message
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 use Socket;

mailbox/detachall.cgi

@@ -2,6 +2,8 @@
 # Download all attachments in a ZIP file
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';

mailbox/edit_auto.cgi

@@ -2,6 +2,8 @@
 # Show a form for setting up scheduled folder clearing
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';

mailbox/edit_comp.cgi

@@ -3,6 +3,8 @@
 # Display a form for creating or editing a composite folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';

mailbox/edit_folder.cgi

@@ -3,6 +3,8 @@
 # Display a form for creating or editing a folder of some kind
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %userconfig);
 our $folders_dir;
 our @remote_user_info;

mailbox/edit_ifolder.cgi

@@ -2,6 +2,8 @@
 # Display a form for creating or editing an IMAP folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';

mailbox/edit_imap.cgi

@@ -3,6 +3,8 @@
 # Display a form for creating or editing an IMAP folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 our $imap_port;
 

mailbox/edit_pop3.cgi

@@ -3,6 +3,8 @@
 # Display a form for creating or editing a POP3 folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 our $pop3_port;
 

mailbox/edit_sig.cgi

@@ -3,6 +3,8 @@
 # Display the user's .signature file for editing
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text);
 
 require './mailbox-lib.pl';

mailbox/edit_virt.cgi

@@ -2,6 +2,8 @@
 # Display a form for creating or editing a virtual folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';

mailbox/export.cgi

@@ -2,6 +2,8 @@
 # Output the address book in some format
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, $remote_user);
 
 require './mailbox-lib.pl';

mailbox/import.cgi

@@ -2,6 +2,8 @@
 # Import addresses from a file
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';

mailbox/inbox_login.cgi

@@ -3,6 +3,8 @@
 # Save inbox POP3 login and password
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %pop3);
 our $user_module_config_directory;
 

mailbox/inbox_login_error.cgi

@@ -3,6 +3,8 @@
 # Let user update IMAP/POP3 login credentials
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 our ($remote_user, $remote_pass);
 

mailbox/inbox_logout.cgi

@@ -3,6 +3,8 @@
 # Clear inbox POP3 login and password
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our %in;
 our $user_module_config_directory;
 

mailbox/index.cgi

@@ -3,6 +3,8 @@
 # List the mail messages for the user
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %userconfig, %config);
 our ($remote_user, $remote_pass);
 our $special_folder_id;

mailbox/list_addresses.cgi

@@ -2,6 +2,8 @@
 # Display contents of the user's address book, and allowed and denied addresses
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config, %userconfig);
 
 require './mailbox-lib.pl';

mailbox/list_folders.cgi

@@ -3,6 +3,8 @@
 # Display a list of all folders and allows additional and deletion
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 our %folder_types;
 our $remote_user;

mailbox/list_ifolders.cgi

@@ -2,6 +2,8 @@
 # Display a list of IMAP folders, and allow addition and deletion
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';

mailbox/mail_search.cgi

@@ -3,6 +3,8 @@
 # Find mail messages matching some pattern
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %userconfig);
 our $search_folder_id;
 

mailbox/mailbox-lib.pl

@@ -1,6 +1,8 @@
 # mailbox-lib.pl
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %config, %gconfig, %userconfig);
 our $remote_user;
 our @remote_user_info;

mailbox/newfolder.cgi

@@ -2,6 +2,8 @@
 # Just re-directs to the appropriate folder creator
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our %in;
 
 require './mailbox-lib.pl';

mailbox/print_mail.cgi

@@ -2,6 +2,8 @@
 # Display a message for printing
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %userconfig);
 
 our $trust_unknown_referers = 1;

mailbox/quotacheck.pl

@@ -4,6 +4,8 @@
 # error occurred
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 
 use Net::LDAP;