LibreHealthIO · maggienegm · Aug 11, 2020 · Aug 11, 2020 · Aug 12, 2020
diff --git a/acl_upgrade.php b/acl_upgrade.php
@@ -106,7 +106,7 @@
 * @link      http://librehealth.io
 */
 
-$ignoreAuth = true; // no login required
+$aclUpgradeConfig = true; // to correctly redirect to login page if needed
 
 require_once('interface/globals.php');
 require_once("$srcdir/acl_upgrade_fx.php");

diff --git a/admin.php b/admin.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * LICENSE: This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>;.
+ * 
+ * 
+ * The purpose of this file is to have one central location to handle 
+ * multiple sites/ and their respective setup and configuration functionalities.
+ * This file may be run after an upgraded LibreHealth EHR has been installed.
+ */
+
+
+require_once("version.php");
+include_once("interface/globals.php");
+require_once("assets/adodb/adodb.inc.php");
+require_once("assets/adodb/drivers/adodb-mysqli.inc.php");
+
+$webserver_root = dirname(__FILE__);
+
+if (stripos(PHP_OS,'WIN') === 0) { 
+    $webserver_root = str_replace("\\","/",$webserver_root);
+    $OE_SITES_BASE = "$webserver_root/sites";
+}
+?>
+<html>
+<head>
+    <title>LibreHealth Medical Suite Site Administration</title>
+    <style>
+        tr.head { font-size:10pt; background-color:#cccccc; text-align:center; font-weight:bold; }
+        tr.detail { font-size:10pt; }
+        a, a:visited, a:hover { color:#0000cc; text-decoration:none; }
+    </style>
+</head>
+<body>
+<center>
+    <p><span class='title'>LibreEHR Site Administration</span></p>
+    <table width='100%' cellpadding='1' cellspacing='2'>
+        <tr class='head'>
+            <td>Site ID</td>
+            <td>DB Name</td>
+            <td>Site Name</td>
+            <td>Version</td>
+            <td>Action</td>
+        </tr>
+<?php
+$dh = opendir($OE_SITES_BASE);
+if (!$dh) die("Cannot read directory '$OE_SITES_BASE'.");
+$siteslist = array();
+
+while (false !== ($sfname = readdir($dh))) {
+    if (substr($sfname, 0, 1) == '.') continue;
+    if ($sfname == 'CVS' ) continue;
+    $sitedir = "$OE_SITES_BASE/$sfname";
+    if (!is_dir($sitedir) ) continue;
+    if (!is_file("$sitedir/sqlconf.php")) continue;
+    $siteslist[$sfname] = $sfname;
+}
+
+closedir($dh);
+ksort($siteslist);
+
+foreach ($siteslist as $sfname) {
+    $sitedir = "$OE_SITES_BASE/$sfname";
+    $errmsg = '';
+    ++$encount;
+    $bgcolor = "#" . (($encount & 1) ? "ddddff" : "ffdddd");
+
+    echo " <tr class='detail' bgcolor='$bgcolor'>\n";
+
+    // Access the site's database.
+    include "$sitedir/sqlconf.php";
+
+    if ($config) {
+        // Establish each sites/ directory database connection here
+        $dbh->connect("$host:$port", "$login", "$pass");
+        if ($dbh === FALSE)
+            $errmsg = "MySQL connect failed";
+        else if (!mysqli_select_db($dbh, $dbase))
+            $errmsg = "Access to database failed";
+        }
+
+    echo " <td>$sfname</td>\n";
+    echo " <td>$dbase</td>\n";
+
+    if (!$config) {
+       echo " <td colspan='3'><a href='setup.php?site=$sfname'>Needs setup, click here to run it</a></td>\n";
+    } 
+    else if ($errmsg) {
+        echo " <td colspan='3' style='color:red'>$errmsg</td>\n";
+    } 
+    else {
+        // Get site name for display
+        $row = mysqli_fetch_array(mysqli_query($dbh, "SELECT gl_value FROM globals WHERE gl_name = 'libreehr_name' LIMIT 1"), MYSQLI_ASSOC);
+        $libreehr_name = $row ? $row['gl_value'] : '';
+
+        // Get version indicators from the database. NOTE: these version indicators have not been maintained! This is related to the whole database installation system moving to a file-per-table version scheme that has not been implemented in the LibreHealth.io code repo, which was incomplete when contributors left the project.
+        $row = mysqli_fetch_array(mysqli_query($dbh, "SHOW TABLES LIKE 'version'"), MYSQLI_ASSOC);
+
+        if (empty($row)) {
+            $libreehr_version = 'Unknown';
+            $database_version = 0;
+        } 
+        else {
+            $row = mysqli_fetch_array(mysqli_query($dbh, "SELECT * FROM version LIMIT 1"), MYSQLI_ASSOC);
+
+            $database_patch_txt = "";
+            if ( !(empty($row['v_realpatch'])) && $row['v_realpatch'] != 0 ) {
+                $database_patch_txt = " (" . $row['v_realpatch'] .")";
+            } 
+
+            $libreehr_version = $row['v_major'] . "." . $row['v_minor'] . "." . $row['v_patch'] . $row['v_tag'] . $database_patch_txt;
+            $database_version = 0 + $row['v_database'];
+            $database_acl = 0 + $row['v_acl'];
+            $database_patch = 0 + $row['v_realpatch'];
+        }
+
+        // Display relevant columns
+        echo " <td>$libreehr_name</td>\n"; 
+        echo " <td>$libreehr_version</td>\n"; 
+
+        if ($v_database != $database_version) { 
+            echo "<td><a href='setup/sql_upgrade.php?site=$sfname'>Upgrade Database</a></td>\n";
+        } 
+        else if ( ($v_acl > $database_acl) ) { 
+            echo "<td><a href='acl_upgrade.php?site=$sfname'>Upgrade Access Controls</a></td>\n";
+        } 
+        else if ( ($v_realpatch != $database_patch) ) { 
+            echo "<td><a href='sql_patch.php?site=$sfname'>Patch Database</a></td>\n"; 
+        } 
+        else { 
+            echo "<td><a href='interface/login/login.php?site=$sfname'>Log In</a></td>\n"; 
+        }
+    } 
+
+    echo " </tr>\n";
+
+    if ($config && $dbh !== FALSE)  mysqli_close($dbh);
+}
+?> 
+    </table>
+    <form method='post' action='setup.php'> 
+        <p><input type='submit' name='form_submit' value='Add New Site' /></p>
+    </form>
+</center>
+</body>
+</html>
diff --git a/docker/README.md b/docker/README.md
@@ -324,7 +324,7 @@ This is only applicable to production.
 $ docker/run update
 ```
 
-Do not forget to run http://localhost:8000/sql_upgrade.php
+Do not forget to run http://localhost:8000/setup/sql_upgrade.php
 
 **Replace `localhost:8000` with the port and, IP address or hostname of your server.**
 

diff --git a/gacl/setup.php b/gacl/setup.php
@@ -5,6 +5,8 @@
 require_once(dirname(__FILE__).'/admin/gacl_admin.inc.php');
 require_once(ADODB_DIR .'/adodb-xmlschema.inc.php');
 
+// check if user is authenticated before displaying setup info
+require_once('../interface/globals.php');
 
 $db_table_prefix = $gacl->_db_table_prefix;
 $db_type = $gacl->_db_type;

diff --git a/interface/globals.php b/interface/globals.php
@@ -148,8 +148,19 @@ function undoMagicQuotes($array, $topLevel=true) {
       header('Location: index.php?site='.$tmp);
     }
     else {
-      // Main LibreHealth EHR use
-      header('Location: ../login/login.php?site='.$tmp); // Assuming in the interface/main directory
+      if (isset($sqlUpgradeConfig) && $sqlUpgradeConfig) {
+        header('Location: ../interface/login/login.php?loginfirst&site='.$tmp);
+        die();
+      }
+      else if ((isset($aclUpgradeConfig) && $aclUpgradeConfig) ||
+        (isset($sqlPatchConfig) && $sqlPatchConfig)) {
+        header('Location: interface/login/login.php?loginfirst&site='.$tmp);
+        die();
+      }
+      else {
+        // Main LibreHealth EHR use
+        header('Location: ../login/login.php?site='.$tmp); // Assuming in the interface/main directory
+      }
     }
     exit;
   }

diff --git a/sql_upgrade.php → setup/sql_upgrade.php b/sql_upgrade.php → setup/sql_upgrade.php
@@ -14,11 +14,11 @@
 // Disable PHP timeout.  This will not work in safe mode.
 ini_set('max_execution_time', '0');
 
-$ignoreAuth = true; // no login required
+$sqlUpgradeConfig = true; // to correctly redirect to login page if needed
 
-require_once('interface/globals.php');
-require_once('library/sql.inc');
-require_once('library/sql_upgrade_fx.php');
+require_once('../interface/globals.php');
+require_once('../library/sql.inc');
+require_once('../library/sql_upgrade_fx.php');
 
 
 // Force logging off
@@ -41,8 +41,8 @@
 <html>
 <head>
 <title>LibreHealth EHR Database Upgrade</title>
-<link rel='STYLESHEET' href='interface/themes/style_setup.css'>
-<link rel="shortcut icon" href="favicon.ico" />
+<link rel='STYLESHEET' href='../interface/themes/style_setup.css'>
+<link rel="shortcut icon" href="../favicon.ico" />
 </head>
 <body>
 <center>
@@ -60,13 +60,13 @@
 
   if ( (!empty($v_realpatch)) && ($v_realpatch != "") && ($v_realpatch > 0) ) {
     // This release contains a patch file, so process it.
-    upgradeFromSqlFile('patch.sql');
+    upgradeFromSqlFile('../patch.sql');
   }
 
   flush();
 
   echo "<font color='green'>Updating global configuration defaults...</font><br />\n";
-  require_once("library/globals.inc.php");
+  require_once("../library/globals.inc.php");
   foreach ($GLOBALS_METADATA as $grpname => $grparr) {
     foreach ($grparr as $fldid => $fldarr) {
       list($fldname, $fldtype, $flddef, $flddesc) = $fldarr;
@@ -81,7 +81,7 @@
   }
 
   echo "<font color='green'>Updating Access Controls...</font><br />\n";
-  require("acl_upgrade.php");
+  require("../acl_upgrade.php");
   echo "<br />\n";
 
   echo "<font color='green'>Updating version indicators...</font><br />\n";

diff --git a/sql_patch.php b/sql_patch.php
@@ -14,7 +14,7 @@
 // Disable PHP timeout.  This will not work in safe mode.
 ini_set('max_execution_time', '0');
 
-$ignoreAuth = true; // no login required
+$sqlPatchConfig = true; // to correctly redirect to login page if needed
 
 require_once('interface/globals.php');
 require_once('library/sql.inc');