Remove excess prints

virtualmin · Apr 22, 2017 · 2bf2eb3 · 2bf2eb3
1 parent a88f48a
commit 2bf2eb3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/lib/Virtualmin/Config/Plugin/Dovecot.pm b/lib/Virtualmin/Config/Plugin/Dovecot.pm
@@ -79,11 +79,11 @@ sub actions {
   		&dovecot::save_directive($conf, "auth_mechanisms", $am);
   	}
   	flush_file_lines();
-  	print "Enabling Dovecot POP3 and IMAP servers\n";
+  	#print "Enabling Dovecot POP3 and IMAP servers\n";
   	init::enable_at_boot("dovecot");
   	if (!dovecot::is_dovecot_running()) {
   		my $err = dovecot::start_dovecot();
-  		print STDERR "Failed to start Dovecot POP3/IMAP server!\n" if ($err);
+  		#print STDERR "Failed to start Dovecot POP3/IMAP server!\n" if ($err);
   	}
     $self->done(1); # OK!
   };

diff --git a/lib/Virtualmin/Config/Plugin/Net.pm b/lib/Virtualmin/Config/Plugin/Net.pm
@@ -33,7 +33,7 @@ sub actions {
   $self->spin();
   eval {
     if (foreign_check("net")) {
-  		print "Configuring resolv.conf to use my DNS server\n";
+  		#print "Configuring resolv.conf to use my DNS server\n";
   		foreign_require("net", "net-lib.pl");
   		my $dns = net::get_dns_config();
   		if (indexof("127.0.0.1", @{$dns->{'nameserver'}}) < 0) {

diff --git a/lib/Virtualmin/Config/Plugin/Procmail.pm b/lib/Virtualmin/Config/Plugin/Procmail.pm
@@ -36,12 +36,14 @@ sub actions {
 	my @recipes = procmail::get_procmailrc();
 	my ($defrec, $orgrec);
 	foreach my $r (@recipes) {
-		if ($r->{'name'} eq "DEFAULT") {
-			$defrec = $r;
-		}
-		elsif ($r->{'name'} eq "ORGMAIL") {
-			$orgrec = $r;
-		}
+    if ($r->{'name'}) {
+		  if ($r->{'name'} eq "DEFAULT") {
+			  $defrec = $r;
+		  }
+		  elsif ($r->{'name'} eq "ORGMAIL") {
+			  $orgrec = $r;
+		  }
+    }
 	}
 	if ($defrec) {
 		# Fix up this DEFAULT entry

diff --git a/lib/Virtualmin/Config/Plugin/Quotas.pm b/lib/Virtualmin/Config/Plugin/Quotas.pm
@@ -37,7 +37,7 @@ sub actions {
 	my ($dir, $dev, $type, $opts) = mount::filesystem_for_dir("/home");
 	mount::parse_options($type, $opts);
 	if (running_in_zone() || &running_in_vserver()) {
-		print STDERR "Skipping quotas for Vserver or Zones systems\n";
+		#print STDERR "Skipping quotas for Vserver or Zones systems\n";
 		return;
 	}
 	elsif ($gconfig{'os_type'} =~ /-linux$/) {
@@ -53,15 +53,15 @@ sub actions {
 			$mount::options{'groupquota'} = '';
 		}
 		else {
-			print "Skipping quotas: Required kernel support is not enabled.\n";
+			#print "Skipping quotas: Required kernel support is not enabled.\n";
 			return;
 		}
 	}
 	elsif ($gconfig{'os_type'} =~ /solaris/) {
 		$mount::options{'quota'} = '';
 	}
 	else {
-		print STDERR "Don't know how to enable quotas on $gconfig{'real_os_type'} ($gconfig{'os_type'})\n";
+		#print STDERR "Don't know how to enable quotas on $gconfig{'real_os_type'} ($gconfig{'os_type'})\n";
 	}
 	$opts = mount::join_options($type);
 	my @mounts = mount::list_mounts();
@@ -77,7 +77,7 @@ sub actions {
 			$mounts[$idx]->[5]);
 	my $err = mount::remount_dir($dir, $dev, $type, $opts);
 	if ($err) {
-		print STDERR "The filesystem $dir could not be remounted with quotas enabled. You may need to reboot your system, and then enable quotas in the Disk Quotas module.\n";
+		print STDERR "\nThe filesystem $dir could not be remounted with quotas enabled. You may need to reboot your system, and then enable quotas in the Disk Quotas module.\n";
 	}
 	else {
   # Activate quotas