Fix 2FA enrolment link

https://forum.virtualmin.com/t/two-questions/129956/3?u=ilia

Author: iliajie

Diff for: edit_2fa.cgi

@@ -3,7 +3,7 @@
 
 require './virtual-server-lib.pl';
 &ReadParse();
-&can_2fa() || &error($text{'2fa_ecannot'});
+&can_user_2fa() || &can_master_reseller_2fa() || &error($text{'2fa_ecannot'});
 
 &ui_print_header(undef, $text{'2fa_title'}, "");
 

Diff for: lang/en

@@ -8246,7 +8246,8 @@ deftmplt_tmpltpagefooteraboutcont=Contact
 2fa_cancel=Cancel Two-Factor
 2fa_header=Two-Factor Options
 2fa_err=Failed to save two-factor authentication
-2fa_enrolling=Enrolling for two-factor with $1 ...
+2fa_enrolling=Enrolling for two-factor authentication with $1 ..
+2fa_ecannot=You are not allowed to manage two-factor authentication
 
 rcert_err=Failed to delete certificate
 rcert_ecert=Virtual server has no certificate to remove

Diff for: save_2fa.cgi

@@ -4,7 +4,7 @@
 require './virtual-server-lib.pl';
 &ReadParse();
 &error_setup($text{'2fa_err'});
-&can_2fa() || &error($text{'2fa_ecannot'});
+&can_user_2fa() || &can_master_reseller_2fa() || &error($text{'2fa_ecannot'});
 
 # Get current status
 &foreign_require("acl");

Diff for: virtual-server-lib-funcs.pl

@@ -11564,12 +11564,20 @@ sub can_passwd
 }
 
 # Returns 1 if the user can enroll for 2fa
-sub can_2fa
+sub can_user_2fa
+{
+my %miniserv;
+&get_miniserv_config(\%miniserv);
+return $miniserv{'twofactor_provider'} && $access{'edit_passwd'};
+}
+
+# Return 1 if the master admin or reseller can enroll for 2fa
+sub can_master_reseller_2fa
 {
 my %miniserv;
 &get_miniserv_config(\%miniserv);
 return $miniserv{'twofactor_provider'} &&
-       (&reseller_admin() || $access{'edit_passwd'});
+       (&master_admin() || &reseller_admin());
 }
 
 # Returns 1 if the user can change a domain's external IP address
@@ -13722,8 +13730,8 @@ sub get_domain_actions
 		  });
 	}
 
-if (&can_2fa()) {
-	# Twofactor enroll button
+if (&can_user_2fa()) {
+	# Twofactor enroll button for the user
 	push(@rv, { 'page' => 'edit_2fa.cgi',
 		    'title' => $text{'edit_change2fa'},
 		    'desc' => $text{'edit_change2fadesc'},
@@ -14074,6 +14082,13 @@ sub get_all_global_links
 		    'icon' => 'wizard' });
 	}
 
+# Twofactor enroll button for master admins and resellers
+if (&can_master_reseller_2fa()) {
+	push(@rv, { 'url' => "$vm/edit_2fa.cgi",
+		    'title' => $text{'edit_change2fa'},
+		    'cat' => 'setting' });
+	}
+
 # Add creation-related links
 my ($dleft, $dreason, $dmax, $dhide) = &count_domains("realdoms");
 my ($aleft, $areason, $amax, $ahide) = &count_domains("aliasdoms");