From bde74e1ffffbcd7cf0d868b9bb4b48fbdc87d03e Mon Sep 17 00:00:00 2001 From: Will Budic Date: Wed, 8 Jan 2020 10:13:12 +1100 Subject: [PATCH] Upd to use Setting module. --- htdocs/cgi-bin/config.cgi | 164 ++++++++++---------------------------- 1 file changed, 40 insertions(+), 124 deletions(-) diff --git a/htdocs/cgi-bin/config.cgi b/htdocs/cgi-bin/config.cgi index 58601e2..e3c6617 100755 --- a/htdocs/cgi-bin/config.cgi +++ b/htdocs/cgi-bin/config.cgi @@ -20,25 +20,9 @@ use Date::Language; use Text::CSV; #DEFAULT SETTINGS HERE! -our $REC_LIMIT = 25; -our $TIME_ZONE = 'Australia/Sydney'; -our $LANGUAGE = 'English'; -our $PRC_WIDTH = '70'; -our $LOG_PATH = '../../dbLifeLog/'; -our $SESSN_EXPR = '+30m'; -our $DATE_UNI = '0'; -our $RELEASE_VER = '1.4'; -our $AUTHORITY = ''; -our $IMG_W_H = '210x120'; -our $AUTO_WRD_LMT = 200; -our $AUTO_LOGIN = 0; -our $FRAME_SIZE = 0; -our $RTF_SIZE = 0; - -my $THEME = 0; -my $TH_CSS = 'main.css'; -my $BGCOL = '#c8fff8'; -#END OF SETTINGS +use lib "system/modules"; +require Settings; +## #This is the OS developer release key, replace on istallation. As it is not secure. my $cipher_key = '95d7a85ba891da'; @@ -47,7 +31,7 @@ my $cipher_key = '95d7a85ba891da'; $CGI::POST_MAX = 1024 * 15000; my ($LOGOUT,$ERROR) = (0,""); my $cgi = CGI->new; -my $session = new CGI::Session("driver:File",$cgi, {Directory=>$LOG_PATH}); +my $session = new CGI::Session("driver:File",$cgi, {Directory=>&Settings::logPath}); my $sid=$session->id(); my $dbname =$session->param('database'); my $userid =$session->param('alias'); @@ -60,14 +44,19 @@ if(!$userid||!$dbname){ exit; } -my $database = $LOG_PATH.$dbname; +my $database = &Settings::logPath.$dbname; my $dsn= "DBI:SQLite:dbname=$database"; my $db = DBI->connect($dsn, $userid, $password, { RaiseError => 1 }) or die "

Error->"& $DBI::errstri &"

"; +### Fetch settings + Settings::getConfiguration($db); + Settings::getTheme(); +### + my $rv; my $dbs; my $today = DateTime->now; -my $lang = Date::Language->new($LANGUAGE); +my $lang = Date::Language->new(&Settings::language); my $tz = $cgi->param('tz'); my $csvp = $cgi->param('csv'); @@ -78,11 +67,8 @@ if($cgi->param('data_cat')){ }elsif($cgi->param('data_log')){ &importLogCSV; } - -##################### - &getConfiguration; -##################### -$today->set_time_zone( $TIME_ZONE ); + +$today->set_time_zone( &Settings::timezone ); my $stmtCat = 'SELECT * FROM CAT ORDER BY ID;'; @@ -93,9 +79,9 @@ my %hshCats = {}; ############### &processSubmit; ############### -&getTheme; - $session->param("theme",$TH_CSS); - $session->param("bgcolor",$BGCOL); +Settings::getTheme(); +$session->param("theme",&Settings::css); +$session->param("bgcolor",&Settings::bgcol); &getHeader; if ($ERROR){&error;}else{ @@ -123,7 +109,7 @@ print qq(