From 6f239460720aa2f131b3652608cc2267cee87d11 Mon Sep 17 00:00:00 2001
From: Agnibho Mondal <mondal@agnibho.com>
Date: Mon, 17 May 2021 23:27:03 +0530
Subject: [PATCH] Major restructuring of code

---
 .gitignore                                                 | 3 ++-
 config.php                                                 | 6 ++++++
 lib/access.php                                             | 3 ++-
 lib/db.php                                                 | 2 +-
 lib/require.php => require.php                             | 1 +
 admission.php => www/admission.php                         | 6 +++---
 attachments.php => www/attachments.php                     | 6 +++---
 {autocomplete => www/autocomplete}/discharge.json          | 0
 {autocomplete => www/autocomplete}/drugs.json              | 0
 {autocomplete => www/autocomplete}/frequency.json          | 0
 {autocomplete => www/autocomplete}/investigation.json      | 0
 {autocomplete => www/autocomplete}/route.json              | 0
 death.php => www/death.php                                 | 6 +++---
 discharge.php => www/discharge.php                         | 6 +++---
 error.php => www/error.php                                 | 0
 {forms => www/forms}/admission.schema.json                 | 0
 {forms => www/forms}/death.schema.json                     | 0
 {forms => www/forms}/drugs.schema.json                     | 0
 {forms => www/forms}/history.schema.json                   | 0
 {forms => www/forms}/nursing.schema.json                   | 0
 {forms => www/forms}/physician.schema.json                 | 0
 {forms => www/forms}/report-abg.schema.json                | 0
 {forms => www/forms}/report-blood-cs.schema.json           | 0
 {forms => www/forms}/report-ch.schema.json                 | 0
 {forms => www/forms}/report-crp.schema.json                | 0
 {forms => www/forms}/report-ddimer.schema.json             | 0
 {forms => www/forms}/report-fluid.schema.json              | 0
 {forms => www/forms}/report-glycemic.schema.json           | 0
 {forms => www/forms}/report-ldh.schema.json                | 0
 {forms => www/forms}/report-lft.schema.json                | 0
 {forms => www/forms}/report-lipid.schema.json              | 0
 {forms => www/forms}/report-other.schema.json              | 0
 {forms => www/forms}/report-rft.schema.json                | 0
 {forms => www/forms}/report-sputum-cs.schema.json          | 0
 {forms => www/forms}/report-sputum-me.schema.json          | 0
 {forms => www/forms}/report-stool-ova.schema.json          | 0
 {forms => www/forms}/report-stool-re.schema.json           | 0
 {forms => www/forms}/report-urine-cs.schema.json           | 0
 {forms => www/forms}/report-urine-re.schema.json           | 0
 history.php => www/history.php                             | 6 +++---
 index.php => www/index.php                                 | 6 +++---
 laboratory.php => www/laboratory.php                       | 7 ++++---
 login.php => www/login.php                                 | 7 ++++---
 nursing.php => www/nursing.php                             | 7 ++++---
 physician.php => www/physician.php                         | 7 ++++---
 print-discharge.php => www/print-discharge.php             | 2 +-
 report.php => www/report.php                               | 6 +++---
 requisition.php => www/requisition.php                     | 6 +++---
 {res => www/res}/bootstrap-4-autocomplete.min.js           | 0
 {res => www/res}/bootstrap/css/bootstrap-grid.css          | 0
 {res => www/res}/bootstrap/css/bootstrap-grid.css.map      | 0
 {res => www/res}/bootstrap/css/bootstrap-grid.min.css      | 0
 {res => www/res}/bootstrap/css/bootstrap-grid.min.css.map  | 0
 {res => www/res}/bootstrap/css/bootstrap-reboot.css        | 0
 {res => www/res}/bootstrap/css/bootstrap-reboot.css.map    | 0
 {res => www/res}/bootstrap/css/bootstrap-reboot.min.css    | 0
 .../res}/bootstrap/css/bootstrap-reboot.min.css.map        | 0
 {res => www/res}/bootstrap/css/bootstrap.css               | 0
 {res => www/res}/bootstrap/css/bootstrap.css.map           | 0
 {res => www/res}/bootstrap/css/bootstrap.min.css           | 0
 {res => www/res}/bootstrap/css/bootstrap.min.css.map       | 0
 {res => www/res}/bootstrap/js/bootstrap.bundle.js          | 0
 {res => www/res}/bootstrap/js/bootstrap.bundle.js.map      | 0
 {res => www/res}/bootstrap/js/bootstrap.bundle.min.js      | 0
 {res => www/res}/bootstrap/js/bootstrap.bundle.min.js.map  | 0
 {res => www/res}/bootstrap/js/bootstrap.js                 | 0
 {res => www/res}/bootstrap/js/bootstrap.js.map             | 0
 {res => www/res}/bootstrap/js/bootstrap.min.js             | 0
 {res => www/res}/bootstrap/js/bootstrap.min.js.map         | 0
 {res => www/res}/custom.css                                | 0
 {res => www/res}/jquery.min.js                             | 0
 {res => www/res}/moment.js                                 | 0
 {res => www/res}/script.js                                 | 0
 treatment.php => www/treatment.php                         | 6 +++---
 view.php => www/view.php                                   | 6 +++---
 75 files changed, 59 insertions(+), 46 deletions(-)
 create mode 100644 config.php
 rename lib/require.php => require.php (95%)
 rename admission.php => www/admission.php (92%)
 rename attachments.php => www/attachments.php (94%)
 rename {autocomplete => www/autocomplete}/discharge.json (100%)
 rename {autocomplete => www/autocomplete}/drugs.json (100%)
 rename {autocomplete => www/autocomplete}/frequency.json (100%)
 rename {autocomplete => www/autocomplete}/investigation.json (100%)
 rename {autocomplete => www/autocomplete}/route.json (100%)
 rename death.php => www/death.php (84%)
 rename discharge.php => www/discharge.php (93%)
 rename error.php => www/error.php (100%)
 rename {forms => www/forms}/admission.schema.json (100%)
 rename {forms => www/forms}/death.schema.json (100%)
 rename {forms => www/forms}/drugs.schema.json (100%)
 rename {forms => www/forms}/history.schema.json (100%)
 rename {forms => www/forms}/nursing.schema.json (100%)
 rename {forms => www/forms}/physician.schema.json (100%)
 rename {forms => www/forms}/report-abg.schema.json (100%)
 rename {forms => www/forms}/report-blood-cs.schema.json (100%)
 rename {forms => www/forms}/report-ch.schema.json (100%)
 rename {forms => www/forms}/report-crp.schema.json (100%)
 rename {forms => www/forms}/report-ddimer.schema.json (100%)
 rename {forms => www/forms}/report-fluid.schema.json (100%)
 rename {forms => www/forms}/report-glycemic.schema.json (100%)
 rename {forms => www/forms}/report-ldh.schema.json (100%)
 rename {forms => www/forms}/report-lft.schema.json (100%)
 rename {forms => www/forms}/report-lipid.schema.json (100%)
 rename {forms => www/forms}/report-other.schema.json (100%)
 rename {forms => www/forms}/report-rft.schema.json (100%)
 rename {forms => www/forms}/report-sputum-cs.schema.json (100%)
 rename {forms => www/forms}/report-sputum-me.schema.json (100%)
 rename {forms => www/forms}/report-stool-ova.schema.json (100%)
 rename {forms => www/forms}/report-stool-re.schema.json (100%)
 rename {forms => www/forms}/report-urine-cs.schema.json (100%)
 rename {forms => www/forms}/report-urine-re.schema.json (100%)
 rename history.php => www/history.php (82%)
 rename index.php => www/index.php (92%)
 rename laboratory.php => www/laboratory.php (83%)
 rename login.php => www/login.php (89%)
 rename nursing.php => www/nursing.php (85%)
 rename physician.php => www/physician.php (85%)
 rename print-discharge.php => www/print-discharge.php (98%)
 rename report.php => www/report.php (89%)
 rename requisition.php => www/requisition.php (95%)
 rename {res => www/res}/bootstrap-4-autocomplete.min.js (100%)
 rename {res => www/res}/bootstrap/css/bootstrap-grid.css (100%)
 rename {res => www/res}/bootstrap/css/bootstrap-grid.css.map (100%)
 rename {res => www/res}/bootstrap/css/bootstrap-grid.min.css (100%)
 rename {res => www/res}/bootstrap/css/bootstrap-grid.min.css.map (100%)
 rename {res => www/res}/bootstrap/css/bootstrap-reboot.css (100%)
 rename {res => www/res}/bootstrap/css/bootstrap-reboot.css.map (100%)
 rename {res => www/res}/bootstrap/css/bootstrap-reboot.min.css (100%)
 rename {res => www/res}/bootstrap/css/bootstrap-reboot.min.css.map (100%)
 rename {res => www/res}/bootstrap/css/bootstrap.css (100%)
 rename {res => www/res}/bootstrap/css/bootstrap.css.map (100%)
 rename {res => www/res}/bootstrap/css/bootstrap.min.css (100%)
 rename {res => www/res}/bootstrap/css/bootstrap.min.css.map (100%)
 rename {res => www/res}/bootstrap/js/bootstrap.bundle.js (100%)
 rename {res => www/res}/bootstrap/js/bootstrap.bundle.js.map (100%)
 rename {res => www/res}/bootstrap/js/bootstrap.bundle.min.js (100%)
 rename {res => www/res}/bootstrap/js/bootstrap.bundle.min.js.map (100%)
 rename {res => www/res}/bootstrap/js/bootstrap.js (100%)
 rename {res => www/res}/bootstrap/js/bootstrap.js.map (100%)
 rename {res => www/res}/bootstrap/js/bootstrap.min.js (100%)
 rename {res => www/res}/bootstrap/js/bootstrap.min.js.map (100%)
 rename {res => www/res}/custom.css (100%)
 rename {res => www/res}/jquery.min.js (100%)
 rename {res => www/res}/moment.js (100%)
 rename {res => www/res}/script.js (100%)
 rename treatment.php => www/treatment.php (93%)
 rename view.php => www/view.php (97%)

diff --git a/.gitignore b/.gitignore
index 60baa9c..0691fec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-data/*
+database/data.db
+www/data/*
diff --git a/config.php b/config.php
new file mode 100644
index 0000000..18b6605
--- /dev/null
+++ b/config.php
@@ -0,0 +1,6 @@
+<?php
+define("CONFIG_ROOT", __DIR__."/");
+define("CONFIG_WWW", CONFIG_ROOT."www/");
+define("CONFIG_LIB", CONFIG_ROOT."lib/");
+define("CONFIG_DB", CONFIG_ROOT."database/data.db");
+?>
diff --git a/lib/access.php b/lib/access.php
index 5a99b63..3a75579 100644
--- a/lib/access.php
+++ b/lib/access.php
@@ -1,6 +1,7 @@
 <?php
 function checkAccess($target, $type="page"){
-  $registry=json_decode(file_get_contents("access.json"));
+  global $config;
+  $registry=json_decode(file_get_contents(CONFIG_ROOT."access.json"));
   $access="none";
   if(!empty($_SESSION["group"])){
     $group=$_SESSION["group"];
diff --git a/lib/db.php b/lib/db.php
index 55f5a55..6675945 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -1,7 +1,7 @@
 <?php
 class DB extends SQLite3 {
   function __construct(){
-    $this->open("data/data.db");
+    $this->open(CONFIG_DB);
   }
   function checkUser($username, $password){
     $stmt=$this->prepare("SELECT hash FROM users WHERE user=:user");
diff --git a/lib/require.php b/require.php
similarity index 95%
rename from lib/require.php
rename to require.php
index f598990..619e891 100644
--- a/lib/require.php
+++ b/require.php
@@ -1,4 +1,5 @@
 <?php
+require(__DIR__."/config.php");
 require("lib/access.php");
 require("lib/db.php");
 require("lib/functions.php");
diff --git a/admission.php b/www/admission.php
similarity index 92%
rename from admission.php
rename to www/admission.php
index e1d5fc5..9109104 100644
--- a/admission.php
+++ b/www/admission.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 if(checkAccess("admission")!="all"){
   header("Location: error.php");
   exit();
@@ -23,7 +23,7 @@ else{
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php");?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>Admission</title>
   </head>
   <body>
@@ -42,6 +42,6 @@ else{
         </div>
       </div>
     </div>
-    <?php include("lib/foot.php");?>
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/attachments.php b/www/attachments.php
similarity index 94%
rename from attachments.php
rename to www/attachments.php
index 000e118..067a6e8 100644
--- a/attachments.php
+++ b/www/attachments.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 $error="<p>";
 $imgs="<div class='card mb-3 w-100'><div class='card-body'><div class='row'>";
 $pdfs="<div class='card mb-3'><div class='card-body'>";
@@ -35,7 +35,7 @@ $error=$error."</p>";
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php");?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>Attachments</title>
   </head>
   <body>
@@ -54,6 +54,6 @@ $error=$error."</p>";
       </div>
       <?php echo $error;?>
     </div>
-    <?php include("lib/foot.php");?>
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/autocomplete/discharge.json b/www/autocomplete/discharge.json
similarity index 100%
rename from autocomplete/discharge.json
rename to www/autocomplete/discharge.json
diff --git a/autocomplete/drugs.json b/www/autocomplete/drugs.json
similarity index 100%
rename from autocomplete/drugs.json
rename to www/autocomplete/drugs.json
diff --git a/autocomplete/frequency.json b/www/autocomplete/frequency.json
similarity index 100%
rename from autocomplete/frequency.json
rename to www/autocomplete/frequency.json
diff --git a/autocomplete/investigation.json b/www/autocomplete/investigation.json
similarity index 100%
rename from autocomplete/investigation.json
rename to www/autocomplete/investigation.json
diff --git a/autocomplete/route.json b/www/autocomplete/route.json
similarity index 100%
rename from autocomplete/route.json
rename to www/autocomplete/route.json
diff --git a/death.php b/www/death.php
similarity index 84%
rename from death.php
rename to www/death.php
index 29844f0..95f9143 100644
--- a/death.php
+++ b/www/death.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 if(checkAccess("death")!="all"){
   header("Location: error.php");
   exit();
@@ -17,7 +17,7 @@ if(!empty($_GET["pid"])){
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php");?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>Death Note</title>
   </head>
   <body>
@@ -25,6 +25,6 @@ if(!empty($_GET["pid"])){
       <?php echo getInfo($pid);?>
       <?php echo str_replace("Save", "Declare Death", $form);?>
     </div>
-    <?php include("lib/foot.php");?>
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/discharge.php b/www/discharge.php
similarity index 93%
rename from discharge.php
rename to www/discharge.php
index d147c69..45c1b91 100644
--- a/discharge.php
+++ b/www/discharge.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 if(!empty($_GET["pid"])){
   $pid=$_GET["pid"];
   if(!empty($_POST["delete"])){
@@ -23,7 +23,7 @@ if(!empty($_GET["pid"])){
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php");?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>Discharge Notes</title>
   </head>
   <body>
@@ -42,6 +42,6 @@ if(!empty($_GET["pid"])){
         <button type="submit" class="btn btn-danger">Discharge Patient</button>
       </form>
     </div>
-    <?php include("lib/foot.php");?>
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/error.php b/www/error.php
similarity index 100%
rename from error.php
rename to www/error.php
diff --git a/forms/admission.schema.json b/www/forms/admission.schema.json
similarity index 100%
rename from forms/admission.schema.json
rename to www/forms/admission.schema.json
diff --git a/forms/death.schema.json b/www/forms/death.schema.json
similarity index 100%
rename from forms/death.schema.json
rename to www/forms/death.schema.json
diff --git a/forms/drugs.schema.json b/www/forms/drugs.schema.json
similarity index 100%
rename from forms/drugs.schema.json
rename to www/forms/drugs.schema.json
diff --git a/forms/history.schema.json b/www/forms/history.schema.json
similarity index 100%
rename from forms/history.schema.json
rename to www/forms/history.schema.json
diff --git a/forms/nursing.schema.json b/www/forms/nursing.schema.json
similarity index 100%
rename from forms/nursing.schema.json
rename to www/forms/nursing.schema.json
diff --git a/forms/physician.schema.json b/www/forms/physician.schema.json
similarity index 100%
rename from forms/physician.schema.json
rename to www/forms/physician.schema.json
diff --git a/forms/report-abg.schema.json b/www/forms/report-abg.schema.json
similarity index 100%
rename from forms/report-abg.schema.json
rename to www/forms/report-abg.schema.json
diff --git a/forms/report-blood-cs.schema.json b/www/forms/report-blood-cs.schema.json
similarity index 100%
rename from forms/report-blood-cs.schema.json
rename to www/forms/report-blood-cs.schema.json
diff --git a/forms/report-ch.schema.json b/www/forms/report-ch.schema.json
similarity index 100%
rename from forms/report-ch.schema.json
rename to www/forms/report-ch.schema.json
diff --git a/forms/report-crp.schema.json b/www/forms/report-crp.schema.json
similarity index 100%
rename from forms/report-crp.schema.json
rename to www/forms/report-crp.schema.json
diff --git a/forms/report-ddimer.schema.json b/www/forms/report-ddimer.schema.json
similarity index 100%
rename from forms/report-ddimer.schema.json
rename to www/forms/report-ddimer.schema.json
diff --git a/forms/report-fluid.schema.json b/www/forms/report-fluid.schema.json
similarity index 100%
rename from forms/report-fluid.schema.json
rename to www/forms/report-fluid.schema.json
diff --git a/forms/report-glycemic.schema.json b/www/forms/report-glycemic.schema.json
similarity index 100%
rename from forms/report-glycemic.schema.json
rename to www/forms/report-glycemic.schema.json
diff --git a/forms/report-ldh.schema.json b/www/forms/report-ldh.schema.json
similarity index 100%
rename from forms/report-ldh.schema.json
rename to www/forms/report-ldh.schema.json
diff --git a/forms/report-lft.schema.json b/www/forms/report-lft.schema.json
similarity index 100%
rename from forms/report-lft.schema.json
rename to www/forms/report-lft.schema.json
diff --git a/forms/report-lipid.schema.json b/www/forms/report-lipid.schema.json
similarity index 100%
rename from forms/report-lipid.schema.json
rename to www/forms/report-lipid.schema.json
diff --git a/forms/report-other.schema.json b/www/forms/report-other.schema.json
similarity index 100%
rename from forms/report-other.schema.json
rename to www/forms/report-other.schema.json
diff --git a/forms/report-rft.schema.json b/www/forms/report-rft.schema.json
similarity index 100%
rename from forms/report-rft.schema.json
rename to www/forms/report-rft.schema.json
diff --git a/forms/report-sputum-cs.schema.json b/www/forms/report-sputum-cs.schema.json
similarity index 100%
rename from forms/report-sputum-cs.schema.json
rename to www/forms/report-sputum-cs.schema.json
diff --git a/forms/report-sputum-me.schema.json b/www/forms/report-sputum-me.schema.json
similarity index 100%
rename from forms/report-sputum-me.schema.json
rename to www/forms/report-sputum-me.schema.json
diff --git a/forms/report-stool-ova.schema.json b/www/forms/report-stool-ova.schema.json
similarity index 100%
rename from forms/report-stool-ova.schema.json
rename to www/forms/report-stool-ova.schema.json
diff --git a/forms/report-stool-re.schema.json b/www/forms/report-stool-re.schema.json
similarity index 100%
rename from forms/report-stool-re.schema.json
rename to www/forms/report-stool-re.schema.json
diff --git a/forms/report-urine-cs.schema.json b/www/forms/report-urine-cs.schema.json
similarity index 100%
rename from forms/report-urine-cs.schema.json
rename to www/forms/report-urine-cs.schema.json
diff --git a/forms/report-urine-re.schema.json b/www/forms/report-urine-re.schema.json
similarity index 100%
rename from forms/report-urine-re.schema.json
rename to www/forms/report-urine-re.schema.json
diff --git a/history.php b/www/history.php
similarity index 82%
rename from history.php
rename to www/history.php
index 22c7320..69d67c6 100644
--- a/history.php
+++ b/www/history.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 if(!empty($_GET["pid"])){
   $pid=$_GET["pid"];
   if(!empty($_POST["cc"])){
@@ -18,7 +18,7 @@ else{
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php");?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>History</title>
   </head>
   <body>
@@ -28,6 +28,6 @@ else{
         <?php echo $form;?>
       </div>
     </div>
-    <?php include("lib/foot.php");?>
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/index.php b/www/index.php
similarity index 92%
rename from index.php
rename to www/index.php
index f030dd5..ac12fb8 100644
--- a/index.php
+++ b/www/index.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 $list=$db->getPatientList();
 $showList="";
 while($arr=$list->fetchArray()){
@@ -22,7 +22,7 @@ while($arr=$reqs->fetchArray()){
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php");?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>View Info</title>
   </head>
   <body>
@@ -48,6 +48,6 @@ while($arr=$reqs->fetchArray()){
         </div>
       </div>
     </div>
-    <?php include("lib/foot.php");?>
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/laboratory.php b/www/laboratory.php
similarity index 83%
rename from laboratory.php
rename to www/laboratory.php
index c619e8e..640d238 100644
--- a/laboratory.php
+++ b/www/laboratory.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 $list="";
 if(isSet($_GET["pid"])){
   foreach(glob("forms/report*.json") as $file){
@@ -11,7 +11,7 @@ if(isSet($_GET["pid"])){
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php")?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>Laboratory</title>
   </head>
   <body>
@@ -25,6 +25,7 @@ if(isSet($_GET["pid"])){
         </div>
       </div>
     </div>
-    <?php include("lib/foot.php");?>
+
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/login.php b/www/login.php
similarity index 89%
rename from login.php
rename to www/login.php
index c8d037d..7689da3 100644
--- a/login.php
+++ b/www/login.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 $error="";
 if(!empty($_GET["action"]) && $_GET["action"]=="logout"){
   $_SESSION["user"]=null;
@@ -23,7 +23,7 @@ if(!empty($_POST["username"]) && !empty($_POST["password"])){
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php");?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>Login</title>
   </head>
   <body>
@@ -35,6 +35,7 @@ if(!empty($_POST["username"]) && !empty($_POST["password"])){
         <button class="m-2 btn btn-primary" type="submit">Login</button>
       </form>
     </div>
-    <?php include("lib/foot.php");?>
+
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/nursing.php b/www/nursing.php
similarity index 85%
rename from nursing.php
rename to www/nursing.php
index c7a0ff7..a833ec1 100644
--- a/nursing.php
+++ b/www/nursing.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 if(!empty($_GET["pid"])){
   $pid=$_GET["pid"];
   if(!empty($_POST["date"]) && !empty($_POST["time"])){
@@ -23,7 +23,7 @@ if(!empty($_GET["pid"])){
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php");?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>Nursing Notes</title>
   </head>
   <body>
@@ -33,6 +33,7 @@ if(!empty($_GET["pid"])){
         <?php echo $form;?>
       </div>
     </div>
-    <?php include("lib/foot.php");?>
+
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/physician.php b/www/physician.php
similarity index 85%
rename from physician.php
rename to www/physician.php
index 8113d65..b95ff67 100644
--- a/physician.php
+++ b/www/physician.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 if(!empty($_GET["pid"])){
   $pid=$_GET["pid"];
   if(!empty($_POST["date"]) && !empty($_POST["time"])){
@@ -23,7 +23,7 @@ if(!empty($_GET["pid"])){
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php");?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>Physician Notes</title>
   </head>
   <body>
@@ -33,6 +33,7 @@ if(!empty($_GET["pid"])){
         <?php echo $form;?>
       </div>
     </div>
-    <?php include("lib/foot.php");?>
+
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/print-discharge.php b/www/print-discharge.php
similarity index 98%
rename from print-discharge.php
rename to www/print-discharge.php
index 54068ed..f1af38f 100644
--- a/print-discharge.php
+++ b/www/print-discharge.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 function json2tex($data){
     $data=json_decode($data);
     if(!empty($data->form)){
diff --git a/report.php b/www/report.php
similarity index 89%
rename from report.php
rename to www/report.php
index 3bb5912..7f8e2ce 100644
--- a/report.php
+++ b/www/report.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 if(checkAccess("report")!="all"){
   header("Location: error.php");
   exit();
@@ -30,7 +30,7 @@ if(!empty($_GET["pid"]) && !empty($_GET["form"])){
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php");?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>Reports</title>
   </head>
   <body>
@@ -43,6 +43,6 @@ if(!empty($_GET["pid"]) && !empty($_GET["form"])){
         </div>
       </div>
     </div>
-    <?php include("lib/foot.php");?>
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/requisition.php b/www/requisition.php
similarity index 95%
rename from requisition.php
rename to www/requisition.php
index 1382f5c..2f51b15 100644
--- a/requisition.php
+++ b/www/requisition.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 if(isSet($_GET["pid"])){
   $pid=$_GET["pid"];
   if(!empty($_POST["del"])){
@@ -41,7 +41,7 @@ if(isSet($_GET["pid"])){
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php")?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>Laboratory</title>
   </head>
   <body>
@@ -79,6 +79,6 @@ if(isSet($_GET["pid"])){
         </div>
       </div>
     </div>
-    <?php include("lib/foot.php");?>
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/res/bootstrap-4-autocomplete.min.js b/www/res/bootstrap-4-autocomplete.min.js
similarity index 100%
rename from res/bootstrap-4-autocomplete.min.js
rename to www/res/bootstrap-4-autocomplete.min.js
diff --git a/res/bootstrap/css/bootstrap-grid.css b/www/res/bootstrap/css/bootstrap-grid.css
similarity index 100%
rename from res/bootstrap/css/bootstrap-grid.css
rename to www/res/bootstrap/css/bootstrap-grid.css
diff --git a/res/bootstrap/css/bootstrap-grid.css.map b/www/res/bootstrap/css/bootstrap-grid.css.map
similarity index 100%
rename from res/bootstrap/css/bootstrap-grid.css.map
rename to www/res/bootstrap/css/bootstrap-grid.css.map
diff --git a/res/bootstrap/css/bootstrap-grid.min.css b/www/res/bootstrap/css/bootstrap-grid.min.css
similarity index 100%
rename from res/bootstrap/css/bootstrap-grid.min.css
rename to www/res/bootstrap/css/bootstrap-grid.min.css
diff --git a/res/bootstrap/css/bootstrap-grid.min.css.map b/www/res/bootstrap/css/bootstrap-grid.min.css.map
similarity index 100%
rename from res/bootstrap/css/bootstrap-grid.min.css.map
rename to www/res/bootstrap/css/bootstrap-grid.min.css.map
diff --git a/res/bootstrap/css/bootstrap-reboot.css b/www/res/bootstrap/css/bootstrap-reboot.css
similarity index 100%
rename from res/bootstrap/css/bootstrap-reboot.css
rename to www/res/bootstrap/css/bootstrap-reboot.css
diff --git a/res/bootstrap/css/bootstrap-reboot.css.map b/www/res/bootstrap/css/bootstrap-reboot.css.map
similarity index 100%
rename from res/bootstrap/css/bootstrap-reboot.css.map
rename to www/res/bootstrap/css/bootstrap-reboot.css.map
diff --git a/res/bootstrap/css/bootstrap-reboot.min.css b/www/res/bootstrap/css/bootstrap-reboot.min.css
similarity index 100%
rename from res/bootstrap/css/bootstrap-reboot.min.css
rename to www/res/bootstrap/css/bootstrap-reboot.min.css
diff --git a/res/bootstrap/css/bootstrap-reboot.min.css.map b/www/res/bootstrap/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from res/bootstrap/css/bootstrap-reboot.min.css.map
rename to www/res/bootstrap/css/bootstrap-reboot.min.css.map
diff --git a/res/bootstrap/css/bootstrap.css b/www/res/bootstrap/css/bootstrap.css
similarity index 100%
rename from res/bootstrap/css/bootstrap.css
rename to www/res/bootstrap/css/bootstrap.css
diff --git a/res/bootstrap/css/bootstrap.css.map b/www/res/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from res/bootstrap/css/bootstrap.css.map
rename to www/res/bootstrap/css/bootstrap.css.map
diff --git a/res/bootstrap/css/bootstrap.min.css b/www/res/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from res/bootstrap/css/bootstrap.min.css
rename to www/res/bootstrap/css/bootstrap.min.css
diff --git a/res/bootstrap/css/bootstrap.min.css.map b/www/res/bootstrap/css/bootstrap.min.css.map
similarity index 100%
rename from res/bootstrap/css/bootstrap.min.css.map
rename to www/res/bootstrap/css/bootstrap.min.css.map
diff --git a/res/bootstrap/js/bootstrap.bundle.js b/www/res/bootstrap/js/bootstrap.bundle.js
similarity index 100%
rename from res/bootstrap/js/bootstrap.bundle.js
rename to www/res/bootstrap/js/bootstrap.bundle.js
diff --git a/res/bootstrap/js/bootstrap.bundle.js.map b/www/res/bootstrap/js/bootstrap.bundle.js.map
similarity index 100%
rename from res/bootstrap/js/bootstrap.bundle.js.map
rename to www/res/bootstrap/js/bootstrap.bundle.js.map
diff --git a/res/bootstrap/js/bootstrap.bundle.min.js b/www/res/bootstrap/js/bootstrap.bundle.min.js
similarity index 100%
rename from res/bootstrap/js/bootstrap.bundle.min.js
rename to www/res/bootstrap/js/bootstrap.bundle.min.js
diff --git a/res/bootstrap/js/bootstrap.bundle.min.js.map b/www/res/bootstrap/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from res/bootstrap/js/bootstrap.bundle.min.js.map
rename to www/res/bootstrap/js/bootstrap.bundle.min.js.map
diff --git a/res/bootstrap/js/bootstrap.js b/www/res/bootstrap/js/bootstrap.js
similarity index 100%
rename from res/bootstrap/js/bootstrap.js
rename to www/res/bootstrap/js/bootstrap.js
diff --git a/res/bootstrap/js/bootstrap.js.map b/www/res/bootstrap/js/bootstrap.js.map
similarity index 100%
rename from res/bootstrap/js/bootstrap.js.map
rename to www/res/bootstrap/js/bootstrap.js.map
diff --git a/res/bootstrap/js/bootstrap.min.js b/www/res/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from res/bootstrap/js/bootstrap.min.js
rename to www/res/bootstrap/js/bootstrap.min.js
diff --git a/res/bootstrap/js/bootstrap.min.js.map b/www/res/bootstrap/js/bootstrap.min.js.map
similarity index 100%
rename from res/bootstrap/js/bootstrap.min.js.map
rename to www/res/bootstrap/js/bootstrap.min.js.map
diff --git a/res/custom.css b/www/res/custom.css
similarity index 100%
rename from res/custom.css
rename to www/res/custom.css
diff --git a/res/jquery.min.js b/www/res/jquery.min.js
similarity index 100%
rename from res/jquery.min.js
rename to www/res/jquery.min.js
diff --git a/res/moment.js b/www/res/moment.js
similarity index 100%
rename from res/moment.js
rename to www/res/moment.js
diff --git a/res/script.js b/www/res/script.js
similarity index 100%
rename from res/script.js
rename to www/res/script.js
diff --git a/treatment.php b/www/treatment.php
similarity index 93%
rename from treatment.php
rename to www/treatment.php
index b75f235..8a8b4fe 100644
--- a/treatment.php
+++ b/www/treatment.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 if(!empty($_GET["pid"])){
   $pid=$_GET["pid"];
   if(!empty($_POST["omit"])){
@@ -32,7 +32,7 @@ if(!empty($_GET["pid"])){
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php");?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>Clinical Notes</title>
   </head>
   <body>
@@ -51,6 +51,6 @@ if(!empty($_GET["pid"])){
         <?php echo $form;?>
       </div>
     </div>
-    <?php include("lib/foot.php");?>
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/view.php b/www/view.php
similarity index 97%
rename from view.php
rename to www/view.php
index e152507..184fea0 100644
--- a/view.php
+++ b/www/view.php
@@ -1,5 +1,5 @@
 <?php
-require("lib/require.php");
+require(dirname(__DIR__)."/require.php");
 $info="";
 $physician=[];
 $nursing=[];
@@ -26,7 +26,7 @@ if(isSet($_GET["pid"])){
 <!DOCTYPE html>
 <html>
   <head>
-    <?php include("lib/head.php");?>
+    <?php include(CONFIG_LIB."head.php");?>
     <title>View Info</title>
   </head>
   <body>
@@ -102,6 +102,6 @@ if(isSet($_GET["pid"])){
         <button class="form-control" type="submit">View</button>
       </form>
     </div>
-    <?php include("lib/foot.php");?>
+    <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
-- 
2.39.2