Skip to content

Commit

Permalink
fix: bug fix (#6354)
Browse files Browse the repository at this point in the history 
* fix: bug fix

* use attr instead
  • Loading branch information
@stephenwaite
stephenwaite committed Apr 13, 2023
1 parent b6b7836 commit abee8d2
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 10 deletions.
68 changes: 62 additions & 6 deletions portal/patient/libs/Controller/OnsiteDocumentController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,12 @@ public function Create()
$onsitedocument->Pid = $this->SafeGetVal($json, 'pid');
}

if (!empty($_SESSION["patient_portal_onsite_two"] ?? null)) {
// removing for testing
/* if (!empty($_SESSION["patient_portal_onsite_two"] ?? null)) {
$decode = $this->SafeGetVal($json, 'fullDocument');
$k = (int)$this->SafeGetVal($json, 'csrf_token_form')[0];
$json->fullDocument = $this->decode($decode, $k);
}
} */

$onsitedocument->Facility = $this->SafeGetVal($json, 'facility');
$onsitedocument->Provider = $this->SafeGetVal($json, 'provider');
Expand All @@ -281,6 +282,12 @@ public function Create()
if (count($errors) > 0) {
$this->RenderErrorJSON('Please check the form for errors', $errors);
} else {
$new_data = $onsitedocument->FullDocument;
// use a custom diff function to look for changing tags only with html
if ($new_data != strip_tags($new_data)) {
$old_data = $json->fullDocument;
$onsitedocument->FullDocument = $this->htmlDiff($old_data, $new_data);
}
$onsitedocument->Save();
$this->RenderJSON($onsitedocument, $this->JSONPCallback(), true, $this->SimpleObjectParams());
}
Expand All @@ -302,6 +309,7 @@ public function Update()
}
$pk = $this->GetRouter()->GetUrlParam('id');
$onsitedocument = $this->Phreezer->Get('OnsiteDocument', $pk);
$old_data = $onsitedocument->FullDocument;

// only allow patient to update themselves (part 1)
if (!empty($GLOBALS['bootstrap_pid'])) {
Expand All @@ -318,11 +326,12 @@ public function Update()
$onsitedocument->Pid = $this->SafeGetVal($json, 'pid', $onsitedocument->Pid);
}

if (!empty($_SESSION["patient_portal_onsite_two"] ?? null)) {
// removing for testing
/* if (!empty($_SESSION["patient_portal_onsite_two"] ?? null)) {
$decode = $this->SafeGetVal($json, 'fullDocument');
$k = (int)$this->SafeGetVal($json, 'csrf_token_form')[0];
$json->fullDocument = $this->decode($decode, $k);
}
} */

$onsitedocument->Facility = $this->SafeGetVal($json, 'facility', $onsitedocument->Facility);
$onsitedocument->Provider = $this->SafeGetVal($json, 'provider', $onsitedocument->Provider);
Expand All @@ -348,6 +357,11 @@ public function Update()
if (count($errors) > 0) {
$this->RenderErrorJSON('Please check the form for errors', $errors);
} else {
// use a custom diff function to look for changing tags only with html
$new_data = $onsitedocument->FullDocument;
if ($new_data != strip_tags($new_data)) {
$onsitedocument->FullDocument = $this->htmlDiff($old_data, $new_data);
}
$onsitedocument->Save();
$this->RenderJSON($onsitedocument, $this->JSONPCallback(), true, $this->SimpleObjectParams());
}
Expand Down Expand Up @@ -385,11 +399,12 @@ public function Delete()
}
}

/**
// removing for testing
/*
* @param $encoded
* @param $v
* @return bool|string
*/
private function decode($encoded, $v): bool|string
{
$encoded = base64_decode($encoded);
Expand All @@ -401,4 +416,45 @@ private function decode($encoded, $v): bool|string
}
return base64_decode(base64_decode($decoded));
}
*/

private function diff($old, $new): array
{
$matrix = array();
$maxlen = 0;
foreach ($old as $oindex => $ovalue) {
$nkeys = array_keys($new, $ovalue);
foreach ($nkeys as $nindex) {
$matrix[$oindex][$nindex] = isset($matrix[$oindex - 1][$nindex - 1]) ?
$matrix[$oindex - 1][$nindex - 1] + 1 : 1;
if ($matrix[$oindex][$nindex] > $maxlen) {
$maxlen = $matrix[$oindex][$nindex];
$omax = $oindex + 1 - $maxlen;
$nmax = $nindex + 1 - $maxlen;
}
}
}
if ($maxlen == 0) {
return array(array('d' => $old, 'i' => $new));
}
return array_merge(
$this->diff(array_slice($old, 0, $omax), array_slice($new, 0, $nmax)),
array_slice($new, $nmax, $maxlen),
$this->diff(array_slice($old, $omax + $maxlen), array_slice($new, $nmax + $maxlen))
);
}

private function htmlDiff($old, $new): string
{
$ret = '';
$diff = $this->diff(preg_split("/[\s]+/", $old), preg_split("/[\s]+/", $new));
foreach ($diff as $k) {
if (is_array($k)) {
$ret .= (!empty($k['i']) ? attr(implode(' ', $k['i'])) : '');
} else {
$ret .= $k . ' ';
}
}
return $ret;
}
}
10 changes: 6 additions & 4 deletions portal/patient/scripts/app/onsitedocuments.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -848,9 +848,10 @@ var page = {
// no frame content is maintained in onsite document activity but template directives are.
templateContent = templateContent.replace("id=0", "id=" + page.encounterFormId);
}
if (isPortal) {
// removing for testing
/* if (isPortal) {
templateContent = page.encode(templateContent, parseInt(csrfTokenDoclib[0]));
}
} */
page.onsiteDocument.save({
'pid': cpid,
'facility': page.formOrigin, /* 0 portal, 1 dashboard, 2 patient documents */
Expand Down Expand Up @@ -956,7 +957,8 @@ var page = {
}
});
},
encode: function (content, k) {
// removing for testing
/* encode: function (content, k) {
let encoded = "";
content = btoa(content);
content = btoa(content);
Expand All @@ -966,5 +968,5 @@ var page = {
encoded = encoded + String.fromCharCode(b);
}
return btoa(encoded);
}
} */
};

0 comments on commit abee8d2

Please sign in to comment.