From 05288e9cedad2fb868d72e202daab43e90a934fb Mon Sep 17 00:00:00 2001 From: Brady Miller Date: Mon, 26 Mar 2018 00:30:04 -0700 Subject: [PATCH] minor fixes to prior commit --- acl_setup.php | 2 +- acl_upgrade.php | 218 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 111 insertions(+), 109 deletions(-) diff --git a/acl_setup.php b/acl_setup.php index 8af116115..cb449fdd1 100644 --- a/acl_setup.php +++ b/acl_setup.php @@ -171,7 +171,7 @@ $gacl->add_object('patients', 'Transactions (write optional)', 'trans', 10, 0, ' $gacl->add_object('patients', 'Documents (write,addonly optional)', 'docs', 10, 0, 'ACO'); // xl('Documents (write,addonly optional)') $gacl->add_object('patients', 'Documents Delete', 'docs_rm', 10, 0, 'ACO'); -// xl('Documents deleting') +// xl('Documents Delete') $gacl->add_object('patients', 'Patient Notes (write,addonly optional)', 'notes', 10, 0, 'ACO'); // xl('Patient Notes (write,addonly optional)') $gacl->add_object('patients', 'Sign Lab Results (write,addonly optional)', 'sign', 10, 0, 'ACO'); diff --git a/acl_upgrade.php b/acl_upgrade.php index 77e8308ad..48b061dee 100644 --- a/acl_upgrade.php +++ b/acl_upgrade.php @@ -1,113 +1,115 @@ // Upgrade for acl_version -* $upgrade_acl = ; -* if ($acl_version < $upgrade_acl) { -* echo "UPGRADING ACCESS CONTROLS TO VERSION ".$upgrade_acl.":
"; -* -* //Collect the ACL ID numbers. -* echo "Checking to ensure all the proper ACL(access control list) are present:
"; -* -* //Add new object Sections -* echo "
Adding new object sections
"; -* -* //Add new Objects -* echo "
Adding new objects
"; -* -* //Update already existing Objects -* echo "
Upgrading objects
"; -* -* //Add new ACLs here (will return the ACL ID of newly created or already existant ACL) -* // (will also place in the appropriate group and CREATE a new group if needed) -* echo "
Adding ACLs(Access Control Lists) and groups
"; -* -* //Update the ACLs -* echo "
Updating the ACLs(Access Control Lists)
"; -* -* //DONE with upgrading to this version -* $acl_version = $upgrade_acl; -* } -* -* -* Updates included: -* 
---VERSION 1 ACL---
-*   2.8.2
-*     Section "sensitivities" (Sensitivities):
-*       ADD  normal   Normal              (Administrators, Physicians, Clinicians(addonly))
-*       ADD  high     High                (Administrators, Physicians)
-*     Section "admin"         (Administration):
-*       ADD  super    Superuser           (Adminstrators)
-*   2.8.4
-*     Section "admin"         (Administration):
-*       ADD  drugs    Pharmacy Dispensary (Administrators, Physicians, Clinicians(write))
-*       ADD  acl      ACL Administration (Administrators)
-*     Section "sensitivities" (Sensitivities):
-*       EDIT high     High               (ensure the order variable is '20')
-*     Section "acct"          (Accounting):
-*       ADD  disc     Price Discounting (Administrators, Physicians, Accounting(write))
-*   3.0.2
-*     ADD Section "lists" (Lists):
-*       ADD  default   Default List (write,addonly optional)  (Administrators)
-*       ADD  state     State List (write,addonly optional)  (Administrators)
-*       ADD  country   Country List (write,addonly optional)  (Administrators)
-*       ADD  language  Language List (write,addonly optional)  (Administrators)
-*       ADD  ethrace   Ethnicity-Race List (write,addonly optional)  (Administrators)
-*     ADD Section "placeholder" (Placeholder):
-*       ADD  filler    Placeholder (Maintains empty ACLs)
-*     ACL/Group  doc   addonly  "Physicians"   (filler aco)
-*     ACL/Group  front addonly  "Front Office" (filler aco)
-*     ACL/Group  back  addonly  "Accounting"   (filler aco)
-*   3.3.0
-*     Section "patients" (Patients):
-*       ADD  sign  Sign Lab Results (Physicians)
-*     ACL/Group  breakglass  write  "Emergency Login"  (added all aco's to it)
-*   4.1.0
-*     Section "nationnotes" (Nation Notes):
-*       ADD  nn_configure  Nation Notes Configure  (Administrators, Emergency Login)
-*     Section "patientportal" (Patient Portal):
-*       ADD  portal    Patient Portal     (Administrators, Emergency Login)
-*   4.1.1
-*     ACL/Group  doc   wsome  "Physicians"   (filler aco)
-*     ACL/Group  clin  wsome  "Clinicians"   (filler aco)
-*     ACL/Group  front wsome  "Front Office" (filler aco)
-*     ACL/Group  back  wsome  "Accounting"   (filler aco)
-*     ACL/Group  doc   view   "Physicians"   (filler aco)
-*     ACL/Group  clin  view   "Clinicians"   (filler aco)
-*     ACL/Group  front view   "Front Office" (filler aco)
-*     ACL/Group  back  view   "Accounting"   (filler aco)
-*   4.1.3
-*     Section "menus" (Menus):
-*       ADD modle Module (Administrators, Emergency Login)
-*   5.0.1
-*     Section "patients" (Patients):
-*       ADD  reminder    Patient Reminders         (Physicians,Clinicians(addonly))
-*       ADD  alert       Clinical Reminders/Alerts (Physicians,Clinicians,Front Office(view),Accounting(view))
-*       ADD  disclosure  Disclosures               (Physicians,Clinicians(addonly))
-*       ADD  rx          Prescriptions             (Physicians,Clinicians(addonly))
-*       ADD  amendment   Amendments                (Physicians,Clinicians(addonly))
-*       ADD  lab         Lab Results               (Physicians,Clinicians(addonly))
-*       ADD  docs_rm     Documents Delete        (Administrators)
-*     Section "admin" (Administration):
-*       ADD  multipledb  Multipledb                (Administrators)
-*       ADD  menu        Menu                      (Administrators)
-*     Section "groups" (Groups):
-*       ADD  gadd        View/Add/Update groups    (Administrators)
-*       ADD  gcalendar   View/Create/Update groups appointment in calendar (Administrators,Physicians,Clinicians)
-*       ADD  glog        Group encounter log       (Administrators,Physicians, Clinicians)
-*       ADD  gdlog       Group detailed log of appointment in patient record (Administrators)
-*       ADD  gm          Send message from the permanent group therapist to the personal therapist (Administrators)
-*
-* + * Upgrade script for access controls. + * + * This script will update the phpGACL database, which include + * Access Control Objects(ACO), Groups(ARO), and Access Control + * Lists(ACL) to the most recent version. + * It will display whether each update already exist + * or if it was updated succesfully. + * To avoid reversing customizations, upgrade is done in versions, + * which are recorded in the database. To add another version of + * changes, use the following template: + * 
// Upgrade for acl_version 
+ * $upgrade_acl = ;
+ * if ($acl_version < $upgrade_acl) {
+ *   echo "UPGRADING ACCESS CONTROLS TO VERSION ".$upgrade_acl.":
";
+ *
+ *   //Collect the ACL ID numbers.
+ *   echo "Checking to ensure all the proper ACL(access control list) are present:
";
+ *
+ *   //Add new object Sections
+ *   echo "
Adding new object sections
";
+ *
+ *   //Add new Objects
+ *   echo "
Adding new objects
";
+ *
+ *   //Update already existing Objects
+ *   echo "
Upgrading objects
";
+ *
+ *   //Add new ACLs here (will return the ACL ID of newly created or already existant ACL)
+ *   // (will also place in the appropriate group and CREATE a new group if needed)
+ *   echo "
Adding ACLs(Access Control Lists) and groups
";
+ *
+ *   //Update the ACLs
+ *   echo "
Updating the ACLs(Access Control Lists)
";
+ *
+ *   //DONE with upgrading to this version
+ *   $acl_version = $upgrade_acl;
+ * }
+ *
+ * + * Updates included: + * 
---VERSION 1 ACL---
+ *   2.8.2
+ *     Section "sensitivities" (Sensitivities):
+ *       ADD  normal   Normal              (Administrators, Physicians, Clinicians(addonly))
+ *       ADD  high     High                (Administrators, Physicians)
+ *     Section "admin"         (Administration):
+ *       ADD  super    Superuser           (Adminstrators)
+ *   2.8.4
+ *     Section "admin"         (Administration):
+ *       ADD  drugs    Pharmacy Dispensary (Administrators, Physicians, Clinicians(write))
+ *       ADD  acl      ACL Administration (Administrators)
+ *     Section "sensitivities" (Sensitivities):
+ *       EDIT high     High               (ensure the order variable is '20')
+ *     Section "acct"          (Accounting):
+ *       ADD  disc     Price Discounting (Administrators, Physicians, Accounting(write))
+ *   3.0.2
+ *     ADD Section "lists" (Lists):
+ *       ADD  default   Default List (write,addonly optional)  (Administrators)
+ *       ADD  state     State List (write,addonly optional)  (Administrators)
+ *       ADD  country   Country List (write,addonly optional)  (Administrators)
+ *       ADD  language  Language List (write,addonly optional)  (Administrators)
+ *       ADD  ethrace   Ethnicity-Race List (write,addonly optional)  (Administrators)
+ *     ADD Section "placeholder" (Placeholder):
+ *       ADD  filler    Placeholder (Maintains empty ACLs)
+ *     ACL/Group  doc   addonly  "Physicians"   (filler aco)
+ *     ACL/Group  front addonly  "Front Office" (filler aco)
+ *     ACL/Group  back  addonly  "Accounting"   (filler aco)
+ *   3.3.0
+ *     Section "patients" (Patients):
+ *       ADD  sign  Sign Lab Results (Physicians)
+ *     ACL/Group  breakglass  write  "Emergency Login"  (added all aco's to it)
+ *   4.1.0
+ *     Section "nationnotes" (Nation Notes):
+ *       ADD  nn_configure  Nation Notes Configure  (Administrators, Emergency Login)
+ *     Section "patientportal" (Patient Portal):
+ *       ADD  portal    Patient Portal     (Administrators, Emergency Login)
+ *   4.1.1
+ *     ACL/Group  doc   wsome  "Physicians"   (filler aco)
+ *     ACL/Group  clin  wsome  "Clinicians"   (filler aco)
+ *     ACL/Group  front wsome  "Front Office" (filler aco)
+ *     ACL/Group  back  wsome  "Accounting"   (filler aco)
+ *     ACL/Group  doc   view   "Physicians"   (filler aco)
+ *     ACL/Group  clin  view   "Clinicians"   (filler aco)
+ *     ACL/Group  front view   "Front Office" (filler aco)
+ *     ACL/Group  back  view   "Accounting"   (filler aco)
+ *   4.1.3
+ *     Section "menus" (Menus):
+ *       ADD modle Module (Administrators, Emergency Login)
+ *   5.0.1
+ *     Section "patients" (Patients):
+ *       ADD  reminder    Patient Reminders         (Physicians,Clinicians(addonly))
+ *       ADD  alert       Clinical Reminders/Alerts (Physicians,Clinicians,Front Office(view),Accounting(view))
+ *       ADD  disclosure  Disclosures               (Physicians,Clinicians(addonly))
+ *       ADD  rx          Prescriptions             (Physicians,Clinicians(addonly))
+ *       ADD  amendment   Amendments                (Physicians,Clinicians(addonly))
+ *       ADD  lab         Lab Results               (Physicians,Clinicians(addonly))
+ *     Section "admin" (Administration):
+ *       ADD  multipledb  Multipledb                (Administrators)
+ *       ADD  menu        Menu                      (Administrators)
+ *     Section "groups" (Groups):
+ *       ADD  gadd        View/Add/Update groups    (Administrators)
+ *       ADD  gcalendar   View/Create/Update groups appointment in calendar (Administrators,Physicians,Clinicians)
+ *       ADD  glog        Group encounter log       (Administrators,Physicians, Clinicians)
+ *       ADD  gdlog       Group detailed log of appointment in patient record (Administrators)
+ *       ADD  gm          Send message from the permanent group therapist to the personal therapist (Administrators)
+ *   5.0.2
+ *     Section "patients" (Patients):
+ *       ADD  docs_rm     Documents Delete          (Administrators)
+ *
+ * * @package OpenEMR * @link http://www.open-emr.org * @author Brady Miller -- 2.11.4.GIT