From e13ecef1eaac42969c1cac7055846bc17edf857d Mon Sep 17 00:00:00 2001 From: Will Budic Date: Thu, 14 Nov 2019 15:42:03 +1100 Subject: [PATCH] Placed globals settings into module. --- htdocs/cgi-bin/main.cgi | 189 +++++++--------------- htdocs/cgi-bin/system/modules/Settings.pm | 106 ++++++++++++ 2 files changed, 165 insertions(+), 130 deletions(-) create mode 100644 htdocs/cgi-bin/system/modules/Settings.pm diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi index d7d524f..85df24f 100755 --- a/htdocs/cgi-bin/main.cgi +++ b/htdocs/cgi-bin/main.cgi @@ -23,41 +23,17 @@ use Time::localtime; use Regexp::Common qw /URI/; #DEFAULT SETTINGS HERE! -our $REC_LIMIT = 25; -our $TIME_ZONE = 'Australia/Sydney'; -our $LANGUAGE = 'English'; -our $PRC_WIDTH = '60'; -our $LOG_PATH = '../../dbLifeLog/'; -our $SESSN_EXPR = '+30m'; -our $DATE_UNI = '0'; -our $RELEASE_VER = '1.6'; -our $AUTHORITY = ''; -our $IMG_W_H = '210x120'; -our $AUTO_WRD_LMT = 1000; -our $FRAME_SIZE = 0; -our $RTF_SIZE = 0; - -my $THEME = 'Standard'; -my $TH_CSS = 'main.css'; -my $BGCOL = '#c8fff8'; -#Set to 1 to get debug help. Switch off with 0. -my $DEBUG = 0; -#END OF SETTINGS - +use lib "system/modules"; +require Settings; my $cgi = CGI->new; -my $sss = - new CGI::Session( "driver:File", $cgi, { Directory => $LOG_PATH} ); +my $sss = new CGI::Session( "driver:File", $cgi, { Directory => Settings::logPath()} ); my $sid = $sss->id(); my $dbname = $sss->param('database'); my $userid = $sss->param('alias'); my $password = $sss->param('passw'); -if ($AUTHORITY) { - $userid = $password = $AUTHORITY; - $dbname = 'data_' . $userid . '_log.db'; -} -elsif ( !$userid || !$dbname ) { +if ( !$userid || !$dbname ) { print $cgi->redirect("login_ctr.cgi?CGISESSID=$sid"); exit; } @@ -68,10 +44,11 @@ my $db = DBI->connect( $dsn, $userid, $password, { PrintError => 0, RaiseE or die "

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

"; my ( $imgw, $imgh ); - +#Fetch settings +Settings::getConfiguration($db); +Settings::getTheme(); ### Authenticate sss to alias password &authenticate; -&getConfiguration($db); my $log_rc = 0; my $log_rc_prev = 0; @@ -86,16 +63,23 @@ my $rs_dat_to = $cgi->param('v_to'); my $rs_prev = $cgi->param('rs_prev'); my $rs_cur = $cgi->param('rs_cur'); my $rs_page = $cgi->param('rs_page'); -my $stmS = 'SELECT ID, ID_CAT, DATE, LOG, AMOUNT, AFLAG, RTF, STICKY from VW_LOG WHERE';#"SELECT rowid, ID_CAT, DATE, LOG, AMOUNT, AFLAG, RTF, STICKY from LOG WHERE"; -my $stmE = "";#" ORDER BY DATE DESC;"; +my $stmS = 'SELECT ID, ID_CAT, DATE, LOG, AMOUNT, AFLAG, RTF, STICKY from VW_LOG WHERE'; +my $stmE = ""; my $stmD = ""; my $sm_reset_all; +my $rl = &Settings::recordLimit; +### Page specific settings Here +my $TH_CSS = &Settings::css; +my $BGCOL = &Settings::bgcol; +#Set to 1 to get debug help. Switch off with 0. +my $DEBUG = &Settings::debug; +#END OF SETTINGS -my $lang = Date::Language->new($LANGUAGE); +my $lang = Date::Language->new(Settings::language()); my $today = DateTime->now; -$today->set_time_zone($TIME_ZONE); +$today->set_time_zone(Settings::timezone()); if ( !$rs_dat_to && $rs_dat_from ) { @@ -114,7 +98,7 @@ if ( $rs_keys || $rs_cat_idx || $stmD || $prm_vc > 0 || $prm_xc > 0) { $toggle = ##Handle Session Keeps -$sss->expire($SESSN_EXPR); +$sss->expire(&Settings::sessionExprs); $sss->param('theme', $TH_CSS); $sss->param('bgcolor', $BGCOL); @@ -150,7 +134,7 @@ if($prm_xc){ $sss->flush(); #tag related framed sizing. -my @arrwh = split /x/, $IMG_W_H; +my @arrwh = split /x/, &Settings::imgWidthHeight; if ( @arrwh == 2 ) { $imgw = $arrwh[0]; $imgh = $arrwh[1]; @@ -160,9 +144,6 @@ else { #defaults $imgh = 120; } - -&getTheme; - print $cgi->header(-expires => "0s", -charset => "UTF-8"); print $cgi->start_html( -title => "Personal Log", @@ -268,7 +249,7 @@ for my $key ( keys %hshDesc ) { } my $log_output = qq(
- +
@@ -477,12 +458,12 @@ qq(\n); if ( $log =~ /
Date Time