Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
bug fixes (#5846)
  • Loading branch information
bradymiller committed Oct 19, 2022
1 parent 3bd4b97 commit 37d7ed4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion interface/main/messages/messages.php
Expand Up @@ -115,7 +115,7 @@
echo "<title>" . xlt('MedEx Setup') . "</title>";
$stage = $_REQUEST['stage'];
if (!is_numeric($stage)) {
echo "<br /><span class='title'>$stage " . xlt('Warning') . ": " . xlt('This is not a valid request') . ".</span>";
echo "<br /><span class='title'>" . text($stage) . " " . xlt('Warning') . ": " . xlt('This is not a valid request') . ".</span>";
} else {
$MedEx->setup->MedExBank($stage);
}
Expand Down
2 changes: 1 addition & 1 deletion interface/main/messages/save.php
Expand Up @@ -248,7 +248,7 @@
sqlQuery($sql, array('recall_' . $pid, $_POST['item'], $_SESSION['authUserID'], 'Label printed locally'));
}
}
echo json_encode($pidList);
echo text(json_encode($pidList));
exit;
}
if ($_REQUEST['go'] == "Messages") {
Expand Down
2 changes: 1 addition & 1 deletion interface/patient_file/front_payment_cc.php
Expand Up @@ -53,7 +53,7 @@
exit();
}

echo $ccaudit;
echo text($ccaudit);
exit();
}

Expand Down
10 changes: 5 additions & 5 deletions library/classes/TreeMenu.php
Expand Up @@ -680,17 +680,17 @@ function _nodeToHTML($nodeObj, $prefix, $return = 'newNode', $currentDepth = 0,
$expanded = $this->isDynamic ? ($nodeObj->expanded ? 'true' : 'false') : 'true';
$isDynamic = $this->isDynamic ? ($nodeObj->isDynamic ? 'true' : 'false') : 'false';
$html = sprintf(
"\t %s = %s.addItem(new TreeNode('%s', %s, %s, %s, %s, '%s', '%s', %s));\n",
"\t %s = %s.addItem(new TreeNode(jsAttr(%s), jsAttr(%s), jsAttr(%s), %s, %s, '%s', '%s', jsAttr(%s)));\n",
$return,
$prefix,
attr($nodeObj->text),
!empty($nodeObj->icon) ? "'" . $nodeObj->icon . "'" : 'null',
!empty($nodeObj->link) ? "'" . attr($nodeObj->link) . "'" : 'null',
js_escape($nodeObj->text),
!empty($nodeObj->icon) ? js_escape($nodeObj->icon) : 'null',
!empty($nodeObj->link) ? js_escape($nodeObj->link) : 'null',
$expanded,
$isDynamic,
$nodeObj->cssClass,
$nodeObj->linkTarget,
!empty($nodeObj->expandedIcon) ? "'" . $nodeObj->expandedIcon . "'" : 'null'
!empty($nodeObj->expandedIcon) ? js_escape($nodeObj->expandedIcon) : 'null'
);

foreach ($nodeObj->events as $event => $handler) {
Expand Down

0 comments on commit 37d7ed4

Please sign in to comment.