Skip to content
Permalink
Browse files Browse the repository at this point in the history
bug fixes (#4280)
  • Loading branch information
bradymiller committed Mar 12, 2021
1 parent a9f0377 commit 0fadc3e
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion interface/orders/patient_match_dialog.php
Expand Up @@ -52,7 +52,7 @@ function myRestoreSession() {

function openPatient(ptid) {
var f = opener.document.forms[0];
var ename = '<?php echo addslashes("select[$form_key]"); ?>';
var ename = <?php echo js_escape("select[$form_key]"); ?>;
if (f[ename]) {
f[ename].value = ptid;
window.close();
Expand Down
2 changes: 1 addition & 1 deletion interface/patient_file/report/patient_report.php
Expand Up @@ -329,7 +329,7 @@ function show_date_fun(){
echo attr($ierow['encounter']) . "/";
}

echo "' />$disptitle</td>\n";
echo "' />" . text($disptitle) . "</td>\n";
echo " <td>" . text($prow['begdate']);

if ($prow['enddate']) {
Expand Down
4 changes: 2 additions & 2 deletions interface/usergroup/mfa_registrations.php
Expand Up @@ -136,7 +136,7 @@ function addclick(sel) {
<input type="hidden" name="csrf_token_form" value="<?php echo attr(CsrfUtils::collectCsrfToken()); ?>" />
<div>
<fieldset>
<legend><?php echo xlt('Current Authentication Method for') . " " . $user_full_name; ?></legend>
<legend><?php echo xlt('Current Authentication Method for') . " " . text($user_full_name); ?></legend>
<table class='table'>
<tr>
<th align='left'>&nbsp;<?php echo xlt('Method'); ?>&nbsp;</th>
Expand Down Expand Up @@ -165,7 +165,7 @@ function addclick(sel) {
</div>
<div>
<fieldset>
<legend><?php echo xlt('Select/Add New Authentication Method for') . " " . $user_full_name; ?></legend>
<legend><?php echo xlt('Select/Add New Authentication Method for') . " " . text($user_full_name); ?></legend>
<div class='col-sm-4 offset-sm-4'>
<select name='form_add' onchange='addclick(this)'class='col-sm-12'>
<option value=''><?php echo xlt('Add New...'); ?></option>
Expand Down
4 changes: 2 additions & 2 deletions interface/usergroup/mfa_totp.php
Expand Up @@ -109,7 +109,7 @@ function docancel() {
?>
<div>
<fieldset>
<legend><?php echo xlt('Provide Password for') . " " . $user_full_name; ?></legend>
<legend><?php echo xlt('Provide Password for') . " " . text($user_full_name); ?></legend>
<div class="row">
<div class="col-sm-12">
<?php if ($error == "auth") { ?>
Expand Down Expand Up @@ -170,7 +170,7 @@ function docancel() {
}
?>
<fieldset>
<legend><?php echo xlt('Register TOTP Key for') . " " . $user_full_name; ?></legend>
<legend><?php echo xlt('Register TOTP Key for') . " " . text($user_full_name); ?></legend>
<div class="row">
<div class="col-sm-12">
<?php if (!$doesExist) { ?>
Expand Down
2 changes: 1 addition & 1 deletion interface/usergroup/mfa_u2f.php
Expand Up @@ -101,7 +101,7 @@ function docancel() {
<div class="row">
<div class="col-sm-12">
<fieldset>
<legend><?php echo xlt('Register U2F Key for') . " " . $user_full_name; ?></legend>
<legend><?php echo xlt('Register U2F Key for') . " " . text($user_full_name); ?></legend>
<div class='col-sm-12'>
<p><?php echo xlt("Instructions");?>:
<ul>
Expand Down
8 changes: 3 additions & 5 deletions interface/usergroup/usergroup_admin.php
Expand Up @@ -277,12 +277,10 @@
$calvar = (!empty($_POST["calendar"])) ? 1 : 0;
$portalvar = (!empty($_POST["portal_user"])) ? 1 : 0;

$res = sqlStatement("select distinct username from users where username != ''");
$res = sqlQuery("select username from users where username = ?", [trim($_POST['rumple'])]);
$doit = true;
while ($row = sqlFetchArray($res)) {
if ($doit == true && $row['username'] == trim($_POST['rumple'])) {
$doit = false;
}
if (!empty($res['username'])) {
$doit = false;
}

if ($doit == true) {
Expand Down

0 comments on commit 0fadc3e

Please sign in to comment.