From 5347680642d61ba7ddcf46409380a870f9bc9587 Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Sun, 25 Feb 2024 00:31:16 +1300 Subject: [PATCH] Hide change password fields if the user can't change the principal There is no need to show these fields as they do nothing. --- inc/ui/principal-edit.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/inc/ui/principal-edit.php b/inc/ui/principal-edit.php index 860e119f..d7d4edf0 100644 --- a/inc/ui/principal-edit.php +++ b/inc/ui/principal-edit.php @@ -327,8 +327,10 @@ function principal_editor() { } $admin_row_entry = ''; - $default_passwd_row_entry = ' ' . $prompt_password_1 . ': ##newpass1.password.' . $pwstars . '## '; - $default_passwd_row_entry .= ' ' . $prompt_password_2 . ': ##newpass2.password.' . $pwstars . '## '; + if ($can_write_principal) { + $default_passwd_row_entry = ' ' . $prompt_password_1 . ': ##newpass1.password.' . $pwstars . '## '; + $default_passwd_row_entry .= ' ' . $prompt_password_2 . ': ##newpass2.password.' . $pwstars . '## '; + } $delete_principal_button = ''; if ( $session->AllowedTo('Admin') ) { $passwd_row_entry = $default_passwd_row_entry; @@ -337,12 +339,14 @@ function principal_editor() { if ( isset($id) ) $delete_principal_button = '' . translate("Delete Principal") . ''; } else { - if ( isset($c->password_change_override) ) { - $passwd_row_entry = ' ' . $prompt_password_1 . ':'; - $passwd_row_entry .= ''; - $passwd_row_entry .= $c->password_change_override['label'] . ' '; - } else { - $passwd_row_entry = $default_passwd_row_entry; + if ($can_write_principal) { + if ( isset($c->password_change_override) ) { + $passwd_row_entry = ' ' . $prompt_password_1 . ':'; + $passwd_row_entry .= ''; + $passwd_row_entry .= $c->password_change_override['label'] . ' '; + } else { + $passwd_row_entry = $default_passwd_row_entry; + } } }