From 5a279ed48b5b1bf74c2865645eb4916b5bab5e75 Mon Sep 17 00:00:00 2001
From: Will Budicm <vilijanac@gmail.com>
Date: Mon, 21 Dec 2020 21:20:10 +1100
Subject: [PATCH] Fix, dbname not set.

---
 htdocs/cgi-bin/stats.cgi                  | 20 ++++++++++----------
 htdocs/cgi-bin/system/modules/Settings.pm |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/cgi-bin/stats.cgi b/htdocs/cgi-bin/stats.cgi
index 7e4ec28..39ed1ba 100755
--- a/htdocs/cgi-bin/stats.cgi
+++ b/htdocs/cgi-bin/stats.cgi
@@ -21,24 +21,24 @@ use lib "system/modules";
 use lib $ENV{'PWD'}.'/htdocs/cgi-bin/system/modules';
 require Settings;
 
-my $cgi     = CGI->new();
-my $db      = Settings::fetchDBSettings($cgi);
+my $db      = Settings::fetchDBSettings();
+my $cgi     = Settings::cgi();
 my $sss     = Settings::session();
 my $sid     = Settings::sid(); 
-my $dbname  = Settings::dbName();
+my $dbname  = Settings::dbFile();
 my $alias   = Settings::alias();
 my $passw   = Settings::pass();
 
 if(!$alias||!$dbname){
-    if (Settings::debug()){
-        $alias  ="admin";
-        $dbname = "data_admin_log.db";
-        $passw  = "admin";
-    }
-    else{
+    # if (Settings::debug()){
+    #     $alias  ="admin";
+    #     $dbname = "data_admin_log.db";
+    #     $passw  = "admin";
+    # }
+    # else{
         print $cgi->redirect("login_ctr.cgi?CGISESSID=$sid");
         exit;
-    }
+    # }
 }
 try{
 
diff --git a/htdocs/cgi-bin/system/modules/Settings.pm b/htdocs/cgi-bin/system/modules/Settings.pm
index ab9128f..c3c137b 100644
--- a/htdocs/cgi-bin/system/modules/Settings.pm
+++ b/htdocs/cgi-bin/system/modules/Settings.pm
@@ -120,11 +120,11 @@ try {
     $CGI::POST_MAX = 1024 * 1024 * 5;  # max 5GB file post size limit.
     $cgi     = CGI->new();    
     $sss     = new CGI::Session("driver:File", $cgi, {Directory=>$LOG_PATH});
-    $sid     = $sss->id();
-    $dbname  = $sss->param('database');
+    $sid     = $sss->id();    
     $alias   = $sss->param('alias');
     $pass    = $sss->param('passw');
     $pub     = $cgi->param('pub');
+    $dbname  = $sss->param('database'); $dbname = $alias if(!$dbname);
 
     ##From here we have data source set, currently Progress DB SQL and SQLite SQL compatible.
     dbSrc($sss->param('db_source'));
@@ -616,7 +616,7 @@ sub connectDB {
     my $db =$u;
     if(!$d){$db = 'data_'.$u.'_log.db';$d=$u}
     else{   $db = 'data_'.$d.'_log.db';}
-    $DBFILE = $LOG_PATH.'/'.$db;
+    $DBFILE = $LOG_PATH.$db;
         if ($IS_PG_DB)  {
             $DSN = $DBI_SOURCE .'dbname='.$d;
         }else{
-- 
2.34.1