From 68e08ee1438f15e4097eb389e758f35bb57a4c20 Mon Sep 17 00:00:00 2001 From: wbudic Date: Tue, 5 Mar 2019 15:09:08 +1100 Subject: [PATCH] Chrome Browser testing and style fixes. Date bug fix. --- htdocs/cgi-bin/main.cgi | 34 ++++--- htdocs/cgi-bin/remove.cgi | 89 +++++++++++------- htdocs/cgi-bin/stats.cgi | 6 +- .../wsrc/{.main.js.swp => .main.css.swp} | Bin 20480 -> 12288 bytes htdocs/cgi-bin/wsrc/main.js | 8 +- 5 files changed, 86 insertions(+), 51 deletions(-) rename htdocs/cgi-bin/wsrc/{.main.js.swp => .main.css.swp} (53%) diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi index 8e5c166..34c628d 100755 --- a/htdocs/cgi-bin/main.cgi +++ b/htdocs/cgi-bin/main.cgi @@ -189,13 +189,16 @@ if($tbl_start>0){ }else{ $tfId = 1; } - my @chunks = split(/($re_a_tag)/si , $log) ; - - foreach my $chunks_i ( @chunks ) { - next if $chunks_i =~ /$re_a_tag/ ; - $chunks_i =~ s/($RE{URI}{HTTP})/$1<\/a>/gsi; + + #Replace with a full link an HTTP URI + my @chnks = split(/($re_a_tag)/si , $log) ; + foreach my $ch_i ( @chnks ) { + next if $ch_i =~ /$re_a_tag/ ; + $ch_i =~ s/https/http/gsi; + $ch_i =~ s/($RE{URI}{HTTP})/$1<\/a>/gsi; } - $log = join('' , @chunks) ; + $log = join('' , @chnks) ; + $tbl = $tbl . ''. $dt->ymd . ''. '' . $dt->hms . "" . @@ -244,9 +247,13 @@ if($tbl_start>0){ } $tbl = $tbl . ' - - -
Keywords: + + +   + + +
+
Keywords:
'; @@ -260,15 +267,18 @@ my $frm = qq( Date:hms . qq(">  -   -   +   + Category: Log: ).$cats.qq( ↡ Ammount: - + + + + diff --git a/htdocs/cgi-bin/remove.cgi b/htdocs/cgi-bin/remove.cgi index 9a876a1..a7b8214 100755 --- a/htdocs/cgi-bin/remove.cgi +++ b/htdocs/cgi-bin/remove.cgi @@ -1,5 +1,8 @@ #!/usr/bin/perl -package PersonalLog; +# +# Programed in vim by: Will Budic +# Open Source License -> https://choosealicense.com/licenses/isc/ +# use strict; use warnings; @@ -17,29 +20,21 @@ my $database = "../../dbLifeLog/data_log.db"; my $dsn = "DBI:$driver:dbname=$database"; my $userid = ""; my $password = ""; -my $dbh = DBI->connect($dsn, $userid, $password, { RaiseError => 1 }) +my $db = DBI->connect($dsn, $userid, $password, { RaiseError => 1 }) or die "

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

"; - - - - - - my $today = DateTime->now; -$today->set_time_zone( 'Australia/Sydney' ); + $today->set_time_zone( 'Australia/Sydney' ); my $stmtCat = "SELECT * FROM CAT;"; - - -my $sth = $dbh->prepare( $stmtCat ); -my $rv = $sth->execute() or die or die "

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

"; +my $st = $db->prepare( $stmtCat ); +my $rv = $st->execute() or die or die "

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

"; my %hshCats; my $tbl_rc =0; - while(my @row = $sth->fetchrow_array()) { +while(my @row = $st->fetchrow_array()) { $hshCats{$row[0]} = $row[1]; - } +} my $stmS = "SELECT rowid, ID_CAT, DATE, LOG from LOG WHERE"; @@ -47,23 +42,46 @@ my $stmE = " ORDER BY DATE DESC, rowid DESC;"; my $tbl = '
'; -my $confirmed = $q->param('confirmed'); -if (!$confirmed){ - print $q->header(-expires=>"+6os"); - print $q->start_html(-title => "Personal Log Record Removal", - -script=>{-type => 'text/javascript', -src => 'wsrc/main.js'}, - -style =>{-type => 'text/css', -src => 'wsrc/main.css'} - ); +print $q->header(-expires=>"+6os"); + +my $datediff = $q->param("datediff"); +my $confirmed = $q->param('confirmed'); +if ($datediff){ + print $q->start_html(-title => "Date Difference Report", + -script=>{-type => 'text/javascript', -src => 'wsrc/main.js'}, + -style =>{-type => 'text/css', -src => 'wsrc/main.css'} - &NotConfirmed; - print $q->end_html; + ); + &DisplayDateDiffs; } else{ - &ConfirmedDelition; + if (!$confirmed){ + print $q->start_html(-title => "Personal Log Record Removal", + -script=>{-type => 'text/javascript', -src => 'wsrc/main.js'}, + -style =>{-type => 'text/css', -src => 'wsrc/main.css'} + + ); + + &NotConfirmed; + } + else{ + &ConfirmedDelition; + } } -$dbh->disconnect(); +print $q->end_html; +$db->disconnect(); +exit; + +sub DisplayDateDiffs{ + $tbl = '
DateTimeLogCategory
+

Under Development Sorry!

'; + + $tbl .= '
'; + +print "
".$tbl."
"; +} sub ConfirmedDelition{ @@ -73,8 +91,8 @@ sub ConfirmedDelition{ foreach my $prm ($q->param('chk')){ $stm = $stmS . "rowid = '" . $prm ."';"; - $sth = $dbh->prepare( $stm ); - $rv = $sth->execute() or die or die "

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

"; + $st = $db->prepare( $stm ); + $rv = $st->execute() or die or die "

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

"; if($rv < 0) { print "

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

"; } @@ -83,27 +101,28 @@ sub ConfirmedDelition{ print $q->redirect('main.cgi'); + $st->finish; } sub NotConfirmed{ #Get prms and build confirm table and check my $stm = $stmS ." "; -foreach my $prm ($q->param('chk')){ - $stm = $stm . "rowid = '" . $prm . "' OR "; -} + foreach my $prm ($q->param('chk')){ + $stm = $stm . "rowid = '" . $prm . "' OR "; + } #rid=0 hack! ;) $stm = $stm . "rowid = '0' " . $stmE; # -$sth = $dbh->prepare( $stm ); -$rv = $sth->execute() or die or die "

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

"; +$st = $db->prepare( $stm ); +$rv = $st->execute() or die or die "

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

"; if($rv < 0) { print "

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

"; } my $r_cnt = 0; -while(my @row = $sth->fetchrow_array()) { +while(my @row = $st->fetchrow_array()) { my $ct = $hshCats{@row[1]}; my $dt = DateTime::Format::SQLite->parse_datetime( $row[2] ); @@ -132,4 +151,6 @@ if($r_cnt>1){ print '
' . $tbl .'
'; + $st->finish; } + diff --git a/htdocs/cgi-bin/stats.cgi b/htdocs/cgi-bin/stats.cgi index d659fe2..ce614bb 100755 --- a/htdocs/cgi-bin/stats.cgi +++ b/htdocs/cgi-bin/stats.cgi @@ -39,7 +39,7 @@ print $q->start_html(-title => "Log Data Stats", ); -my $tbl = ''; +my $tbl = '
Personal Log Data Stats
'; @@ -68,9 +68,9 @@ my $processes = `$prc | sort -u -r -`; #Strip kernel 0 processes reported $processes =~ s/\s*0.00.*//gd; -$tbl = $tbl . ' - diff --git a/htdocs/cgi-bin/wsrc/.main.js.swp b/htdocs/cgi-bin/wsrc/.main.css.swp similarity index 53% rename from htdocs/cgi-bin/wsrc/.main.js.swp rename to htdocs/cgi-bin/wsrc/.main.css.swp index b39e5779cfb1ca7426a0a2740ea61f01d22aeb5b..77e4799b857107b20e002e7af696f40493c7bba0 100644 GIT binary patch literal 12288 zcmeI1y-yTD7>5Vc;-VlC8w|yG*I0O8h+eXU3M?$N5-EgSc6WxmiL)Q>&T)qX(OB{a z&?!bc3yqzXg&MWi*s6uC{skuf_I59FKthNW=AGop?#|A<^UgDGvstHdZ5 z+i~QUJzM!DH;(rYM zfD9aN1120`>)66zwvCzWIGD`P5^3TfDDiUGC&5%02v?yWPl9(ZwA&_&d81_ z+FCVyOUorQ#d6(;q8s=|`lhe5@1dxS^x~|mVCz+UXt10UL_$W>Rwe8p)DnUeV|7Pb zwJ-@C+CnJ5!7p~-dUn)MzQrq3tR#gph>*sx-CK<)X!!zJ=peFq!F89=FfOWYU&rFr zu*2g(E5RL&X;{PAJzHMt&90=gvpkB)j;$=4UY`>f6L>p&Bh_f`8ft>DH!j`x9{H4v zqj|cjP;sd36^r|UFOli8jEr(^o$2SE5<(|0ww(!gaR@R(XIlx=w0Lc@tCkgnTCT@Y zGY$Pup%AHG%iapM?Y2Lc?9h|L(sme2i}&uPn6Vu#&vVlR0;?o7(yfZNOpQ8$7T8@{ z3)z9xx?2o0ZGVfXI?-1*RSZiGk9TiUFF99B8x@n*@=dc6%ISREay(`7iwO7!2V615 literal 20480 zcmeI2eTW?89mk)jZMxCKyeWmY=E+H<4cazM{ z95b_fS(B(xQH1`XwX_CPS_*}NVE-tnQBnj!3PK<)#n#wTu&t#a*v8twO#69eXJ76v zyO+L5-<~}_%*{N{?|J$Dp0}CjDGwjqxm(^^_>ADUScp%ZnL51u=DhgU3L&OE-`9`l z`t3O|HZ;6pu2@1mpc5=66G<}ZmRwaYP9$#V#6@S^8!CH2aVn0SV%7G7!jX9H)JzPc zfKlLz6{sbZq1zUUTW;PktZi0VE9J7K2d>!ML^KK*1&jhl0i%FXz$jo8FbWt2{`(b3 zCa)F`QjM#!s*GjVc{8rpWcT-F*KISxug>m2l3l+$BRsn`7o&htz$jo8FbWt2i~>dh zqkvJsC}0#Y3K#|c4GP$<5J66eZ!92l_WxV&{~ug0#GCLmJO$r``(Y<+hWT&}Tm|#s zcZ-C03w{76;5clDJ7EmA!a7(E7ZwWf8vGbuf-~>}dI3O|7#!C8114#Afo5AUPLtDtpx z1-=TSuo>pV>uB~v_#T|n`oX<01nc1@_#}J+E`3ah58xa;1CPTb?1oKnJFJ5|tc3-T zgE!_2@jRS{6L2@&2CL!Ia04uZrEuw^==IBqN-b~_FAQW{D_6Z_kD3~@6Ez-2jr_oI3MY!iob9V9 z$(NI$P`CY>8W`zV)jc(}wXqEo9e(8&?M&KMk{{<-YE=~^g>jYK=_~#3*2YdZZ#hXd z9=8SxankTr!S&)v-)_iJX$4`RtPyQ1azbCq1uqCxv|k-d2#=Lt2q$&@;=A?#pqxax zI|El8yQh#4Ya}&u?4((_xs6f{Mnq~>ww}xyMRGu~3cTNo`T?7au`d@pG~x zbZyc_^Q`pCvl3NHoEnsqwf0SfQ*xiObsAZwx=?tum&?+Uos`Otl{|jABzJhO>PnJ4 zFOyc;51pf}9KDLn&x$kJY9#W+iP^R%jEWx$@S{Ul&aKmOcIWd`#46| zJ?#S|r~6GVQb{ceWW}b6G?z3Bgf28YT3$=7bL~7Td2vbir?vw(bVZ5c(qyFS?XcnL zVNNaT6=eHlkr3PBvosVA-eQ;_ z9)PNJR`sNM8#BGm%74O(^zTUK+)#%ez&5p1Z(WbTcHfis<>C@d_P)k($oX3OB zhx?Qh25!~?nETspyBWN_=KF`3b@Bs)){r$=t)>^(ZMBQ0bgrJz(qc8O4(uOG7i$A; ze^>P|-xXtb7$g%Uxk~y0=e;bO}~!qr#*e#VYS61Kn*UwMr!= zAZ>3gExJOqHMgv}<(f4tP&$Rr9wV&w5w+>t1v}m#=16Ly-SYQ1kQH{Porh8Npe~H9 zm)5Q6UOR8vYN+S9rq{U5^`>rQ=+rbrhSuOU`xRhX6*_Z6yG(v)yUN`fx{Xe1VqHdhqkvJsC}0#Y3jD(goD@<{|DeQ&!*qwmaVEywAJ81nZT_Eq%i>;t z17mN-u{}3?$n9L8NBBNh@zO02{rJc9sH7g`xoKc@F3g^ zBanx+@Nu{iZh(0p;5_^G&%%>%3=YHXum)Dcjj$Y+!BY4$`}ps{EASO?VGK6H5_p%r z`#-?%;cYk%=ioFv1P{PTI1Gni0RFdhqrm^E0&Ir%`gOK7n)^rQ2-KYCrqV4bwx0CrN^d`zBT(iDlsN*G z9-}lzpk|Jz<_J{hm_z$8V9%}b9^2f#_r?Fmk3iYg?jul~W$He;(_58)>g3ey!w1Um NE(Ir~rj
* PERSONAL LOG DATA STATS *
Number of Records:'. +$tbl = $tbl . '
Number of Records:'. $log_rc.'
No. of Records This Year:'. +
No. of Records This Year:'. $log_this_year_rc.'
# Sum of Expenses For Year '.$today->year(). ''.$expense.'