Remove more use of vpopmail-specific mail quota field

create-user.pl

@@ -145,10 +145,6 @@ package virtual_server;
 		$mquota = shift(@ARGV);
 		$mquota = 0 if ($mquota eq "UNLIMITED");
 		}
-	elsif ($a eq "--qmail-quota") {
-		$qquota = shift(@ARGV);
-		$qquota = 0 if ($qquota eq "UNLIMITED");
-		}
 	elsif ($a eq "--mysql") {
 		$db = shift(@ARGV);
 		push(@dbs, { 'type' => 'mysql', 'name' => $db });
@@ -221,9 +217,6 @@ package virtual_server;
 		$mquota =~ /^\d+$/ || &usage("Quota must be a number");
 		}
 	}
-if ($user->{'mailquota'}) {
-	!$qquota || $qquota =~ /^\d+$/ || usage("Mail quota must be a number");
-	}
 $err = &valid_mailbox_name($username);
 &usage($err) if ($err);
 $real =~ /^[^:]*$/ || usage($text{'user_ereal'});
@@ -335,9 +328,6 @@ package virtual_server;
 if (defined($recovery)) {
 	$user->{'recovery'} = $recovery;
 	}
-if ($user->{'mailquota'}) {
-	$user->{'qquota'} = $qquota;
-	}
 if (!$user->{'noquota'}) {
 	# Set quotas, if not using the defaults
 	$pd = $d->{'parent'} ? &get_domain($d->{'parent'}) : $d;

edit_user.cgi

@@ -276,18 +276,9 @@ elsif ($user_type eq 'mail') {
 
 	# Print quota hidden defaults as
 	# it has to be always considered
-	my $showmailquota = $user->{'mailquota'};
 	my $showquota = !$user->{'noquota'};
 	my $showhome = &can_mailbox_home($user) && $d && $d->{'home'} &&
 		       !$user->{'fixedhome'};
-	if ($showmailquota) {
-		my $qquota_default = $user->{'qquota'} ne "none" &&
-				     $user->{'qquota'} ? 0 : 1;
-		my $qquota = &ui_hidden("qquota_def", $qquota_default);
-		$qquota .= &ui_hidden("qquota", $user->{'qquota'})
-			if (!$qquota_default);
-		print $qquota;
-		}
 	if ($showquota) {
 		if (&has_home_quotas()) {
 			my $quota_data = &quota_field(
@@ -827,33 +818,19 @@ else {
 
 	print &ui_hidden_table_end();
 
-	$showmailquota = !$mailbox && $user->{'mailquota'};
 	$showquota = !$mailbox && !$user->{'noquota'};
 	$showhome = &can_mailbox_home($user) && $d && $d->{'home'} &&
 		!$mailbox && !$user->{'fixedhome'};
 
-	if ($showmailquota || $showquota || $showhome) {
+	if ($showquota || $showhome) {
 		# Start quota and home table
 		my $header2_title = 'user_header2';
 		$header2_title = 'user_header2a' if (!$showhome);
-		$header2_title = 'user_header2b' if (!$showmailquota &&
-						     !$showquota);
+		$header2_title = 'user_header2b' if (!$showquota);
 		print &ui_hidden_table_start(
 			$text{$header2_title}, "width=100%", 2, "table2", 0);
 		}
 
-	if ($showmailquota) {
-		# Show Qmail/VPOPMail quota field
-		$user->{'qquota'} = "" if ($user->{'qquota'} eq "none");
-		print &ui_table_row(&hlink($text{'user_qquota'},"qmailquota"),
-			&ui_radio("qquota_def", $user->{'qquota'} ? 0 : 1,
-				[ [ 1, $text{'form_unlimit'} ],
-					[ 0, " " ] ])." ".
-			&ui_textbox("qquota", $user->{'qquota'} || "", 10)." ".
-				$text{'form_bytes'},
-			2, \@tds);
-		}
-
 	if ($showquota) {
 		# Show quotas field(s)
 		if (&has_home_quotas()) {
@@ -914,7 +891,7 @@ else {
 				2, \@tds);
 		}
 
-	if ($showmailquota || $showquota || $showhome) {
+	if ($showquota || $showhome) {
 		print &ui_hidden_table_end("table2");
 		}
 

feature-mail.pl

@@ -2658,10 +2658,6 @@ sub backup_mail
 			&print_tempfile(UFILE, ":-");
 			}
 		}
-	elsif ($u->{'mailquota'}) {
-		&print_tempfile(UFILE, ":$u->{'qquota'}");
-		&print_tempfile(UFILE, ":-");
-		}
 	else {
 		&print_tempfile(UFILE, ":-:-");
 		}
@@ -3030,10 +3026,7 @@ sub restore_mail
 		$uinfo->{'shell'} = $user[6];
 		$uinfo->{'email'} = $user[7];
 		$uinfo->{'to'} = \@to;
-		if ($uinfo->{'mailquota'}) {
-			$uinfo->{'qquota'} = $user[8];
-			}
-		elsif (!$uinfo->{'noquota'}) {
+		if (!$uinfo->{'noquota'}) {
 			$uinfo->{'quota'} = $user[8];
 			$uinfo->{'mquota'} = $user[9];
 			}

list-users.pl

@@ -146,10 +146,6 @@ package virtual_server;
 				($u->{'domainowner'} ? "Server owner" :
 				 $u->{'webowner'} ? "Website manager" :
 						    "Normal user"),"\n";
-			if ($u->{'mailquota'}) {
-				print "    Mail server quota: ",
-				      $u->{'qquota'},"\n";
-				}
 			if (&has_home_quotas() && !$u->{'noquota'}) {
 				print "    Home quota: ",
 				      &quota_show($u->{'quota'}, "home"),"\n";
@@ -312,7 +308,6 @@ package virtual_server;
 				    $u->{'email'} ? "Yes" : "No",
 				    $shell->{'id'} eq 'nologin' ? "No" : "Yes",
 				    scalar(@{$u->{'dbs'}}) || "No",
-				    $u->{'mailquota'} ? $u->{'qquota'} :
 				    &has_home_quotas() ? 
 					    &quota_show($u->{'quota'}, "home") :
 					    "NA";

mass_ucreate.cgi

@@ -238,9 +238,6 @@ USER: foreach $line (@lines) {
 		$user->{'quota'} = $quota;
 		$user->{'mquota'} = $mquota;
 		}
-	if ($user->{'mailquota'}) {
-		$user->{'qquota'} = $qquota;
-		}
 	$user->{'dbs'} = \@dbs if (@dbs);
 
 	# Check for a Unix clash

migration-cpanel.pl

@@ -1534,7 +1534,6 @@ sub cpanel_migrate_mailboxes
 			   lc($muser);
 	$uinfo->{'shell'} = $nologin_shell->{'shell'};
 	$uinfo->{'email'} = lc($muser)."\@$dom";
-	$uinfo->{'qquota'} = $quota{$muser};
 	$uinfo->{'quota'} = $quota{$muser};
 	$uinfo->{'mquota'} = $quota{$muser};
 	&create_user_home($uinfo, $d, 1);

migration-directadmin.pl

@@ -407,7 +407,6 @@ sub migration_directadmin_migrate
 				   lc($muser);
 		$uinfo->{'shell'} = $nologin_shell->{'shell'};
 		$uinfo->{'email'} = lc($muser)."\@$dom";
-		$uinfo->{'qquota'} = $quota{$muser};
 		$uinfo->{'quota'} = $quota{$muser};
 		$uinfo->{'mquota'} = $quota{$muser};
 		&create_user_home($uinfo, \%dom, 1);

migration-ensim.pl

@@ -413,7 +413,6 @@ sub migration_ensim_migrate
 		$uinfo->{'email'} = lc($mu).'@'.$dom;
 		if ($qu) {
 			$uinfo->{'quota'} = $uinfo->{'mquota'} =
-			  $uinfo->{'qquota'} =
 			    $qu->{'config'}->{'quota'} / &quota_bsize("home");
 			}
 		&create_user_home($uinfo, \%dom, 1);

migration-plesk.pl

@@ -513,7 +513,6 @@ sub migration_plesk_migrate
 	if (&has_home_quotas()) {
 		local $q = $mailuser->{'mailbox-quota'} < 0 ? undef :
 				$mailuser->{'mailbox-quota'}*1024;
-		$uinfo->{'qquota'} = $q;
 		$uinfo->{'quota'} = $q / &quota_bsize("home");
 		$uinfo->{'mquota'} = $q / &quota_bsize("home");
 		}
@@ -607,7 +606,6 @@ sub migration_plesk_migrate
 	if (&has_home_quotas()) {
 		local $q = $mailuser->{'mbox_quota'} < 0 ? undef :
 				$mailuser->{'mbox_quota'}*1024;
-		$uinfo->{'qquota'} = $q;
 		$uinfo->{'quota'} = $q / &quota_bsize("home");
 		$uinfo->{'mquota'} = $q / &quota_bsize("home");
 		}

migration-plesk9.pl

@@ -539,7 +539,6 @@ sub migration_plesk9_migrate
 	if (&has_home_quotas()) {
 		local $q = $mailuser->{'mailbox-quota'} < 0 ? undef :
 				$mailuser->{'mailbox-quota'}*1024;
-		$uinfo->{'qquota'} = $q;
 		$uinfo->{'quota'} = $q / &quota_bsize("home");
 		$uinfo->{'mquota'} = $q / &quota_bsize("home");
 		}

migration-psa.pl

@@ -417,7 +417,6 @@ sub migration_psa_migrate
 		}
 	if (&has_home_quotas()) {
 		local $q = $mailuser->{'login'}->{'quota'};
-		$muinfo->{'qquota'} = $q;
 		$muinfo->{'quota'} = $q / &quota_bsize("home");
 		$muinfo->{'mquota'} = $q / &quota_bsize("home");
 		}

modify-user.pl

@@ -298,7 +298,7 @@ package virtual_server;
 	defined($pass) &&
 	  &usage("The --pass and --passfile flags cannot be used when ".
 		 "editing a domain owner");
-	($quota || $mquota || $qquota) &&
+	($quota || $mquota) &&
 	  &usage("Quotas cannot be changed when editing a domain owner");
 	(@adddbs || @deldbs) &&
 	  &usage("Databases cannot be changed when editing a domain owner");
@@ -340,9 +340,6 @@ package virtual_server;
 		&usage("User's mail quota cannot be higher than domain's ".
 		       "mail quota of $pd->{'quota'}");
 	}
-if (defined($qquota) && $user->{'mailquota'}) {
-	$user->{'qquota'} = $qquota eq "UNLIMITED" ? 0 : $qquota;
-	}
 @domdbs = &domain_databases($d);
 @newdbs = @{$user->{'dbs'}};
 foreach $db (@adddbs) {

save_user.cgi

@@ -200,17 +200,6 @@ else {
 			# Disable account if requested
 			&set_pass_disable($user, $in{'disable'});
 			}
-		if ($user->{'mailquota'}) {
-			# Check and save qmail quota
-			if (!$in{'qquota_def'}) {
-				$in{'qquota'} =~ /^\d+$/ ||
-					&error($text{'user_eqquota'});
-				$user->{'qquota'} = $in{'qquota'};
-				}
-			else {
-				$user->{'qquota'} = 0;
-				}
-			}
 		if (!$user->{'noquota'}) {
 			# Check and save quota inputs
 			$qedit = &can_mailbox_quota();

virtual-server-lib-funcs.pl

@@ -4529,9 +4529,6 @@ sub make_user_substitutions
 if ($hash{'umquota'}) {
 	$hash{'umquota'} = &nice_size($user->{'umquota'}*&quota_bsize("mail"));
 	}
-if ($hash{'qquota'}) {
-	$hash{'qquota'} = &nice_size($user->{'qquota'});
-	}
 return %hash;
 }
 
@@ -5629,10 +5626,6 @@ sub users_table
 			push(@cols, &quota_show($uquota, "home"));
 			}
 		}
-	if ($u->{'mailquota'}) {
-		push(@cols, $u->{'qquota'} ? &nice_size($u->{'qquota'}) :
-					     $text{'form_unlimit'});
-		}
 
 	if ($config{'show_mailsize'} && $d->{'mail'}) {
 		# Mailbox link, if this user has email enabled or is the owner
@@ -10657,7 +10650,7 @@ sub create_initial_user
 if ($d) {
 	local %init;
 	&read_file("$initial_users_dir/$d->{'id'}", \%init);
-	foreach my $a ("email", "quota", "mquota", "qquota", "shell") {
+	foreach my $a ("email", "quota", "mquota", "shell") {
 		$user->{$a} = $init{$a} if (defined($init{$a}));
 		}
 	foreach my $a ("secs", "to") {
@@ -10685,7 +10678,6 @@ sub create_initial_user
 	$user->{'fixedhome'} = 0;
 	$user->{'home'} = &public_html_dir($d);
 	$user->{'noquota'} = 1;
-	$user->{'mailquota'} = 0;
 	$user->{'noprimary'} = 1;
 	$user->{'noextra'} = 1;
 	$user->{'noalias'} = 1;
@@ -10726,7 +10718,7 @@ sub save_initial_user
 	}
 &lock_file("$initial_users_dir/$dom->{'id'}");
 local %init;
-foreach my $a ("email", "quota", "mquota", "qquota", "shell") {
+foreach my $a ("email", "quota", "mquota", "shell") {
 	$init{$a} = $user->{$a} if (defined($user->{$a}));
 	}
 foreach my $a ("secs", "to") {