From fd0b14232373c58fd6b529b0aad593fbb13eb797 Mon Sep 17 00:00:00 2001
From: "JP-DEV\\sjpad" <sjpadgett@gmail.com>
Date: Fri, 2 Nov 2018 02:55:05 -0400
Subject: [PATCH] Dashboard User signature change fix. Separated Patient Report
 Content feature disable from ccda disable.

---
 portal/_header.php                                    |  2 ++
 portal/home.php                                       |  2 +-
 portal/patient/libs/Controller/ProviderController.php |  4 ++--
 portal/sign/css/signer.css                            | 19 ++++++++++++++++++-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/portal/_header.php b/portal/_header.php
index 51f9e31f8..9c62fba2f 100644
--- a/portal/_header.php
+++ b/portal/_header.php
@@ -155,6 +155,8 @@ use OpenEMR\Core\Header;
                             <?php if ($GLOBALS['ccda_alt_service_enable'] > 1) { ?>
                                 <li><a id="callccda" href="<?php echo $GLOBALS['web_root']; ?>/ccdaservice/ccda_gateway.php?action=startandrun">
                                     <i class="fa fa-envelope" aria-hidden="true"></i><span><?php echo xlt('View CCD'); ?></span></a></li>
+                            <?php } ?>
+                            <?php if (!empty($GLOBALS['portal_onsite_document_download'])) { ?>
                             <li data-toggle="pill"><a href="#reportpanel" data-toggle="collapse"
                                 data-parent="#panelgroup"> <i class="fa fa-folder-open"></i> <span><?php echo xlt('Report Content'); ?></span></a></li>
                             <?php } ?>
diff --git a/portal/home.php b/portal/home.php
index a2e7893e5..5b0e6ba0c 100644
--- a/portal/home.php
+++ b/portal/home.php
@@ -325,7 +325,7 @@ function editAppointment(mode,deid){
                     <div class="panel panel-primary collapse" id="downloadpanel">
                         <header class="panel-heading"> <?php echo xlt('Download Documents'); ?> </header>
                         <div id="docsdownload" class="panel-body">
-                        <?php if ($GLOBALS['portal_onsite_document_download']) { ?>
+                        <?php if (!empty($GLOBALS['portal_onsite_document_download'])) { ?>
                             <div>
                                 <span class="text"><?php echo xlt('Download all patient documents');?></span>
                                 <form name='doc_form' id='doc_form' action='./get_patient_documents.php' method='post'>
diff --git a/portal/patient/libs/Controller/ProviderController.php b/portal/patient/libs/Controller/ProviderController.php
index a28f8025a..51ebce1d0 100644
--- a/portal/patient/libs/Controller/ProviderController.php
+++ b/portal/patient/libs/Controller/ProviderController.php
@@ -51,8 +51,8 @@ class ProviderController extends AppBaseController
     public function Home()
     {
         $cpid=$cuser=0;
-        if (isset($_SESSION['authUser'])) {
-            $cuser = $_SESSION['authUser'];
+        if (isset($_SESSION['authUserID'])) {
+            $cuser = $_SESSION['authUserID'];
         } else {
             header("refresh:5;url= ./provider");
             echo 'Shared session not allowed with Portal!!!  <br>Onsite portal is using this session<br>Waiting until Onsite Portal is logged out........';
diff --git a/portal/sign/css/signer.css b/portal/sign/css/signer.css
index 24e18ff28..479fc3e9d 100644
--- a/portal/sign/css/signer.css
+++ b/portal/sign/css/signer.css
@@ -49,6 +49,23 @@
 	cursor: pointer;
 	border-radius: 5px;
 }
+body.modal-open {
+    overflow: hidden;
+    position: fixed;
+}
+.modal-backdrop {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 1040;
+    background-color: #000;
+}
+/*.modal-backdrop.in {
+    filter: alpha(opacity=100);
+    opacity: .8;
+}*/
 
 .signature {
 	width: auto !important;
@@ -89,4 +106,4 @@
 
 #openSignModal .close:hover {
 	background-color: #f0f0f0;
-}
\ No newline at end of file
+}
-- 
2.11.4.GIT